Added create version command

Author: alenon

application/cli/cli.go

@@ -9,19 +9,34 @@ import (
 
 const category = "Application Lifecycle"
 
+//
+//func GetJfrogApplicationCli() components.App {
+//	appContext := app.NewAppContext()
+//	appEntity := components.CreateEmbeddedApp(
+//		category,
+//		nil,
+//		components.Namespace{
+//			Name:        "app",
+//			Description: "Tools for Application Lifecycle management",
+//			Category:    category,
+//			Commands: []components.Command{
+//				system.GetPingCommand(appContext),
+//				version.GetCreateAppVersionCommand(appContext),
+//			},
+//		},
+//	)
+//	return appEntity
+//}
+
 func GetJfrogApplicationCli() components.App {
 	appContext := app.NewAppContext()
-	appEntity := components.CreateEmbeddedApp(
-		category,
-		nil,
-		components.Namespace{
-			Name:        "app",
-			Description: "Tools for Application Lifecycle management",
-			Category:    category,
-			Commands: []components.Command{
-				system.GetPingCommand(appContext),
-				version.GetCreateAppVersionCommand(appContext),
-			},
+	appEntity := components.CreateApp(
+		"app",
+		"1.0.0",
+		"JFrog Application CLI",
+		[]components.Command{
+			system.GetPingCommand(appContext),
+			version.GetCreateAppVersionCommand(appContext),
 		},
 	)
 	return appEntity

application/commands/flags.go

@@ -15,11 +15,11 @@ const (
 	accessToken = "access-token"
 	ProjectFlag = "project"
 
-	ApplicationKey      = "app"
-	PackageTypeFlag     = "package-type"
-	PackageNameFlag     = "package-name"
-	PackageVersionFlag  = "package-version"
-	PackageRepoNameFlag = "package-repo-name"
+	ApplicationKeyFlag    = "app"
+	PackageTypeFlag       = "package-type"
+	PackageNameFlag       = "package-name"
+	PackageVersionFlag    = "package-version"
+	PackageRepositoryFlag = "package-repository"
 )
 
 // Flag keys mapped to their corresponding components.Flag definition.
@@ -31,11 +31,11 @@ var flagsMap = map[string]components.Flag{
 	accessToken: components.NewStringFlag(accessToken, "JFrog access token.", func(f *components.StringFlag) { f.Mandatory = false }),
 	ProjectFlag: components.NewStringFlag(ProjectFlag, "Project key associated with the created evidence.", func(f *components.StringFlag) { f.Mandatory = false }),
 
-	ApplicationKey:      components.NewStringFlag(ApplicationKey, "Application key.", func(f *components.StringFlag) { f.Mandatory = true }),
-	PackageTypeFlag:     components.NewStringFlag(PackageTypeFlag, "Package type.", func(f *components.StringFlag) { f.Mandatory = false }),
-	PackageNameFlag:     components.NewStringFlag(PackageNameFlag, "Package name.", func(f *components.StringFlag) { f.Mandatory = false }),
-	PackageVersionFlag:  components.NewStringFlag(PackageVersionFlag, "Package version.", func(f *components.StringFlag) { f.Mandatory = false }),
-	PackageRepoNameFlag: components.NewStringFlag(PackageRepoNameFlag, "Package repository Name.", func(f *components.StringFlag) { f.Mandatory = false }),
+	ApplicationKeyFlag:    components.NewStringFlag(ApplicationKeyFlag, "Application key.", func(f *components.StringFlag) { f.Mandatory = true }),
+	PackageTypeFlag:       components.NewStringFlag(PackageTypeFlag, "Package type.", func(f *components.StringFlag) { f.Mandatory = false }),
+	PackageNameFlag:       components.NewStringFlag(PackageNameFlag, "Package name.", func(f *components.StringFlag) { f.Mandatory = false }),
+	PackageVersionFlag:    components.NewStringFlag(PackageVersionFlag, "Package version.", func(f *components.StringFlag) { f.Mandatory = false }),
+	PackageRepositoryFlag: components.NewStringFlag(PackageRepositoryFlag, "Package storing repository.", func(f *components.StringFlag) { f.Mandatory = false }),
 }
 
 var commandFlags = map[string][]string{
@@ -45,11 +45,11 @@ var commandFlags = map[string][]string{
 		accessToken,
 		ServerId,
 		ProjectFlag,
-		ApplicationKey,
+		ApplicationKeyFlag,
 		PackageTypeFlag,
 		PackageNameFlag,
 		PackageVersionFlag,
-		PackageRepoNameFlag,
+		PackageRepositoryFlag,
 	},
 
 	Ping: {

application/commands/version/create_app_version_cmd.go

@@ -41,10 +41,27 @@ func (cv *createAppVersionCommand) prepareAndRunCommand(ctx *components.Context)
 		return err
 	}
 	cv.serverDetails = serverDetails
-	cv.requestPayload = &model.CreateAppVersionRequest{}
+	cv.requestPayload = cv.buildRequestPayload(ctx)
 	return commonCLiCommands.Exec(cv)
 }
 
+func (cv *createAppVersionCommand) buildRequestPayload(ctx *components.Context) *model.CreateAppVersionRequest {
+	packages := []model.CreateVersionPackage{
+		{
+			Type:       ctx.GetStringFlagValue(commands.PackageTypeFlag),
+			Name:       ctx.GetStringFlagValue(commands.PackageNameFlag),
+			Version:    ctx.GetStringFlagValue(commands.PackageVersionFlag),
+			Repository: ctx.GetStringFlagValue(commands.PackageRepositoryFlag),
+		},
+	}
+
+	return &model.CreateAppVersionRequest{
+		ApplicationKey: ctx.GetStringFlagValue(commands.ApplicationKeyFlag),
+		Version:        ctx.Arguments[0],
+		Packages:       packages,
+	}
+}
+
 func validateCreateAppVersionContext(ctx *components.Context) error {
 	if show, err := pluginsCommon.ShowCmdHelpIfNeeded(ctx, ctx.Arguments); show || err != nil {
 		return err
@@ -62,7 +79,7 @@ func validateCreateAppVersionContext(ctx *components.Context) error {
 	//if err != nil {
 	//	return err
 	//}
-	//err = utils.AssertValueProvided(ctx, commands.PackageRepoNameFlag)
+	//err = utils.AssertValueProvided(ctx, commands.PackageRepositoryFlag)
 	//return err
 }
 
@@ -73,8 +90,14 @@ func GetCreateAppVersionCommand(appContext app.Context) components.Command {
 		Description: "Create application version",
 		Category:    common.CategoryVersion,
 		Aliases:     []string{"cav"},
-		Arguments:   []components.Argument{},
-		Flags:       commands.GetCommandFlags(commands.CreateAppVersion),
-		Action:      cmd.prepareAndRunCommand,
+		Arguments: []components.Argument{
+			{
+				Name:        "version-name",
+				Description: "The name of the version",
+				Optional:    false,
+			},
+		},
+		Flags:  commands.GetCommandFlags(commands.CreateAppVersion),
+		Action: cmd.prepareAndRunCommand,
 	}
 }

application/model/create_app_version_request.go

@@ -1,9 +1,9 @@
 package model
 
 type CreateAppVersionRequest struct {
-	ApplicationKey string                  `json:"application_key"`
-	Version        string                  `json:"version"`
-	Packages       []*CreateVersionPackage `json:"packages"`
+	ApplicationKey string                 `json:"application_key"`
+	Version        string                 `json:"version"`
+	Packages       []CreateVersionPackage `json:"packages"`
 }
 
 type CreateVersionPackage struct {