From 26b4f088346d6c0e781081371bc914ed70a2c438 Mon Sep 17 00:00:00 2001 From: Michael Vidrevich Date: Tue, 21 Jul 2026 13:39:37 +0300 Subject: [PATCH 1/4] XRAY-156157 - Add command line argument and parameter to get configuration --- commands/git/audit/gitauditparams.go | 1 + 1 file changed, 1 insertion(+) diff --git a/commands/git/audit/gitauditparams.go b/commands/git/audit/gitauditparams.go index 865f079ca..f566d9a91 100644 --- a/commands/git/audit/gitauditparams.go +++ b/commands/git/audit/gitauditparams.go @@ -20,6 +20,7 @@ type GitAuditParams struct { serverDetails *config.ServerDetails useConfigProfile bool configProfile *services.ConfigProfile + workspaceName string // Violations params resultsContext results.ResultContext failBuild bool From b5be3d2f675937d44a0370d42bee5badedcb63db Mon Sep 17 00:00:00 2001 From: Michael Vidrevich Date: Sun, 26 Jul 2026 12:21:09 +0300 Subject: [PATCH 2/4] XRAY-156157 - Code review --- commands/git/audit/gitauditparams.go | 1 - 1 file changed, 1 deletion(-) diff --git a/commands/git/audit/gitauditparams.go b/commands/git/audit/gitauditparams.go index f566d9a91..865f079ca 100644 --- a/commands/git/audit/gitauditparams.go +++ b/commands/git/audit/gitauditparams.go @@ -20,7 +20,6 @@ type GitAuditParams struct { serverDetails *config.ServerDetails useConfigProfile bool configProfile *services.ConfigProfile - workspaceName string // Violations params resultsContext results.ResultContext failBuild bool From b47d9b002c739503550b5a8113f0f445f363a586 Mon Sep 17 00:00:00 2001 From: Michael Vidrevich Date: Mon, 27 Jul 2026 14:51:45 +0300 Subject: [PATCH 3/4] XRAY-156516 - Add workspace to the Git Info --- commands/git/audit/gitaudit.go | 1 + go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/commands/git/audit/gitaudit.go b/commands/git/audit/gitaudit.go index d70296e04..c37712a5b 100644 --- a/commands/git/audit/gitaudit.go +++ b/commands/git/audit/gitaudit.go @@ -52,6 +52,7 @@ func (gaCmd *GitAuditCommand) Run() (err error) { // No Error but no git info = project working tree is dirty return fmt.Errorf("detected uncommitted changes in '%s'. Please commit your changes and try again", gaCmd.repositoryLocalPath) } + gitInfo.WorkspaceName = gaCmd.resultsContext.WorkspaceName gaCmd.SetGitContext(gitInfo) // Get the config profile if applicable configProfile, err := getJPDConfigProfile(gaCmd.GitAuditParams) diff --git a/go.mod b/go.mod index 9942dac4e..87b5846f0 100644 --- a/go.mod +++ b/go.mod @@ -19,7 +19,7 @@ require ( github.com/jfrog/jfrog-apps-config v1.0.1 github.com/jfrog/jfrog-cli-artifactory v0.8.1-0.20260722060859-50ee96befe5c github.com/jfrog/jfrog-cli-core/v2 v2.60.1-0.20260724083402-361ba4a2ecdb - github.com/jfrog/jfrog-client-go v1.55.1-0.20260722075451-613a6b6a7603 + github.com/jfrog/jfrog-client-go v1.55.1-0.20260727112535-8cb0c8e8dc62 github.com/magiconair/properties v1.8.10 github.com/owenrumney/go-sarif/v3 v3.2.3 github.com/package-url/packageurl-go v0.1.3 diff --git a/go.sum b/go.sum index d59ab376e..62d87b6b0 100644 --- a/go.sum +++ b/go.sum @@ -173,8 +173,8 @@ github.com/jfrog/jfrog-cli-artifactory v0.8.1-0.20260722060859-50ee96befe5c h1:e github.com/jfrog/jfrog-cli-artifactory v0.8.1-0.20260722060859-50ee96befe5c/go.mod h1:1vxzqW7jHBSuTNqO2vxEnhbniwq4dj5wveDuCMJX7Yo= github.com/jfrog/jfrog-cli-core/v2 v2.60.1-0.20260724083402-361ba4a2ecdb h1:OW2W8ryV0FiCq1DKfRXPLwuB8OB+1wWebVG/sQPaF3Y= github.com/jfrog/jfrog-cli-core/v2 v2.60.1-0.20260724083402-361ba4a2ecdb/go.mod h1:9R90mhbczGXwW5EGlDs7F08ejQU/xdoDhYHMvzBiqgE= -github.com/jfrog/jfrog-client-go v1.55.1-0.20260722075451-613a6b6a7603 h1:gwxRPCQRsbwt8rIWQ6LDu09aH4I2F1DFYObBpx1KDHw= -github.com/jfrog/jfrog-client-go v1.55.1-0.20260722075451-613a6b6a7603/go.mod h1:FHpjN1nTDoj96xd6obe27EOgGErqzU0rQgC96L3Ch9E= +github.com/jfrog/jfrog-client-go v1.55.1-0.20260727112535-8cb0c8e8dc62 h1:jWeSXS9RKvouJa+SaQQLNGGmzjmgpq51J999rFxg5DE= +github.com/jfrog/jfrog-client-go v1.55.1-0.20260727112535-8cb0c8e8dc62/go.mod h1:FHpjN1nTDoj96xd6obe27EOgGErqzU0rQgC96L3Ch9E= github.com/jhump/protoreflect v1.15.1 h1:HUMERORf3I3ZdX05WaQ6MIpd/NJ434hTp5YiKgfCL6c= github.com/jhump/protoreflect v1.15.1/go.mod h1:jD/2GMKKE6OqX8qTjhADU1e6DShO+gavG9e0Q693nKo= github.com/kevinburke/ssh_config v1.6.0 h1:J1FBfmuVosPHf5GRdltRLhPJtJpTlMdKTBjRgTaQBFY= From 9585b7c618732225a99b210e85c7bb4664e42d20 Mon Sep 17 00:00:00 2001 From: Michael Vidrevich Date: Tue, 28 Jul 2026 15:13:43 +0300 Subject: [PATCH 4/4] XRAY-156516 - Fix dependencies --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 87b5846f0..082b032a4 100644 --- a/go.mod +++ b/go.mod @@ -19,7 +19,7 @@ require ( github.com/jfrog/jfrog-apps-config v1.0.1 github.com/jfrog/jfrog-cli-artifactory v0.8.1-0.20260722060859-50ee96befe5c github.com/jfrog/jfrog-cli-core/v2 v2.60.1-0.20260724083402-361ba4a2ecdb - github.com/jfrog/jfrog-client-go v1.55.1-0.20260727112535-8cb0c8e8dc62 + github.com/jfrog/jfrog-client-go v1.55.1-0.20260728084229-b4b7a5c98201 github.com/magiconair/properties v1.8.10 github.com/owenrumney/go-sarif/v3 v3.2.3 github.com/package-url/packageurl-go v0.1.3 diff --git a/go.sum b/go.sum index 62d87b6b0..c315bcf3a 100644 --- a/go.sum +++ b/go.sum @@ -175,6 +175,8 @@ github.com/jfrog/jfrog-cli-core/v2 v2.60.1-0.20260724083402-361ba4a2ecdb h1:OW2W github.com/jfrog/jfrog-cli-core/v2 v2.60.1-0.20260724083402-361ba4a2ecdb/go.mod h1:9R90mhbczGXwW5EGlDs7F08ejQU/xdoDhYHMvzBiqgE= github.com/jfrog/jfrog-client-go v1.55.1-0.20260727112535-8cb0c8e8dc62 h1:jWeSXS9RKvouJa+SaQQLNGGmzjmgpq51J999rFxg5DE= github.com/jfrog/jfrog-client-go v1.55.1-0.20260727112535-8cb0c8e8dc62/go.mod h1:FHpjN1nTDoj96xd6obe27EOgGErqzU0rQgC96L3Ch9E= +github.com/jfrog/jfrog-client-go v1.55.1-0.20260728084229-b4b7a5c98201 h1:1LdE+OGPcTJkVIJLEWjRFx8WRnfcuFwDxxEqkWI3GCY= +github.com/jfrog/jfrog-client-go v1.55.1-0.20260728084229-b4b7a5c98201/go.mod h1:FHpjN1nTDoj96xd6obe27EOgGErqzU0rQgC96L3Ch9E= github.com/jhump/protoreflect v1.15.1 h1:HUMERORf3I3ZdX05WaQ6MIpd/NJ434hTp5YiKgfCL6c= github.com/jhump/protoreflect v1.15.1/go.mod h1:jD/2GMKKE6OqX8qTjhADU1e6DShO+gavG9e0Q693nKo= github.com/kevinburke/ssh_config v1.6.0 h1:J1FBfmuVosPHf5GRdltRLhPJtJpTlMdKTBjRgTaQBFY=