Delete application version command

Author: asafgabai

apptrust/commands/flags.go

@@ -11,6 +11,7 @@ const (
 	Ping              = "ping"
 	CreateAppVersion  = "create-app-version"
 	PromoteAppVersion = "promote-app-version"
+	DeleteAppVersion  = "delete-app-version"
 	CreateApp         = "create-app"
 	UpdateApp         = "update-app"
 	DeleteApp         = "delete-app"
@@ -90,6 +91,12 @@ var commandFlags = map[string][]string{
 		ApplicationKeyFlag,
 		StageVarsFlag,
 	},
+	DeleteAppVersion: {
+		url,
+		user,
+		accessToken,
+		serverId,
+	},
 
 	Ping: {
 		url,

apptrust/commands/version/delete_app_version_cmd.go

@@ -0,0 +1,82 @@
+package version
+
+import (
+	"github.com/jfrog/jfrog-cli-application/apptrust/app"
+	"github.com/jfrog/jfrog-cli-application/apptrust/commands"
+	"github.com/jfrog/jfrog-cli-application/apptrust/commands/utils"
+	"github.com/jfrog/jfrog-cli-application/apptrust/common"
+	"github.com/jfrog/jfrog-cli-application/apptrust/service"
+	"github.com/jfrog/jfrog-cli-application/apptrust/service/versions"
+	commonCLiCommands "github.com/jfrog/jfrog-cli-core/v2/common/commands"
+	pluginsCommon "github.com/jfrog/jfrog-cli-core/v2/plugins/common"
+	"github.com/jfrog/jfrog-cli-core/v2/plugins/components"
+	coreConfig "github.com/jfrog/jfrog-cli-core/v2/utils/config"
+)
+
+type deleteAppVersionCommand struct {
+	versionService versions.VersionService
+	serverDetails  *coreConfig.ServerDetails
+	applicationKey string
+	version        string
+}
+
+func (dv *deleteAppVersionCommand) Run() error {
+	ctx, err := service.NewContext(*dv.serverDetails)
+	if err != nil {
+		return err
+	}
+
+	return dv.versionService.DeleteAppVersion(ctx, dv.applicationKey, dv.version)
+}
+
+func (dv *deleteAppVersionCommand) ServerDetails() (*coreConfig.ServerDetails, error) {
+	return dv.serverDetails, nil
+}
+
+func (dv *deleteAppVersionCommand) CommandName() string {
+	return commands.DeleteAppVersion
+}
+
+func (dv *deleteAppVersionCommand) prepareAndRunCommand(ctx *components.Context) error {
+	if len(ctx.Arguments) != 2 {
+		return pluginsCommon.WrongNumberOfArgumentsHandler(ctx)
+	}
+
+	dv.applicationKey = ctx.Arguments[0]
+	dv.version = ctx.Arguments[1]
+
+	var err error
+	dv.serverDetails, err = utils.ServerDetailsByFlags(ctx)
+	if err != nil {
+		return err
+	}
+
+	return commonCLiCommands.Exec(dv)
+}
+
+func GetDeleteAppVersionCommand(appContext app.Context) components.Command {
+	cmd := &deleteAppVersionCommand{
+		versionService: appContext.GetVersionService(),
+	}
+	// TODO: app version commands are planned to be re-organized
+	return components.Command{
+		Name:        commands.DeleteAppVersion,
+		Description: "Delete application version",
+		Category:    common.CategoryVersion,
+		Aliases:     []string{"dav"},
+		Arguments: []components.Argument{
+			{
+				Name:        "application-key",
+				Description: "The application key",
+				Optional:    false,
+			},
+			{
+				Name:        "version",
+				Description: "The name of the version to delete",
+				Optional:    false,
+			},
+		},
+		Flags:  commands.GetCommandFlags(commands.DeleteAppVersion),
+		Action: cmd.prepareAndRunCommand,
+	}
+}

apptrust/commands/version/delete_app_version_cmd_test.go

@@ -0,0 +1,58 @@
+package version
+
+import (
+	"errors"
+	"testing"
+
+	mockversions "github.com/jfrog/jfrog-cli-application/apptrust/service/versions/mocks"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/config"
+	"github.com/stretchr/testify/assert"
+	"go.uber.org/mock/gomock"
+)
+
+func TestDeleteAppVersionCommand_Run(t *testing.T) {
+	ctrl := gomock.NewController(t)
+	defer ctrl.Finish()
+
+	serverDetails := &config.ServerDetails{Url: "https://example.com"}
+	applicationKey := "app-key"
+	version := "1.0.0"
+
+	mockVersionService := mockversions.NewMockVersionService(ctrl)
+	mockVersionService.EXPECT().DeleteAppVersion(gomock.Any(), applicationKey, version).
+		Return(nil).Times(1)
+
+	cmd := &deleteAppVersionCommand{
+		versionService: mockVersionService,
+		serverDetails:  serverDetails,
+		applicationKey: applicationKey,
+		version:        version,
+	}
+
+	err := cmd.Run()
+	assert.NoError(t, err)
+}
+
+func TestDeleteAppVersionCommand_Run_Error(t *testing.T) {
+	ctrl := gomock.NewController(t)
+	defer ctrl.Finish()
+
+	serverDetails := &config.ServerDetails{Url: "https://example.com"}
+	applicationKey := "app-key"
+	version := "1.0.0"
+
+	mockVersionService := mockversions.NewMockVersionService(ctrl)
+	mockVersionService.EXPECT().DeleteAppVersion(gomock.Any(), applicationKey, version).
+		Return(errors.New("delete error")).Times(1)
+
+	cmd := &deleteAppVersionCommand{
+		versionService: mockVersionService,
+		serverDetails:  serverDetails,
+		applicationKey: applicationKey,
+		version:        version,
+	}
+
+	err := cmd.Run()
+	assert.Error(t, err)
+	assert.Equal(t, "delete error", err.Error())
+}

apptrust/service/versions/version_service.go

@@ -13,6 +13,7 @@ import (
 type VersionService interface {
 	CreateAppVersion(ctx service.Context, request *model.CreateAppVersionRequest) error
 	PromoteAppVersion(ctx service.Context, payload *model.PromoteAppVersionRequest) error
+	DeleteAppVersion(ctx service.Context, applicationKey string, version string) error
 }
 
 type versionService struct{}
@@ -48,3 +49,18 @@ func (vs *versionService) PromoteAppVersion(ctx service.Context, payload *model.
 
 	return nil
 }
+
+func (vs *versionService) DeleteAppVersion(ctx service.Context, applicationKey string, version string) error {
+	url := fmt.Sprintf("/v1/applications/%s/versions/%s", applicationKey, version)
+	response, responseBody, err := ctx.GetHttpClient().Delete(url)
+	if err != nil {
+		return err
+	}
+
+	if response.StatusCode != 204 {
+		return fmt.Errorf("failed to delete app version. Status code: %d.\n%s",
+			response.StatusCode, responseBody)
+	}
+
+	return nil
+}

cli/cli.go

@@ -40,6 +40,7 @@ func GetJfrogCliApptrustApp() components.App {
 			system.GetPingCommand(appContext),
 			version.GetCreateAppVersionCommand(appContext),
 			version.GetPromoteAppVersionCommand(appContext),
+			version.GetDeleteAppVersionCommand(appContext),
 			application.GetCreateAppCommand(appContext),
 			application.GetUpdateAppCommand(appContext),
 			application.GetDeleteAppCommand(appContext),