From f2e3ed3a298d3fd613f44c8c6c1385491f71c293 Mon Sep 17 00:00:00 2001 From: Naveen Kumar Date: Fri, 26 Dec 2025 11:45:07 +0530 Subject: [PATCH 01/10] Updated artifactory version --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 2574cfe4e..c7b268f11 100644 --- a/go.mod +++ b/go.mod @@ -19,7 +19,7 @@ require ( github.com/jfrog/build-info-go v1.13.0 github.com/jfrog/gofrog v1.7.6 github.com/jfrog/jfrog-cli-application v1.0.2-0.20251210075951-519050602a7f - github.com/jfrog/jfrog-cli-artifactory v0.8.1-0.20251224081136-c963f7963aa1 + github.com/jfrog/jfrog-cli-artifactory v0.8.1-0.20251226061308-9e2e89aff61f github.com/jfrog/jfrog-cli-core/v2 v2.60.1-0.20251223102649-e659f6937251 github.com/jfrog/jfrog-cli-evidence v0.8.3-0.20251204144808-73fa744851c0 github.com/jfrog/jfrog-cli-platform-services v1.10.1-0.20251205121610-171eb9b0000e diff --git a/go.sum b/go.sum index ea0c31b99..2759c5e41 100644 --- a/go.sum +++ b/go.sum @@ -1216,8 +1216,8 @@ github.com/jfrog/jfrog-apps-config v1.0.1 h1:mtv6k7g8A8BVhlHGlSveapqf4mJfonwvXYL github.com/jfrog/jfrog-apps-config v1.0.1/go.mod h1:8AIIr1oY9JuH5dylz2S6f8Ym2MaadPLR6noCBO4C22w= github.com/jfrog/jfrog-cli-application v1.0.2-0.20251210075951-519050602a7f h1:YHwPNF13Gmt65J618kEGn/4SGewXqyYuAdcyYWYdrBA= github.com/jfrog/jfrog-cli-application v1.0.2-0.20251210075951-519050602a7f/go.mod h1:xum2HquWO5uExa/A7MQs3TgJJVEeoqTR+6Z4mfBr1Xw= -github.com/jfrog/jfrog-cli-artifactory v0.8.1-0.20251224081136-c963f7963aa1 h1:bwS1qqLwr3+bVuvsClk/dWBAvPp31/rkwIqKdyDT2Hk= -github.com/jfrog/jfrog-cli-artifactory v0.8.1-0.20251224081136-c963f7963aa1/go.mod h1:QRRvIcvN/qQEGZmanB8ILKjVawNiu0kZAcjcnST3Bsk= +github.com/jfrog/jfrog-cli-artifactory v0.8.1-0.20251226061308-9e2e89aff61f h1:bBtKivC2XFayT0OqV9R83DWGuAiGzuDMYfMva7Nb2gs= +github.com/jfrog/jfrog-cli-artifactory v0.8.1-0.20251226061308-9e2e89aff61f/go.mod h1:QRRvIcvN/qQEGZmanB8ILKjVawNiu0kZAcjcnST3Bsk= github.com/jfrog/jfrog-cli-core/v2 v2.60.1-0.20251223102649-e659f6937251 h1:WTyDOaYJUwY6zQujZuL9JQ9Q9+QWj9p31tLb4bJnu4U= github.com/jfrog/jfrog-cli-core/v2 v2.60.1-0.20251223102649-e659f6937251/go.mod h1:REkU0OfnLYZbQIjD2Cg85DAVP0SRZuV/PxiDfCJiJOc= github.com/jfrog/jfrog-cli-evidence v0.8.3-0.20251204144808-73fa744851c0 h1:8S1vE1PeVtrzWkKL0N39cX6XLLNV0It+f6xjRKjw7Ug= From ae3a46e8f6a14953a33fd1215008623153abe515 Mon Sep 17 00:00:00 2001 From: Naveen Kumar Date: Fri, 26 Dec 2025 14:13:45 +0530 Subject: [PATCH 02/10] Updated artifactory version --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index c7b268f11..c712227e7 100644 --- a/go.mod +++ b/go.mod @@ -282,7 +282,7 @@ replace github.com/docker/docker => github.com/docker/docker v27.5.1+incompatibl replace github.com/gfleury/go-bitbucket-v1 => github.com/gfleury/go-bitbucket-v1 v0.0.0-20230825095122-9bc1711434ab -//replace github.com/jfrog/jfrog-cli-artifactory => github.com/naveenku-jfrog/jfrog-cli-artifactory v0.0.0-20251210184507-0c8d138690cb +replace github.com/jfrog/jfrog-cli-artifactory => github.com/naveenku-jfrog/jfrog-cli-artifactory v0.0.0-20251226084033-ba947c142494 //replace github.com/jfrog/build-info-go => github.com/jfrog/build-info-go v1.8.9-0.20251006061821-8b1be6a65215 diff --git a/go.sum b/go.sum index 2759c5e41..992566d4a 100644 --- a/go.sum +++ b/go.sum @@ -1216,8 +1216,6 @@ github.com/jfrog/jfrog-apps-config v1.0.1 h1:mtv6k7g8A8BVhlHGlSveapqf4mJfonwvXYL github.com/jfrog/jfrog-apps-config v1.0.1/go.mod h1:8AIIr1oY9JuH5dylz2S6f8Ym2MaadPLR6noCBO4C22w= github.com/jfrog/jfrog-cli-application v1.0.2-0.20251210075951-519050602a7f h1:YHwPNF13Gmt65J618kEGn/4SGewXqyYuAdcyYWYdrBA= github.com/jfrog/jfrog-cli-application v1.0.2-0.20251210075951-519050602a7f/go.mod h1:xum2HquWO5uExa/A7MQs3TgJJVEeoqTR+6Z4mfBr1Xw= -github.com/jfrog/jfrog-cli-artifactory v0.8.1-0.20251226061308-9e2e89aff61f h1:bBtKivC2XFayT0OqV9R83DWGuAiGzuDMYfMva7Nb2gs= -github.com/jfrog/jfrog-cli-artifactory v0.8.1-0.20251226061308-9e2e89aff61f/go.mod h1:QRRvIcvN/qQEGZmanB8ILKjVawNiu0kZAcjcnST3Bsk= github.com/jfrog/jfrog-cli-core/v2 v2.60.1-0.20251223102649-e659f6937251 h1:WTyDOaYJUwY6zQujZuL9JQ9Q9+QWj9p31tLb4bJnu4U= github.com/jfrog/jfrog-cli-core/v2 v2.60.1-0.20251223102649-e659f6937251/go.mod h1:REkU0OfnLYZbQIjD2Cg85DAVP0SRZuV/PxiDfCJiJOc= github.com/jfrog/jfrog-cli-evidence v0.8.3-0.20251204144808-73fa744851c0 h1:8S1vE1PeVtrzWkKL0N39cX6XLLNV0It+f6xjRKjw7Ug= @@ -1327,6 +1325,8 @@ github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A= github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= +github.com/naveenku-jfrog/jfrog-cli-artifactory v0.0.0-20251226084033-ba947c142494 h1:28HYrHRL7qq+2bDN3czvx2GisE3IaeoLN3MfkS6rEgE= +github.com/naveenku-jfrog/jfrog-cli-artifactory v0.0.0-20251226084033-ba947c142494/go.mod h1:QRRvIcvN/qQEGZmanB8ILKjVawNiu0kZAcjcnST3Bsk= github.com/nwaples/rardecode v1.1.3 h1:cWCaZwfM5H7nAD6PyEdcVnczzV8i/JtotnyW/dD9lEc= github.com/nwaples/rardecode v1.1.3/go.mod h1:5DzqNKiOdpKKBH87u8VlvAnPZMXcGRhxWkRpHbbfGS0= github.com/oklog/run v1.0.0 h1:Ru7dDtJNOyC66gQ5dQmaCa0qIsAUFY3sFpK1Xk8igrw= From ff0c6bb7d2b0b9a21c65b7de35fc2d4c886858ef Mon Sep 17 00:00:00 2001 From: Naveen Kumar Date: Mon, 29 Dec 2025 11:06:59 +0530 Subject: [PATCH 03/10] Updated artifactory version --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index c712227e7..00630b6ee 100644 --- a/go.mod +++ b/go.mod @@ -282,7 +282,7 @@ replace github.com/docker/docker => github.com/docker/docker v27.5.1+incompatibl replace github.com/gfleury/go-bitbucket-v1 => github.com/gfleury/go-bitbucket-v1 v0.0.0-20230825095122-9bc1711434ab -replace github.com/jfrog/jfrog-cli-artifactory => github.com/naveenku-jfrog/jfrog-cli-artifactory v0.0.0-20251226084033-ba947c142494 +replace github.com/jfrog/jfrog-cli-artifactory => github.com/naveenku-jfrog/jfrog-cli-artifactory v0.0.0-20251229053433-7fa3be5cc370 //replace github.com/jfrog/build-info-go => github.com/jfrog/build-info-go v1.8.9-0.20251006061821-8b1be6a65215 diff --git a/go.sum b/go.sum index 992566d4a..62fe8bf34 100644 --- a/go.sum +++ b/go.sum @@ -1325,8 +1325,8 @@ github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A= github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= -github.com/naveenku-jfrog/jfrog-cli-artifactory v0.0.0-20251226084033-ba947c142494 h1:28HYrHRL7qq+2bDN3czvx2GisE3IaeoLN3MfkS6rEgE= -github.com/naveenku-jfrog/jfrog-cli-artifactory v0.0.0-20251226084033-ba947c142494/go.mod h1:QRRvIcvN/qQEGZmanB8ILKjVawNiu0kZAcjcnST3Bsk= +github.com/naveenku-jfrog/jfrog-cli-artifactory v0.0.0-20251229053433-7fa3be5cc370 h1:tKGEVRxk0hZ2gJVLM2CV2X/0oolEz65Ei1ShzDMlLXo= +github.com/naveenku-jfrog/jfrog-cli-artifactory v0.0.0-20251229053433-7fa3be5cc370/go.mod h1:QRRvIcvN/qQEGZmanB8ILKjVawNiu0kZAcjcnST3Bsk= github.com/nwaples/rardecode v1.1.3 h1:cWCaZwfM5H7nAD6PyEdcVnczzV8i/JtotnyW/dD9lEc= github.com/nwaples/rardecode v1.1.3/go.mod h1:5DzqNKiOdpKKBH87u8VlvAnPZMXcGRhxWkRpHbbfGS0= github.com/oklog/run v1.0.0 h1:Ru7dDtJNOyC66gQ5dQmaCa0qIsAUFY3sFpK1Xk8igrw= From 608c401f72cd2b7058ebafcd66327f155c9a35d2 Mon Sep 17 00:00:00 2001 From: Naveen Kumar Date: Mon, 29 Dec 2025 12:33:43 +0530 Subject: [PATCH 04/10] Updated artifactory version --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 00630b6ee..03e41d6df 100644 --- a/go.mod +++ b/go.mod @@ -282,7 +282,7 @@ replace github.com/docker/docker => github.com/docker/docker v27.5.1+incompatibl replace github.com/gfleury/go-bitbucket-v1 => github.com/gfleury/go-bitbucket-v1 v0.0.0-20230825095122-9bc1711434ab -replace github.com/jfrog/jfrog-cli-artifactory => github.com/naveenku-jfrog/jfrog-cli-artifactory v0.0.0-20251229053433-7fa3be5cc370 +replace github.com/jfrog/jfrog-cli-artifactory => github.com/naveenku-jfrog/jfrog-cli-artifactory v0.0.0-20251229070129-c1333b607e86 //replace github.com/jfrog/build-info-go => github.com/jfrog/build-info-go v1.8.9-0.20251006061821-8b1be6a65215 diff --git a/go.sum b/go.sum index 62fe8bf34..3b7a5f907 100644 --- a/go.sum +++ b/go.sum @@ -1325,8 +1325,8 @@ github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A= github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= -github.com/naveenku-jfrog/jfrog-cli-artifactory v0.0.0-20251229053433-7fa3be5cc370 h1:tKGEVRxk0hZ2gJVLM2CV2X/0oolEz65Ei1ShzDMlLXo= -github.com/naveenku-jfrog/jfrog-cli-artifactory v0.0.0-20251229053433-7fa3be5cc370/go.mod h1:QRRvIcvN/qQEGZmanB8ILKjVawNiu0kZAcjcnST3Bsk= +github.com/naveenku-jfrog/jfrog-cli-artifactory v0.0.0-20251229070129-c1333b607e86 h1:QlKOfZde9tGXOfU72I3SxWF18lmgVqCZjNluvYg9Pgc= +github.com/naveenku-jfrog/jfrog-cli-artifactory v0.0.0-20251229070129-c1333b607e86/go.mod h1:QRRvIcvN/qQEGZmanB8ILKjVawNiu0kZAcjcnST3Bsk= github.com/nwaples/rardecode v1.1.3 h1:cWCaZwfM5H7nAD6PyEdcVnczzV8i/JtotnyW/dD9lEc= github.com/nwaples/rardecode v1.1.3/go.mod h1:5DzqNKiOdpKKBH87u8VlvAnPZMXcGRhxWkRpHbbfGS0= github.com/oklog/run v1.0.0 h1:Ru7dDtJNOyC66gQ5dQmaCa0qIsAUFY3sFpK1Xk8igrw= From b325246415ff77f2c0e41371564f5cfbc28c3ebc Mon Sep 17 00:00:00 2001 From: Naveen Kumar Date: Mon, 29 Dec 2025 16:18:52 +0530 Subject: [PATCH 05/10] Added test case for newly added function --- go.mod | 2 +- go.sum | 4 ++-- pip_test.go | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 67 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 03e41d6df..14c4cee40 100644 --- a/go.mod +++ b/go.mod @@ -282,7 +282,7 @@ replace github.com/docker/docker => github.com/docker/docker v27.5.1+incompatibl replace github.com/gfleury/go-bitbucket-v1 => github.com/gfleury/go-bitbucket-v1 v0.0.0-20230825095122-9bc1711434ab -replace github.com/jfrog/jfrog-cli-artifactory => github.com/naveenku-jfrog/jfrog-cli-artifactory v0.0.0-20251229070129-c1333b607e86 +replace github.com/jfrog/jfrog-cli-artifactory => github.com/naveenku-jfrog/jfrog-cli-artifactory v0.0.0-20251229103125-f60e8dcd8f43 //replace github.com/jfrog/build-info-go => github.com/jfrog/build-info-go v1.8.9-0.20251006061821-8b1be6a65215 diff --git a/go.sum b/go.sum index 3b7a5f907..9c13999ef 100644 --- a/go.sum +++ b/go.sum @@ -1325,8 +1325,8 @@ github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A= github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= -github.com/naveenku-jfrog/jfrog-cli-artifactory v0.0.0-20251229070129-c1333b607e86 h1:QlKOfZde9tGXOfU72I3SxWF18lmgVqCZjNluvYg9Pgc= -github.com/naveenku-jfrog/jfrog-cli-artifactory v0.0.0-20251229070129-c1333b607e86/go.mod h1:QRRvIcvN/qQEGZmanB8ILKjVawNiu0kZAcjcnST3Bsk= +github.com/naveenku-jfrog/jfrog-cli-artifactory v0.0.0-20251229103125-f60e8dcd8f43 h1:i8Jo9JW+HqfTkWX6e+DqYMF+dyPhPmzb7ArDKs5Cm6U= +github.com/naveenku-jfrog/jfrog-cli-artifactory v0.0.0-20251229103125-f60e8dcd8f43/go.mod h1:VyGDxuVfxD/3di+MStfU6nM7d0u2aziM7W3Gf4hXpaE= github.com/nwaples/rardecode v1.1.3 h1:cWCaZwfM5H7nAD6PyEdcVnczzV8i/JtotnyW/dD9lEc= github.com/nwaples/rardecode v1.1.3/go.mod h1:5DzqNKiOdpKKBH87u8VlvAnPZMXcGRhxWkRpHbbfGS0= github.com/oklog/run v1.0.0 h1:Ru7dDtJNOyC66gQ5dQmaCa0qIsAUFY3sFpK1Xk8igrw= diff --git a/pip_test.go b/pip_test.go index 4303aaeea..5ba4af1ba 100644 --- a/pip_test.go +++ b/pip_test.go @@ -11,6 +11,7 @@ import ( "strings" "testing" + pythoncmd "github.com/jfrog/jfrog-cli-artifactory/artifactory/commands/python" "github.com/jfrog/jfrog-cli-core/v2/artifactory/utils" biutils "github.com/jfrog/build-info-go/utils" @@ -595,6 +596,69 @@ func validateBuildTimestampProperty(properties map[string][]string, moduleType b return nil } +func TestCreateAqlQueryForSearchBySHA256(t *testing.T) { + tests := []struct { + name string + repo string + sha256s []string + expected string + }{ + { + name: "single SHA256", + repo: "pypi-local", + sha256s: []string{"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"}, + expected: `{"repo": "pypi-local","$or": [{"sha256": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"}]}`, + }, + { + name: "multiple SHA256s", + repo: "pypi-local", + sha256s: []string{ + "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", + "a1b2c3d4e5f6789012345678901234567890abcdef1234567890abcdef123456", + "f6e5d4c3b2a1098765432109876543210987654321098765432109876543210987", + }, + expected: `{"repo": "pypi-local","$or": [{"sha256": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"},{"sha256": "a1b2c3d4e5f6789012345678901234567890abcdef1234567890abcdef123456"},{"sha256": "f6e5d4c3b2a1098765432109876543210987654321098765432109876543210987"}]}`, + }, + { + name: "empty SHA256s", + repo: "pypi-local", + sha256s: []string{}, + expected: `{"repo": "pypi-local","$or": []}`, + }, + { + name: "different repository", + repo: "maven-local", + sha256s: []string{"abc123def456"}, + expected: `{"repo": "maven-local","$or": [{"sha256": "abc123def456"}]}`, + }, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + result := pythoncmd.CreateAqlQueryForSearchBySHA256(tt.repo, tt.sha256s) + assert.Equal(t, tt.expected, result) + + // Verify it's valid JSON + var jsonObj map[string]interface{} + err := json.Unmarshal([]byte(result), &jsonObj) + assert.NoError(t, err, "Generated query should be valid JSON") + assert.Equal(t, tt.repo, jsonObj["repo"], "Repository should match") + + // Verify $or array exists and has correct structure + orArray, ok := jsonObj["$or"].([]interface{}) + assert.True(t, ok, "$or should be an array") + assert.Equal(t, len(tt.sha256s), len(orArray), "Number of SHA256 conditions should match") + + // Verify each SHA256 condition + for i, sha256 := range tt.sha256s { + condition, ok := orArray[i].(map[string]interface{}) + assert.True(t, ok, "Each condition should be an object") + assert.Equal(t, sha256, condition["sha256"], "SHA256 value should match") + } + }) + } +} + func TestSetupPipCommand(t *testing.T) { if !*tests.TestPip { t.Skip("Skipping Pip test. To run Pip test add the '-test.pip=true' option.") From eb989381cc8536f05236de904e7d77431f6bf8f0 Mon Sep 17 00:00:00 2001 From: Naveen Kumar Date: Mon, 29 Dec 2025 17:18:45 +0530 Subject: [PATCH 06/10] Added test case for newly added function --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 14c4cee40..82cd89095 100644 --- a/go.mod +++ b/go.mod @@ -282,7 +282,7 @@ replace github.com/docker/docker => github.com/docker/docker v27.5.1+incompatibl replace github.com/gfleury/go-bitbucket-v1 => github.com/gfleury/go-bitbucket-v1 v0.0.0-20230825095122-9bc1711434ab -replace github.com/jfrog/jfrog-cli-artifactory => github.com/naveenku-jfrog/jfrog-cli-artifactory v0.0.0-20251229103125-f60e8dcd8f43 +replace github.com/jfrog/jfrog-cli-artifactory => github.com/naveenku-jfrog/jfrog-cli-artifactory v0.0.0-20251229114728-e5f53e263257 //replace github.com/jfrog/build-info-go => github.com/jfrog/build-info-go v1.8.9-0.20251006061821-8b1be6a65215 diff --git a/go.sum b/go.sum index 9c13999ef..8fd018296 100644 --- a/go.sum +++ b/go.sum @@ -1325,8 +1325,8 @@ github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A= github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= -github.com/naveenku-jfrog/jfrog-cli-artifactory v0.0.0-20251229103125-f60e8dcd8f43 h1:i8Jo9JW+HqfTkWX6e+DqYMF+dyPhPmzb7ArDKs5Cm6U= -github.com/naveenku-jfrog/jfrog-cli-artifactory v0.0.0-20251229103125-f60e8dcd8f43/go.mod h1:VyGDxuVfxD/3di+MStfU6nM7d0u2aziM7W3Gf4hXpaE= +github.com/naveenku-jfrog/jfrog-cli-artifactory v0.0.0-20251229114728-e5f53e263257 h1:+0VPQfcoiNJMXBZyiOPS1vFg2PHf8RQL02IRdVDIEMQ= +github.com/naveenku-jfrog/jfrog-cli-artifactory v0.0.0-20251229114728-e5f53e263257/go.mod h1:VyGDxuVfxD/3di+MStfU6nM7d0u2aziM7W3Gf4hXpaE= github.com/nwaples/rardecode v1.1.3 h1:cWCaZwfM5H7nAD6PyEdcVnczzV8i/JtotnyW/dD9lEc= github.com/nwaples/rardecode v1.1.3/go.mod h1:5DzqNKiOdpKKBH87u8VlvAnPZMXcGRhxWkRpHbbfGS0= github.com/oklog/run v1.0.0 h1:Ru7dDtJNOyC66gQ5dQmaCa0qIsAUFY3sFpK1Xk8igrw= From adf90321d9a0dace319f828f159c0b123c2ab948 Mon Sep 17 00:00:00 2001 From: Naveen Kumar Date: Mon, 29 Dec 2025 17:33:24 +0530 Subject: [PATCH 07/10] Added test case for newly added function --- go.mod | 4 ++-- go.sum | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 82cd89095..7c2e09e4f 100644 --- a/go.mod +++ b/go.mod @@ -282,9 +282,9 @@ replace github.com/docker/docker => github.com/docker/docker v27.5.1+incompatibl replace github.com/gfleury/go-bitbucket-v1 => github.com/gfleury/go-bitbucket-v1 v0.0.0-20230825095122-9bc1711434ab -replace github.com/jfrog/jfrog-cli-artifactory => github.com/naveenku-jfrog/jfrog-cli-artifactory v0.0.0-20251229114728-e5f53e263257 +replace github.com/jfrog/jfrog-cli-artifactory => /Users/naveenku/Desktop/eco-matrix/jfrog-cli-artifactory -//replace github.com/jfrog/build-info-go => github.com/jfrog/build-info-go v1.8.9-0.20251006061821-8b1be6a65215 +replace github.com/jfrog/build-info-go => github.com/naveenku-jfrog/build-info-go v1.12.1-0.20251229102022-065f0cbe8e9d // replace github.com/jfrog/jfrog-cli-core/v2 => github.com/reshmifrog/jfrog-cli-core/v2 v2.58.5-0.20251110095124-ab9a4102ec5a diff --git a/go.sum b/go.sum index 8fd018296..192032442 100644 --- a/go.sum +++ b/go.sum @@ -1204,8 +1204,6 @@ github.com/jellydator/ttlcache/v3 v3.4.0 h1:YS4P125qQS0tNhtL6aeYkheEaB/m8HCqdMMP github.com/jellydator/ttlcache/v3 v3.4.0/go.mod h1:Hw9EgjymziQD3yGsQdf1FqFdpp7YjFMd4Srg5EJlgD4= github.com/jfrog/archiver/v3 v3.6.1 h1:LOxnkw9pOn45DzCbZNFV6K0+6dCsQ0L8mR3ZcujO5eI= github.com/jfrog/archiver/v3 v3.6.1/go.mod h1:VgR+3WZS4N+i9FaDwLZbq+jeU4B4zctXL+gL4EMzfLw= -github.com/jfrog/build-info-go v1.13.0 h1:bHedp1Gl+a8eR71xxP5JvkqwDj2X3r6e5NiIwNcIwRM= -github.com/jfrog/build-info-go v1.13.0/go.mod h1:+OCtMb22/D+u7Wne5lzkjJjaWr0LRZcHlDwTH86Mpwo= github.com/jfrog/froggit-go v1.20.6 h1:Xp7+LlEh0m1KGrQstb+u0aGfjRUtv1eh9xQBV3571jQ= github.com/jfrog/froggit-go v1.20.6/go.mod h1:obSG1SlsWjktkuqmKtpq7MNTTL63e0ot+ucTnlOMV88= github.com/jfrog/go-mockhttp v0.3.1 h1:/wac8v4GMZx62viZmv4wazB5GNKs+GxawuS1u3maJH8= @@ -1325,8 +1323,8 @@ github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A= github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= -github.com/naveenku-jfrog/jfrog-cli-artifactory v0.0.0-20251229114728-e5f53e263257 h1:+0VPQfcoiNJMXBZyiOPS1vFg2PHf8RQL02IRdVDIEMQ= -github.com/naveenku-jfrog/jfrog-cli-artifactory v0.0.0-20251229114728-e5f53e263257/go.mod h1:VyGDxuVfxD/3di+MStfU6nM7d0u2aziM7W3Gf4hXpaE= +github.com/naveenku-jfrog/build-info-go v1.12.1-0.20251229102022-065f0cbe8e9d h1:gcZZJLZ+B9vQUluCI/qFjHi6XZhwFueaPIlgcdqFaaE= +github.com/naveenku-jfrog/build-info-go v1.12.1-0.20251229102022-065f0cbe8e9d/go.mod h1:+OCtMb22/D+u7Wne5lzkjJjaWr0LRZcHlDwTH86Mpwo= github.com/nwaples/rardecode v1.1.3 h1:cWCaZwfM5H7nAD6PyEdcVnczzV8i/JtotnyW/dD9lEc= github.com/nwaples/rardecode v1.1.3/go.mod h1:5DzqNKiOdpKKBH87u8VlvAnPZMXcGRhxWkRpHbbfGS0= github.com/oklog/run v1.0.0 h1:Ru7dDtJNOyC66gQ5dQmaCa0qIsAUFY3sFpK1Xk8igrw= From 288894c668f96785e2cf2aeef025eb356f3e1278 Mon Sep 17 00:00:00 2001 From: Naveen Kumar Date: Mon, 29 Dec 2025 17:36:08 +0530 Subject: [PATCH 08/10] Added test case for newly added function --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 7c2e09e4f..03c30b653 100644 --- a/go.mod +++ b/go.mod @@ -282,7 +282,7 @@ replace github.com/docker/docker => github.com/docker/docker v27.5.1+incompatibl replace github.com/gfleury/go-bitbucket-v1 => github.com/gfleury/go-bitbucket-v1 v0.0.0-20230825095122-9bc1711434ab -replace github.com/jfrog/jfrog-cli-artifactory => /Users/naveenku/Desktop/eco-matrix/jfrog-cli-artifactory +replace github.com/jfrog/jfrog-cli-artifactory => github.com/naveenku-jfrog/jfrog-cli-artifactory v0.0.0-20251229114728-e5f53e263257 replace github.com/jfrog/build-info-go => github.com/naveenku-jfrog/build-info-go v1.12.1-0.20251229102022-065f0cbe8e9d diff --git a/go.sum b/go.sum index 192032442..e3851a47e 100644 --- a/go.sum +++ b/go.sum @@ -1325,6 +1325,8 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/naveenku-jfrog/build-info-go v1.12.1-0.20251229102022-065f0cbe8e9d h1:gcZZJLZ+B9vQUluCI/qFjHi6XZhwFueaPIlgcdqFaaE= github.com/naveenku-jfrog/build-info-go v1.12.1-0.20251229102022-065f0cbe8e9d/go.mod h1:+OCtMb22/D+u7Wne5lzkjJjaWr0LRZcHlDwTH86Mpwo= +github.com/naveenku-jfrog/jfrog-cli-artifactory v0.0.0-20251229114728-e5f53e263257 h1:+0VPQfcoiNJMXBZyiOPS1vFg2PHf8RQL02IRdVDIEMQ= +github.com/naveenku-jfrog/jfrog-cli-artifactory v0.0.0-20251229114728-e5f53e263257/go.mod h1:VyGDxuVfxD/3di+MStfU6nM7d0u2aziM7W3Gf4hXpaE= github.com/nwaples/rardecode v1.1.3 h1:cWCaZwfM5H7nAD6PyEdcVnczzV8i/JtotnyW/dD9lEc= github.com/nwaples/rardecode v1.1.3/go.mod h1:5DzqNKiOdpKKBH87u8VlvAnPZMXcGRhxWkRpHbbfGS0= github.com/oklog/run v1.0.0 h1:Ru7dDtJNOyC66gQ5dQmaCa0qIsAUFY3sFpK1Xk8igrw= From d4a37290ff570ea9a95a52412a543b6ac6f0c6d1 Mon Sep 17 00:00:00 2001 From: Naveen Kumar Date: Tue, 30 Dec 2025 12:39:05 +0530 Subject: [PATCH 09/10] Update artifactory and build-info-go version --- go.mod | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index 03c30b653..00b3d2663 100644 --- a/go.mod +++ b/go.mod @@ -16,10 +16,10 @@ require ( github.com/docker/docker v28.5.2+incompatible github.com/gocarina/gocsv v0.0.0-20240520201108-78e41c74b4b1 github.com/jfrog/archiver/v3 v3.6.1 - github.com/jfrog/build-info-go v1.13.0 + github.com/jfrog/build-info-go v1.13.1-0.20251230063402-e9f0a3564df1 github.com/jfrog/gofrog v1.7.6 github.com/jfrog/jfrog-cli-application v1.0.2-0.20251210075951-519050602a7f - github.com/jfrog/jfrog-cli-artifactory v0.8.1-0.20251226061308-9e2e89aff61f + github.com/jfrog/jfrog-cli-artifactory v0.8.1-0.20251230064405-049e011b0bb7 github.com/jfrog/jfrog-cli-core/v2 v2.60.1-0.20251223102649-e659f6937251 github.com/jfrog/jfrog-cli-evidence v0.8.3-0.20251204144808-73fa744851c0 github.com/jfrog/jfrog-cli-platform-services v1.10.1-0.20251205121610-171eb9b0000e From 46f26828f52233454ce9bbae95c709af7aaea3c7 Mon Sep 17 00:00:00 2001 From: Naveen Kumar Date: Tue, 30 Dec 2025 12:40:07 +0530 Subject: [PATCH 10/10] Update artifactory and build-info-go version --- go.mod | 6 +----- go.sum | 12 ++++++------ 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/go.mod b/go.mod index 00b3d2663..1e7f4f380 100644 --- a/go.mod +++ b/go.mod @@ -24,7 +24,7 @@ require ( github.com/jfrog/jfrog-cli-evidence v0.8.3-0.20251204144808-73fa744851c0 github.com/jfrog/jfrog-cli-platform-services v1.10.1-0.20251205121610-171eb9b0000e github.com/jfrog/jfrog-cli-security v1.24.1 - github.com/jfrog/jfrog-client-go v1.55.1-0.20251224075603-b50939a87fa6 + github.com/jfrog/jfrog-client-go v1.55.1-0.20251230061734-d954605bdb23 github.com/jszwec/csvutil v1.10.0 github.com/manifoldco/promptui v0.9.0 github.com/spf13/viper v1.21.0 @@ -282,10 +282,6 @@ replace github.com/docker/docker => github.com/docker/docker v27.5.1+incompatibl replace github.com/gfleury/go-bitbucket-v1 => github.com/gfleury/go-bitbucket-v1 v0.0.0-20230825095122-9bc1711434ab -replace github.com/jfrog/jfrog-cli-artifactory => github.com/naveenku-jfrog/jfrog-cli-artifactory v0.0.0-20251229114728-e5f53e263257 - -replace github.com/jfrog/build-info-go => github.com/naveenku-jfrog/build-info-go v1.12.1-0.20251229102022-065f0cbe8e9d - // replace github.com/jfrog/jfrog-cli-core/v2 => github.com/reshmifrog/jfrog-cli-core/v2 v2.58.5-0.20251110095124-ab9a4102ec5a // replace github.com/jfrog/jfrog-cli-core/v2 => github.com/attiasas/jfrog-cli-core/v2 v2.0.0-20251104113958-abd9de5958c4 diff --git a/go.sum b/go.sum index e3851a47e..4619b1ffb 100644 --- a/go.sum +++ b/go.sum @@ -1204,6 +1204,8 @@ github.com/jellydator/ttlcache/v3 v3.4.0 h1:YS4P125qQS0tNhtL6aeYkheEaB/m8HCqdMMP github.com/jellydator/ttlcache/v3 v3.4.0/go.mod h1:Hw9EgjymziQD3yGsQdf1FqFdpp7YjFMd4Srg5EJlgD4= github.com/jfrog/archiver/v3 v3.6.1 h1:LOxnkw9pOn45DzCbZNFV6K0+6dCsQ0L8mR3ZcujO5eI= github.com/jfrog/archiver/v3 v3.6.1/go.mod h1:VgR+3WZS4N+i9FaDwLZbq+jeU4B4zctXL+gL4EMzfLw= +github.com/jfrog/build-info-go v1.13.1-0.20251230063402-e9f0a3564df1 h1:ZT/hph6QcpTi9Fam9MJiouJ6g0H8Hx9p2Mnah2zPnks= +github.com/jfrog/build-info-go v1.13.1-0.20251230063402-e9f0a3564df1/go.mod h1:+OCtMb22/D+u7Wne5lzkjJjaWr0LRZcHlDwTH86Mpwo= github.com/jfrog/froggit-go v1.20.6 h1:Xp7+LlEh0m1KGrQstb+u0aGfjRUtv1eh9xQBV3571jQ= github.com/jfrog/froggit-go v1.20.6/go.mod h1:obSG1SlsWjktkuqmKtpq7MNTTL63e0ot+ucTnlOMV88= github.com/jfrog/go-mockhttp v0.3.1 h1:/wac8v4GMZx62viZmv4wazB5GNKs+GxawuS1u3maJH8= @@ -1214,6 +1216,8 @@ github.com/jfrog/jfrog-apps-config v1.0.1 h1:mtv6k7g8A8BVhlHGlSveapqf4mJfonwvXYL github.com/jfrog/jfrog-apps-config v1.0.1/go.mod h1:8AIIr1oY9JuH5dylz2S6f8Ym2MaadPLR6noCBO4C22w= github.com/jfrog/jfrog-cli-application v1.0.2-0.20251210075951-519050602a7f h1:YHwPNF13Gmt65J618kEGn/4SGewXqyYuAdcyYWYdrBA= github.com/jfrog/jfrog-cli-application v1.0.2-0.20251210075951-519050602a7f/go.mod h1:xum2HquWO5uExa/A7MQs3TgJJVEeoqTR+6Z4mfBr1Xw= +github.com/jfrog/jfrog-cli-artifactory v0.8.1-0.20251230064405-049e011b0bb7 h1:UzFwA39ZTvinCbNvhr9QooeZaF1NBMkxXdBYJwTrXcU= +github.com/jfrog/jfrog-cli-artifactory v0.8.1-0.20251230064405-049e011b0bb7/go.mod h1:T8BzK7jnojx74G/tFs6lTjvNjNO6ltdWaZmY0X0YOOI= github.com/jfrog/jfrog-cli-core/v2 v2.60.1-0.20251223102649-e659f6937251 h1:WTyDOaYJUwY6zQujZuL9JQ9Q9+QWj9p31tLb4bJnu4U= github.com/jfrog/jfrog-cli-core/v2 v2.60.1-0.20251223102649-e659f6937251/go.mod h1:REkU0OfnLYZbQIjD2Cg85DAVP0SRZuV/PxiDfCJiJOc= github.com/jfrog/jfrog-cli-evidence v0.8.3-0.20251204144808-73fa744851c0 h1:8S1vE1PeVtrzWkKL0N39cX6XLLNV0It+f6xjRKjw7Ug= @@ -1222,8 +1226,8 @@ github.com/jfrog/jfrog-cli-platform-services v1.10.1-0.20251205121610-171eb9b000 github.com/jfrog/jfrog-cli-platform-services v1.10.1-0.20251205121610-171eb9b0000e/go.mod h1:qbu4iqBST9x8LgD8HhzUm91iOB3vHqtoGmaxOnmw0ok= github.com/jfrog/jfrog-cli-security v1.24.1 h1:NF8SE9uzUgqvqYjuuqbduXBqj+fwE4CmkMeVKtcLkyI= github.com/jfrog/jfrog-cli-security v1.24.1/go.mod h1:3FXD5IkKtdQOm9CZk6cR7q0iC6PaGMnjqzZqRcQp2r0= -github.com/jfrog/jfrog-client-go v1.55.1-0.20251224075603-b50939a87fa6 h1:vn7xCygFmL2etGiKnW+aDKCx6cSg1qgC0iaTSBX1kbA= -github.com/jfrog/jfrog-client-go v1.55.1-0.20251224075603-b50939a87fa6/go.mod h1:sCE06+GngPoyrGO0c+vmhgMoVSP83UMNiZnIuNPzU8U= +github.com/jfrog/jfrog-client-go v1.55.1-0.20251230061734-d954605bdb23 h1:tL4NUrnSiFN6MeK27z96ehiKXhYZDY2DyH95ogNRHrY= +github.com/jfrog/jfrog-client-go v1.55.1-0.20251230061734-d954605bdb23/go.mod h1:sCE06+GngPoyrGO0c+vmhgMoVSP83UMNiZnIuNPzU8U= github.com/jhump/protoreflect v1.17.0 h1:qOEr613fac2lOuTgWN4tPAtLL7fUSbuJL5X5XumQh94= github.com/jhump/protoreflect v1.17.0/go.mod h1:h9+vUUL38jiBzck8ck+6G/aeMX8Z4QUY/NiJPwPNi+8= github.com/jmespath/go-jmespath v0.4.1-0.20220621161143-b0104c826a24 h1:liMMTbpW34dhU4az1GN0pTPADwNmvoRSeoZ6PItiqnY= @@ -1323,10 +1327,6 @@ github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A= github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= -github.com/naveenku-jfrog/build-info-go v1.12.1-0.20251229102022-065f0cbe8e9d h1:gcZZJLZ+B9vQUluCI/qFjHi6XZhwFueaPIlgcdqFaaE= -github.com/naveenku-jfrog/build-info-go v1.12.1-0.20251229102022-065f0cbe8e9d/go.mod h1:+OCtMb22/D+u7Wne5lzkjJjaWr0LRZcHlDwTH86Mpwo= -github.com/naveenku-jfrog/jfrog-cli-artifactory v0.0.0-20251229114728-e5f53e263257 h1:+0VPQfcoiNJMXBZyiOPS1vFg2PHf8RQL02IRdVDIEMQ= -github.com/naveenku-jfrog/jfrog-cli-artifactory v0.0.0-20251229114728-e5f53e263257/go.mod h1:VyGDxuVfxD/3di+MStfU6nM7d0u2aziM7W3Gf4hXpaE= github.com/nwaples/rardecode v1.1.3 h1:cWCaZwfM5H7nAD6PyEdcVnczzV8i/JtotnyW/dD9lEc= github.com/nwaples/rardecode v1.1.3/go.mod h1:5DzqNKiOdpKKBH87u8VlvAnPZMXcGRhxWkRpHbbfGS0= github.com/oklog/run v1.0.0 h1:Ru7dDtJNOyC66gQ5dQmaCa0qIsAUFY3sFpK1Xk8igrw=