RTECO-235 - Fixed the proper handling of deletionStatus (#1142)

Author: naveenku-jfrog

README.md

@@ -3081,17 +3081,23 @@ resp, err := serviceManager.DeleteReleaseBundleVersionPromotion(rbDetails, query
 #### Remote Delete Release Bundle
 
 ```go
+rbDetails := ReleaseBundleDetails{"rbName", "rbVersion"}
+
 rules := &distribution.DistributionCommonParams{
-    SiteName:     "*",
-    CityName:     "*",
-    CountryCodes: []string{"*"},
+SiteName:     "*",
+CityName:     "*",
+CountryCodes: []string{"*"},
 }
 params := distribution.NewDistributeReleaseBundleParams("rbName", "rbVersion")
 params.DistributionRules = append(params.DistributionRules, rules)
 
-dryRun := true
+queryParams := CommonOptionalQueryParams{}
+queryParams.ProjectKey = "project"
+queryParams.Async = true
 
-resp, err := serviceManager.RemoteDeleteReleaseBundle(params, dryRun)
+isNewReleaseBundleApiSupported=true 
+//From 7.63.2, isNewReleaseBundleApiSupported is true, below that version it should be false.
+resp, err := serviceManager.RemoteDeleteReleaseBundle(rbDetails, params, isNewReleaseBundleApiSupported)
 ```
 
 #### check-rb-exists

lifecycle/lifecycle_test.go

@@ -211,15 +211,31 @@ func TestRemoteDeleteReleaseBundle(t *testing.T) {
 			}
 			requestNum++
 			writeMockStatusResponse(t, w, lifecycle.GetDistributionsResponse{{Status: rbStatus}})
-		case "/" + lifecycle.GetRemoteDeleteReleaseBundleApi(testRb):
+		case "/" + lifecycle.GetRemoteDeleteReleaseBundleApi(testRb, false):
 			w.WriteHeader(http.StatusAccepted)
 		}
 	}
 
 	mockServer, rbService := createMockServer(t, handlerFunc)
 	defer mockServer.Close()
 
-	assert.NoError(t, rbService.RemoteDeleteReleaseBundle(testRb, lifecycle.ReleaseBundleRemoteDeleteParams{MaxWaitMinutes: 2}))
+	assert.NoError(t, rbService.RemoteDeleteReleaseBundle(testRb, lifecycle.ReleaseBundleRemoteDeleteParams{MaxWaitMinutes: 2}, false))
+}
+
+func TestRemoteDeleteReleaseBundleNewApi(t *testing.T) {
+	lifecycle.SyncSleepInterval = 1 * time.Second
+	defer func() { lifecycle.SyncSleepInterval = lifecycle.DefaultSyncSleepInterval }()
+
+	handlerFunc := func(w http.ResponseWriter, r *http.Request) {
+		if r.RequestURI == "/"+lifecycle.GetRemoteDeleteReleaseBundleApi(testRb, true) {
+			w.WriteHeader(http.StatusOK)
+		}
+	}
+
+	mockServer, rbService := createMockServer(t, handlerFunc)
+	defer mockServer.Close()
+
+	assert.NoError(t, rbService.RemoteDeleteReleaseBundle(testRb, lifecycle.ReleaseBundleRemoteDeleteParams{MaxWaitMinutes: 2}, true))
 }
 
 func TestGetReleaseBundleVersionPromotions(t *testing.T) {

lifecycle/manager.go

@@ -137,9 +137,9 @@ func (lcs *LifecycleServicesManager) DistributeReleaseBundle(rbDetails lifecycle
 	return distributeBundleService.Distribute()
 }
 
-func (lcs *LifecycleServicesManager) RemoteDeleteReleaseBundle(rbDetails lifecycle.ReleaseBundleDetails, params lifecycle.ReleaseBundleRemoteDeleteParams) error {
+func (lcs *LifecycleServicesManager) RemoteDeleteReleaseBundle(rbDetails lifecycle.ReleaseBundleDetails, params lifecycle.ReleaseBundleRemoteDeleteParams, isNewReleaseBundleApiSupported bool) error {
 	rbService := lifecycle.NewReleaseBundlesService(lcs.config.GetServiceDetails(), lcs.client)
-	return rbService.RemoteDeleteReleaseBundle(rbDetails, params)
+	return rbService.RemoteDeleteReleaseBundle(rbDetails, params, isNewReleaseBundleApiSupported)
 }
 
 func (lcs *LifecycleServicesManager) ExportReleaseBundle(rbDetails lifecycle.ReleaseBundleDetails, modifications lifecycle.Modifications, queryParams lifecycle.CommonOptionalQueryParams) (exportResponse lifecycle.ReleaseBundleExportedStatusResponse, err error) {

lifecycle/services/delete.go

@@ -46,7 +46,7 @@ func (rbs *ReleaseBundlesService) deleteReleaseBundle(params CommonOptionalQuery
 	return errorutils.CheckResponseStatusWithBody(resp, body, http.StatusNoContent)
 }
 
-func (rbs *ReleaseBundlesService) RemoteDeleteReleaseBundle(rbDetails ReleaseBundleDetails, params ReleaseBundleRemoteDeleteParams) error {
+func (rbs *ReleaseBundlesService) RemoteDeleteReleaseBundle(rbDetails ReleaseBundleDetails, params ReleaseBundleRemoteDeleteParams, isNewReleaseBundleApiSupported bool) error {
 	dryRunStr := ""
 	if params.DryRun {
 		dryRunStr = "[Dry run] "
@@ -59,20 +59,30 @@ func (rbs *ReleaseBundlesService) RemoteDeleteReleaseBundle(rbDetails ReleaseBun
 		return errorutils.CheckError(err)
 	}
 
-	restApi := GetRemoteDeleteReleaseBundleApi(rbDetails)
+	restApi := GetRemoteDeleteReleaseBundleApi(rbDetails, isNewReleaseBundleApiSupported)
 	requestFullUrl, err := utils.BuildUrl(rbs.GetLifecycleDetails().GetUrl(), restApi, nil)
 	if err != nil {
 		return err
 	}
 
 	httpClientDetails := rbs.GetLifecycleDetails().CreateHttpClientDetails()
 	httpClientDetails.SetContentTypeApplicationJson()
+	if isNewReleaseBundleApiSupported {
+		resp, body, err := rbs.client.SendDelete(requestFullUrl, content, &httpClientDetails)
+		if err != nil {
+			return err
+		}
+		log.Debug("Artifactory response:", resp.Status)
+		return errorutils.CheckResponseStatusWithBody(resp, body, http.StatusOK)
+	}
+
 	resp, body, err := rbs.client.SendPost(requestFullUrl, content, &httpClientDetails)
 	if err != nil {
 		return err
 	}
 
 	log.Debug("Artifactory response:", resp.Status)
+
 	err = errorutils.CheckResponseStatusWithBody(resp, body, http.StatusAccepted)
 	if err != nil || params.Async || params.DryRun {
 		return err
@@ -81,7 +91,10 @@ func (rbs *ReleaseBundlesService) RemoteDeleteReleaseBundle(rbDetails ReleaseBun
 	return rbs.waitForRemoteDeletion(rbDetails, params)
 }
 
-func GetRemoteDeleteReleaseBundleApi(rbDetails ReleaseBundleDetails) string {
+func GetRemoteDeleteReleaseBundleApi(rbDetails ReleaseBundleDetails, isNewReleaseBundleApiSupported bool) string {
+	if isNewReleaseBundleApiSupported {
+		return path.Join(releaseBundleNewApi, records, rbDetails.ReleaseBundleName, rbDetails.ReleaseBundleVersion)
+	}
 	return path.Join(distributionBaseApi, remoteDeleteEndpoint, rbDetails.ReleaseBundleName, rbDetails.ReleaseBundleVersion)
 }
 

lifecycle/services/distribute.go

@@ -14,6 +14,7 @@ import (
 )
 
 const (
+	releaseBundleNewApi = "api/v2/release_bundle"
 	distributionBaseApi = "api/v2/distribution/"
 	distribute          = "distribute"
 	trackers            = "trackers"