From f2e3ed3a298d3fd613f44c8c6c1385491f71c293 Mon Sep 17 00:00:00 2001 From: Naveen Kumar Date: Fri, 26 Dec 2025 11:45:07 +0530 Subject: [PATCH 1/3] 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 af910cb4896b5b015b892a141ebd16f345b5d563 Mon Sep 17 00:00:00 2001 From: Naveen Kumar Date: Mon, 29 Dec 2025 15:22:09 +0530 Subject: [PATCH 2/3] Updated artifactory and client-go version in go.mod --- go.mod | 4 +-- go.sum | 8 +++--- lifecycle_test.go | 71 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 77 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index c7b268f11..d96bfdc81 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-20251210184507-0c8d138690cb +replace github.com/jfrog/jfrog-cli-artifactory => github.com/naveenku-jfrog/jfrog-cli-artifactory v0.0.0-20251229092106-be3b2f97d144 -//replace github.com/jfrog/build-info-go => github.com/jfrog/build-info-go v1.8.9-0.20251006061821-8b1be6a65215 +replace github.com/jfrog/jfrog-client-go => github.com/naveenku-jfrog/jfrog-client-go v1.54.2-0.20251229091207-1f540f06a592 // 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 2759c5e41..79d0012e1 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= @@ -1226,8 +1224,6 @@ 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/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= @@ -1327,6 +1323,10 @@ 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-20251229092106-be3b2f97d144 h1:ndOK3+j8QlclchbYTanfNvJZ2HMWICB29uYUlu33Fc8= +github.com/naveenku-jfrog/jfrog-cli-artifactory v0.0.0-20251229092106-be3b2f97d144/go.mod h1:yGX6A9LKTHGWs9yko9BB2u5gu1QSPa8x+EQad+5dLT8= +github.com/naveenku-jfrog/jfrog-client-go v1.54.2-0.20251229091207-1f540f06a592 h1:WcBGL3OWIt0hzEOeS9HwM3JF+r5lmmYMIYXrIROnK0Q= +github.com/naveenku-jfrog/jfrog-client-go v1.54.2-0.20251229091207-1f540f06a592/go.mod h1:sCE06+GngPoyrGO0c+vmhgMoVSP83UMNiZnIuNPzU8U= 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/lifecycle_test.go b/lifecycle_test.go index 9d465c2c3..938e4b516 100644 --- a/lifecycle_test.go +++ b/lifecycle_test.go @@ -1079,6 +1079,77 @@ func TestReleaseBundlesSearchVersions(t *testing.T) { }, } + // Setup for project test case + projectRbName := "my-versioned-app-project" + projectVersionA := "1.0.0" + projectVersionB := "1.0.1" + + // Setup: Create test project and upload builds with project + deleteProject := createTestProject(t) + if deleteProject != nil { + defer func() { + if err := deleteProject(); err != nil { + t.Logf("Warning: Failed to delete test project: %v", err) + } + }() + } + + deleteBuildsWithProject := uploadBuildsWithProject(t) + defer deleteBuildsWithProject() + + // Delete existing release bundle versions with project + for _, version := range []string{projectVersionA, projectVersionB} { + isExist, err := lcManager.IsReleaseBundleExist(projectRbName, version, tests.ProjectKey) + if err == nil && isExist { + rbDetails := services.ReleaseBundleDetails{ + ReleaseBundleName: projectRbName, + ReleaseBundleVersion: version, + } + err := lcManager.DeleteReleaseBundleVersion(rbDetails, services.CommonOptionalQueryParams{Async: false, ProjectKey: tests.ProjectKey}) + if err != nil { + if !strings.Contains(err.Error(), "404") && !strings.Contains(err.Error(), "not found") { + t.Logf("Warning: Failed to delete release bundle %s/%s: %v", projectRbName, version, err) + } + } else { + time.Sleep(5 * time.Second) + } + } + } + + // Create release bundles with project + createRbWithFlags(t, "", "", tests.LcBuildName1, number1, projectRbName, projectVersionA, tests.ProjectKey, true, false) + defer deleteReleaseBundleWithProject(t, lcManager, projectRbName, projectVersionA, tests.ProjectKey) + assertStatusCompletedWithProject(t, lcManager, projectRbName, projectVersionA, "", tests.ProjectKey) + + time.Sleep(1 * time.Second) + + createRbWithFlags(t, "", "", tests.LcBuildName2, number2, projectRbName, projectVersionB, tests.ProjectKey, true, false) + defer deleteReleaseBundleWithProject(t, lcManager, projectRbName, projectVersionB, tests.ProjectKey) + assertStatusCompletedWithProject(t, lcManager, projectRbName, projectVersionB, "", tests.ProjectKey) + + log.Info("Created two versions for release bundle '%s' with project for search testing.", projectRbName) + time.Sleep(3 * time.Second) + + // Add project test case to existing testCases + testCases = append(testCases, struct { + name string + releaseBundleName string + queryParams services.GetSearchOptionalQueryParams + expectedRbVersions []string + expectedTotal int + expectError bool + errorMessage string + }{ + name: "Search with project", + releaseBundleName: projectRbName, + queryParams: services.GetSearchOptionalQueryParams{ + Project: tests.ProjectKey, + }, + expectedRbVersions: []string{projectVersionA, projectVersionB}, + expectedTotal: 2, + expectError: false, + }) + for _, tc := range testCases { t.Run(tc.name, func(t *testing.T) { var resp services.ReleaseBundleVersionsResponse From 566a1e9dbf21e0e49369b8b49b32477589cad83a Mon Sep 17 00:00:00 2001 From: Naveen Kumar Date: Tue, 30 Dec 2025 12:01:07 +0530 Subject: [PATCH 3/3] Update artifactory and client-go version --- go.mod | 8 ++------ go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/go.mod b/go.mod index d96bfdc81..a7a7a42f9 100644 --- a/go.mod +++ b/go.mod @@ -19,12 +19,12 @@ 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.20251226061308-9e2e89aff61f + github.com/jfrog/jfrog-cli-artifactory v0.8.1-0.20251230062658-a3f96d1fd36a 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 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-20251229092106-be3b2f97d144 - -replace github.com/jfrog/jfrog-client-go => github.com/naveenku-jfrog/jfrog-client-go v1.54.2-0.20251229091207-1f540f06a592 - // 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 79d0012e1..a36ab9563 100644 --- a/go.sum +++ b/go.sum @@ -1216,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.20251230062658-a3f96d1fd36a h1:V2L7J9Kum4ur4EbvubES/Ej54LoI6iN/HuDJm684EGY= +github.com/jfrog/jfrog-cli-artifactory v0.8.1-0.20251230062658-a3f96d1fd36a/go.mod h1:zLyP0cwq+Ahn+d3CmjV3FvT1htoD/I4d6gFvKBLwrTI= 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= @@ -1224,6 +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.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/jfrog-cli-artifactory v0.0.0-20251229092106-be3b2f97d144 h1:ndOK3+j8QlclchbYTanfNvJZ2HMWICB29uYUlu33Fc8= -github.com/naveenku-jfrog/jfrog-cli-artifactory v0.0.0-20251229092106-be3b2f97d144/go.mod h1:yGX6A9LKTHGWs9yko9BB2u5gu1QSPa8x+EQad+5dLT8= -github.com/naveenku-jfrog/jfrog-client-go v1.54.2-0.20251229091207-1f540f06a592 h1:WcBGL3OWIt0hzEOeS9HwM3JF+r5lmmYMIYXrIROnK0Q= -github.com/naveenku-jfrog/jfrog-client-go v1.54.2-0.20251229091207-1f540f06a592/go.mod h1:sCE06+GngPoyrGO0c+vmhgMoVSP83UMNiZnIuNPzU8U= 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=