fix(sca): pr revisor suggestions

Author: Juan Jesús Padrón Hernández

internal/cmd/alpha/alpha.go

@@ -18,13 +18,13 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
 		Use:   "alpha",
 		Short: "Contains alpha STACKIT CLI commands",
 		Long: fmt.Sprintf("%s\n%s",
-			"Contains beta STACKIT CLI commands.",
+			"Contains alpha STACKIT CLI commands.",
 			"The commands under this group are still in an alpha state, and functionality may be incomplete or have breaking changes."),
 		Args: args.NoArgs,
 		Run:  utils.CmdHelp,
 		Example: examples.Build(
 			examples.NewExample(
-				"See the currently available beta commands",
+				"See the currently available alpha commands",
 				"$ stackit alpha --help"),
 			examples.NewExample(
 				"Execute a alpha command",

internal/cmd/alpha/sca/application/create-from-payload/create_from_payload.go

@@ -105,11 +105,10 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *sca.APIClie
 }
 
 func outputResult(p *print.Printer, model *inputModel, application *sca.Application) error {
-	if application == nil {
-		return fmt.Errorf("create application response is empty")
-	}
-
 	return p.OutputResult(model.OutputFormat, application, func() error {
+		if application == nil {
+			return fmt.Errorf("create application response is empty")
+		}
 		operationState := "Created"
 		if model.Async {
 			operationState = "Triggered creation of"
@@ -122,9 +121,9 @@ func outputResult(p *print.Printer, model *inputModel, application *sca.Applicat
 func configureFlags(cmd *cobra.Command) {
 	cmd.Flags().Var(flags.UUIDFlag(), environmentIDFlag, "Environment ID (uses default environment if not set)")
 	cmd.Flags().String(nameFlag, "", "Application display name")
-	cmd.Flags().Var(flags.ReadFromFileFlag(), payloadFlag, `Request payload (JSON). Can be a string or a file path, if prefixed with "@" (example: @./payload.json). If unset, will use a default payload (you can check it by running "stackit sca application generate-payload")`)
+	cmd.Flags().Var(flags.ReadFromFileFlag(), payloadFlag, `Request payload (JSON). Can be a string or a file path, if prefixed with "@" (example: @./payload.json).`)
 
-	cobra.CheckErr(flags.MarkFlagsRequired(cmd, nameFlag))
+	cobra.CheckErr(flags.MarkFlagsRequired(cmd, nameFlag, payloadFlag))
 }
 
 func parseInput(p *print.Printer, cmd *cobra.Command, _ []string) (*inputModel, error) {

internal/cmd/alpha/sca/application/create/create.go

@@ -216,11 +216,10 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *sca.APIClie
 }
 
 func outputResult(p *print.Printer, model *inputModel, application *sca.Application) error {
-	if application == nil {
-		return fmt.Errorf("create application response is empty")
-	}
-
 	return p.OutputResult(model.OutputFormat, application, func() error {
+		if application == nil {
+			return fmt.Errorf("create application response is empty")
+		}
 		operationState := "Created"
 		if model.Async {
 			operationState = "Triggered creation of"
@@ -276,12 +275,6 @@ func parseInput(p *print.Printer, cmd *cobra.Command, _ []string) (*inputModel,
 	if err := utils.ValidateInstances(instances, instancesFlag); err != nil {
 		return nil, err
 	}
-	if instances < 0 || instances > 10 {
-		return nil, &errors.FlagValidationError{
-			Flag:    instancesFlag,
-			Details: "must be an integer between 0 and 10",
-		}
-	}
 
 	minInstances := flags.FlagWithDefaultToInt32Value(p, cmd, minInstancesFlag)
 	if err := utils.ValidateInstances(minInstances, minInstancesFlag); err != nil {
@@ -302,8 +295,8 @@ func parseInput(p *print.Printer, cmd *cobra.Command, _ []string) (*inputModel,
 		}
 	}
 
-	extertalPort := flags.FlagWithDefaultToInt32Value(p, cmd, externalPortFlag)
-	if err := utils.ValidatePort(extertalPort, externalPortFlag); err != nil {
+	externalPort := flags.FlagWithDefaultToInt32Value(p, cmd, externalPortFlag)
+	if err := utils.ValidatePort(externalPort, externalPortFlag); err != nil {
 		return nil, err
 	}
 
@@ -341,7 +334,7 @@ func parseInput(p *print.Printer, cmd *cobra.Command, _ []string) (*inputModel,
 		RPS:                   flags.FlagWithDefaultToInt32Value(p, cmd, rpsFlag),
 		Concurrency:           flags.FlagWithDefaultToInt32Value(p, cmd, concurrencyFlag),
 		Public:                flags.FlagToBoolValue(p, cmd, publicFlag),
-		ContainerExternalPort: extertalPort,
+		ContainerExternalPort: externalPort,
 	}
 
 	p.DebugInputModel(model)

internal/cmd/alpha/sca/application/describe/describe.go

@@ -3,6 +3,7 @@ package describe
 import (
 	"context"
 	"fmt"
+	"strconv"
 	"strings"
 
 	"github.com/spf13/cobra"
@@ -147,12 +148,12 @@ func outputResult(p *print.Printer, outputFormat string, application *sca.Applic
 
 			cpu := "-"
 			if c.Cpu != nil {
-				cpu = string(*c.Cpu)
+				cpu = strconv.Itoa(int(*c.Cpu))
 			}
 
 			memory := "-"
 			if c.Memory != nil {
-				memory = string(*c.Memory)
+				memory = strconv.Itoa(int(*c.Memory))
 			}
 
 			containersTable.AddRow(

internal/cmd/alpha/sca/application/generate-payload/generate_payload.go

@@ -68,15 +68,14 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
 				return err
 			}
 
-			apiClient, err := client.ConfigureClient(params.Printer, params.CliVersion)
-			if err != nil {
-				return err
-			}
-
 			var payload *sca.CreateApplicationPayload
 			if model.ApplicationID == nil {
 				payload = scautils.GetDefaultPayload()
 			} else {
+				apiClient, err := client.ConfigureClient(params.Printer, params.CliVersion)
+				if err != nil {
+					return err
+				}
 				req := apiClient.DefaultAPI.GetApplication(ctx, model.ProjectId, *model.EnvironmentID, *model.ApplicationID)
 				resp, err := req.Execute()
 				if err != nil {

internal/cmd/alpha/sca/application/update-from-payload/update-from-payload.go

@@ -88,9 +88,7 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
 				}
 			}
 
-			outputResult(params.Printer, model, resp)
-
-			return nil
+			return outputResult(params.Printer, model, resp)
 		},
 	}
 
@@ -103,18 +101,26 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *sca.APIClie
 		UpdateApplicationPayload(*model.Payload)
 }
 
-func outputResult(p *print.Printer, model *inputModel, application *sca.Application) {
-	operationState := "Updated"
-	if model.Async {
-		operationState = "Triggered update of"
-	}
+func outputResult(p *print.Printer, model *inputModel, application *sca.Application) error {
+	return p.OutputResult(model.OutputFormat, application, func() error {
+		if application == nil {
+			return fmt.Errorf("update application response is empty")
+		}
+		operationState := "Updated"
+		if model.Async {
+			operationState = "Triggered update of"
+		}
 
-	p.Outputf("%s application for environment %s. Application ID: %s\n", operationState, application.GetEnvironmentId(), application.GetId())
+		p.Outputf("%s application for environment %s. Application ID: %s\n", operationState, application.GetEnvironmentId(), application.GetId())
+		return nil
+	})
 }
 
 func configureFlags(cmd *cobra.Command) {
 	cmd.Flags().Var(flags.UUIDFlag(), environmentIDFlag, "Environment ID (uses default environment if not set)")
-	cmd.Flags().Var(flags.ReadFromFileFlag(), payloadFlag, `Request payload (JSON). Can be a string or a file path, if prefixed with "@" (example: @./payload.json). If unset, will use a default payload (you can check it by running "stackit sca application generate-payload")`)
+	cmd.Flags().Var(flags.ReadFromFileFlag(), payloadFlag, `Request payload (JSON). Can be a string or a file path, if prefixed with "@" (example: @./payload.json).`)
+
+	flags.MarkFlagsRequired(cmd, payloadFlag)
 }
 
 func parseInput(p *print.Printer, cmd *cobra.Command, inputArgs []string) (*inputModel, error) {
@@ -136,7 +142,7 @@ func parseInput(p *print.Printer, cmd *cobra.Command, inputArgs []string) (*inpu
 		payload = &sca.UpdateApplicationPayload{}
 		err := json.Unmarshal([]byte(*payloadValue), payload)
 		if err != nil {
-			return nil, fmt.Errorf("enconde payload: %w", err)
+			return nil, fmt.Errorf("encode payload: %w", err)
 		}
 	}
 

internal/cmd/alpha/sca/application/update/update.go

@@ -50,7 +50,6 @@ var scalingTypeFlag = flags.StringEnumFlag(
 	"scaling-type",
 	[]string{scalingTypeManual, scalingTypeAuto},
 	"Scaling type",
-	flags.StringEnumDefaultValue(scalingTypeManual),
 )
 
 type inputModel struct {
@@ -291,7 +290,7 @@ func buildScalingConfig(model *inputModel, current *sca.Application) (*sca.Scali
 		case scalingTypeAuto:
 			if model.MinInstances == nil {
 				return nil, &errors.FlagValidationError{
-					Flag:    instancesFlag,
+					Flag:    minInstancesFlag,
 					Details: "required flag if replacing scaling type to auto",
 				}
 			}
@@ -315,7 +314,7 @@ func buildScalingConfig(model *inputModel, current *sca.Application) (*sca.Scali
 		}
 	}
 
-	// input's scaling type is ni or equal to current
+	// input's scaling type is nil or equal to current
 
 	switch current.Scaling.Type {
 	case sca.SCALINGTYPE_SCALING_TYPE_MANUAL:
@@ -351,13 +350,36 @@ func buildAutoscalingConfig(model *inputModel, current *sca.AutoScaling) (*sca.A
 		}
 	}
 
-	autoScaling := &sca.AutoScaling{}
-	if current != nil {
-		autoScaling = current
+	if current == nil {
+		if model.MinInstances == nil {
+			return nil, &errors.FlagValidationError{
+				Flag:    instancesFlag,
+				Details: "Required flag if auto scaling is being configured",
+			}
+		}
+
+		maxInstances := *model.MinInstances
+		if model.MaxInstances != nil {
+			maxInstances = *model.MaxInstances
+		}
+
+		return &sca.AutoScaling{
+			MinInstances:     *model.MinInstances,
+			MaxInstances:     maxInstances,
+			AllowScaleToZero: model.ScaleToZero,
+			Rules:            buildScalingRules(model, nil),
+		}, nil
+	}
+
+	autoScaling := &sca.AutoScaling{
+		MinInstances: current.MinInstances,
+		MaxInstances: current.MaxInstances,
 	}
 
 	if model.ScaleToZero != nil {
 		autoScaling.AllowScaleToZero = model.ScaleToZero
+	} else if current.AllowScaleToZero != nil {
+		autoScaling.AllowScaleToZero = new(*current.AllowScaleToZero)
 	}
 
 	if model.MinInstances != nil {
@@ -372,9 +394,7 @@ func buildAutoscalingConfig(model *inputModel, current *sca.AutoScaling) (*sca.A
 		autoScaling.MaxInstances = autoScaling.MinInstances
 	}
 
-	if model.RPS != nil || model.Concurrency != nil {
-		autoScaling.Rules = buildScalingRules(model, autoScaling.Rules)
-	}
+	autoScaling.Rules = buildScalingRules(model, current.Rules)
 
 	if len(autoScaling.Rules) == 0 {
 		return nil, &errors.OneOfFlagsIsMissing{
@@ -390,31 +410,46 @@ func buildScalingRules(model *inputModel, current []sca.ScaleRule) []sca.ScaleRu
 	if model.Concurrency == nil && model.RPS == nil {
 		return current
 	}
+
 	found := false
+	updatedRules := make([]sca.ScaleRule, 0, len(current))
+
+	var httpRule *sca.HttpScaleRule
 	for _, rule := range current {
 		if rule.Type == sca.RULETYPE_RULE_TYPE_HTTP {
+			httpRule = &sca.HttpScaleRule{}
 			found = true
 			if model.Concurrency != nil {
-				rule.HttpRule.Concurrency = model.Concurrency
+				httpRule.Concurrency = model.Concurrency
 			}
 			if model.RPS != nil {
-				rule.HttpRule.Rps = model.RPS
+				httpRule.Rps = model.RPS
 			}
 		}
+		updatedRules = append(updatedRules, sca.ScaleRule{
+			Type:       rule.Type,
+			Name:       rule.Name,
+			HttpRule:   httpRule,
+			CustomRule: rule.CustomRule,
+		})
 	}
 
 	if found {
-		return current
+		return updatedRules
 	}
 
-	return append(current, sca.ScaleRule{
+	return append(updatedRules, buildHttpScaleRule(model))
+}
+
+func buildHttpScaleRule(model *inputModel) sca.ScaleRule {
+	return sca.ScaleRule{
 		Type: sca.RULETYPE_RULE_TYPE_HTTP,
 		Name: "http-scaling-rule",
 		HttpRule: &sca.HttpScaleRule{
 			Concurrency: model.Concurrency,
 			Rps:         model.RPS,
 		},
-	})
+	}
 }
 
 func configureFlags(cmd *cobra.Command) {
@@ -483,9 +518,9 @@ func parseInput(p *print.Printer, cmd *cobra.Command, inputArgs []string) (*inpu
 		}
 	}
 
-	extertalPort := flags.FlagToInt32Pointer(p, cmd, externalPortFlag)
-	if extertalPort != nil {
-		if err := scautils.ValidatePort(*extertalPort, externalPortFlag); err != nil {
+	externalPort := flags.FlagToInt32Pointer(p, cmd, externalPortFlag)
+	if externalPort != nil {
+		if err := scautils.ValidatePort(*externalPort, externalPortFlag); err != nil {
 			return nil, err
 		}
 	}
@@ -516,19 +551,18 @@ func parseInput(p *print.Printer, cmd *cobra.Command, inputArgs []string) (*inpu
 		Concurrency:           flags.FlagToInt32Pointer(p, cmd, concurrencyFlag),
 		RPS:                   flags.FlagToInt32Pointer(p, cmd, rpsFlag),
 		Public:                flags.FlagToBoolPointer(p, cmd, publicFlag),
-		ContainerExternalPort: extertalPort,
+		ContainerExternalPort: externalPort,
 	}
 
 	p.DebugInputModel(model)
 	return &model, nil
 }
 
 func outputResult(p *print.Printer, model *inputModel, application *sca.Application) error {
-	if application == nil {
-		return fmt.Errorf("update application response is empty")
-	}
-
 	return p.OutputResult(model.OutputFormat, application, func() error {
+		if application == nil {
+			return fmt.Errorf("update application response is empty")
+		}
 		operationState := "Updated"
 		if model.Async {
 			operationState = "Triggered update of"

internal/pkg/services/sca/utils/utils.go

@@ -85,8 +85,8 @@ func EnvironmentVariablesFromMap(m map[string]string) []sca.EnvVar {
 	return envVars
 }
 
-func GetApplicationName(ctx context.Context, apiClient sca.DefaultAPI, projectId, environmentID, applicaitonID string) (string, error) {
-	resp, err := apiClient.GetApplication(ctx, projectId, environmentID, applicaitonID).Execute()
+func GetApplicationName(ctx context.Context, apiClient sca.DefaultAPI, projectId, environmentID, applicationID string) (string, error) {
+	resp, err := apiClient.GetApplication(ctx, projectId, environmentID, applicationID).Execute()
 	if err != nil {
 		return "", fmt.Errorf("get application: %w", err)
 	}