Merge remote-tracking branch 'origin/APP-440-Create-application-descriptor' into APP-443-Update-specific-application

# Conflicts:
#	application/commands/application/create_app_cmd.go
#	application/commands/flags.go

Author: asafgabai

application/commands/application/create_app_cmd.go

@@ -44,11 +44,11 @@ func (cac *createAppCommand) CommandName() string {
 }
 
 func (cac *createAppCommand) buildRequestPayload(ctx *components.Context) (*model.AppDescriptor, error) {
-	appKey := ctx.Arguments[0]
-	displayName := ctx.GetStringFlagValue(commands.DisplayNameFlag)
-	if displayName == "" {
-		// Default to the application key if display name is not provided
-		displayName = appKey
+	applicationKey := ctx.Arguments[0]
+	applicationName := ctx.GetStringFlagValue(commands.ApplicationNameFlag)
+	if applicationName == "" {
+		// Default to the application key if application name is not provided
+		applicationName = applicationKey
 	}
 
 	project := ctx.GetStringFlagValue(commands.ProjectFlag)
@@ -81,8 +81,8 @@ func (cac *createAppCommand) buildRequestPayload(ctx *components.Context) (*mode
 	}
 
 	return &model.AppDescriptor{
-		ApplicationName:     displayName,
-		ApplicationKey:      appKey,
+		ApplicationName:     applicationName,
+		ApplicationKey:      applicationKey,
 		Description:         description,
 		ProjectKey:          project,
 		MaturityLevel:       maturityLevel,

application/commands/flags.go

@@ -22,15 +22,15 @@ const (
 	accessToken = "access-token"
 	ProjectFlag = "project"
 
-	ApplicationKeyFlag      = "app-key"
+	ApplicationKeyFlag      = "application-key"
 	PackageTypeFlag         = "package-type"
 	PackageNameFlag         = "package-name"
 	PackageVersionFlag      = "package-version"
 	PackageRepositoryFlag   = "package-repository"
 	SpecFlag                = "spec"
 	SpecVarsFlag            = "spec-vars"
 	StageVarsFlag           = "stage"
-	DisplayNameFlag         = "display-name"
+	ApplicationNameFlag     = "application-name"
 	DescriptionFlag         = "desc"
 	BusinessCriticalityFlag = "business-criticality"
 	MaturityLevelFlag       = "maturity-level"
@@ -57,7 +57,7 @@ var flagsMap = map[string]components.Flag{
 	SpecFlag:                components.NewStringFlag(SpecFlag, "A path to the specification file.", func(f *components.StringFlag) { f.Mandatory = false }),
 	SpecVarsFlag:            components.NewStringFlag(SpecVarsFlag, "List of semicolon-separated (;) variables in the form of \"key1=value1;key2=value2;...\" (wrapped by quotes) to be replaced in the File Spec. In the File Spec, the variables should be used as follows: ${key1}.", func(f *components.StringFlag) { f.Mandatory = false }),
 	StageVarsFlag:           components.NewStringFlag(StageVarsFlag, "Promotion stage.", func(f *components.StringFlag) { f.Mandatory = true }),
-	DisplayNameFlag:         components.NewStringFlag(DisplayNameFlag, "The display name of the application.", func(f *components.StringFlag) { f.Mandatory = false }),
+	ApplicationNameFlag:     components.NewStringFlag(ApplicationNameFlag, "The display name of the application.", func(f *components.StringFlag) { f.Mandatory = false }),
 	DescriptionFlag:         components.NewStringFlag(DescriptionFlag, "The description of the application.", func(f *components.StringFlag) { f.Mandatory = false }),
 	BusinessCriticalityFlag: components.NewStringFlag(BusinessCriticalityFlag, "The business criticality level. The following values are supported: "+coreutils.ListToText(model.BusinessCriticalityValues), func(f *components.StringFlag) { f.DefaultValue = model.BusinessCriticalityValues[0] }),
 	MaturityLevelFlag:       components.NewStringFlag(MaturityLevelFlag, "The maturity level.", func(f *components.StringFlag) { f.DefaultValue = model.MaturityLevelValues[0] }),
@@ -102,7 +102,7 @@ var commandFlags = map[string][]string{
 		user,
 		accessToken,
 		serverId,
-		DisplayNameFlag,
+		ApplicationNameFlag,
 		ProjectFlag,
 		DescriptionFlag,
 		BusinessCriticalityFlag,
@@ -120,7 +120,7 @@ var commandFlags = map[string][]string{
 		user,
 		accessToken,
 		serverId,
-		DisplayNameFlag,
+		ApplicationNameFlag,
 		DescriptionFlag,
 		BusinessCriticalityFlag,
 		MaturityLevelFlag,