add async to rollback

Author: EyalDelarea

apptrust/commands/flags.go

@@ -133,6 +133,7 @@ var commandFlags = map[string][]string{
 		user,
 		accessToken,
 		serverId,
+		SyncFlag,
 	},
 	VersionUpdate: {
 		url,

apptrust/commands/version/rollback_app_version_cmd.go

@@ -23,6 +23,7 @@ type rollbackAppVersionCommand struct {
 	version        string
 	requestPayload *model.RollbackAppVersionRequest
 	fromStage      string
+	sync           bool
 }
 
 func (rv *rollbackAppVersionCommand) Run() error {
@@ -31,7 +32,7 @@ func (rv *rollbackAppVersionCommand) Run() error {
 		return err
 	}
 
-	return rv.versionService.RollbackAppVersion(ctx, rv.applicationKey, rv.version, rv.requestPayload)
+	return rv.versionService.RollbackAppVersion(ctx, rv.applicationKey, rv.version, rv.requestPayload, rv.sync)
 }
 
 func (rv *rollbackAppVersionCommand) ServerDetails() (*coreConfig.ServerDetails, error) {
@@ -51,6 +52,9 @@ func (rv *rollbackAppVersionCommand) prepareAndRunCommand(ctx *components.Contex
 	rv.version = ctx.Arguments[1]
 	rv.fromStage = ctx.Arguments[2]
 
+	// Extract sync flag value
+	rv.sync = ctx.GetBoolFlagValue(commands.SyncFlag)
+
 	serverDetails, err := utils.ServerDetailsByFlags(ctx)
 	if err != nil {
 		return err

apptrust/commands/version/rollback_app_version_cmd_test.go

@@ -24,7 +24,7 @@ func TestRollbackAppVersionCommand_Run(t *testing.T) {
 	}
 
 	mockVersionService := mockversions.NewMockVersionService(ctrl)
-	mockVersionService.EXPECT().RollbackAppVersion(gomock.Any(), applicationKey, version, requestPayload).
+	mockVersionService.EXPECT().RollbackAppVersion(gomock.Any(), applicationKey, version, requestPayload, false).
 		Return(nil).Times(1)
 
 	cmd := &rollbackAppVersionCommand{
@@ -52,7 +52,7 @@ func TestRollbackAppVersionCommand_Run_Error(t *testing.T) {
 	expectedError := errors.New("rollback service error occurred")
 
 	mockVersionService := mockversions.NewMockVersionService(ctrl)
-	mockVersionService.EXPECT().RollbackAppVersion(gomock.Any(), applicationKey, version, requestPayload).
+	mockVersionService.EXPECT().RollbackAppVersion(gomock.Any(), applicationKey, version, requestPayload, false).
 		Return(expectedError).Times(1)
 
 	cmd := &rollbackAppVersionCommand{

apptrust/service/versions/version_service.go

@@ -17,7 +17,7 @@ type VersionService interface {
 	CreateAppVersion(ctx service.Context, request *model.CreateAppVersionRequest) error
 	PromoteAppVersion(ctx service.Context, applicationKey string, version string, payload *model.PromoteAppVersionRequest, sync bool) error
 	ReleaseAppVersion(ctx service.Context, applicationKey string, version string, request *model.ReleaseAppVersionRequest, sync bool) error
-	RollbackAppVersion(ctx service.Context, applicationKey string, version string, request *model.RollbackAppVersionRequest) error
+	RollbackAppVersion(ctx service.Context, applicationKey string, version string, request *model.RollbackAppVersionRequest, sync bool) error
 	DeleteAppVersion(ctx service.Context, applicationKey string, version string) error
 	UpdateAppVersion(ctx service.Context, applicationKey string, version string, request *model.UpdateAppVersionRequest) error
 }
@@ -76,19 +76,19 @@ func (vs *versionService) ReleaseAppVersion(ctx service.Context, applicationKey,
 	return nil
 }
 
-func (vs *versionService) RollbackAppVersion(ctx service.Context, applicationKey, version string, request *model.RollbackAppVersionRequest) error {
+func (vs *versionService) RollbackAppVersion(ctx service.Context, applicationKey, version string, request *model.RollbackAppVersionRequest, sync bool) 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": strconv.FormatBool(!sync)})
 	if err != nil {
 		return err
 	}
 
-	if response.StatusCode != http.StatusOK && response.StatusCode != http.StatusAccepted {
+	if response.StatusCode >= http.StatusBadRequest {
 		return fmt.Errorf("failed to rollback app version. Status code: %d. \n%s",
 			response.StatusCode, responseBody)
 	}
 
-	log.Output("Application version deleted successfully")
+	log.Output(string(responseBody))
 	return nil
 }
 

apptrust/service/versions/version_service_test.go

@@ -422,26 +422,29 @@ func TestRollbackAppVersion(t *testing.T) {
 		applicationKey string
 		version        string
 		payload        *model.RollbackAppVersionRequest
+		sync           bool
 		expectedStatus int
 		expectedError  bool
 	}{
 		{
-			name:           "successful rollback with 200",
+			name:           "successful rollback with sync=true",
 			applicationKey: "video-encoder",
 			version:        "1.5.0",
 			payload: &model.RollbackAppVersionRequest{
 				FromStage: "qa",
 			},
+			sync:           true,
 			expectedStatus: http.StatusOK,
 			expectedError:  false,
 		},
 		{
-			name:           "successful rollback with 204",
+			name:           "successful rollback with sync=false",
 			applicationKey: "video-encoder",
 			version:        "1.5.0",
 			payload: &model.RollbackAppVersionRequest{
 				FromStage: "prod",
 			},
+			sync:           false,
 			expectedStatus: http.StatusAccepted,
 			expectedError:  false,
 		},
@@ -452,6 +455,7 @@ func TestRollbackAppVersion(t *testing.T) {
 			payload: &model.RollbackAppVersionRequest{
 				FromStage: "nonexistent",
 			},
+			sync:           true,
 			expectedStatus: http.StatusBadRequest,
 			expectedError:  true,
 		},
@@ -467,11 +471,11 @@ 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": strconv.FormatBool(!tt.sync)}).
 				Return(&http.Response{StatusCode: tt.expectedStatus}, []byte(""), nil)
 
 			service := NewVersionService()
-			err := service.RollbackAppVersion(mockCtx, tt.applicationKey, tt.version, tt.payload)
+			err := service.RollbackAppVersion(mockCtx, tt.applicationKey, tt.version, tt.payload, tt.sync)
 
 			if tt.expectedError {
 				assert.Error(t, err)