Update the version-promote command to align with the new API

Author: asafgabai

apptrust/http/http_client.go

@@ -23,7 +23,7 @@ const apptrustApiPath = "apptrust/api"
 
 type ApptrustHttpClient interface {
 	GetHttpClient() *jfroghttpclient.JfrogHttpClient
-	Post(path string, requestBody interface{}) (resp *http.Response, body []byte, err error)
+	Post(path string, requestBody interface{}, params map[string]string) (resp *http.Response, body []byte, err error)
 	Get(path string) (resp *http.Response, body []byte, err error)
 	Patch(path string, requestBody interface{}) (resp *http.Response, body []byte, err error)
 	Delete(path string, requestBody interface{}) (resp *http.Response, body []byte, err error)
@@ -86,8 +86,8 @@ func (c *apptrustHttpClient) GetHttpClient() *jfroghttpclient.JfrogHttpClient {
 	return c.client
 }
 
-func (c *apptrustHttpClient) Post(path string, requestBody interface{}) (resp *http.Response, body []byte, err error) {
-	url, err := utils.BuildUrl(c.serverDetails.Url, apptrustApiPath+path, nil)
+func (c *apptrustHttpClient) Post(path string, requestBody interface{}, params map[string]string) (resp *http.Response, body []byte, err error) {
+	url, err := utils.BuildUrl(c.serverDetails.Url, apptrustApiPath+path, params)
 	if err != nil {
 		return nil, nil, err
 	}

apptrust/service/applications/application_service.go

@@ -25,7 +25,7 @@ func NewApplicationService() ApplicationService {
 }
 
 func (as *applicationService) CreateApplication(ctx service.Context, requestBody *model.AppDescriptor) error {
-	response, responseBody, err := ctx.GetHttpClient().Post("/v1/applications", requestBody)
+	response, responseBody, err := ctx.GetHttpClient().Post("/v1/applications", requestBody, nil)
 	if err != nil {
 		return err
 	}

apptrust/service/packages/package_service.go

@@ -23,7 +23,7 @@ func NewPackageService() PackageService {
 
 func (ps *packageService) BindPackage(ctx service.Context, request *model.BindPackageRequest) error {
 	endpoint := "/v1/package"
-	response, responseBody, err := ctx.GetHttpClient().Post(endpoint, request)
+	response, responseBody, err := ctx.GetHttpClient().Post(endpoint, request, nil)
 	if err != nil {
 		return err
 	}

apptrust/service/versions/version_service.go

@@ -23,7 +23,7 @@ func NewVersionService() VersionService {
 }
 
 func (vs *versionService) CreateAppVersion(ctx service.Context, request *model.CreateAppVersionRequest) error {
-	response, responseBody, err := ctx.GetHttpClient().Post("/v1/applications/version", request)
+	response, responseBody, err := ctx.GetHttpClient().Post("/v1/applications/version", request, nil)
 	if err != nil {
 		return err
 	}
@@ -37,8 +37,8 @@ func (vs *versionService) CreateAppVersion(ctx service.Context, request *model.C
 }
 
 func (vs *versionService) PromoteAppVersion(ctx service.Context, applicationKey, version string, request *model.PromoteAppVersionRequest, sync bool) error {
-	endpoint := fmt.Sprintf("/v1/applications/%s/versions/%s/promote?async=%s", applicationKey, version, strconv.FormatBool(!sync))
-	response, responseBody, err := ctx.GetHttpClient().Post(endpoint, request)
+	endpoint := fmt.Sprintf("/v1/applications/%s/versions/%s/promote", applicationKey, version)
+	response, responseBody, err := ctx.GetHttpClient().Post(endpoint, request, map[string]string{"async": strconv.FormatBool(!sync)})
 	if err != nil {
 		return err
 	}

apptrust/service/versions/version_service_test.go

@@ -3,6 +3,7 @@ package versions
 import (
 	"errors"
 	"net/http"
+	"strconv"
 	"testing"
 
 	mockhttp "github.com/jfrog/jfrog-cli-application/apptrust/http/mocks"
@@ -56,7 +57,7 @@ func TestCreateAppVersion(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			mockHttpClient := mockhttp.NewMockApptrustHttpClient(ctrl)
-			mockHttpClient.EXPECT().Post("/v1/applications/version", tt.request).
+			mockHttpClient.EXPECT().Post("/v1/applications/version", tt.request, nil).
 				Return(tt.mockResponse, []byte(tt.mockResponseBody), tt.mockError).Times(1)
 
 			mockCtx := mockservice.NewMockContext(ctrl)
@@ -102,7 +103,7 @@ func TestPromoteAppVersion(t *testing.T) {
 				ExcludedRepositoryKeys: []string{"repo3"},
 			},
 			sync:             true,
-			expectedEndpoint: "/v1/applications/test-app/versions/1.0.0/promote?async=false",
+			expectedEndpoint: "/v1/applications/test-app/versions/1.0.0/promote",
 			mockResponse:     &http.Response{StatusCode: 200},
 			mockResponseBody: "{}",
 			mockError:        nil,
@@ -119,7 +120,7 @@ func TestPromoteAppVersion(t *testing.T) {
 				ExcludedRepositoryKeys: []string{"repo3"},
 			},
 			sync:             false,
-			expectedEndpoint: "/v1/applications/test-app/versions/1.0.0/promote?async=true",
+			expectedEndpoint: "/v1/applications/test-app/versions/1.0.0/promote",
 			mockResponse:     &http.Response{StatusCode: 202},
 			mockResponseBody: "{}",
 			mockError:        nil,
@@ -134,7 +135,7 @@ func TestPromoteAppVersion(t *testing.T) {
 				PromotionType: model.PromotionTypeCopy,
 			},
 			sync:             true,
-			expectedEndpoint: "/v1/applications/test-app/versions/1.0.0/promote?async=false",
+			expectedEndpoint: "/v1/applications/test-app/versions/1.0.0/promote",
 			mockResponse:     &http.Response{StatusCode: 400},
 			mockResponseBody: "error",
 			mockError:        nil,
@@ -149,7 +150,7 @@ func TestPromoteAppVersion(t *testing.T) {
 				PromotionType: model.PromotionTypeCopy,
 			},
 			sync:             false,
-			expectedEndpoint: "/v1/applications/test-app/versions/1.0.0/promote?async=true",
+			expectedEndpoint: "/v1/applications/test-app/versions/1.0.0/promote",
 			mockResponse:     nil,
 			mockResponseBody: "",
 			mockError:        errors.New("http client error"),
@@ -160,7 +161,7 @@ func TestPromoteAppVersion(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			mockHttpClient := mockhttp.NewMockApptrustHttpClient(ctrl)
-			mockHttpClient.EXPECT().Post(tt.expectedEndpoint, tt.payload).
+			mockHttpClient.EXPECT().Post(tt.expectedEndpoint, tt.payload, map[string]string{"async": strconv.FormatBool(!tt.sync)}).
 				Return(tt.mockResponse, []byte(tt.mockResponseBody), tt.mockError).Times(1)
 
 			mockCtx := mockservice.NewMockContext(ctrl)