Skip to content

Commit f5f8aed

Browse files
authored
Add artifactory version validation for create and update draft bundle (#358)
1 parent f9cd7d2 commit f5f8aed

File tree

5 files changed

+16
-3
lines changed

5 files changed

+16
-3
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ require (
1010
github.com/jfrog/build-info-go v1.13.1-0.20260119231731-3cc4a0771bbd
1111
github.com/jfrog/gofrog v1.7.6
1212
github.com/jfrog/jfrog-cli-core/v2 v2.60.1-0.20260106204841-744f3f71817b
13-
github.com/jfrog/jfrog-client-go v1.55.1-0.20260128141727-bd34d78a3e48
13+
github.com/jfrog/jfrog-client-go v1.55.1-0.20260201135506-ffd03518ef56
1414
github.com/pkg/errors v0.9.1
1515
github.com/spf13/viper v1.21.0
1616
github.com/stretchr/testify v1.11.1

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,8 +168,8 @@ github.com/jfrog/gofrog v1.7.6 h1:QmfAiRzVyaI7JYGsB7cxfAJePAZTzFz0gRWZSE27c6s=
168168
github.com/jfrog/gofrog v1.7.6/go.mod h1:ntr1txqNOZtHplmaNd7rS4f8jpA5Apx8em70oYEe7+4=
169169
github.com/jfrog/jfrog-cli-core/v2 v2.60.1-0.20260106204841-744f3f71817b h1:gGGmYXuYvcNns1BnLQI13lC+pgMxrmenx+ramtolQuA=
170170
github.com/jfrog/jfrog-cli-core/v2 v2.60.1-0.20260106204841-744f3f71817b/go.mod h1:+Hnaikp/xCSPD/q7txxRy4Zc0wzjW/usrCSf+6uONSQ=
171-
github.com/jfrog/jfrog-client-go v1.55.1-0.20260128141727-bd34d78a3e48 h1:HY4b9DsUe0Lox1rScYHKmfIZY9PQvy0kfkOefqc/QdQ=
172-
github.com/jfrog/jfrog-client-go v1.55.1-0.20260128141727-bd34d78a3e48/go.mod h1:sCE06+GngPoyrGO0c+vmhgMoVSP83UMNiZnIuNPzU8U=
171+
github.com/jfrog/jfrog-client-go v1.55.1-0.20260201135506-ffd03518ef56 h1:MLbEex8JxLDj4bh62ZjQu16Qgfu8BPcKnlSTtizipe8=
172+
github.com/jfrog/jfrog-client-go v1.55.1-0.20260201135506-ffd03518ef56/go.mod h1:sCE06+GngPoyrGO0c+vmhgMoVSP83UMNiZnIuNPzU8U=
173173
github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4=
174174
github.com/kevinburke/ssh_config v1.2.0/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM=
175175
github.com/klauspost/compress v1.4.1/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=

lifecycle/commands/common.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ const (
2222
releaseBundlesV2 = "release-bundles-v2"
2323
minimalLifecycleArtifactoryVersion = "7.63.2"
2424
minArtifactoryVersionForMultiSourceAndPackagesSupport = "7.114.0"
25+
minArtifactoryVersionForDraftBundleSupport = "7.136.0"
2526
)
2627

2728
type releaseBundleCmd struct {

lifecycle/commands/createcommon.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,13 @@ func (rbc *ReleaseBundleCreateCommand) Run() error {
136136
return err
137137
}
138138

139+
// Validate Artifactory version supports draft bundle creation
140+
if rbc.draft {
141+
if err := ValidateFeatureSupportedVersion(rbc.serverDetails, minArtifactoryVersionForDraftBundleSupport); err != nil {
142+
return errorutils.CheckErrorf("draft bundle creation requires Artifactory version %s or higher", minArtifactoryVersionForDraftBundleSupport)
143+
}
144+
}
145+
139146
servicesManager, rbDetails, queryParams, err := rbc.getPrerequisites()
140147
if err != nil {
141148
return err

lifecycle/commands/update.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,11 @@ func (rbu *ReleaseBundleUpdateCommand) Run() error {
7474
return err
7575
}
7676

77+
// Validate Artifactory version supports draft bundle operations (update only works on draft bundles)
78+
if err := ValidateFeatureSupportedVersion(rbu.serverDetails, minArtifactoryVersionForDraftBundleSupport); err != nil {
79+
return errorutils.CheckErrorf("release bundle update requires Artifactory version %s or higher", minArtifactoryVersionForDraftBundleSupport)
80+
}
81+
7782
servicesManager, rbDetails, queryParams, err := rbu.getPrerequisites()
7883
if err != nil {
7984
return err

0 commit comments

Comments
 (0)