feat(alb): review findings

Author: bahkauv70

docs/stackit_beta_alb_create.md

@@ -20,7 +20,7 @@ stackit beta alb create [flags]
 ### Options
 
 ```
-  -c, --configuration string   filename of the input configuration file
+  -c, --configuration string   Filename of the input configuration file
   -h, --help                   Help for "stackit beta alb create"
 ```
 

docs/stackit_beta_alb_describe.md

@@ -4,7 +4,7 @@ Describes an application loadbalancer
 
 ### Synopsis
 
-Describes an application loadbalancer.
+Describes an application alb.
 
 ```
 stackit beta alb describe LOADBALANCER_NAME_ARG [flags]

docs/stackit_beta_alb_pool_update.md

@@ -20,9 +20,9 @@ stackit beta alb pool update [flags]
 ### Options
 
 ```
-  -c, --configuration string   filename of the input configuration file
+  -c, --configuration string   Filename of the input configuration file
   -h, --help                   Help for "stackit beta alb pool update"
-  -n, --name string            name of the target pool name to update
+  -n, --name string            Name of the target pool name to update
 ```
 
 ### Options inherited from parent commands

docs/stackit_beta_alb_update.md

@@ -20,7 +20,7 @@ stackit beta alb update [flags]
 ### Options
 
 ```
-  -c, --configuration string   filename of the input configuration file
+  -c, --configuration string   Filename of the input configuration file
   -h, --help                   Help for "stackit beta alb update"
 ```
 

internal/cmd/beta/alb/create/create.go

@@ -101,7 +101,7 @@ func NewCmd(p *print.Printer) *cobra.Command {
 }
 
 func configureFlags(cmd *cobra.Command) {
-	cmd.Flags().StringP(configurationFlag, "c", "", "filename of the input configuration file")
+	cmd.Flags().StringP(configurationFlag, "c", "", "Filename of the input configuration file")
 	err := flags.MarkFlagsRequired(cmd, configurationFlag)
 	cobra.CheckErr(err)
 }

internal/cmd/beta/alb/describe/describe.go

@@ -33,7 +33,7 @@ func NewCmd(p *print.Printer) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   fmt.Sprintf("describe %s", loadbalancerNameArg),
 		Short: "Describes an application loadbalancer",
-		Long:  "Describes an application loadbalancer.",
+		Long:  "Describes an application alb.",
 		Args:  args.SingleArg(loadbalancerNameArg, nil),
 		Example: examples.Build(
 			examples.NewExample(
@@ -117,33 +117,104 @@ func outputResult(p *print.Printer, outputFormat string, response *alb.LoadBalan
 
 		return nil
 	default:
-		table := tables.NewTable()
-		table.AddRow("EXTERNAL ADDRESS", utils.PtrString(response.ExternalAddress))
-		table.AddSeparator()
-		var numErrors int
-		if response.Errors != nil {
-			numErrors = len(*response.Errors)
-		}
-		table.AddRow("NUMBER OF ERRORS", numErrors)
-		table.AddSeparator()
-		table.AddRow("PLAN ID", utils.PtrString(response.PlanId))
-		table.AddSeparator()
-		table.AddRow("REGION", utils.PtrString(response.Region))
-		table.AddSeparator()
-		table.AddRow("STATUS", utils.PtrString(response.Status))
-		table.AddSeparator()
-		table.AddRow("VERSION", utils.PtrString(response.Version))
-		if response.Errors != nil {
-			table.AddSeparator()
-			var builder strings.Builder
-			for _, err := range *response.Errors {
-				builder.WriteString(fmt.Sprintf("[%s] %s\n", utils.PtrString(err.Type), utils.PtrString(err.Description)))
-			}
-			table.AddRow("ERRORS", builder.String())
+		if err := outputResultAsTable(p, response); err != nil {
+			return err
 		}
+	}
 
-		p.Outputln(table.Render())
+	return nil
+}
+
+func outputResultAsTable(p *print.Printer, loadbalancer *alb.LoadBalancer) error {
+	content := []tables.Table{}
+
+	content = append(content, buildLoadBalancerTable(loadbalancer))
+
+	if loadbalancer.Listeners != nil {
+		content = append(content, buildListenersTable(*loadbalancer.Listeners))
+	}
+
+	if loadbalancer.TargetPools != nil {
+		content = append(content, buildTargetPoolsTable(*loadbalancer.TargetPools))
+	}
+
+	err := tables.DisplayTables(p, content)
+	if err != nil {
+		return fmt.Errorf("display output: %w", err)
 	}
 
 	return nil
 }
+
+func buildLoadBalancerTable(loadbalancer *alb.LoadBalancer) tables.Table {
+	acl := []string{}
+	privateAccessOnly := false
+	if loadbalancer.Options != nil {
+		if loadbalancer.Options.AccessControl != nil && loadbalancer.Options.AccessControl.AllowedSourceRanges != nil {
+			acl = *loadbalancer.Options.AccessControl.AllowedSourceRanges
+		}
+
+		if loadbalancer.Options.PrivateNetworkOnly != nil {
+			privateAccessOnly = *loadbalancer.Options.PrivateNetworkOnly
+		}
+	}
+
+	networkId := "-"
+	if loadbalancer.Networks != nil && len(*loadbalancer.Networks) > 0 {
+		networks := *loadbalancer.Networks
+		networkId = *networks[0].NetworkId
+	}
+
+	externalAddress := utils.PtrStringDefault(loadbalancer.ExternalAddress, "-")
+
+	errorDescriptions := []string{}
+	if loadbalancer.Errors != nil && len((*loadbalancer.Errors)) > 0 {
+		for _, err := range *loadbalancer.Errors {
+			errorDescriptions = append(errorDescriptions, *err.Description)
+		}
+	}
+
+	table := tables.NewTable()
+	table.SetTitle("Load Balancer")
+	table.AddRow("NAME", utils.PtrString(loadbalancer.Name))
+	table.AddSeparator()
+	table.AddRow("STATE", utils.PtrString(loadbalancer.Status))
+	table.AddSeparator()
+	if len(errorDescriptions) > 0 {
+		table.AddRow("ERROR DESCRIPTIONS", strings.Join(errorDescriptions, "\n"))
+		table.AddSeparator()
+	}
+	table.AddRow("PRIVATE ACCESS ONLY", privateAccessOnly)
+	table.AddSeparator()
+	table.AddRow("ATTACHED PUBLIC IP", externalAddress)
+	table.AddSeparator()
+	table.AddRow("ATTACHED NETWORK ID", networkId)
+	table.AddSeparator()
+	table.AddRow("ACL", acl)
+	return table
+}
+
+func buildListenersTable(listeners []alb.Listener) tables.Table {
+	table := tables.NewTable()
+	table.SetTitle("Listeners")
+	table.SetHeader("NAME", "PORT", "PROTOCOL", "TARGET POOL")
+	for i := range listeners {
+		listener := listeners[i]
+		table.AddRow(
+			utils.PtrString(listener.Name),
+			utils.PtrString(listener.Port),
+			utils.PtrString(listener.Protocol),
+		)
+	}
+	return table
+}
+
+func buildTargetPoolsTable(targetPools []alb.TargetPool) tables.Table {
+	table := tables.NewTable()
+	table.SetTitle("Target Pools")
+	table.SetHeader("NAME", "PORT", "TARGETS")
+	for _, targetPool := range targetPools {
+		table.AddRow(utils.PtrString(targetPool.Name), utils.PtrString(targetPool.TargetPort), len(*targetPool.Targets))
+	}
+	return table
+}

internal/cmd/beta/alb/pool/update/update.go

@@ -90,8 +90,8 @@ func NewCmd(p *print.Printer) *cobra.Command {
 }
 
 func configureFlags(cmd *cobra.Command) {
-	cmd.Flags().StringP(configurationFlag, "c", "", "filename of the input configuration file")
-	cmd.Flags().StringP(albNameFlag, "n", "", "name of the target pool name to update")
+	cmd.Flags().StringP(configurationFlag, "c", "", "Filename of the input configuration file")
+	cmd.Flags().StringP(albNameFlag, "n", "", "Name of the target pool name to update")
 	err := flags.MarkFlagsRequired(cmd, configurationFlag, albNameFlag)
 	cobra.CheckErr(err)
 }

internal/cmd/beta/alb/template/template-alb.yaml

@@ -86,6 +86,6 @@ targetPools:
     # allows defining the TLS configuration
     # tlsConfig:
     #   # A PEM and base64 encoded certificate
-    #   customCa: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tDQpNSUlEbkRDQ0EwS2dBd0lCQWdJUkFNUmhrL3pZWkh5UUVDRjQwd3JrTHMwd0NnWUlLb1pJemowRUF3SXdPekVMDQpNQWtHQTFVRUJoTUNWVk14SGpBY0JnTlZCQW9URlVkdmIyZHNaU0JVY25WemRDQlRaWEoyYVdObGN6RU1NQW9HDQpBMVVFQXhNRFYwVXlNQjRYRFRJMU1ETXlNREV4TWpFeU0xb1hEVEkxTURZeE1qRXhNakV5TWxvd0ZqRVVNQklHDQpBMVVFQXd3TEtpNW5iMjluYkdVdVpHVXdXVEFUQmdjcWhrak9QUUlCQmdncWhrak9QUU1CQndOQ0FBUUtNUldLDQpyZTV2RUtkVkNVam9oSlJxSitZdnJ6Mmg2RlpwTGo4SkpHTUlEajh1VlNzY0MvNG9jOURtRDI1c0ZhWnhlUytRDQozcVpGU1FkamxLTGdaRTdPbzRJQ1NqQ0NBa1l3RGdZRFZSMFBBUUgvQkFRREFnZUFNQk1HQTFVZEpRUU1NQW9HDQpDQ3NHQVFVRkJ3TUJNQXdHQTFVZEV3RUIvd1FDTUFBd0hRWURWUjBPQkJZRUZHQVY3ekQvT0Nvd1RrTmhjNGN0DQpEM2lpZ0FnTE1COEdBMVVkSXdRWU1CYUFGSFcreEhldWlmWkVOMzNQc1dnZkhScnIzRFJaTUZnR0NDc0dBUVVGDQpCd0VCQkV3d1NqQWhCZ2dyQmdFRkJRY3dBWVlWYUhSMGNEb3ZMMjh1Y0d0cExtZHZiMmN2ZDJVeU1DVUdDQ3NHDQpBUVVGQnpBQ2hobG9kSFJ3T2k4dmFTNXdhMmt1WjI5dlp5OTNaVEl1WTNKME1DRUdBMVVkRVFRYU1CaUNDeW91DQpaMjl2WjJ4bExtUmxnZ2xuYjI5bmJHVXVaR1V3RXdZRFZSMGdCQXd3Q2pBSUJnWm5nUXdCQWdFd05nWURWUjBmDQpCQzh3TFRBcm9DbWdKNFlsYUhSMGNEb3ZMMk11Y0d0cExtZHZiMmN2ZDJVeUwyUlVUVE10TUdod1YyWkZMbU55DQpiRENDQVFVR0Npc0dBUVFCMW5rQ0JBSUVnZllFZ2ZNQThRQjNBRTUxb3lkY21oRERPRnRzMU44L1V1c2Q4T0NPDQpHNDFwd0xINlpMRmltam5mQUFBQmxiT0FTK29BQUFRREFFZ3dSZ0loQU1YWWVmZDZyNWZWUXpKRHRWQmNjcjdsDQpDZ3RyQi84NHY0MnRyMU1HbXFSRUFpRUE5RHRMNFpGK1RPN2Q1bWprUTNjc2NCUWwxY2xXMmp1eHlKTXVTeDFMDQp5TzRBZGdEZ2tyUDhEQjNJNTJnMkg5NWh1WlpOQ2xKNEdZcHkxbkxFc0UybGJXOVVCQUFBQVpXemdFendBQUFFDQpBd0JITUVVQ0lHNElvTjRHYW03RGgzeVR4MlF2aTA0dS9HRy9IRExTK2V0K21ycVdJQ1l5QWlFQWhHdkNjaFF2DQpCdFVHMDd0bHAvRzRrdkZ3eG01YklSUzJ5ZzBYNU5Obkl4b3dDZ1lJS29aSXpqMEVBd0lEU0FBd1JRSWhBTnpXDQptQU1Jbjl2dmQyN1Q0UVNBR0FkS2xUdDlncnNxa1dtbUxCcUM3Z1NqQWlBbzBjREZYbGFJZ3FqV0tFM043VmdPDQpqYWthT1lZcnZmdnVqT0pmTUxwNzlBPT0NCi0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0NCg==
+    #   customCa: LS0t...
     #   enabled: true
     #   skipCertificateValidation: false

internal/cmd/beta/alb/template/template-pool.yaml

@@ -17,7 +17,7 @@ targets:
     # allows defining the TLS configuration
     # tlsConfig:
     #   # A PEM and base64 encoded certificate
-    #   customCa: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tDQpNSUlEbkRDQ0EwS2dBd0lCQWdJUkFNUmhrL3pZWkh5UUVDRjQwd3JrTHMwd0NnWUlLb1pJemowRUF3SXdPekVMDQpNQWtHQTFVRUJoTUNWVk14SGpBY0JnTlZCQW9URlVkdmIyZHNaU0JVY25WemRDQlRaWEoyYVdObGN6RU1NQW9HDQpBMVVFQXhNRFYwVXlNQjRYRFRJMU1ETXlNREV4TWpFeU0xb1hEVEkxTURZeE1qRXhNakV5TWxvd0ZqRVVNQklHDQpBMVVFQXd3TEtpNW5iMjluYkdVdVpHVXdXVEFUQmdjcWhrak9QUUlCQmdncWhrak9QUU1CQndOQ0FBUUtNUldLDQpyZTV2RUtkVkNVam9oSlJxSitZdnJ6Mmg2RlpwTGo4SkpHTUlEajh1VlNzY0MvNG9jOURtRDI1c0ZhWnhlUytRDQozcVpGU1FkamxLTGdaRTdPbzRJQ1NqQ0NBa1l3RGdZRFZSMFBBUUgvQkFRREFnZUFNQk1HQTFVZEpRUU1NQW9HDQpDQ3NHQVFVRkJ3TUJNQXdHQTFVZEV3RUIvd1FDTUFBd0hRWURWUjBPQkJZRUZHQVY3ekQvT0Nvd1RrTmhjNGN0DQpEM2lpZ0FnTE1COEdBMVVkSXdRWU1CYUFGSFcreEhldWlmWkVOMzNQc1dnZkhScnIzRFJaTUZnR0NDc0dBUVVGDQpCd0VCQkV3d1NqQWhCZ2dyQmdFRkJRY3dBWVlWYUhSMGNEb3ZMMjh1Y0d0cExtZHZiMmN2ZDJVeU1DVUdDQ3NHDQpBUVVGQnpBQ2hobG9kSFJ3T2k4dmFTNXdhMmt1WjI5dlp5OTNaVEl1WTNKME1DRUdBMVVkRVFRYU1CaUNDeW91DQpaMjl2WjJ4bExtUmxnZ2xuYjI5bmJHVXVaR1V3RXdZRFZSMGdCQXd3Q2pBSUJnWm5nUXdCQWdFd05nWURWUjBmDQpCQzh3TFRBcm9DbWdKNFlsYUhSMGNEb3ZMMk11Y0d0cExtZHZiMmN2ZDJVeUwyUlVUVE10TUdod1YyWkZMbU55DQpiRENDQVFVR0Npc0dBUVFCMW5rQ0JBSUVnZllFZ2ZNQThRQjNBRTUxb3lkY21oRERPRnRzMU44L1V1c2Q4T0NPDQpHNDFwd0xINlpMRmltam5mQUFBQmxiT0FTK29BQUFRREFFZ3dSZ0loQU1YWWVmZDZyNWZWUXpKRHRWQmNjcjdsDQpDZ3RyQi84NHY0MnRyMU1HbXFSRUFpRUE5RHRMNFpGK1RPN2Q1bWprUTNjc2NCUWwxY2xXMmp1eHlKTXVTeDFMDQp5TzRBZGdEZ2tyUDhEQjNJNTJnMkg5NWh1WlpOQ2xKNEdZcHkxbkxFc0UybGJXOVVCQUFBQVpXemdFendBQUFFDQpBd0JITUVVQ0lHNElvTjRHYW03RGgzeVR4MlF2aTA0dS9HRy9IRExTK2V0K21ycVdJQ1l5QWlFQWhHdkNjaFF2DQpCdFVHMDd0bHAvRzRrdkZ3eG01YklSUzJ5ZzBYNU5Obkl4b3dDZ1lJS29aSXpqMEVBd0lEU0FBd1JRSWhBTnpXDQptQU1Jbjl2dmQyN1Q0UVNBR0FkS2xUdDlncnNxa1dtbUxCcUM3Z1NqQWlBbzBjREZYbGFJZ3FqV0tFM043VmdPDQpqYWthT1lZcnZmdnVqT0pmTUxwNzlBPT0NCi0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0NCg==
+    #   customCa: LS0...
     #   enabled: true
     #   skipCertificateValidation: false
 

internal/cmd/beta/alb/template/template.go

@@ -14,6 +14,7 @@ import (
 	"github.com/stackitcloud/stackit-cli/internal/pkg/flags"
 	"github.com/stackitcloud/stackit-cli/internal/pkg/globalflags"
 	"github.com/stackitcloud/stackit-cli/internal/pkg/print"
+	"github.com/stackitcloud/stackit-cli/internal/pkg/utils"
 	"github.com/stackitcloud/stackit-sdk-go/services/alb"
 )
 
@@ -64,9 +65,11 @@ func NewCmd(p *print.Printer) *cobra.Command {
 			if model.Type != nil && *model.Type == "pool" {
 				template = templatePool
 				target = alb.CreateLoadBalancerPayload{}
-			} else {
+			} else if model.Type == nil || *model.Type == "alb" {
 				template = templateAlb
 				target = alb.UpdateTargetPoolPayload{}
+			} else {
+				return fmt.Errorf("invalid type %q", utils.PtrString(model.Type))
 			}
 
 			if model.Format == nil || *model.Format == "yaml" {