Commands for binding and unbinding packages to applications

Author: asafgabai

apptrust/commands/flags.go

@@ -13,6 +13,7 @@ const (
 	PromoteAppVersion = "version-promote"
 	DeleteAppVersion  = "version-delete"
 	PackageBind       = "package-bind"
+	PackageUnbind     = "package-unbind"
 	CreateApp         = "app-create"
 	UpdateApp         = "app-update"
 	DeleteApp         = "app-delete"
@@ -106,6 +107,13 @@ var commandFlags = map[string][]string{
 		serverId,
 	},
 
+	PackageUnbind: {
+		url,
+		user,
+		accessToken,
+		serverId,
+	},
+
 	Ping: {
 		url,
 		user,
@@ -147,6 +155,13 @@ var commandFlags = map[string][]string{
 		SpecFlag,
 		SpecVarsFlag,
 	},
+
+	DeleteApp: {
+		url,
+		user,
+		accessToken,
+		serverId,
+	},
 }
 
 func GetCommandFlags(cmdKey string) []components.Flag {

apptrust/commands/package/bind_package_cmd.go

@@ -45,33 +45,19 @@ func (bp *bindPackageCommand) prepareAndRunCommand(ctx *components.Context) erro
 	if err != nil {
 		return err
 	}
-	bp.requestPayload, err = bp.buildRequestPayload(ctx)
+	bp.requestPayload, err = BuildPackageRequestPayload(ctx)
 	if err != nil {
 		return err
 	}
 
 	return commonCLiCommands.Exec(bp)
 }
 
-func (bp *bindPackageCommand) buildRequestPayload(ctx *components.Context) (*model.BindPackageRequest, error) {
-	applicationKey := ctx.Arguments[0]
-	packageType := ctx.Arguments[1]
-	packageName := ctx.Arguments[2]
-	packageVersion := ctx.Arguments[3]
-
-	return &model.BindPackageRequest{
-		ApplicationKey: applicationKey,
-		Type:           packageType,
-		Name:           packageName,
-		Version:        packageVersion,
-	}, nil
-}
-
 func GetBindPackageCommand(appContext app.Context) components.Command {
 	cmd := &bindPackageCommand{packageService: appContext.GetPackageService()}
 	return components.Command{
 		Name:        commands.PackageBind,
-		Description: "Bind packages to an application version.",
+		Description: "Bind packages to an application.",
 		Aliases:     []string{"pb"},
 		Arguments: []components.Argument{
 			{

apptrust/commands/package/unbind_package_cmd.go

@@ -0,0 +1,83 @@
+package packagecmds
+
+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/model"
+	"github.com/jfrog/jfrog-cli-application/apptrust/service"
+	"github.com/jfrog/jfrog-cli-application/apptrust/service/packages"
+	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 unbindPackageCommand struct {
+	packageService packages.PackageService
+	serverDetails  *coreConfig.ServerDetails
+	requestPayload *model.BindPackageRequest
+}
+
+func (up *unbindPackageCommand) Run() error {
+	ctx, err := service.NewContext(*up.serverDetails)
+	if err != nil {
+		return err
+	}
+	return up.packageService.UnbindPackage(ctx, up.requestPayload)
+}
+
+func (up *unbindPackageCommand) ServerDetails() (*coreConfig.ServerDetails, error) {
+	return up.serverDetails, nil
+}
+
+func (up *unbindPackageCommand) CommandName() string {
+	return commands.PackageUnbind
+}
+
+func (up *unbindPackageCommand) prepareAndRunCommand(ctx *components.Context) error {
+	if len(ctx.Arguments) != 4 {
+		return pluginsCommon.WrongNumberOfArgumentsHandler(ctx)
+	}
+
+	var err error
+	up.serverDetails, err = utils.ServerDetailsByFlags(ctx)
+	if err != nil {
+		return err
+	}
+	up.requestPayload, err = BuildPackageRequestPayload(ctx)
+	if err != nil {
+		return err
+	}
+
+	return commonCLiCommands.Exec(up)
+}
+
+func GetUnbindPackageCommand(appContext app.Context) components.Command {
+	cmd := &unbindPackageCommand{packageService: appContext.GetPackageService()}
+	return components.Command{
+		Name:        commands.PackageUnbind,
+		Description: "Unbind packages from an application.",
+		Aliases:     []string{"pu"},
+		Arguments: []components.Argument{
+			{
+				Name:        "application-key",
+				Description: "The key of the application to unbind the package from.",
+			},
+			{
+				Name:        "package-type",
+				Description: "Package type (e.g., npm, docker, maven, generic).",
+			},
+			{
+				Name:        "package-name",
+				Description: "Package name.",
+			},
+			{
+				Name:        "package-version",
+				Description: "Package version.",
+			},
+		},
+		Flags:  commands.GetCommandFlags(commands.PackageUnbind),
+		Action: cmd.prepareAndRunCommand,
+	}
+}

apptrust/commands/package/unbind_package_cmd_test.go

@@ -0,0 +1,65 @@
+package packagecmds
+
+import (
+	"errors"
+	"testing"
+
+	"github.com/jfrog/jfrog-cli-application/apptrust/model"
+	mockpackages "github.com/jfrog/jfrog-cli-application/apptrust/service/packages/mocks"
+	"github.com/jfrog/jfrog-cli-core/v2/utils/config"
+	"github.com/stretchr/testify/assert"
+	"go.uber.org/mock/gomock"
+)
+
+func TestUnbindPackageCommand_Run(t *testing.T) {
+	ctrl := gomock.NewController(t)
+	defer ctrl.Finish()
+
+	serverDetails := &config.ServerDetails{Url: "https://example.com"}
+	requestPayload := &model.BindPackageRequest{
+		ApplicationKey: "app-key",
+		Type:           "npm",
+		Name:           "test-package",
+		Version:        "1.0.0",
+	}
+
+	mockPackageService := mockpackages.NewMockPackageService(ctrl)
+	mockPackageService.EXPECT().UnbindPackage(gomock.Any(), requestPayload).
+		Return(nil).Times(1)
+
+	cmd := &unbindPackageCommand{
+		packageService: mockPackageService,
+		serverDetails:  serverDetails,
+		requestPayload: requestPayload,
+	}
+
+	err := cmd.Run()
+	assert.NoError(t, err)
+}
+
+func TestUnbindPackageCommand_Run_Error(t *testing.T) {
+	ctrl := gomock.NewController(t)
+	defer ctrl.Finish()
+
+	serverDetails := &config.ServerDetails{Url: "https://example.com"}
+	requestPayload := &model.BindPackageRequest{
+		ApplicationKey: "app-key",
+		Type:           "npm",
+		Name:           "test-package",
+		Version:        "1.0.0",
+	}
+
+	mockPackageService := mockpackages.NewMockPackageService(ctrl)
+	mockPackageService.EXPECT().UnbindPackage(gomock.Any(), requestPayload).
+		Return(errors.New("unbind error")).Times(1)
+
+	cmd := &unbindPackageCommand{
+		packageService: mockPackageService,
+		serverDetails:  serverDetails,
+		requestPayload: requestPayload,
+	}
+
+	err := cmd.Run()
+	assert.Error(t, err)
+	assert.Equal(t, "unbind error", err.Error())
+}

apptrust/commands/package/utils.go

@@ -0,0 +1,23 @@
+package packagecmds
+
+import (
+	"github.com/jfrog/jfrog-cli-application/apptrust/model"
+	"github.com/jfrog/jfrog-cli-core/v2/plugins/components"
+)
+
+// BuildPackageRequestPayload creates a BindPackageRequest from command arguments.
+// This function is shared between bind and unbind package commands.
+// It expects the following arguments in order: <application_key> <package_type> <package_name> <package_version>.
+func BuildPackageRequestPayload(ctx *components.Context) (*model.BindPackageRequest, error) {
+	applicationKey := ctx.Arguments[0]
+	packageType := ctx.Arguments[1]
+	packageName := ctx.Arguments[2]
+	packageVersion := ctx.Arguments[3]
+
+	return &model.BindPackageRequest{
+		ApplicationKey: applicationKey,
+		Type:           packageType,
+		Name:           packageName,
+		Version:        packageVersion,
+	}, nil
+}

apptrust/http/http_client.go

@@ -26,7 +26,7 @@ type ApptrustHttpClient interface {
 	Post(path string, requestBody interface{}) (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) (resp *http.Response, body []byte, err error)
+	Delete(path string, requestBody interface{}) (resp *http.Response, body []byte, err error)
 }
 
 type apptrustHttpClient struct {
@@ -139,14 +139,22 @@ func (c *apptrustHttpClient) toJsonBytes(payload interface{}) ([]byte, error) {
 	return jsonBytes, nil
 }
 
-func (c *apptrustHttpClient) Delete(path string) (resp *http.Response, body []byte, err error) {
+func (c *apptrustHttpClient) Delete(path string, requestBody interface{}) (resp *http.Response, body []byte, err error) {
 	url, err := utils.BuildUrl(c.serverDetails.Url, apptrustApiPath+path, nil)
 	if err != nil {
 		return nil, nil, err
 	}
 
+	var requestContent []byte
+	if requestBody != nil {
+		requestContent, err = c.toJsonBytes(requestBody)
+		if err != nil {
+			return nil, nil, err
+		}
+	}
+
 	log.Debug("Sending DELETE request to:", url)
-	return c.client.SendDelete(url, nil, c.getJsonHttpClientDetails())
+	return c.client.SendDelete(url, requestContent, c.getJsonHttpClientDetails())
 }
 
 func (c *apptrustHttpClient) getJsonHttpClientDetails() *httputils.HttpClientDetails {

apptrust/service/applications/application_service.go

@@ -57,7 +57,7 @@ func (as *applicationService) UpdateApplication(ctx service.Context, requestBody
 
 func (as *applicationService) DeleteApplication(ctx service.Context, applicationKey string) error {
 	endpoint := fmt.Sprintf("/v1/applications/%s", applicationKey)
-	response, responseBody, err := ctx.GetHttpClient().Delete(endpoint)
+	response, responseBody, err := ctx.GetHttpClient().Delete(endpoint, nil)
 	if err != nil {
 		return err
 	}

apptrust/service/packages/package_service.go

@@ -12,6 +12,7 @@ import (
 
 type PackageService interface {
 	BindPackage(ctx service.Context, request *model.BindPackageRequest) error
+	UnbindPackage(ctx service.Context, request *model.BindPackageRequest) error
 }
 
 type packageService struct{}
@@ -28,7 +29,22 @@ func (ps *packageService) BindPackage(ctx service.Context, request *model.BindPa
 	}
 
 	if response.StatusCode != http.StatusCreated {
-		return fmt.Errorf("failed to bind package. Status code: %d. \n%s",
+		return fmt.Errorf("failed to bind package. Status code: %d.\n%s",
+			response.StatusCode, responseBody)
+	}
+
+	return nil
+}
+
+func (ps *packageService) UnbindPackage(ctx service.Context, request *model.BindPackageRequest) error {
+	endpoint := "/v1/package"
+	response, responseBody, err := ctx.GetHttpClient().Delete(endpoint, request)
+	if err != nil {
+		return err
+	}
+
+	if response.StatusCode != http.StatusNoContent {
+		return fmt.Errorf("failed to unbind package. Status code: %d.\n%s",
 			response.StatusCode, responseBody)
 	}