Skip to content

RTECO-235 - Fixed the proper handling of Deleting Remote Release Bundle #95

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
naveenku-jfrog merged 5 commits into from
Jul 8, 2025
Merged

RTECO-235 - Fixed the proper handling of Deleting Remote Release Bundle #95

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6e0b289
RTECO-235 - Fixed the proper handling of Deleting Remote Release Bundle
naveenku-jfrog Jul 7, 2025
718ae06
RTECO-235 - Handled Version Checking in artifactory itself
naveenku-jfrog Jul 8, 2025
9e59050
RTECO-235 - Updating go.mod temporarily
naveenku-jfrog Jul 8, 2025
cad1904
RTECO-235 - Updating go.sum temporarily
naveenku-jfrog Jul 8, 2025
f92d481
RTECO-235 - Addressing Comments
naveenku-jfrog Jul 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,6 @@ require (

replace github.com/jfrog/jfrog-cli-core/v2 => github.com/jfrog/jfrog-cli-core/v2 v2.31.1-0.20250619122826-54ff6f65b128

replace github.com/jfrog/jfrog-client-go => github.com/jfrog/jfrog-client-go v1.28.1-0.20250623080810-85bcce028748
replace github.com/jfrog/jfrog-client-go => github.com/naveenku-jfrog/jfrog-client-go v1.28.1-0.20250708064309-257727d14f1f

//replace github.com/jfrog/jfrog-client-go => github.com/jfrog/jfrog-client-go v1.28.1-0.20240811142930-ab9715567376
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,8 +139,6 @@ 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-cli-core/v2 v2.31.1-0.20250619122826-54ff6f65b128 h1:SdNS8Z1H1c1wgtHxZJNjLf9cWx+zdfXDQPmjUwQ55Bo=
github.com/jfrog/jfrog-cli-core/v2 v2.31.1-0.20250619122826-54ff6f65b128/go.mod h1:JDMYJHxU3W0/jaiiSljHLAcd0QeEGwpAwsnOqVR8c/0=
github.com/jfrog/jfrog-client-go v1.28.1-0.20250623080810-85bcce028748 h1:299KpOItnMAdW2ZmWrqn4+j1dEemNWSX/PHq6C+IVQA=
github.com/jfrog/jfrog-client-go v1.28.1-0.20250623080810-85bcce028748/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/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88/go.mod h1:3w7q1U84EfirKl04SVQ/s7nPm1ZPhiXd34z40TNz36k=
Expand Down Expand Up @@ -201,6 +199,8 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
github.com/naveenku-jfrog/jfrog-client-go v1.28.1-0.20250708064309-257727d14f1f h1:WBnRcroXnixcVdkTN3A/H3N0RRQKaOKM5lOnArqVNGo=
github.com/naveenku-jfrog/jfrog-client-go v1.28.1-0.20250708064309-257727d14f1f/go.mod h1:1v0eih4thdPA4clBo9TuvAMT25sGDr1IQJ81DXQ/lBY=
github.com/nwaples/rardecode v1.1.3 h1:cWCaZwfM5H7nAD6PyEdcVnczzV8i/JtotnyW/dD9lEc=
github.com/nwaples/rardecode v1.1.3/go.mod h1:5DzqNKiOdpKKBH87u8VlvAnPZMXcGRhxWkRpHbbfGS0=
github.com/onsi/ginkgo/v2 v2.14.0 h1:vSmGj2Z5YPb9JwCWT6z6ihcUvDhuXLc3sJiqd3jMKAY=
Expand Down
24 changes: 20 additions & 4 deletions lifecycle/commands/deleteremote.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,12 @@ package commands
import (
"encoding/json"
"fmt"
"github.com/jfrog/gofrog/version"
"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
"github.com/jfrog/jfrog-cli-core/v2/common/spec"
"github.com/jfrog/jfrog-cli-core/v2/utils/config"
"github.com/jfrog/jfrog-cli-core/v2/utils/coreutils"
"github.com/jfrog/jfrog-client-go/artifactory"
"github.com/jfrog/jfrog-client-go/lifecycle"
"github.com/jfrog/jfrog-client-go/lifecycle/services"
clientutils "github.com/jfrog/jfrog-client-go/utils"
Expand All @@ -14,7 +17,10 @@ import (
"github.com/jfrog/jfrog-client-go/utils/log"
)

const avoidConfirmationMsg = "You can avoid this confirmation message by adding --quiet to the command."
const (
avoidConfirmationMsg = "You can avoid this confirmation message by adding --quiet to the command."
minimumVersionForSupportingNewReleaseBundleApi = "7.63.2"
)

type ReleaseBundleRemoteDeleteCommand struct {
releaseBundleCmd
Expand Down Expand Up @@ -90,26 +96,31 @@ func (rbd *ReleaseBundleRemoteDeleteCommand) Run() error {
if err != nil {
return err
}
artifactoryServiceManager, err := utils.CreateServiceManager(rbd.serverDetails, -1, 0, false)
if err != nil {
return err
}

return rbd.deleteRemote(servicesManager, rbDetails, queryParams)
return rbd.deleteRemote(servicesManager, rbDetails, queryParams, artifactoryServiceManager)
}

func (rbd *ReleaseBundleRemoteDeleteCommand) deleteRemote(servicesManager *lifecycle.LifecycleServicesManager,
rbDetails services.ReleaseBundleDetails, queryParams services.CommonOptionalQueryParams) error {
rbDetails services.ReleaseBundleDetails, queryParams services.CommonOptionalQueryParams, artifactoryServiceManager artifactory.ArtifactoryServicesManager) error {

confirm, err := rbd.confirmDelete()
if err != nil || !confirm {
return err
}

aggregatedRules := rbd.getAggregatedDistRules()
newReleaseBundleApiSupported := rbd.IsNewReleaseBundleApiSupported(artifactoryServiceManager)

return servicesManager.RemoteDeleteReleaseBundle(rbDetails, services.ReleaseBundleRemoteDeleteParams{
DistributionRules: aggregatedRules,
DryRun: rbd.dryRun,
MaxWaitMinutes: rbd.maxWaitMinutes,
CommonOptionalQueryParams: queryParams,
})
}, newReleaseBundleApiSupported)
}

func (rbd *ReleaseBundleRemoteDeleteCommand) distributionRulesEmpty() bool {
Expand Down Expand Up @@ -157,3 +168,8 @@ func (rbd *ReleaseBundleRemoteDeleteCommand) getAggregatedDistRules() (aggregate
}
return
}

func (rbd *ReleaseBundleRemoteDeleteCommand) IsNewReleaseBundleApiSupported(artifactoryServiceManager artifactory.ArtifactoryServicesManager) bool {
artifactoryVersion, _ := artifactoryServiceManager.GetVersion()
return version.NewVersion(artifactoryVersion).AtLeast(minimumVersionForSupportingNewReleaseBundleApi)
}