From 608994c4bc839a393b8cef7da2041d477b97fc84 Mon Sep 17 00:00:00 2001 From: attiasas Date: Sun, 23 Mar 2025 10:27:30 +0200 Subject: [PATCH 1/8] Add CycloneDx Format --- common/format/output.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/common/format/output.go b/common/format/output.go index c2e518443..a1ae5a6a5 100644 --- a/common/format/output.go +++ b/common/format/output.go @@ -15,9 +15,10 @@ const ( Json OutputFormat = "json" SimpleJson OutputFormat = "simple-json" Sarif OutputFormat = "sarif" + CycloneDx OutputFormat = "cyclonedx" ) -var OutputFormats = []string{string(Table), string(Json), string(SimpleJson), string(Sarif)} +var OutputFormats = []string{string(Table), string(Json), string(SimpleJson), string(Sarif), string(CycloneDx)} func GetOutputFormat(formatFlagVal string) (format OutputFormat, err error) { // Default print format is table. @@ -32,6 +33,8 @@ func GetOutputFormat(formatFlagVal string) (format OutputFormat, err error) { format = SimpleJson case string(Sarif): format = Sarif + case string(CycloneDx): + format = CycloneDx default: err = errorutils.CheckErrorf("only the following output formats are supported: " + coreutils.ListToText(OutputFormats)) } From 122d889894c6414879a448a360ea6a1b9459fe6c Mon Sep 17 00:00:00 2001 From: attiasas Date: Thu, 5 Jun 2025 12:12:26 +0300 Subject: [PATCH 2/8] Add catalog Auth config --- go.mod | 3 ++- go.sum | 4 ++-- utils/config/config.go | 12 ++++++++++++ 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 0246ef5a6..1850b9d3f 100644 --- a/go.mod +++ b/go.mod @@ -114,7 +114,8 @@ require ( sigs.k8s.io/yaml v1.4.0 // indirect ) -// replace github.com/jfrog/jfrog-client-go => github.com/jfrog/jfrog-client-go v1.28.1-0.20250508130334-f159cff9b11a +// attiasas:add_catalog +replace github.com/jfrog/jfrog-client-go => github.com/attiasas/jfrog-client-go v0.0.0-20250605084418-6ce910c2083d // replace github.com/jfrog/build-info-go => github.com/jfrog/build-info-go v1.8.9-0.20250226091544-c803cbbc5495 diff --git a/go.sum b/go.sum index d1d2c63ff..5a6ab51bb 100644 --- a/go.sum +++ b/go.sum @@ -21,6 +21,8 @@ github.com/apache/camel-k/v2 v2.5.0 h1:voFPrxhuaedKn68RerS+QkXYXyZ+5tBfVaAc7QYOg github.com/apache/camel-k/v2 v2.5.0/go.mod h1:vLrJAJAp9EGxY54cUR7VHzIF70JHfFzk4OOaYRfLr44= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= +github.com/attiasas/jfrog-client-go v0.0.0-20250605084418-6ce910c2083d h1:bV9UNMSX7Tbl2L2qnlusa2Whz6s6xl9mdokK+n/Gspc= +github.com/attiasas/jfrog-client-go v0.0.0-20250605084418-6ce910c2083d/go.mod h1:XxYs2QtlTm92yqJ5O4j4vzWI8d4sDtKQUT1miNHMgnw= github.com/bradleyjkemp/cupaloy/v2 v2.8.0 h1:any4BmKE+jGIaMpnU8YgH/I2LPiLBufr6oMMlVBbn9M= github.com/bradleyjkemp/cupaloy/v2 v2.8.0/go.mod h1:bm7JXdkRd4BHJk9HpwqAI8BoAY1lps46Enkdqw6aRX0= github.com/buger/jsonparser v1.1.1 h1:2PnMjfWD7wBILjqQbt530v576A/cAbQvEW9gGIpYMUs= @@ -113,8 +115,6 @@ github.com/jfrog/build-info-go v1.10.12 h1:KO/YUeKYtDrnpcmsXmwqr6akjzrwA0hSTUB+O github.com/jfrog/build-info-go v1.10.12/go.mod h1:JcISnovFXKx3wWf3p1fcMmlPdt6adxScXvoJN4WXqIE= github.com/jfrog/gofrog v1.7.6 h1:QmfAiRzVyaI7JYGsB7cxfAJePAZTzFz0gRWZSE27c6s= github.com/jfrog/gofrog v1.7.6/go.mod h1:ntr1txqNOZtHplmaNd7rS4f8jpA5Apx8em70oYEe7+4= -github.com/jfrog/jfrog-client-go v1.53.1 h1:GDRLUDs6hhfGNjqbI+bjc3ApgBHnpVwURM+f26PVfyw= -github.com/jfrog/jfrog-client-go v1.53.1/go.mod h1:XxYs2QtlTm92yqJ5O4j4vzWI8d4sDtKQUT1miNHMgnw= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4= diff --git a/utils/config/config.go b/utils/config/config.go index c3a15cdfd..155d2c066 100644 --- a/utils/config/config.go +++ b/utils/config/config.go @@ -17,6 +17,7 @@ import ( accessAuth "github.com/jfrog/jfrog-client-go/access/auth" artifactoryAuth "github.com/jfrog/jfrog-client-go/artifactory/auth" "github.com/jfrog/jfrog-client-go/auth" + catalogAuth "github.com/jfrog/jfrog-client-go/catalog/auth" distributionAuth "github.com/jfrog/jfrog-client-go/distribution/auth" evidenceAuth "github.com/jfrog/jfrog-client-go/evidence/auth" lifecycleAuth "github.com/jfrog/jfrog-client-go/lifecycle/auth" @@ -577,6 +578,7 @@ type ServerDetails struct { DistributionUrl string `json:"distributionUrl,omitempty"` XrayUrl string `json:"xrayUrl,omitempty"` XscUrl string `json:"xscUrl,omitempty"` + CatalogUrl string `json:"catalogUrl,omitempty"` MissionControlUrl string `json:"missionControlUrl,omitempty"` PipelinesUrl string `json:"pipelinesUrl,omitempty"` AccessUrl string `json:"accessUrl,omitempty"` @@ -657,6 +659,10 @@ func (serverDetails *ServerDetails) GetXrayUrl() string { return serverDetails.XrayUrl } +func (serverDetails *ServerDetails) GetCatalogUrl() string { + return serverDetails.CatalogUrl +} + func (serverDetails *ServerDetails) GetMissionControlUrl() string { return serverDetails.MissionControlUrl } @@ -723,6 +729,12 @@ func (serverDetails *ServerDetails) CreateXrayAuthConfig() (auth.ServiceDetails, return serverDetails.createAuthConfig(artAuth) } +func (serverDetails *ServerDetails) CreateCatalogAuthConfig() (auth.ServiceDetails, error) { + catAuth := catalogAuth.NewCatalogDetails() + catAuth.SetUrl(utils.AddTrailingSlashIfNeeded(serverDetails.Url) + "catalog/") + return serverDetails.createAuthConfig(catAuth) +} + func (serverDetails *ServerDetails) CreateXscAuthConfig() (auth.ServiceDetails, error) { ascAuth := xscAuth.NewXscDetails() ascAuth.SetUrl(serverDetails.convertXrayUrlToXscUrl()) From 76fb8f52e23ac7caf2dd99ceb4564d27f478ead6 Mon Sep 17 00:00:00 2001 From: attiasas Date: Sun, 8 Jun 2025 14:19:53 +0300 Subject: [PATCH 3/8] update deps --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 1850b9d3f..495593558 100644 --- a/go.mod +++ b/go.mod @@ -115,7 +115,7 @@ require ( ) // attiasas:add_catalog -replace github.com/jfrog/jfrog-client-go => github.com/attiasas/jfrog-client-go v0.0.0-20250605084418-6ce910c2083d +replace github.com/jfrog/jfrog-client-go => github.com/attiasas/jfrog-client-go v0.0.0-20250608111856-bfdba1cce0d8 // replace github.com/jfrog/build-info-go => github.com/jfrog/build-info-go v1.8.9-0.20250226091544-c803cbbc5495 diff --git a/go.sum b/go.sum index 5a6ab51bb..405bd55df 100644 --- a/go.sum +++ b/go.sum @@ -21,8 +21,8 @@ github.com/apache/camel-k/v2 v2.5.0 h1:voFPrxhuaedKn68RerS+QkXYXyZ+5tBfVaAc7QYOg github.com/apache/camel-k/v2 v2.5.0/go.mod h1:vLrJAJAp9EGxY54cUR7VHzIF70JHfFzk4OOaYRfLr44= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= -github.com/attiasas/jfrog-client-go v0.0.0-20250605084418-6ce910c2083d h1:bV9UNMSX7Tbl2L2qnlusa2Whz6s6xl9mdokK+n/Gspc= -github.com/attiasas/jfrog-client-go v0.0.0-20250605084418-6ce910c2083d/go.mod h1:XxYs2QtlTm92yqJ5O4j4vzWI8d4sDtKQUT1miNHMgnw= +github.com/attiasas/jfrog-client-go v0.0.0-20250608111856-bfdba1cce0d8 h1:mFCaY4tmdsSnrRL/jJDfR8tZ3LQDfepa/ctJApenRSM= +github.com/attiasas/jfrog-client-go v0.0.0-20250608111856-bfdba1cce0d8/go.mod h1:XxYs2QtlTm92yqJ5O4j4vzWI8d4sDtKQUT1miNHMgnw= github.com/bradleyjkemp/cupaloy/v2 v2.8.0 h1:any4BmKE+jGIaMpnU8YgH/I2LPiLBufr6oMMlVBbn9M= github.com/bradleyjkemp/cupaloy/v2 v2.8.0/go.mod h1:bm7JXdkRd4BHJk9HpwqAI8BoAY1lps46Enkdqw6aRX0= github.com/buger/jsonparser v1.1.1 h1:2PnMjfWD7wBILjqQbt530v576A/cAbQvEW9gGIpYMUs= From cf801c828c25805b28e7b23966b98e60169794a9 Mon Sep 17 00:00:00 2001 From: attiasas Date: Sun, 8 Jun 2025 16:53:29 +0300 Subject: [PATCH 4/8] add cdx format to output formats --- common/format/output.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/common/format/output.go b/common/format/output.go index c2e518443..831b874de 100644 --- a/common/format/output.go +++ b/common/format/output.go @@ -15,6 +15,7 @@ const ( Json OutputFormat = "json" SimpleJson OutputFormat = "simple-json" Sarif OutputFormat = "sarif" + CycloneDx OutputFormat = "cyclonedx" ) var OutputFormats = []string{string(Table), string(Json), string(SimpleJson), string(Sarif)} @@ -32,6 +33,8 @@ func GetOutputFormat(formatFlagVal string) (format OutputFormat, err error) { format = SimpleJson case string(Sarif): format = Sarif + case string(CycloneDx): + format = CycloneDx default: err = errorutils.CheckErrorf("only the following output formats are supported: " + coreutils.ListToText(OutputFormats)) } From b186da791b913003935363950a45c2f40ee97688 Mon Sep 17 00:00:00 2001 From: attiasas Date: Thu, 12 Jun 2025 18:49:15 +0300 Subject: [PATCH 5/8] update dep --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 21cb7792f..beb249cf1 100644 --- a/go.mod +++ b/go.mod @@ -115,7 +115,7 @@ require ( ) // attiasas:add_catalog -replace github.com/jfrog/jfrog-client-go => github.com/attiasas/jfrog-client-go v0.0.0-20250608111856-bfdba1cce0d8 +replace github.com/jfrog/jfrog-client-go => github.com/attiasas/jfrog-client-go v0.0.0-20250612153843-7671f43b7be6 // replace github.com/jfrog/build-info-go => github.com/jfrog/build-info-go v1.8.9-0.20250611113558-c1a092f216fd diff --git a/go.sum b/go.sum index b7ac691a6..0b776c2a4 100644 --- a/go.sum +++ b/go.sum @@ -21,8 +21,8 @@ github.com/apache/camel-k/v2 v2.5.0 h1:voFPrxhuaedKn68RerS+QkXYXyZ+5tBfVaAc7QYOg github.com/apache/camel-k/v2 v2.5.0/go.mod h1:vLrJAJAp9EGxY54cUR7VHzIF70JHfFzk4OOaYRfLr44= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= -github.com/attiasas/jfrog-client-go v0.0.0-20250608111856-bfdba1cce0d8 h1:mFCaY4tmdsSnrRL/jJDfR8tZ3LQDfepa/ctJApenRSM= -github.com/attiasas/jfrog-client-go v0.0.0-20250608111856-bfdba1cce0d8/go.mod h1:XxYs2QtlTm92yqJ5O4j4vzWI8d4sDtKQUT1miNHMgnw= +github.com/attiasas/jfrog-client-go v0.0.0-20250612153843-7671f43b7be6 h1:mB+KHcaaeb9vGwzI7kpPGHgub8lz7JjyxWvYF/C5aDY= +github.com/attiasas/jfrog-client-go v0.0.0-20250612153843-7671f43b7be6/go.mod h1:1v0eih4thdPA4clBo9TuvAMT25sGDr1IQJ81DXQ/lBY= github.com/bradleyjkemp/cupaloy/v2 v2.8.0 h1:any4BmKE+jGIaMpnU8YgH/I2LPiLBufr6oMMlVBbn9M= github.com/bradleyjkemp/cupaloy/v2 v2.8.0/go.mod h1:bm7JXdkRd4BHJk9HpwqAI8BoAY1lps46Enkdqw6aRX0= github.com/buger/jsonparser v1.1.1 h1:2PnMjfWD7wBILjqQbt530v576A/cAbQvEW9gGIpYMUs= From b4bc3de2cdbd15f52aeb0e09101d29908e80505b Mon Sep 17 00:00:00 2001 From: attiasas Date: Sun, 15 Jun 2025 18:45:53 +0300 Subject: [PATCH 6/8] remove unrelated code --- common/format/output.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/common/format/output.go b/common/format/output.go index 831b874de..c2e518443 100644 --- a/common/format/output.go +++ b/common/format/output.go @@ -15,7 +15,6 @@ const ( Json OutputFormat = "json" SimpleJson OutputFormat = "simple-json" Sarif OutputFormat = "sarif" - CycloneDx OutputFormat = "cyclonedx" ) var OutputFormats = []string{string(Table), string(Json), string(SimpleJson), string(Sarif)} @@ -33,8 +32,6 @@ func GetOutputFormat(formatFlagVal string) (format OutputFormat, err error) { format = SimpleJson case string(Sarif): format = Sarif - case string(CycloneDx): - format = CycloneDx default: err = errorutils.CheckErrorf("only the following output formats are supported: " + coreutils.ListToText(OutputFormats)) } From 73ed64af127ea9b1f5de7425afe6e41bbee25479 Mon Sep 17 00:00:00 2001 From: attiasas Date: Thu, 3 Jul 2025 08:16:45 +0300 Subject: [PATCH 7/8] update after merge --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 136aa3124..978f5fb86 100644 --- a/go.mod +++ b/go.mod @@ -115,7 +115,7 @@ require ( ) // attiasas:add_catalog -replace github.com/jfrog/jfrog-client-go => github.com/attiasas/jfrog-client-go v0.0.0-20250626144927-4f720f081e8c +replace github.com/jfrog/jfrog-client-go => github.com/attiasas/jfrog-client-go v0.0.0-20250702063018-f37283b624cd // replace github.com/jfrog/build-info-go => github.com/jfrog/build-info-go v1.8.9-0.20250611113558-c1a092f216fd diff --git a/go.sum b/go.sum index 46d33408e..0d9eda36d 100644 --- a/go.sum +++ b/go.sum @@ -21,8 +21,8 @@ github.com/apache/camel-k/v2 v2.5.0 h1:voFPrxhuaedKn68RerS+QkXYXyZ+5tBfVaAc7QYOg github.com/apache/camel-k/v2 v2.5.0/go.mod h1:vLrJAJAp9EGxY54cUR7VHzIF70JHfFzk4OOaYRfLr44= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= -github.com/attiasas/jfrog-client-go v0.0.0-20250626144927-4f720f081e8c h1:iXOJJDhy10+L+xoJ3/UdvpVvgTIn4QjfPbclA5r2Ypc= -github.com/attiasas/jfrog-client-go v0.0.0-20250626144927-4f720f081e8c/go.mod h1:1v0eih4thdPA4clBo9TuvAMT25sGDr1IQJ81DXQ/lBY= +github.com/attiasas/jfrog-client-go v0.0.0-20250702063018-f37283b624cd h1:Wt12bfPo10LqJhqz2/bO35VewFfeXZKlINPJmZCMIes= +github.com/attiasas/jfrog-client-go v0.0.0-20250702063018-f37283b624cd/go.mod h1:1v0eih4thdPA4clBo9TuvAMT25sGDr1IQJ81DXQ/lBY= github.com/bradleyjkemp/cupaloy/v2 v2.8.0 h1:any4BmKE+jGIaMpnU8YgH/I2LPiLBufr6oMMlVBbn9M= github.com/bradleyjkemp/cupaloy/v2 v2.8.0/go.mod h1:bm7JXdkRd4BHJk9HpwqAI8BoAY1lps46Enkdqw6aRX0= github.com/buger/jsonparser v1.1.1 h1:2PnMjfWD7wBILjqQbt530v576A/cAbQvEW9gGIpYMUs= From e3fbaa8b3a35889ebe33751ac8b843cf367bfe0a Mon Sep 17 00:00:00 2001 From: attiasas Date: Mon, 7 Jul 2025 13:03:21 +0300 Subject: [PATCH 8/8] point to dev after client merge --- go.mod | 3 +-- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 978f5fb86..f4bb9ef08 100644 --- a/go.mod +++ b/go.mod @@ -114,8 +114,7 @@ require ( sigs.k8s.io/yaml v1.4.0 // indirect ) -// attiasas:add_catalog -replace github.com/jfrog/jfrog-client-go => github.com/attiasas/jfrog-client-go v0.0.0-20250702063018-f37283b624cd +replace github.com/jfrog/jfrog-client-go => github.com/jfrog/jfrog-client-go v1.28.1-0.20250707095624-7062538a0961 // replace github.com/jfrog/build-info-go => github.com/jfrog/build-info-go v1.8.9-0.20250611113558-c1a092f216fd diff --git a/go.sum b/go.sum index 0d9eda36d..9cba01676 100644 --- a/go.sum +++ b/go.sum @@ -21,8 +21,6 @@ github.com/apache/camel-k/v2 v2.5.0 h1:voFPrxhuaedKn68RerS+QkXYXyZ+5tBfVaAc7QYOg github.com/apache/camel-k/v2 v2.5.0/go.mod h1:vLrJAJAp9EGxY54cUR7VHzIF70JHfFzk4OOaYRfLr44= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= -github.com/attiasas/jfrog-client-go v0.0.0-20250702063018-f37283b624cd h1:Wt12bfPo10LqJhqz2/bO35VewFfeXZKlINPJmZCMIes= -github.com/attiasas/jfrog-client-go v0.0.0-20250702063018-f37283b624cd/go.mod h1:1v0eih4thdPA4clBo9TuvAMT25sGDr1IQJ81DXQ/lBY= github.com/bradleyjkemp/cupaloy/v2 v2.8.0 h1:any4BmKE+jGIaMpnU8YgH/I2LPiLBufr6oMMlVBbn9M= github.com/bradleyjkemp/cupaloy/v2 v2.8.0/go.mod h1:bm7JXdkRd4BHJk9HpwqAI8BoAY1lps46Enkdqw6aRX0= github.com/buger/jsonparser v1.1.1 h1:2PnMjfWD7wBILjqQbt530v576A/cAbQvEW9gGIpYMUs= @@ -115,6 +113,8 @@ github.com/jfrog/build-info-go v1.10.14 h1:PWnw+rBwiQTHZ5q+84+E8MHFjtAQkB3+Oc2sK github.com/jfrog/build-info-go v1.10.14/go.mod h1:JcISnovFXKx3wWf3p1fcMmlPdt6adxScXvoJN4WXqIE= github.com/jfrog/gofrog v1.7.6 h1:QmfAiRzVyaI7JYGsB7cxfAJePAZTzFz0gRWZSE27c6s= github.com/jfrog/gofrog v1.7.6/go.mod h1:ntr1txqNOZtHplmaNd7rS4f8jpA5Apx8em70oYEe7+4= +github.com/jfrog/jfrog-client-go v1.28.1-0.20250707095624-7062538a0961 h1:JI3qV665s4RlvQ3K4t7yXJ8hqvfFF4TVRwmaOF4zCls= +github.com/jfrog/jfrog-client-go v1.28.1-0.20250707095624-7062538a0961/go.mod h1:1v0eih4thdPA4clBo9TuvAMT25sGDr1IQJ81DXQ/lBY= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4=