Skip to content

Commit cba8e0b

Browse files
committed
go mod update
1 parent ee2cc8b commit cba8e0b

File tree

3 files changed

+13
-77
lines changed

3 files changed

+13
-77
lines changed

go.mod

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -127,12 +127,12 @@ require (
127127

128128
replace github.com/jfrog/jfrog-cli-security => github.com/jfrog/jfrog-cli-security v1.21.11-0.20251104140634-6dbc03278772
129129

130-
// replace github.com/jfrog/jfrog-cli-core/v2 => github.com/jfrog/jfrog-cli-core/v2 dev
130+
replace github.com/jfrog/jfrog-cli-core/v2 => github.com/jfrog/jfrog-cli-core/v2 v2.59.2-0.20250709124419-1e5e14be13da
131131

132-
// replace github.com/jfrog/jfrog-cli-artifactory => github.com/jfrog/jfrog-cli-artifactory main
132+
//replace github.com/jfrog/jfrog-cli-artifactory => github.com/jfrog/jfrog-cli-artifactory main
133133

134-
// replace github.com/jfrog/build-info-go => github.com/jfrog/build-info-go dev
134+
replace github.com/jfrog/build-info-go => github.com/jfrog/build-info-go v1.8.9-0.20251105082953-2acbee2cb0b2
135135

136-
// replace github.com/jfrog/jfrog-client-go => github.com/jfrog/jfrog-client-go dev
136+
replace github.com/jfrog/jfrog-client-go => github.com/jfrog/jfrog-client-go v1.28.1-0.20250903131326-8b1e76d13715
137137

138-
// replace github.com/jfrog/froggit-go => github.com/jfrog/froggit-go master
138+
replace github.com/jfrog/froggit-go => github.com/jfrog/froggit-go v1.20.6

go.sum

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -128,22 +128,22 @@ github.com/jedib0t/go-pretty/v6 v6.6.8 h1:JnnzQeRz2bACBobIaa/r+nqjvws4yEhcmaZ4n1
128128
github.com/jedib0t/go-pretty/v6 v6.6.8/go.mod h1:YwC5CE4fJ1HFUDeivSV1r//AmANFHyqczZk+U6BDALU=
129129
github.com/jfrog/archiver/v3 v3.6.1 h1:LOxnkw9pOn45DzCbZNFV6K0+6dCsQ0L8mR3ZcujO5eI=
130130
github.com/jfrog/archiver/v3 v3.6.1/go.mod h1:VgR+3WZS4N+i9FaDwLZbq+jeU4B4zctXL+gL4EMzfLw=
131-
github.com/jfrog/build-info-go v1.12.1 h1:pXyx2F3MzrdbLPhYU8om+RHl87yEDYW+UwAUw3f40fQ=
132-
github.com/jfrog/build-info-go v1.12.1/go.mod h1:szdz9+WzB7+7PGnILLUgyY+OF5qD5geBT7UGNIxibyw=
133-
github.com/jfrog/froggit-go v1.20.4 h1:N9XkNV00HNjpI8p6xXlF9DrWmvE9hz3z2XRDAYJDweQ=
134-
github.com/jfrog/froggit-go v1.20.4/go.mod h1:obSG1SlsWjktkuqmKtpq7MNTTL63e0ot+ucTnlOMV88=
131+
github.com/jfrog/build-info-go v1.8.9-0.20251105082953-2acbee2cb0b2 h1:LtzLuS9lNBLkpoSr7r/rJGqFz5V01PH5q5M0gTXwsQE=
132+
github.com/jfrog/build-info-go v1.8.9-0.20251105082953-2acbee2cb0b2/go.mod h1:szdz9+WzB7+7PGnILLUgyY+OF5qD5geBT7UGNIxibyw=
133+
github.com/jfrog/froggit-go v1.20.6 h1:Xp7+LlEh0m1KGrQstb+u0aGfjRUtv1eh9xQBV3571jQ=
134+
github.com/jfrog/froggit-go v1.20.6/go.mod h1:obSG1SlsWjktkuqmKtpq7MNTTL63e0ot+ucTnlOMV88=
135135
github.com/jfrog/gofrog v1.7.6 h1:QmfAiRzVyaI7JYGsB7cxfAJePAZTzFz0gRWZSE27c6s=
136136
github.com/jfrog/gofrog v1.7.6/go.mod h1:ntr1txqNOZtHplmaNd7rS4f8jpA5Apx8em70oYEe7+4=
137137
github.com/jfrog/jfrog-apps-config v1.0.1 h1:mtv6k7g8A8BVhlHGlSveapqf4mJfonwvXYLipdsOFMY=
138138
github.com/jfrog/jfrog-apps-config v1.0.1/go.mod h1:8AIIr1oY9JuH5dylz2S6f8Ym2MaadPLR6noCBO4C22w=
139139
github.com/jfrog/jfrog-cli-artifactory v0.7.3-0.20251021143342-49bab7f38cec h1:iB5bXWKvzNejqyUgqxKf8YNj+DBx1suf2r2KzI03wkU=
140140
github.com/jfrog/jfrog-cli-artifactory v0.7.3-0.20251021143342-49bab7f38cec/go.mod h1:JE/35+kU8cBET4I4iuNcVBvhm8SF64DAmGgtHRzf5Do=
141-
github.com/jfrog/jfrog-cli-core/v2 v2.60.1-0.20251023084247-a56afca52451 h1:Q0PY8VSOVsfvXzKiUnn+Rv7Ynf901QW6Wn1CbWpHBD0=
142-
github.com/jfrog/jfrog-cli-core/v2 v2.60.1-0.20251023084247-a56afca52451/go.mod h1:UOeOwEEmRIi57cRwghN5OBVoqkJieYQQfLpeqw8Yv38=
141+
github.com/jfrog/jfrog-cli-core/v2 v2.59.2-0.20250709124419-1e5e14be13da h1:uDMQ6tdKI7nk3Z4fwYv0xcdQZVGnrt58+Wk5970c6Zk=
142+
github.com/jfrog/jfrog-cli-core/v2 v2.59.2-0.20250709124419-1e5e14be13da/go.mod h1:pcAx7PFOLiw82c6fBDJw3BfIfUQdoHsxWd5u/XH9XEM=
143143
github.com/jfrog/jfrog-cli-security v1.21.11-0.20251104140634-6dbc03278772 h1:bUbeuPF7DvS++/PcuMuCpRzMa3gS3vaoyBsk/ZYumAY=
144144
github.com/jfrog/jfrog-cli-security v1.21.11-0.20251104140634-6dbc03278772/go.mod h1:Spi+fMs/zlRPRYJqC2qVFtGB1kuJ6nCNagU8hy+JkmQ=
145-
github.com/jfrog/jfrog-client-go v1.55.1-0.20251030113529-d87ecf28ffb6 h1:wIvalJQqSu8HsMduiaCTU7FtkRhbOeaikCIaQKF8EHI=
146-
github.com/jfrog/jfrog-client-go v1.55.1-0.20251030113529-d87ecf28ffb6/go.mod h1:wsMEtoyAu/1bARUHxFdmgz83g96ml7ZWcFioIPiuz/U=
145+
github.com/jfrog/jfrog-client-go v1.28.1-0.20250903131326-8b1e76d13715 h1:XhEV/3LE7hj9xlQjZSn+XHTUi42AOyPcbsGtdKr6jlY=
146+
github.com/jfrog/jfrog-client-go v1.28.1-0.20250903131326-8b1e76d13715/go.mod h1:cOy7Pn34bGtjp0eWHADTRJG5Er0qVnJIz04u+NGEpcQ=
147147
github.com/jhump/protoreflect v1.15.1 h1:HUMERORf3I3ZdX05WaQ6MIpd/NJ434hTp5YiKgfCL6c=
148148
github.com/jhump/protoreflect v1.15.1/go.mod h1:jD/2GMKKE6OqX8qTjhADU1e6DShO+gavG9e0Q693nKo=
149149
github.com/jordan-wright/email v4.0.1-0.20210109023952-943e75fe5223+incompatible h1:jdpOPRN1zP63Td1hDQbZW73xKmzDvZHzVdNYxhnTMDA=

utils/outputwriter/outputcontent.go

Lines changed: 0 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -645,70 +645,6 @@ func stringToApplicabilityStatus(status string) *jasutils.ApplicabilityStatus {
645645
}
646646
}
647647

648-
// formatComponentWithApplicability formats a component with its applicability status
649-
// Format: "component-id (Status)"
650-
func formatComponentWithApplicability(component formats.ComponentRow, status string) string {
651-
componentId := results.GetDependencyId(component.Name, component.Version)
652-
if status == "" {
653-
return componentId
654-
}
655-
// Format status as (Status)
656-
return fmt.Sprintf("%s (%s)", componentId, status)
657-
}
658-
659-
// buildComponentApplicabilityMap builds a mapping of component keys (name:version) to their applicability statuses
660-
// from the impact paths and CVEs
661-
func buildComponentApplicabilityMap(impactPaths [][]formats.ComponentRow, cves []formats.CveRow) map[string]string {
662-
componentStatusMap := make(map[string]string)
663-
664-
// Collect all component statuses from CVEs
665-
// For each CVE, check if it has applicability status
666-
for _, cve := range cves {
667-
if cve.Applicability != nil && cve.Applicability.Status != "" {
668-
// Map all components in impact paths to this CVE's applicability status
669-
for _, path := range impactPaths {
670-
for _, component := range path {
671-
componentKey := fmt.Sprintf("%s:%s", component.Name, component.Version)
672-
// Use the first status we find for each component
673-
// If multiple CVEs have different statuses, we'll use GetFinalApplicabilityStatus
674-
if _, exists := componentStatusMap[componentKey]; !exists {
675-
componentStatusMap[componentKey] = cve.Applicability.Status
676-
}
677-
}
678-
}
679-
}
680-
}
681-
682-
// For components with multiple statuses, use GetFinalApplicabilityStatus
683-
// Group components by their statuses
684-
componentStatuses := make(map[string][]jasutils.ApplicabilityStatus)
685-
for componentKey, status := range componentStatusMap {
686-
statusEnum := stringToApplicabilityStatus(status)
687-
if statusEnum != nil {
688-
componentStatuses[componentKey] = append(componentStatuses[componentKey], *statusEnum)
689-
}
690-
}
691-
692-
// Use GetFinalApplicabilityStatus for components with multiple statuses
693-
finalMap := make(map[string]string)
694-
for componentKey, statuses := range componentStatuses {
695-
if len(statuses) > 0 {
696-
finalMap[componentKey] = results.GetFinalApplicabilityStatus(statuses).String()
697-
}
698-
}
699-
700-
return finalMap
701-
}
702-
703-
// getComponentApplicabilityStatus gets the applicability status for a component from the provided map
704-
func getComponentApplicabilityStatus(component formats.ComponentRow, componentStatusMap map[string]string) string {
705-
componentKey := fmt.Sprintf("%s:%s", component.Name, component.Version)
706-
if status, exists := componentStatusMap[componentKey]; exists {
707-
return status
708-
}
709-
return ""
710-
}
711-
712648
// getDependencyPathCellData extracts and formats direct and transitive dependencies from ImpactPaths as collapsible sections
713649
func getDependencyPathCellData(impactPaths [][]formats.ComponentRow, writer OutputWriter) CellData {
714650
if len(impactPaths) == 0 {

0 commit comments

Comments
 (0)