Sync the Async

Author: EyalDelarea

apptrust/http/http_client.go

@@ -25,7 +25,7 @@ type ApptrustHttpClient interface {
 	GetHttpClient() *jfroghttpclient.JfrogHttpClient
 	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)
+	Patch(path string, requestBody interface{}, params map[string]string) (resp *http.Response, body []byte, err error)
 	Delete(path string) (resp *http.Response, body []byte, err error)
 }
 
@@ -112,8 +112,8 @@ func (c *apptrustHttpClient) Get(path string) (resp *http.Response, body []byte,
 	return response, body, err
 }
 
-func (c *apptrustHttpClient) Patch(path string, requestBody interface{}) (resp *http.Response, body []byte, err error) {
-	url, err := utils.BuildUrl(c.serverDetails.Url, apptrustApiPath+path, nil)
+func (c *apptrustHttpClient) Patch(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

@@ -42,7 +42,7 @@ func (as *applicationService) CreateApplication(ctx service.Context, requestBody
 
 func (as *applicationService) UpdateApplication(ctx service.Context, requestBody *model.AppDescriptor) error {
 	endpoint := fmt.Sprintf("/v1/applications/%s", requestBody.ApplicationKey)
-	response, responseBody, err := ctx.GetHttpClient().Patch(endpoint, requestBody)
+	response, responseBody, err := ctx.GetHttpClient().Patch(endpoint, requestBody, nil)
 	if err != nil {
 		return err
 	}

apptrust/service/versions/version_service.go

@@ -78,7 +78,7 @@ func (vs *versionService) ReleaseAppVersion(ctx service.Context, applicationKey,
 
 func (vs *versionService) RollbackAppVersion(ctx service.Context, applicationKey, version string, request *model.RollbackAppVersionRequest) error {
 	endpoint := fmt.Sprintf("/v1/applications/%s/versions/%s/rollback", applicationKey, version)
-	response, responseBody, err := ctx.GetHttpClient().Post(endpoint, request, map[string]string{})
+	response, responseBody, err := ctx.GetHttpClient().Post(endpoint, request, map[string]string{"async": "false"})
 	if err != nil {
 		return err
 	}
@@ -88,7 +88,7 @@ func (vs *versionService) RollbackAppVersion(ctx service.Context, applicationKey
 			response.StatusCode, responseBody)
 	}
 
-	log.Output("Application version deleted successfully")
+	log.Output("Application version rollback completed successfully")
 	return nil
 }
 
@@ -109,12 +109,12 @@ func (vs *versionService) DeleteAppVersion(ctx service.Context, applicationKey,
 
 func (vs *versionService) UpdateAppVersion(ctx service.Context, applicationKey string, version string, request *model.UpdateAppVersionRequest) error {
 	endpoint := fmt.Sprintf("/v1/applications/%s/versions/%s", applicationKey, version)
-	response, responseBody, err := ctx.GetHttpClient().Patch(endpoint, request)
+	response, responseBody, err := ctx.GetHttpClient().Patch(endpoint, request, map[string]string{"async": "false"})
 	if err != nil {
 		return err
 	}
 
-	if response.StatusCode != http.StatusAccepted {
+	if response.StatusCode != http.StatusOK {
 		return fmt.Errorf("failed to update app version. Status code: %d. \n%s",
 			response.StatusCode, responseBody)
 	}

apptrust/service/versions/version_service_test.go

@@ -314,7 +314,7 @@ func TestUpdateAppVersion(t *testing.T) {
 			request: &model.UpdateAppVersionRequest{
 				Tag: "release/1.2.3",
 			},
-			mockResponse:     &http.Response{StatusCode: http.StatusAccepted},
+			mockResponse:     &http.Response{StatusCode: http.StatusOK},
 			mockResponseBody: "{}",
 			mockError:        nil,
 			expectError:      false,
@@ -327,7 +327,7 @@ func TestUpdateAppVersion(t *testing.T) {
 					"status": {"rc", "validated"},
 				},
 			},
-			mockResponse:     &http.Response{StatusCode: http.StatusAccepted},
+			mockResponse:     &http.Response{StatusCode: http.StatusOK},
 			mockResponseBody: "{}",
 			mockError:        nil,
 			expectError:      false,
@@ -338,7 +338,7 @@ func TestUpdateAppVersion(t *testing.T) {
 			request: &model.UpdateAppVersionRequest{
 				DeleteProperties: []string{"legacy_param", "toBeDeleted"},
 			},
-			mockResponse:     &http.Response{StatusCode: http.StatusAccepted},
+			mockResponse:     &http.Response{StatusCode: http.StatusOK},
 			mockResponseBody: "{}",
 			mockError:        nil,
 			expectError:      false,
@@ -353,7 +353,7 @@ func TestUpdateAppVersion(t *testing.T) {
 				},
 				DeleteProperties: []string{"old_param"},
 			},
-			mockResponse:     &http.Response{StatusCode: http.StatusAccepted},
+			mockResponse:     &http.Response{StatusCode: http.StatusOK},
 			mockResponseBody: "{}",
 			mockError:        nil,
 			expectError:      false,
@@ -397,7 +397,7 @@ func TestUpdateAppVersion(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			mockHttpClient := mockhttp.NewMockApptrustHttpClient(ctrl)
-			mockHttpClient.EXPECT().Patch("/v1/applications/test-app/versions/1.0.0", tt.request).
+			mockHttpClient.EXPECT().Patch("/v1/applications/test-app/versions/1.0.0", tt.request, map[string]string{"async": "false"}).
 				Return(tt.mockResponse, []byte(tt.mockResponseBody), tt.mockError).Times(1)
 
 			mockCtx := mockservice.NewMockContext(ctrl)
@@ -467,7 +467,7 @@ func TestRollbackAppVersion(t *testing.T) {
 			mockCtx.EXPECT().GetHttpClient().Return(mockClient)
 
 			expectedEndpoint := "/v1/applications/" + tt.applicationKey + "/versions/" + tt.version + "/rollback"
-			mockClient.EXPECT().Post(expectedEndpoint, tt.payload, map[string]string{}).
+			mockClient.EXPECT().Post(expectedEndpoint, tt.payload, map[string]string{"async": "false"}).
 				Return(&http.Response{StatusCode: tt.expectedStatus}, []byte(""), nil)
 
 			service := NewVersionService()