From 41f51784aca9362de80d5daa5a64faf4c9381e2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Go=CC=88kc=CC=A7e=20Go=CC=88k=20Klingel?= Date: Mon, 29 Apr 2024 17:18:30 +0200 Subject: [PATCH 01/18] onboard-create-command --- docs/stackit_load-balancer.md | 1 + docs/stackit_load-balancer_create.md | 50 +++ internal/cmd/load-balancer/create/create.go | 146 +++++++ .../cmd/load-balancer/create/create_test.go | 356 ++++++++++++++++++ internal/cmd/load-balancer/load_balancer.go | 2 + 5 files changed, 555 insertions(+) create mode 100644 docs/stackit_load-balancer_create.md create mode 100644 internal/cmd/load-balancer/create/create.go create mode 100644 internal/cmd/load-balancer/create/create_test.go diff --git a/docs/stackit_load-balancer.md b/docs/stackit_load-balancer.md index bd709799c..49a0c3f80 100644 --- a/docs/stackit_load-balancer.md +++ b/docs/stackit_load-balancer.md @@ -29,6 +29,7 @@ stackit load-balancer [flags] ### SEE ALSO * [stackit](./stackit.md) - Manage STACKIT resources using the command line +* [stackit load-balancer create](./stackit_load-balancer_create.md) - Creates a Load Balancer * [stackit load-balancer describe](./stackit_load-balancer_describe.md) - Shows details of a Load Balancer * [stackit load-balancer generate-payload](./stackit_load-balancer_generate-payload.md) - Generates a payload to create/update a Load Balancer * [stackit load-balancer list](./stackit_load-balancer_list.md) - Lists all Load Balancers diff --git a/docs/stackit_load-balancer_create.md b/docs/stackit_load-balancer_create.md new file mode 100644 index 000000000..7b4f9fc6c --- /dev/null +++ b/docs/stackit_load-balancer_create.md @@ -0,0 +1,50 @@ +## stackit load-balancer create + +Creates a Load Balancer + +### Synopsis + +Creates a Load Balancer. +The payload can be provided as a JSON string or a file path prefixed with "@". +See https://docs.api.stackit.cloud/documentation/load-balancer/version/v1#tag/Load-Balancer/operation/APIService_CreateLoadBalancer for information regarding the payload structure. + +``` +stackit load-balancer create [flags] +``` + +### Examples + +``` + Create a load balancer using an API payload sourced from the file "./payload.json" + $ stackit load-balancer create --payload @./payload.json + + Create a load balancer using an API payload provided as a JSON string + $ stackit load-balancer create --payload "{...}" + + Generate a payload with default values, and adapt it with custom values for the different configuration options + $ stackit load-balancer generate-payload > ./payload.json + + $ stackit load-balancer create --payload @./payload.json +``` + +### Options + +``` + -h, --help Help for "stackit load-balancer create" + --payload string Request payload (JSON). Can be a string or a file path, if prefixed with "@" (example: @./payload.json). +``` + +### Options inherited from parent commands + +``` + -y, --assume-yes If set, skips all confirmation prompts + --async If set, runs the command asynchronously + -o, --output-format string Output format, one of ["json" "pretty" "none"] + -p, --project-id string Project ID + --verbosity string Verbosity of the CLI, one of ["debug" "info" "warning" "error"] (default "info") +``` + +### SEE ALSO + +* [stackit load-balancer](./stackit_load-balancer.md) - Provides functionality for Load Balancer + diff --git a/internal/cmd/load-balancer/create/create.go b/internal/cmd/load-balancer/create/create.go new file mode 100644 index 000000000..29c6d4799 --- /dev/null +++ b/internal/cmd/load-balancer/create/create.go @@ -0,0 +1,146 @@ +package create + +import ( + "context" + "encoding/json" + "fmt" + + "github.com/google/uuid" + + "github.com/stackitcloud/stackit-sdk-go/services/loadbalancer" + + "github.com/stackitcloud/stackit-cli/internal/pkg/args" + "github.com/stackitcloud/stackit-cli/internal/pkg/errors" + "github.com/stackitcloud/stackit-cli/internal/pkg/examples" + "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/services/load-balancer/client" + "github.com/stackitcloud/stackit-cli/internal/pkg/spinner" + + "github.com/spf13/cobra" + "github.com/stackitcloud/stackit-sdk-go/services/loadbalancer/wait" +) + +const ( + payloadFlag = "payload" +) + +type inputModel struct { + *globalflags.GlobalFlagModel + Payload *loadbalancer.CreateLoadBalancerPayload +} + +var ( + xRequestId = uuid.NewString() +) + +func NewCmd(p *print.Printer) *cobra.Command { + cmd := &cobra.Command{ + Use: "create", + Short: "Creates a Load Balancer", + Long: fmt.Sprintf("%s\n%s\n%s", + "Creates a Load Balancer.", + "The payload can be provided as a JSON string or a file path prefixed with \"@\".", + "See https://docs.api.stackit.cloud/documentation/load-balancer/version/v1#tag/Load-Balancer/operation/APIService_CreateLoadBalancer for information regarding the payload structure.", + ), + Args: args.NoArgs, + Example: examples.Build( + examples.NewExample( + `Create a load balancer using an API payload sourced from the file "./payload.json"`, + "$ stackit load-balancer create --payload @./payload.json"), + examples.NewExample( + `Create a load balancer using an API payload provided as a JSON string`, + `$ stackit load-balancer create --payload "{...}"`), + examples.NewExample( + `Generate a payload with default values, and adapt it with custom values for the different configuration options`, + `$ stackit load-balancer generate-payload > ./payload.json`, + ``, + `$ stackit load-balancer create --payload @./payload.json`), + ), + RunE: func(cmd *cobra.Command, args []string) error { + ctx := context.Background() + model, err := parseInput(p, cmd) + if err != nil { + return err + } + + // Configure API client + apiClient, err := client.ConfigureClient(p) + if err != nil { + return err + } + + if !model.AssumeYes { + prompt := fmt.Sprintf("Are you sure you want to create load balancer %q?", *model.Payload.Name) + err = p.PromptForConfirmation(prompt) + if err != nil { + return err + } + } + + // Call API + req := buildRequest(ctx, model, apiClient) + _, err = req.Execute() + if err != nil { + return fmt.Errorf("create load balancer: %w", err) + } + + // Wait for async operation, if async mode not enabled + if !model.Async { + s := spinner.New(p) + s.Start("Creating load balancer") + _, err = wait.CreateLoadBalancerWaitHandler(ctx, apiClient, model.ProjectId, *model.Payload.Name).WaitWithContext(ctx) + if err != nil { + return fmt.Errorf("wait for load balancer creation: %w", err) + } + s.Stop() + } + + operationState := "Created" + if model.Async { + operationState = "Triggered creation of" + } + p.Outputf("%s load balancer with name %q \n", operationState, *model.Payload.Name) + return nil + }, + } + configureFlags(cmd) + return cmd +} + +func configureFlags(cmd *cobra.Command) { + cmd.Flags().Var(flags.ReadFromFileFlag(), payloadFlag, `Request payload (JSON). Can be a string or a file path, if prefixed with "@" (example: @./payload.json).`) + + err := flags.MarkFlagsRequired(cmd, payloadFlag) + cobra.CheckErr(err) +} + +func parseInput(p *print.Printer, cmd *cobra.Command) (*inputModel, error) { + globalFlags := globalflags.Parse(p, cmd) + if globalFlags.ProjectId == "" { + return nil, &errors.ProjectIdError{} + } + + payloadValue := flags.FlagToStringPointer(p, cmd, payloadFlag) + var payload *loadbalancer.CreateLoadBalancerPayload + if payloadValue != nil { + payload = &loadbalancer.CreateLoadBalancerPayload{} + err := json.Unmarshal([]byte(*payloadValue), payload) + if err != nil { + return nil, fmt.Errorf("encode payload: %w", err) + } + } + + return &inputModel{ + GlobalFlagModel: globalFlags, + Payload: payload, + }, nil +} + +func buildRequest(ctx context.Context, model *inputModel, apiClient *loadbalancer.APIClient) loadbalancer.ApiCreateLoadBalancerRequest { + req := apiClient.CreateLoadBalancer(ctx, model.ProjectId) + req = req.CreateLoadBalancerPayload(*model.Payload) + req = req.XRequestID(xRequestId) + return req +} diff --git a/internal/cmd/load-balancer/create/create_test.go b/internal/cmd/load-balancer/create/create_test.go new file mode 100644 index 000000000..54a0a75ea --- /dev/null +++ b/internal/cmd/load-balancer/create/create_test.go @@ -0,0 +1,356 @@ +package create + +import ( + "context" + "testing" + + "github.com/stackitcloud/stackit-sdk-go/services/loadbalancer" + + "github.com/stackitcloud/stackit-cli/internal/pkg/globalflags" + "github.com/stackitcloud/stackit-cli/internal/pkg/utils" + + "github.com/google/go-cmp/cmp" + "github.com/google/go-cmp/cmp/cmpopts" + "github.com/google/uuid" +) + +var projectIdFlag = globalflags.ProjectIdFlag + +type testCtxKey struct{} + +var testCtx = context.WithValue(context.Background(), testCtxKey{}, "foo") +var testClient = &loadbalancer.APIClient{} +var testProjectId = uuid.NewString() +var testRequestId = xRequestId + +var testPayload = &loadbalancer.CreateLoadBalancerPayload{ + ExternalAddress: utils.Ptr(""), + + Listeners: &[]loadbalancer.Listener{ + { + DisplayName: utils.Ptr(""), + Name: utils.Ptr(""), + Port: utils.Ptr(int64(0)), + Protocol: utils.Ptr(""), + ServerNameIndicators: &[]loadbalancer.ServerNameIndicator{ + { + Name: utils.Ptr(""), + }, + }, + TargetPool: utils.Ptr(""), + Tcp: &loadbalancer.OptionsTCP{ + IdleTimeout: utils.Ptr(""), + }, + Udp: &loadbalancer.OptionsUDP{ + IdleTimeout: utils.Ptr(""), + }, + }, + }, + Name: utils.Ptr(""), + Networks: &[]loadbalancer.Network{ + { + NetworkId: utils.Ptr(""), + Role: utils.Ptr(""), + }, + }, + Options: &loadbalancer.LoadBalancerOptions{ + AccessControl: &loadbalancer.LoadbalancerOptionAccessControl{ + AllowedSourceRanges: &[]string{ + "", + }, + }, + EphemeralAddress: utils.Ptr(false), + Observability: &loadbalancer.LoadbalancerOptionObservability{ + Logs: &loadbalancer.LoadbalancerOptionLogs{ + CredentialsRef: utils.Ptr(""), + PushUrl: utils.Ptr(""), + }, + Metrics: &loadbalancer.LoadbalancerOptionMetrics{ + CredentialsRef: utils.Ptr(""), + PushUrl: utils.Ptr(""), + }, + }, + PrivateNetworkOnly: utils.Ptr(false), + }, + PrivateAddress: utils.Ptr(""), + TargetPools: &[]loadbalancer.TargetPool{ + { + ActiveHealthCheck: &loadbalancer.ActiveHealthCheck{ + HealthyThreshold: utils.Ptr(int64(0)), + Interval: utils.Ptr(""), + IntervalJitter: utils.Ptr(""), + Timeout: utils.Ptr(""), + UnhealthyThreshold: utils.Ptr(int64(0)), + }, + Name: utils.Ptr(""), + SessionPersistence: &loadbalancer.SessionPersistence{ + UseSourceIpAddress: utils.Ptr(false), + }, + TargetPort: utils.Ptr(int64(0)), + Targets: &[]loadbalancer.Target{ + { + DisplayName: utils.Ptr(""), + Ip: utils.Ptr(""), + }, + }, + }, + }, +} + +func fixtureFlagValues(mods ...func(flagValues map[string]string)) map[string]string { + flagValues := map[string]string{ + projectIdFlag: testProjectId, + payloadFlag: `{ + "externalAddress": "", + "listeners": [ + { + "displayName": "", + "name": "", + "port": 0, + "protocol": "", + "serverNameIndicators": [ + { + "name": "" + } + ], + "targetPool": "", + "tcp": { + "idleTimeout": "" + }, + "udp": { + "idleTimeout": "" + } + } + ], + "name": "", + "networks": [ + { + "networkId": "", + "role": "" + } + ], + "options": { + "accessControl": { + "allowedSourceRanges": [ + "" + ] + }, + "ephemeralAddress": false, + "observability": { + "logs": { + "credentialsRef": "", + "pushUrl": "" + }, + "metrics": { + "credentialsRef": "", + "pushUrl": "" + } + }, + "privateNetworkOnly": false + }, + "privateAddress": "", + "targetPools": [ + { + "activeHealthCheck": { + "healthyThreshold": 0, + "interval": "", + "intervalJitter": "", + "timeout": "", + "unhealthyThreshold": 0 + }, + "name": "", + "sessionPersistence": { + "useSourceIpAddress": false + }, + "targetPort": 0, + "targets": [ + { + "displayName": "", + "ip": "" + } + ] + } + ] +}`, + } + for _, mod := range mods { + mod(flagValues) + } + return flagValues +} + +func fixtureInputModel(mods ...func(model *inputModel)) *inputModel { + model := &inputModel{ + GlobalFlagModel: &globalflags.GlobalFlagModel{ + ProjectId: testProjectId, + Verbosity: globalflags.VerbosityDefault, + }, + Payload: testPayload, + } + for _, mod := range mods { + mod(model) + } + return model +} + +func fixtureRequest(mods ...func(request *loadbalancer.ApiCreateLoadBalancerRequest)) loadbalancer.ApiCreateLoadBalancerRequest { + request := testClient.CreateLoadBalancer(testCtx, testProjectId) + request = request.CreateLoadBalancerPayload(*testPayload) + request = request.XRequestID(testRequestId) + for _, mod := range mods { + mod(&request) + } + return request +} + +func TestParseInput(t *testing.T) { + tests := []struct { + description string + flagValues map[string]string + isValid bool + expectedModel *inputModel + }{ + { + description: "base", + flagValues: fixtureFlagValues(), + isValid: true, + expectedModel: fixtureInputModel(), + }, + { + description: "no values", + flagValues: map[string]string{}, + isValid: false, + }, + { + description: "no flag values", + flagValues: map[string]string{}, + isValid: false, + }, + { + description: "project id missing", + flagValues: fixtureFlagValues(func(flagValues map[string]string) { + delete(flagValues, projectIdFlag) + }), + isValid: false, + }, + { + description: "project id invalid 1", + flagValues: fixtureFlagValues(func(flagValues map[string]string) { + flagValues[projectIdFlag] = "" + }), + isValid: false, + }, + { + description: "project id invalid 2", + flagValues: fixtureFlagValues(func(flagValues map[string]string) { + flagValues[projectIdFlag] = "invalid-uuid" + }), + isValid: false, + }, + { + description: "payload is missing", + flagValues: fixtureFlagValues(func(flagValues map[string]string) { + delete(flagValues, payloadFlag) + }), + isValid: false, + }, + { + description: "payload is empty", + flagValues: fixtureFlagValues(func(flagValues map[string]string) { + flagValues[payloadFlag] = "" + }), + isValid: false, + }, + { + description: "invalid json", + flagValues: fixtureFlagValues(func(flagValues map[string]string) { + flagValues[payloadFlag] = "not json" + }), + isValid: false, + expectedModel: fixtureInputModel(), + }, + } + + for _, tt := range tests { + t.Run(tt.description, func(t *testing.T) { + cmd := NewCmd(nil) + err := globalflags.Configure(cmd.Flags()) + if err != nil { + t.Fatalf("configure global flags: %v", err) + } + + for flag, value := range tt.flagValues { + err := cmd.Flags().Set(flag, value) + if err != nil { + if !tt.isValid { + return + } + t.Fatalf("setting flag --%s=%s: %v", flag, value, err) + } + } + + err = cmd.ValidateRequiredFlags() + if err != nil { + if !tt.isValid { + return + } + t.Fatalf("error validating flags: %v", err) + } + + err = cmd.ValidateFlagGroups() + if err != nil { + if !tt.isValid { + return + } + t.Fatalf("error validating flags: %v", err) + } + + model, err := parseInput(nil, cmd) + if err != nil { + if !tt.isValid { + return + } + t.Fatalf("error parsing flags: %v", err) + } + + if !tt.isValid { + t.Fatalf("did not fail on invalid input") + } + diff := cmp.Diff(*model, *tt.expectedModel, + cmpopts.EquateComparable(testCtx), + ) + if diff != "" { + t.Fatalf("Data does not match: %s", diff) + } + }) + } +} + +func TestBuildRequest(t *testing.T) { + tests := []struct { + description string + model *inputModel + expectedRequest loadbalancer.ApiCreateLoadBalancerRequest + isValid bool + }{ + { + description: "base", + model: fixtureInputModel(), + expectedRequest: fixtureRequest(), + }, + } + + for _, tt := range tests { + t.Run(tt.description, func(t *testing.T) { + request := buildRequest(testCtx, tt.model, testClient) + + diff := cmp.Diff(request, tt.expectedRequest, + cmp.AllowUnexported(tt.expectedRequest), + cmpopts.EquateComparable(testCtx), + ) + if diff != "" { + t.Fatalf("Data does not match: %s", diff) + } + }) + } +} diff --git a/internal/cmd/load-balancer/load_balancer.go b/internal/cmd/load-balancer/load_balancer.go index fdce4cdbf..ab9d46f36 100644 --- a/internal/cmd/load-balancer/load_balancer.go +++ b/internal/cmd/load-balancer/load_balancer.go @@ -1,6 +1,7 @@ package loadbalancer import ( + "github.com/stackitcloud/stackit-cli/internal/cmd/load-balancer/create" "github.com/stackitcloud/stackit-cli/internal/cmd/load-balancer/describe" generatepayload "github.com/stackitcloud/stackit-cli/internal/cmd/load-balancer/generate-payload" "github.com/stackitcloud/stackit-cli/internal/cmd/load-balancer/list" @@ -31,4 +32,5 @@ func addSubcommands(cmd *cobra.Command, p *print.Printer) { cmd.AddCommand(list.NewCmd(p)) cmd.AddCommand(quota.NewCmd(p)) cmd.AddCommand(generatepayload.NewCmd(p)) + cmd.AddCommand(create.NewCmd(p)) } From c44c5144918be85d90c814247a89530fe18ea73f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Go=CC=88kc=CC=A7e=20Go=CC=88k=20Klingel?= Date: Mon, 29 Apr 2024 17:28:52 +0200 Subject: [PATCH 02/18] remove fields that are not needed for create --- internal/cmd/load-balancer/create/create_test.go | 4 ---- 1 file changed, 4 deletions(-) diff --git a/internal/cmd/load-balancer/create/create_test.go b/internal/cmd/load-balancer/create/create_test.go index 54a0a75ea..b325dedeb 100644 --- a/internal/cmd/load-balancer/create/create_test.go +++ b/internal/cmd/load-balancer/create/create_test.go @@ -29,7 +29,6 @@ var testPayload = &loadbalancer.CreateLoadBalancerPayload{ Listeners: &[]loadbalancer.Listener{ { DisplayName: utils.Ptr(""), - Name: utils.Ptr(""), Port: utils.Ptr(int64(0)), Protocol: utils.Ptr(""), ServerNameIndicators: &[]loadbalancer.ServerNameIndicator{ @@ -72,7 +71,6 @@ var testPayload = &loadbalancer.CreateLoadBalancerPayload{ }, PrivateNetworkOnly: utils.Ptr(false), }, - PrivateAddress: utils.Ptr(""), TargetPools: &[]loadbalancer.TargetPool{ { ActiveHealthCheck: &loadbalancer.ActiveHealthCheck{ @@ -105,7 +103,6 @@ func fixtureFlagValues(mods ...func(flagValues map[string]string)) map[string]st "listeners": [ { "displayName": "", - "name": "", "port": 0, "protocol": "", "serverNameIndicators": [ @@ -148,7 +145,6 @@ func fixtureFlagValues(mods ...func(flagValues map[string]string)) map[string]st }, "privateNetworkOnly": false }, - "privateAddress": "", "targetPools": [ { "activeHealthCheck": { From b175d90be13ee6212390256ed9fcd26c428b317d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Go=CC=88kc=CC=A7e=20Go=CC=88k=20Klingel?= Date: Mon, 29 Apr 2024 17:29:30 +0200 Subject: [PATCH 03/18] remove fields that are not needed for create from default payload --- internal/cmd/load-balancer/generate-payload/generate_payload.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/internal/cmd/load-balancer/generate-payload/generate_payload.go b/internal/cmd/load-balancer/generate-payload/generate_payload.go index 9d1ebb9fd..d4ed94156 100644 --- a/internal/cmd/load-balancer/generate-payload/generate_payload.go +++ b/internal/cmd/load-balancer/generate-payload/generate_payload.go @@ -30,7 +30,6 @@ type inputModel struct { var ( defaultPayloadListener = &loadbalancer.Listener{ DisplayName: utils.Ptr(""), - Name: utils.Ptr(""), Port: utils.Ptr(int64(0)), Protocol: utils.Ptr(""), ServerNameIndicators: &[]loadbalancer.ServerNameIndicator{ @@ -101,7 +100,6 @@ var ( }, PrivateNetworkOnly: utils.Ptr(false), }, - PrivateAddress: utils.Ptr(""), TargetPools: &[]loadbalancer.TargetPool{ *defaultPayloadTargetPool, }, From 213424363f5544e8a729f7a51fc2a9b1a8078990 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Go=CC=88kc=CC=A7e=20Go=CC=88k=20Klingel?= Date: Tue, 30 Apr 2024 08:34:49 +0200 Subject: [PATCH 04/18] remove privateAddress from update payload (read only field) --- internal/cmd/load-balancer/generate-payload/generate_payload.go | 1 - 1 file changed, 1 deletion(-) diff --git a/internal/cmd/load-balancer/generate-payload/generate_payload.go b/internal/cmd/load-balancer/generate-payload/generate_payload.go index d4ed94156..2ade57733 100644 --- a/internal/cmd/load-balancer/generate-payload/generate_payload.go +++ b/internal/cmd/load-balancer/generate-payload/generate_payload.go @@ -156,7 +156,6 @@ func NewCmd(p *print.Printer) *cobra.Command { Name: resp.Name, Networks: resp.Networks, Options: resp.Options, - PrivateAddress: resp.PrivateAddress, TargetPools: resp.TargetPools, Version: resp.Version, } From 6d01bc28ad3eee10d20211511eabe8f133df68e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Go=CC=88kc=CC=A7e=20Go=CC=88k=20Klingel?= Date: Tue, 30 Apr 2024 14:10:05 +0200 Subject: [PATCH 05/18] update generate payload to remove read-only fields from updatePayload --- .../generate-payload/generate_payload.go | 31 +++++++++++++++++-- 1 file changed, 28 insertions(+), 3 deletions(-) diff --git a/internal/cmd/load-balancer/generate-payload/generate_payload.go b/internal/cmd/load-balancer/generate-payload/generate_payload.go index 2ade57733..b45bf71cc 100644 --- a/internal/cmd/load-balancer/generate-payload/generate_payload.go +++ b/internal/cmd/load-balancer/generate-payload/generate_payload.go @@ -123,9 +123,9 @@ func NewCmd(p *print.Printer) *cobra.Command { `$ stackit load-balancer create --payload @./payload.json`), examples.NewExample( `Generate a payload with values of an existing load balancer, and adapt it with custom values for the different configuration options`, - `$ stackit load-balancer generate-payload --instance-name my-lb > ./payload.json`, + `$ stackit load-balancer generate-payload --instance-name xxx > ./payload.json`, ``, - `$ stackit load-balancer update my-lb --payload @./payload.json`), + `$ stackit load-balancer update xxx --payload @./payload.json`), ), RunE: func(cmd *cobra.Command, args []string) error { ctx := context.Background() @@ -150,9 +150,34 @@ func NewCmd(p *print.Printer) *cobra.Command { if err != nil { return fmt.Errorf("read load balancer: %w", err) } + + listeners := *resp.Listeners + + for i := range listeners { + listener := listeners[i] + listeners[i] = loadbalancer.Listener{ + DisplayName: listener.DisplayName, + Port: listener.Port, + Protocol: listener.Protocol, + TargetPool: listener.TargetPool, + } + + if listener.ServerNameIndicators != nil { + listeners[i].ServerNameIndicators = listener.ServerNameIndicators + } + + if listener.Tcp != nil { + listeners[i].Tcp = listener.Tcp + } + + if listener.Udp != nil { + listeners[i].Udp = listener.Udp + } + } + updatePayload := &loadbalancer.UpdateLoadBalancerPayload{ ExternalAddress: resp.ExternalAddress, - Listeners: resp.Listeners, + Listeners: &listeners, Name: resp.Name, Networks: resp.Networks, Options: resp.Options, From a24bfd7c15b8dccf7ed36e53c17f4973aa07e49c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Go=CC=88kc=CC=A7e=20Go=CC=88k=20Klingel?= Date: Tue, 30 Apr 2024 14:10:25 +0200 Subject: [PATCH 06/18] onboard update load balancer command --- docs/stackit_load-balancer.md | 1 + .../stackit_load-balancer_generate-payload.md | 4 +- docs/stackit_load-balancer_update.md | 50 +++ internal/cmd/load-balancer/load_balancer.go | 2 + internal/cmd/load-balancer/update/update.go | 125 ++++++ .../cmd/load-balancer/update/update_test.go | 375 ++++++++++++++++++ 6 files changed, 555 insertions(+), 2 deletions(-) create mode 100644 docs/stackit_load-balancer_update.md create mode 100644 internal/cmd/load-balancer/update/update.go create mode 100644 internal/cmd/load-balancer/update/update_test.go diff --git a/docs/stackit_load-balancer.md b/docs/stackit_load-balancer.md index 49a0c3f80..41144037d 100644 --- a/docs/stackit_load-balancer.md +++ b/docs/stackit_load-balancer.md @@ -34,4 +34,5 @@ stackit load-balancer [flags] * [stackit load-balancer generate-payload](./stackit_load-balancer_generate-payload.md) - Generates a payload to create/update a Load Balancer * [stackit load-balancer list](./stackit_load-balancer_list.md) - Lists all Load Balancers * [stackit load-balancer quota](./stackit_load-balancer_quota.md) - Shows the configured Load Balancer quota +* [stackit load-balancer update](./stackit_load-balancer_update.md) - Updates a load balancer diff --git a/docs/stackit_load-balancer_generate-payload.md b/docs/stackit_load-balancer_generate-payload.md index eedcdd5ba..0f7727277 100644 --- a/docs/stackit_load-balancer_generate-payload.md +++ b/docs/stackit_load-balancer_generate-payload.md @@ -20,9 +20,9 @@ stackit load-balancer generate-payload [flags] $ stackit load-balancer create --payload @./payload.json Generate a payload with values of an existing load balancer, and adapt it with custom values for the different configuration options - $ stackit load-balancer generate-payload --instance-name my-lb > ./payload.json + $ stackit load-balancer generate-payload --instance-name xxx > ./payload.json - $ stackit load-balancer update my-lb --payload @./payload.json + $ stackit load-balancer update xxx --payload @./payload.json ``` ### Options diff --git a/docs/stackit_load-balancer_update.md b/docs/stackit_load-balancer_update.md new file mode 100644 index 000000000..7aa979459 --- /dev/null +++ b/docs/stackit_load-balancer_update.md @@ -0,0 +1,50 @@ +## stackit load-balancer update + +Updates a load balancer + +### Synopsis + +Updates a load balancer. +The payload can be provided as a JSON string or a file path prefixed with "@". +See https://docs.api.stackit.cloud/documentation/load-balancer/version/v1#tag/Load-Balancer/operation/APIService_UpdateLoadBalancer for information regarding the payload structure. + +``` +stackit load-balancer update LOAD_BALANCER_NAME [flags] +``` + +### Examples + +``` + Update a load balancer with name "xxx", using an API payload sourced from the file "./payload.json" + $ stackit load-balancer update xxx --payload @./payload.json + + Update a load balancer with name "xxx", using an API payload provided as a JSON string + $ stackit load-balancer update xxx --payload "{...}" + + Generate a payload with the current values of an existing load balancer xxx, and adapt it with custom values for the different configuration options + $ stackit load-balancer generate-payload --instance-name xxx > ./payload.json + + $ stackit load-balancer update xxx --payload @./payload.json +``` + +### Options + +``` + -h, --help Help for "stackit load-balancer update" + --payload string Request payload (JSON). Can be a string or a file path, if prefixed with "@". Example: @./payload.json +``` + +### Options inherited from parent commands + +``` + -y, --assume-yes If set, skips all confirmation prompts + --async If set, runs the command asynchronously + -o, --output-format string Output format, one of ["json" "pretty" "none"] + -p, --project-id string Project ID + --verbosity string Verbosity of the CLI, one of ["debug" "info" "warning" "error"] (default "info") +``` + +### SEE ALSO + +* [stackit load-balancer](./stackit_load-balancer.md) - Provides functionality for Load Balancer + diff --git a/internal/cmd/load-balancer/load_balancer.go b/internal/cmd/load-balancer/load_balancer.go index ab9d46f36..7e9f15d69 100644 --- a/internal/cmd/load-balancer/load_balancer.go +++ b/internal/cmd/load-balancer/load_balancer.go @@ -6,6 +6,7 @@ import ( generatepayload "github.com/stackitcloud/stackit-cli/internal/cmd/load-balancer/generate-payload" "github.com/stackitcloud/stackit-cli/internal/cmd/load-balancer/list" "github.com/stackitcloud/stackit-cli/internal/cmd/load-balancer/quota" + "github.com/stackitcloud/stackit-cli/internal/cmd/load-balancer/update" "github.com/stackitcloud/stackit-cli/internal/pkg/args" "github.com/stackitcloud/stackit-cli/internal/pkg/print" @@ -33,4 +34,5 @@ func addSubcommands(cmd *cobra.Command, p *print.Printer) { cmd.AddCommand(quota.NewCmd(p)) cmd.AddCommand(generatepayload.NewCmd(p)) cmd.AddCommand(create.NewCmd(p)) + cmd.AddCommand(update.NewCmd(p)) } diff --git a/internal/cmd/load-balancer/update/update.go b/internal/cmd/load-balancer/update/update.go new file mode 100644 index 000000000..eb4be1efd --- /dev/null +++ b/internal/cmd/load-balancer/update/update.go @@ -0,0 +1,125 @@ +package update + +import ( + "context" + "encoding/json" + "fmt" + + "github.com/stackitcloud/stackit-cli/internal/pkg/args" + "github.com/stackitcloud/stackit-cli/internal/pkg/errors" + "github.com/stackitcloud/stackit-cli/internal/pkg/examples" + "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/services/load-balancer/client" + + "github.com/spf13/cobra" + "github.com/stackitcloud/stackit-sdk-go/services/loadbalancer" +) + +const ( + loadBalancerNameArg = "LOAD_BALANCER_NAME" + payloadFlag = "payload" +) + +type inputModel struct { + *globalflags.GlobalFlagModel + LoadBalancerName string + Payload loadbalancer.UpdateLoadBalancerPayload +} + +func NewCmd(p *print.Printer) *cobra.Command { + cmd := &cobra.Command{ + Use: fmt.Sprintf("update %s", loadBalancerNameArg), + Short: "Updates a load balancer", + Long: fmt.Sprintf("%s\n%s\n%s", + "Updates a load balancer.", + "The payload can be provided as a JSON string or a file path prefixed with \"@\".", + "See https://docs.api.stackit.cloud/documentation/load-balancer/version/v1#tag/Load-Balancer/operation/APIService_UpdateLoadBalancer for information regarding the payload structure.", + ), + Args: args.SingleArg(loadBalancerNameArg, nil), + Example: examples.Build( + examples.NewExample( + `Update a load balancer with name "xxx", using an API payload sourced from the file "./payload.json"`, + "$ stackit load-balancer update xxx --payload @./payload.json"), + examples.NewExample( + `Update a load balancer with name "xxx", using an API payload provided as a JSON string`, + `$ stackit load-balancer update xxx --payload "{...}"`), + examples.NewExample( + `Generate a payload with the current values of an existing load balancer xxx, and adapt it with custom values for the different configuration options`, + `$ stackit load-balancer generate-payload --instance-name xxx > ./payload.json`, + ``, + `$ stackit load-balancer update xxx --payload @./payload.json`), + ), + RunE: func(cmd *cobra.Command, args []string) error { + ctx := context.Background() + model, err := parseInput(p, cmd, args) + if err != nil { + return err + } + + // Configure API client + apiClient, err := client.ConfigureClient(p) + if err != nil { + return err + } + + if !model.AssumeYes { + prompt := fmt.Sprintf("Are you sure you want to update load balancer %q?", model.LoadBalancerName) + err = p.PromptForConfirmation(prompt) + if err != nil { + return err + } + } + + // Call API + req := buildRequest(ctx, model, apiClient) + _, err = req.Execute() + if err != nil { + return fmt.Errorf("update load balancer: %w", err) + } + + // The API has no status to wait on, so async mode is default + p.Info("Updated load balancer with name %q\n", model.LoadBalancerName) + return nil + }, + } + configureFlags(cmd) + return cmd +} + +func configureFlags(cmd *cobra.Command) { + cmd.Flags().Var(flags.ReadFromFileFlag(), payloadFlag, `Request payload (JSON). Can be a string or a file path, if prefixed with "@". Example: @./payload.json`) + + err := flags.MarkFlagsRequired(cmd, payloadFlag) + cobra.CheckErr(err) +} + +func parseInput(p *print.Printer, cmd *cobra.Command, inputArgs []string) (*inputModel, error) { + loadBalancerName := inputArgs[0] + + globalFlags := globalflags.Parse(p, cmd) + if globalFlags.ProjectId == "" { + return nil, &errors.ProjectIdError{} + } + + payloadString := flags.FlagToStringValue(p, cmd, payloadFlag) + var payload loadbalancer.UpdateLoadBalancerPayload + err := json.Unmarshal([]byte(payloadString), &payload) + if err != nil { + return nil, fmt.Errorf("encode payload: %w", err) + } + + return &inputModel{ + GlobalFlagModel: globalFlags, + LoadBalancerName: loadBalancerName, + Payload: payload, + }, nil +} + +func buildRequest(ctx context.Context, model *inputModel, apiClient *loadbalancer.APIClient) loadbalancer.ApiUpdateLoadBalancerRequest { + req := apiClient.UpdateLoadBalancer(ctx, model.ProjectId, model.LoadBalancerName) + + req = req.UpdateLoadBalancerPayload(model.Payload) + return req +} diff --git a/internal/cmd/load-balancer/update/update_test.go b/internal/cmd/load-balancer/update/update_test.go new file mode 100644 index 000000000..504e39160 --- /dev/null +++ b/internal/cmd/load-balancer/update/update_test.go @@ -0,0 +1,375 @@ +package update + +import ( + "context" + "testing" + + "github.com/stackitcloud/stackit-cli/internal/pkg/globalflags" + "github.com/stackitcloud/stackit-cli/internal/pkg/utils" + + "github.com/google/go-cmp/cmp" + "github.com/google/go-cmp/cmp/cmpopts" + "github.com/google/uuid" + "github.com/stackitcloud/stackit-sdk-go/services/loadbalancer" +) + +var projectIdFlag = globalflags.ProjectIdFlag + +type testCtxKey struct{} + +var testCtx = context.WithValue(context.Background(), testCtxKey{}, "foo") +var testClient = &loadbalancer.APIClient{} +var testProjectId = uuid.NewString() +var testLoadBalancerName = "loadBalancer" + +var testPayload = loadbalancer.UpdateLoadBalancerPayload{ + ExternalAddress: utils.Ptr(""), + + Listeners: &[]loadbalancer.Listener{ + { + DisplayName: utils.Ptr(""), + Port: utils.Ptr(int64(0)), + Protocol: utils.Ptr(""), + ServerNameIndicators: &[]loadbalancer.ServerNameIndicator{ + { + Name: utils.Ptr(""), + }, + }, + TargetPool: utils.Ptr(""), + Tcp: &loadbalancer.OptionsTCP{ + IdleTimeout: utils.Ptr(""), + }, + Udp: &loadbalancer.OptionsUDP{ + IdleTimeout: utils.Ptr(""), + }, + }, + }, + Name: utils.Ptr(""), + Networks: &[]loadbalancer.Network{ + { + NetworkId: utils.Ptr(""), + Role: utils.Ptr(""), + }, + }, + Options: &loadbalancer.LoadBalancerOptions{ + AccessControl: &loadbalancer.LoadbalancerOptionAccessControl{ + AllowedSourceRanges: &[]string{ + "", + }, + }, + EphemeralAddress: utils.Ptr(false), + Observability: &loadbalancer.LoadbalancerOptionObservability{ + Logs: &loadbalancer.LoadbalancerOptionLogs{ + CredentialsRef: utils.Ptr(""), + PushUrl: utils.Ptr(""), + }, + Metrics: &loadbalancer.LoadbalancerOptionMetrics{ + CredentialsRef: utils.Ptr(""), + PushUrl: utils.Ptr(""), + }, + }, + PrivateNetworkOnly: utils.Ptr(false), + }, + TargetPools: &[]loadbalancer.TargetPool{ + { + ActiveHealthCheck: &loadbalancer.ActiveHealthCheck{ + HealthyThreshold: utils.Ptr(int64(0)), + Interval: utils.Ptr(""), + IntervalJitter: utils.Ptr(""), + Timeout: utils.Ptr(""), + UnhealthyThreshold: utils.Ptr(int64(0)), + }, + Name: utils.Ptr(""), + SessionPersistence: &loadbalancer.SessionPersistence{ + UseSourceIpAddress: utils.Ptr(false), + }, + TargetPort: utils.Ptr(int64(0)), + Targets: &[]loadbalancer.Target{ + { + DisplayName: utils.Ptr(""), + Ip: utils.Ptr(""), + }, + }, + }, + }, + Version: utils.Ptr(""), +} + +func fixtureArgValues(mods ...func(argValues []string)) []string { + argValues := []string{ + testLoadBalancerName, + } + for _, mod := range mods { + mod(argValues) + } + return argValues +} + +func fixtureFlagValues(mods ...func(flagValues map[string]string)) map[string]string { + flagValues := map[string]string{ + projectIdFlag: testProjectId, + payloadFlag: ` +{ + "externalAddress": "", + "listeners": [ + { + "displayName": "", + "port": 0, + "protocol": "", + "serverNameIndicators": [ + { + "name": "" + } + ], + "targetPool": "", + "tcp": { + "idleTimeout": "" + }, + "udp": { + "idleTimeout": "" + } + } + ], + "name": "", + "networks": [ + { + "networkId": "", + "role": "" + } + ], + "options": { + "accessControl": { + "allowedSourceRanges": [ + "" + ] + }, + "ephemeralAddress": false, + "observability": { + "logs": { + "credentialsRef": "", + "pushUrl": "" + }, + "metrics": { + "credentialsRef": "", + "pushUrl": "" + } + }, + "privateNetworkOnly": false + }, + "targetPools": [ + { + "activeHealthCheck": { + "healthyThreshold": 0, + "interval": "", + "intervalJitter": "", + "timeout": "", + "unhealthyThreshold": 0 + }, + "name": "", + "sessionPersistence": { + "useSourceIpAddress": false + }, + "targetPort": 0, + "targets": [ + { + "displayName": "", + "ip": "" + } + ] + } + ], + "version": "" +} +`, + } + for _, mod := range mods { + mod(flagValues) + } + return flagValues +} + +func fixtureInputModel(mods ...func(model *inputModel)) *inputModel { + model := &inputModel{ + GlobalFlagModel: &globalflags.GlobalFlagModel{ + ProjectId: testProjectId, + Verbosity: globalflags.VerbosityDefault, + }, + LoadBalancerName: testLoadBalancerName, + Payload: testPayload, + } + for _, mod := range mods { + mod(model) + } + return model +} + +func fixtureRequest(mods ...func(request *loadbalancer.ApiUpdateLoadBalancerRequest)) loadbalancer.ApiUpdateLoadBalancerRequest { + request := testClient.UpdateLoadBalancer(testCtx, testProjectId, testLoadBalancerName) + request = request.UpdateLoadBalancerPayload(testPayload) + for _, mod := range mods { + mod(&request) + } + return request +} + +func TestParseInput(t *testing.T) { + tests := []struct { + description string + argValues []string + flagValues map[string]string + isValid bool + expectedModel *inputModel + }{ + { + description: "base", + argValues: fixtureArgValues(), + flagValues: fixtureFlagValues(), + isValid: true, + expectedModel: fixtureInputModel(), + }, + { + description: "no values", + argValues: []string{}, + flagValues: map[string]string{}, + isValid: false, + }, + { + description: "no arg values", + argValues: []string{}, + flagValues: fixtureFlagValues(), + isValid: false, + }, + { + description: "no flag values", + argValues: fixtureArgValues(), + flagValues: map[string]string{}, + isValid: false, + }, + { + description: "project id missing", + argValues: fixtureArgValues(), + flagValues: fixtureFlagValues(func(flagValues map[string]string) { + delete(flagValues, projectIdFlag) + }), + isValid: false, + }, + { + description: "project id invalid 1", + argValues: fixtureArgValues(), + flagValues: fixtureFlagValues(func(flagValues map[string]string) { + flagValues[projectIdFlag] = "" + }), + isValid: false, + }, + { + description: "project id invalid 2", + argValues: fixtureArgValues(), + flagValues: fixtureFlagValues(func(flagValues map[string]string) { + flagValues[projectIdFlag] = "invalid-uuid" + }), + isValid: false, + }, + { + description: "invalid json", + flagValues: fixtureFlagValues(func(flagValues map[string]string) { + flagValues[payloadFlag] = "not json" + }), + isValid: false, + }, + { + description: "payload missing", + flagValues: fixtureFlagValues(func(flagValues map[string]string) { + delete(flagValues, payloadFlag) + }), + isValid: false, + }, + { + description: "payload is empty", + flagValues: fixtureFlagValues(func(flagValues map[string]string) { + flagValues[payloadFlag] = "" + }), + isValid: false, + }, + } + + for _, tt := range tests { + t.Run(tt.description, func(t *testing.T) { + cmd := NewCmd(nil) + err := globalflags.Configure(cmd.Flags()) + if err != nil { + t.Fatalf("configure global flags: %v", err) + } + + for flag, value := range tt.flagValues { + err := cmd.Flags().Set(flag, value) + if err != nil { + if !tt.isValid { + return + } + t.Fatalf("setting flag --%s=%s: %v", flag, value, err) + } + } + + err = cmd.ValidateArgs(tt.argValues) + if err != nil { + if !tt.isValid { + return + } + t.Fatalf("error validating args: %v", err) + } + + err = cmd.ValidateRequiredFlags() + if err != nil { + if !tt.isValid { + return + } + t.Fatalf("error validating flags: %v", err) + } + + model, err := parseInput(nil, cmd, tt.argValues) + if err != nil { + if !tt.isValid { + return + } + t.Fatalf("error parsing flags: %v", err) + } + + if !tt.isValid { + t.Fatalf("did not fail on invalid input") + } + diff := cmp.Diff(model, tt.expectedModel) + if diff != "" { + t.Fatalf("Data does not match: %s", diff) + } + }) + } +} + +func TestBuildRequest(t *testing.T) { + tests := []struct { + description string + model *inputModel + expectedRequest loadbalancer.ApiUpdateLoadBalancerRequest + isValid bool + }{ + { + description: "base", + model: fixtureInputModel(), + expectedRequest: fixtureRequest(), + }, + } + + for _, tt := range tests { + t.Run(tt.description, func(t *testing.T) { + request := buildRequest(testCtx, tt.model, testClient) + + diff := cmp.Diff(request, tt.expectedRequest, + cmp.AllowUnexported(tt.expectedRequest), + cmpopts.EquateComparable(testCtx), + ) + if diff != "" { + t.Fatalf("Data does not match: %s", diff) + } + }) + } +} From 48410e49adf72b5cd27319ccefa10466a1483da6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Go=CC=88kc=CC=A7e=20Go=CC=88k=20Klingel?= Date: Tue, 30 Apr 2024 14:12:00 +0200 Subject: [PATCH 07/18] update description of update command --- docs/stackit_load-balancer.md | 2 +- docs/stackit_load-balancer_update.md | 2 +- internal/cmd/load-balancer/update/update.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/stackit_load-balancer.md b/docs/stackit_load-balancer.md index 41144037d..c9727e1b6 100644 --- a/docs/stackit_load-balancer.md +++ b/docs/stackit_load-balancer.md @@ -34,5 +34,5 @@ stackit load-balancer [flags] * [stackit load-balancer generate-payload](./stackit_load-balancer_generate-payload.md) - Generates a payload to create/update a Load Balancer * [stackit load-balancer list](./stackit_load-balancer_list.md) - Lists all Load Balancers * [stackit load-balancer quota](./stackit_load-balancer_quota.md) - Shows the configured Load Balancer quota -* [stackit load-balancer update](./stackit_load-balancer_update.md) - Updates a load balancer +* [stackit load-balancer update](./stackit_load-balancer_update.md) - Updates a Load Balancer diff --git a/docs/stackit_load-balancer_update.md b/docs/stackit_load-balancer_update.md index 7aa979459..b5fa0f334 100644 --- a/docs/stackit_load-balancer_update.md +++ b/docs/stackit_load-balancer_update.md @@ -1,6 +1,6 @@ ## stackit load-balancer update -Updates a load balancer +Updates a Load Balancer ### Synopsis diff --git a/internal/cmd/load-balancer/update/update.go b/internal/cmd/load-balancer/update/update.go index eb4be1efd..57bacacfd 100644 --- a/internal/cmd/load-balancer/update/update.go +++ b/internal/cmd/load-balancer/update/update.go @@ -31,7 +31,7 @@ type inputModel struct { func NewCmd(p *print.Printer) *cobra.Command { cmd := &cobra.Command{ Use: fmt.Sprintf("update %s", loadBalancerNameArg), - Short: "Updates a load balancer", + Short: "Updates a Load Balancer", Long: fmt.Sprintf("%s\n%s\n%s", "Updates a load balancer.", "The payload can be provided as a JSON string or a file path prefixed with \"@\".", From 1308ed9d9ad350fa2598b9f3b906177cbc100cf7 Mon Sep 17 00:00:00 2001 From: GokceGK <161626272+GokceGK@users.noreply.github.com> Date: Thu, 2 May 2024 09:45:57 +0200 Subject: [PATCH 08/18] Update internal/cmd/load-balancer/create/create.go MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: João Palet --- internal/cmd/load-balancer/create/create.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/cmd/load-balancer/create/create.go b/internal/cmd/load-balancer/create/create.go index 29c6d4799..d6168ae2c 100644 --- a/internal/cmd/load-balancer/create/create.go +++ b/internal/cmd/load-balancer/create/create.go @@ -55,7 +55,7 @@ func NewCmd(p *print.Printer) *cobra.Command { examples.NewExample( `Generate a payload with default values, and adapt it with custom values for the different configuration options`, `$ stackit load-balancer generate-payload > ./payload.json`, - ``, + ``, `$ stackit load-balancer create --payload @./payload.json`), ), RunE: func(cmd *cobra.Command, args []string) error { From 087b0212532de80bd5b08b6b698b9b930c17372c Mon Sep 17 00:00:00 2001 From: GokceGK <161626272+GokceGK@users.noreply.github.com> Date: Thu, 2 May 2024 09:46:17 +0200 Subject: [PATCH 09/18] Update internal/cmd/load-balancer/create/create.go MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: João Palet --- internal/cmd/load-balancer/create/create.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/cmd/load-balancer/create/create.go b/internal/cmd/load-balancer/create/create.go index d6168ae2c..a81b87b72 100644 --- a/internal/cmd/load-balancer/create/create.go +++ b/internal/cmd/load-balancer/create/create.go @@ -72,7 +72,7 @@ func NewCmd(p *print.Printer) *cobra.Command { } if !model.AssumeYes { - prompt := fmt.Sprintf("Are you sure you want to create load balancer %q?", *model.Payload.Name) + prompt := fmt.Sprintf("Are you sure you want to create a load balancer for project %q?", projectLabel) err = p.PromptForConfirmation(prompt) if err != nil { return err From a0db0376fbcc3d93c9911d558710fd45f0820342 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Go=CC=88kc=CC=A7e=20Go=CC=88k=20Klingel?= Date: Thu, 2 May 2024 09:51:31 +0200 Subject: [PATCH 10/18] add GetProjectName --- internal/cmd/load-balancer/create/create.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/internal/cmd/load-balancer/create/create.go b/internal/cmd/load-balancer/create/create.go index a81b87b72..f11cac9d6 100644 --- a/internal/cmd/load-balancer/create/create.go +++ b/internal/cmd/load-balancer/create/create.go @@ -7,6 +7,7 @@ import ( "github.com/google/uuid" + "github.com/stackitcloud/stackit-cli/internal/pkg/projectname" "github.com/stackitcloud/stackit-sdk-go/services/loadbalancer" "github.com/stackitcloud/stackit-cli/internal/pkg/args" @@ -71,6 +72,12 @@ func NewCmd(p *print.Printer) *cobra.Command { return err } + projectLabel, err := projectname.GetProjectName(ctx, p, cmd) + if err != nil { + p.Debug(print.ErrorLevel, "get project name: %v", err) + projectLabel = model.ProjectId + } + if !model.AssumeYes { prompt := fmt.Sprintf("Are you sure you want to create a load balancer for project %q?", projectLabel) err = p.PromptForConfirmation(prompt) From 6e4b4550110adb9941ba6b0e1ee65d73edd519d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Go=CC=88kc=CC=A7e=20Go=CC=88k=20Klingel?= Date: Thu, 2 May 2024 10:11:46 +0200 Subject: [PATCH 11/18] change instance name to load balancer name --- docs/stackit_load-balancer_create.md | 2 +- .../stackit_load-balancer_generate-payload.md | 6 ++--- .../generate-payload/generate_payload.go | 22 +++++++++---------- .../generate-payload/generate_payload_test.go | 10 ++++----- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/docs/stackit_load-balancer_create.md b/docs/stackit_load-balancer_create.md index 7b4f9fc6c..b685dd6e7 100644 --- a/docs/stackit_load-balancer_create.md +++ b/docs/stackit_load-balancer_create.md @@ -23,7 +23,7 @@ stackit load-balancer create [flags] Generate a payload with default values, and adapt it with custom values for the different configuration options $ stackit load-balancer generate-payload > ./payload.json - + $ stackit load-balancer create --payload @./payload.json ``` diff --git a/docs/stackit_load-balancer_generate-payload.md b/docs/stackit_load-balancer_generate-payload.md index 0f7727277..f01579eca 100644 --- a/docs/stackit_load-balancer_generate-payload.md +++ b/docs/stackit_load-balancer_generate-payload.md @@ -20,7 +20,7 @@ stackit load-balancer generate-payload [flags] $ stackit load-balancer create --payload @./payload.json Generate a payload with values of an existing load balancer, and adapt it with custom values for the different configuration options - $ stackit load-balancer generate-payload --instance-name xxx > ./payload.json + $ stackit load-balancer generate-payload --lb-name xxx > ./payload.json $ stackit load-balancer update xxx --payload @./payload.json ``` @@ -28,8 +28,8 @@ stackit load-balancer generate-payload [flags] ### Options ``` - -h, --help Help for "stackit load-balancer generate-payload" - -n, --instance-name string If set, generates the payload with the current values of the given load balancer. If unset, generates the payload with empty values + -h, --help Help for "stackit load-balancer generate-payload" + -n, --lb-name string If set, generates the payload with the current values of the given load balancer. If unset, generates the payload with empty values ``` ### Options inherited from parent commands diff --git a/internal/cmd/load-balancer/generate-payload/generate_payload.go b/internal/cmd/load-balancer/generate-payload/generate_payload.go index b45bf71cc..121d88050 100644 --- a/internal/cmd/load-balancer/generate-payload/generate_payload.go +++ b/internal/cmd/load-balancer/generate-payload/generate_payload.go @@ -19,12 +19,12 @@ import ( ) const ( - instanceNameFlag = "instance-name" + loadBalancerNameFlag = "lb-name" ) type inputModel struct { *globalflags.GlobalFlagModel - InstanceName *string + LoadBalancerName *string } var ( @@ -123,7 +123,7 @@ func NewCmd(p *print.Printer) *cobra.Command { `$ stackit load-balancer create --payload @./payload.json`), examples.NewExample( `Generate a payload with values of an existing load balancer, and adapt it with custom values for the different configuration options`, - `$ stackit load-balancer generate-payload --instance-name xxx > ./payload.json`, + `$ stackit load-balancer generate-payload --lb-name xxx > ./payload.json`, ``, `$ stackit load-balancer update xxx --payload @./payload.json`), ), @@ -140,7 +140,7 @@ func NewCmd(p *print.Printer) *cobra.Command { return err } - if model.InstanceName == nil { + if model.LoadBalancerName == nil { createPayload := DefaultCreateLoadBalancerPayload return outputCreateResult(p, &createPayload) } @@ -192,26 +192,26 @@ func NewCmd(p *print.Printer) *cobra.Command { } func configureFlags(cmd *cobra.Command) { - cmd.Flags().StringP(instanceNameFlag, "n", "", "If set, generates the payload with the current values of the given load balancer. If unset, generates the payload with empty values") + cmd.Flags().StringP(loadBalancerNameFlag, "n", "", "If set, generates the payload with the current values of the given load balancer. If unset, generates the payload with empty values") } func parseInput(p *print.Printer, cmd *cobra.Command) (*inputModel, error) { globalFlags := globalflags.Parse(p, cmd) - instanceName := flags.FlagToStringPointer(p, cmd, instanceNameFlag) - // If instanceName is provided, projectId is needed as well - if instanceName != nil && globalFlags.ProjectId == "" { + loadBalancerName := flags.FlagToStringPointer(p, cmd, loadBalancerNameFlag) + // If load balancer name is provided, projectId is needed as well + if loadBalancerName != nil && globalFlags.ProjectId == "" { return nil, &errors.ProjectIdError{} } return &inputModel{ - GlobalFlagModel: globalFlags, - InstanceName: instanceName, + GlobalFlagModel: globalFlags, + LoadBalancerName: loadBalancerName, }, nil } func buildRequest(ctx context.Context, model *inputModel, apiClient *loadbalancer.APIClient) loadbalancer.ApiGetLoadBalancerRequest { - req := apiClient.GetLoadBalancer(ctx, model.ProjectId, *model.InstanceName) + req := apiClient.GetLoadBalancer(ctx, model.ProjectId, *model.LoadBalancerName) return req } diff --git a/internal/cmd/load-balancer/generate-payload/generate_payload_test.go b/internal/cmd/load-balancer/generate-payload/generate_payload_test.go index 8f7b8459b..faddfc368 100644 --- a/internal/cmd/load-balancer/generate-payload/generate_payload_test.go +++ b/internal/cmd/load-balancer/generate-payload/generate_payload_test.go @@ -24,8 +24,8 @@ var testProjectId = uuid.NewString() func fixtureFlagValues(mods ...func(flagValues map[string]string)) map[string]string { flagValues := map[string]string{ - projectIdFlag: testProjectId, - instanceNameFlag: "example-name", + projectIdFlag: testProjectId, + loadBalancerNameFlag: "example-name", } for _, mod := range mods { mod(flagValues) @@ -39,7 +39,7 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel { ProjectId: testProjectId, Verbosity: globalflags.VerbosityDefault, }, - InstanceName: utils.Ptr("example-name"), + LoadBalancerName: utils.Ptr("example-name"), } for _, mod := range mods { mod(model) @@ -79,11 +79,11 @@ func TestParseInput(t *testing.T) { { description: "name missing", flagValues: fixtureFlagValues(func(flagValues map[string]string) { - delete(flagValues, instanceNameFlag) + delete(flagValues, loadBalancerNameFlag) }), isValid: true, expectedModel: fixtureInputModel(func(model *inputModel) { - model.InstanceName = nil + model.LoadBalancerName = nil }), }, { From 73c82fae0855151112bc71a1baf4a33219ae7079 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Go=CC=88kc=CC=A7e=20Go=CC=88k=20Klingel?= Date: Thu, 2 May 2024 11:04:26 +0200 Subject: [PATCH 12/18] set listener name to nil --- .../generate-payload/generate_payload.go | 20 +------------------ 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/internal/cmd/load-balancer/generate-payload/generate_payload.go b/internal/cmd/load-balancer/generate-payload/generate_payload.go index 121d88050..4eb0c10b0 100644 --- a/internal/cmd/load-balancer/generate-payload/generate_payload.go +++ b/internal/cmd/load-balancer/generate-payload/generate_payload.go @@ -154,25 +154,7 @@ func NewCmd(p *print.Printer) *cobra.Command { listeners := *resp.Listeners for i := range listeners { - listener := listeners[i] - listeners[i] = loadbalancer.Listener{ - DisplayName: listener.DisplayName, - Port: listener.Port, - Protocol: listener.Protocol, - TargetPool: listener.TargetPool, - } - - if listener.ServerNameIndicators != nil { - listeners[i].ServerNameIndicators = listener.ServerNameIndicators - } - - if listener.Tcp != nil { - listeners[i].Tcp = listener.Tcp - } - - if listener.Udp != nil { - listeners[i].Udp = listener.Udp - } + listeners[i].Name = nil } updatePayload := &loadbalancer.UpdateLoadBalancerPayload{ From f52ba4b86da16afc34d5af6ff97ea552e04357e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Go=CC=88kc=CC=A7e=20Go=CC=88k=20Klingel?= Date: Thu, 2 May 2024 11:42:51 +0200 Subject: [PATCH 13/18] abstract set listener name to nil in a function // add unit test --- .../generate-payload/generate_payload.go | 18 +++-- .../generate-payload/generate_payload_test.go | 65 +++++++++++++++++++ 2 files changed, 77 insertions(+), 6 deletions(-) diff --git a/internal/cmd/load-balancer/generate-payload/generate_payload.go b/internal/cmd/load-balancer/generate-payload/generate_payload.go index 4eb0c10b0..2f02defee 100644 --- a/internal/cmd/load-balancer/generate-payload/generate_payload.go +++ b/internal/cmd/load-balancer/generate-payload/generate_payload.go @@ -151,15 +151,11 @@ func NewCmd(p *print.Printer) *cobra.Command { return fmt.Errorf("read load balancer: %w", err) } - listeners := *resp.Listeners - - for i := range listeners { - listeners[i].Name = nil - } + listeners := modifyListener(resp) updatePayload := &loadbalancer.UpdateLoadBalancerPayload{ ExternalAddress: resp.ExternalAddress, - Listeners: &listeners, + Listeners: listeners, Name: resp.Name, Networks: resp.Networks, Options: resp.Options, @@ -216,3 +212,13 @@ func outputUpdateResult(p *print.Printer, payload *loadbalancer.UpdateLoadBalanc return nil } + +func modifyListener(resp *loadbalancer.LoadBalancer) *[]loadbalancer.Listener { + listeners := *resp.Listeners + + for i := range listeners { + listeners[i].Name = nil + } + + return &listeners +} diff --git a/internal/cmd/load-balancer/generate-payload/generate_payload_test.go b/internal/cmd/load-balancer/generate-payload/generate_payload_test.go index faddfc368..40295f3a0 100644 --- a/internal/cmd/load-balancer/generate-payload/generate_payload_test.go +++ b/internal/cmd/load-balancer/generate-payload/generate_payload_test.go @@ -190,3 +190,68 @@ func TestBuildRequest(t *testing.T) { }) } } + +func TestToModifyListeners(t *testing.T) { + tests := []struct { + description string + response *loadbalancer.LoadBalancer + expected *[]loadbalancer.Listener + }{ + { + description: "base", + response: &loadbalancer.LoadBalancer{ + Listeners: &[]loadbalancer.Listener{ + { + DisplayName: utils.Ptr(""), + Port: utils.Ptr(int64(0)), + Protocol: utils.Ptr(""), + Name: utils.Ptr(""), + ServerNameIndicators: &[]loadbalancer.ServerNameIndicator{ + { + Name: utils.Ptr(""), + }, + }, + TargetPool: utils.Ptr(""), + Tcp: &loadbalancer.OptionsTCP{ + IdleTimeout: utils.Ptr(""), + }, + Udp: &loadbalancer.OptionsUDP{ + IdleTimeout: utils.Ptr(""), + }, + }, + }, + }, + expected: &[]loadbalancer.Listener{ + { + DisplayName: utils.Ptr(""), + Port: utils.Ptr(int64(0)), + Protocol: utils.Ptr(""), + Name: nil, + ServerNameIndicators: &[]loadbalancer.ServerNameIndicator{ + { + Name: utils.Ptr(""), + }, + }, + TargetPool: utils.Ptr(""), + Tcp: &loadbalancer.OptionsTCP{ + IdleTimeout: utils.Ptr(""), + }, + Udp: &loadbalancer.OptionsUDP{ + IdleTimeout: utils.Ptr(""), + }, + }, + }, + }, + } + + for _, tt := range tests { + t.Run(tt.description, func(t *testing.T) { + output := modifyListener(tt.response) + + diff := cmp.Diff(output, tt.expected) + if diff != "" { + t.Errorf("expected output to be %+v, got %+v", tt.expected, output) + } + }) + } +} From 9cf74c9e7fcb7352f47a47510472d1a74921b2ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Go=CC=88kc=CC=A7e=20Go=CC=88k=20Klingel?= Date: Thu, 2 May 2024 11:53:33 +0200 Subject: [PATCH 14/18] add debug logs to the create command --- internal/cmd/load-balancer/create/create.go | 15 +++++++++++++-- internal/cmd/load-balancer/create/create_test.go | 6 ++++-- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/internal/cmd/load-balancer/create/create.go b/internal/cmd/load-balancer/create/create.go index f11cac9d6..324948fff 100644 --- a/internal/cmd/load-balancer/create/create.go +++ b/internal/cmd/load-balancer/create/create.go @@ -139,10 +139,21 @@ func parseInput(p *print.Printer, cmd *cobra.Command) (*inputModel, error) { } } - return &inputModel{ + model := inputModel{ GlobalFlagModel: globalFlags, Payload: payload, - }, nil + } + + if p.IsVerbosityDebug() { + modelStr, err := print.BuildDebugStrFromInputModel(model) + if err != nil { + p.Debug(print.ErrorLevel, "convert model to string for debugging: %v", err) + } else { + p.Debug(print.DebugLevel, "parsed input values: %s", modelStr) + } + } + + return &model, nil } func buildRequest(ctx context.Context, model *inputModel, apiClient *loadbalancer.APIClient) loadbalancer.ApiCreateLoadBalancerRequest { diff --git a/internal/cmd/load-balancer/create/create_test.go b/internal/cmd/load-balancer/create/create_test.go index b325dedeb..09dae8cc1 100644 --- a/internal/cmd/load-balancer/create/create_test.go +++ b/internal/cmd/load-balancer/create/create_test.go @@ -7,6 +7,7 @@ import ( "github.com/stackitcloud/stackit-sdk-go/services/loadbalancer" "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/google/go-cmp/cmp" @@ -269,7 +270,8 @@ func TestParseInput(t *testing.T) { for _, tt := range tests { t.Run(tt.description, func(t *testing.T) { - cmd := NewCmd(nil) + p := print.NewPrinter() + cmd := NewCmd(p) err := globalflags.Configure(cmd.Flags()) if err != nil { t.Fatalf("configure global flags: %v", err) @@ -301,7 +303,7 @@ func TestParseInput(t *testing.T) { t.Fatalf("error validating flags: %v", err) } - model, err := parseInput(nil, cmd) + model, err := parseInput(p, cmd) if err != nil { if !tt.isValid { return From a266f86d1f5a540b061bdec1ea93720451b96e80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Go=CC=88kc=CC=A7e=20Go=CC=88k=20Klingel?= Date: Thu, 2 May 2024 11:57:26 +0200 Subject: [PATCH 15/18] add debug logs to the generate payload command --- .../generate-payload/generate_payload.go | 15 +++++++++++++-- .../generate-payload/generate_payload_test.go | 6 ++++-- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/internal/cmd/load-balancer/generate-payload/generate_payload.go b/internal/cmd/load-balancer/generate-payload/generate_payload.go index 2f02defee..6275ba819 100644 --- a/internal/cmd/load-balancer/generate-payload/generate_payload.go +++ b/internal/cmd/load-balancer/generate-payload/generate_payload.go @@ -182,10 +182,21 @@ func parseInput(p *print.Printer, cmd *cobra.Command) (*inputModel, error) { return nil, &errors.ProjectIdError{} } - return &inputModel{ + model := inputModel{ GlobalFlagModel: globalFlags, LoadBalancerName: loadBalancerName, - }, nil + } + + if p.IsVerbosityDebug() { + modelStr, err := print.BuildDebugStrFromInputModel(model) + if err != nil { + p.Debug(print.ErrorLevel, "convert model to string for debugging: %v", err) + } else { + p.Debug(print.DebugLevel, "parsed input values: %s", modelStr) + } + } + + return &model, nil } func buildRequest(ctx context.Context, model *inputModel, apiClient *loadbalancer.APIClient) loadbalancer.ApiGetLoadBalancerRequest { diff --git a/internal/cmd/load-balancer/generate-payload/generate_payload_test.go b/internal/cmd/load-balancer/generate-payload/generate_payload_test.go index 40295f3a0..d77709b04 100644 --- a/internal/cmd/load-balancer/generate-payload/generate_payload_test.go +++ b/internal/cmd/load-balancer/generate-payload/generate_payload_test.go @@ -5,6 +5,7 @@ import ( "testing" "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/google/go-cmp/cmp" @@ -111,7 +112,8 @@ func TestParseInput(t *testing.T) { for _, tt := range tests { t.Run(tt.description, func(t *testing.T) { - cmd := NewCmd(nil) + p := print.NewPrinter() + cmd := NewCmd(p) err := globalflags.Configure(cmd.Flags()) if err != nil { t.Fatalf("configure global flags: %v", err) @@ -143,7 +145,7 @@ func TestParseInput(t *testing.T) { t.Fatalf("error validating flags: %v", err) } - model, err := parseInput(nil, cmd) + model, err := parseInput(p, cmd) if err != nil { if !tt.isValid { return From 40bbfb9cbe8e864421b2b17afab8fd237bb03aad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Go=CC=88kc=CC=A7e=20Go=CC=88k=20Klingel?= Date: Thu, 2 May 2024 11:57:38 +0200 Subject: [PATCH 16/18] add debug logs to the update command --- internal/cmd/load-balancer/update/update.go | 15 +++++++++++++-- internal/cmd/load-balancer/update/update_test.go | 6 ++++-- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/internal/cmd/load-balancer/update/update.go b/internal/cmd/load-balancer/update/update.go index 57bacacfd..d1fa791c9 100644 --- a/internal/cmd/load-balancer/update/update.go +++ b/internal/cmd/load-balancer/update/update.go @@ -110,11 +110,22 @@ func parseInput(p *print.Printer, cmd *cobra.Command, inputArgs []string) (*inpu return nil, fmt.Errorf("encode payload: %w", err) } - return &inputModel{ + model := inputModel{ GlobalFlagModel: globalFlags, LoadBalancerName: loadBalancerName, Payload: payload, - }, nil + } + + if p.IsVerbosityDebug() { + modelStr, err := print.BuildDebugStrFromInputModel(model) + if err != nil { + p.Debug(print.ErrorLevel, "convert model to string for debugging: %v", err) + } else { + p.Debug(print.DebugLevel, "parsed input values: %s", modelStr) + } + } + + return &model, nil } func buildRequest(ctx context.Context, model *inputModel, apiClient *loadbalancer.APIClient) loadbalancer.ApiUpdateLoadBalancerRequest { diff --git a/internal/cmd/load-balancer/update/update_test.go b/internal/cmd/load-balancer/update/update_test.go index 504e39160..ea03f5932 100644 --- a/internal/cmd/load-balancer/update/update_test.go +++ b/internal/cmd/load-balancer/update/update_test.go @@ -5,6 +5,7 @@ import ( "testing" "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/google/go-cmp/cmp" @@ -294,7 +295,8 @@ func TestParseInput(t *testing.T) { for _, tt := range tests { t.Run(tt.description, func(t *testing.T) { - cmd := NewCmd(nil) + p := print.NewPrinter() + cmd := NewCmd(p) err := globalflags.Configure(cmd.Flags()) if err != nil { t.Fatalf("configure global flags: %v", err) @@ -326,7 +328,7 @@ func TestParseInput(t *testing.T) { t.Fatalf("error validating flags: %v", err) } - model, err := parseInput(nil, cmd, tt.argValues) + model, err := parseInput(p, cmd, tt.argValues) if err != nil { if !tt.isValid { return From 4c4c0be1f7ecca1619d0c58122922f5ef54cb3fb Mon Sep 17 00:00:00 2001 From: GokceGK <161626272+GokceGK@users.noreply.github.com> Date: Fri, 3 May 2024 08:34:09 +0200 Subject: [PATCH 17/18] Update test func name MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: João Palet --- .../cmd/load-balancer/generate-payload/generate_payload_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/cmd/load-balancer/generate-payload/generate_payload_test.go b/internal/cmd/load-balancer/generate-payload/generate_payload_test.go index d77709b04..b8f357dd8 100644 --- a/internal/cmd/load-balancer/generate-payload/generate_payload_test.go +++ b/internal/cmd/load-balancer/generate-payload/generate_payload_test.go @@ -193,7 +193,7 @@ func TestBuildRequest(t *testing.T) { } } -func TestToModifyListeners(t *testing.T) { +func TestModifyListeners(t *testing.T) { tests := []struct { description string response *loadbalancer.LoadBalancer From a4f340aab9c7d5701addc736b8902df072db4d1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Go=CC=88kc=CC=A7e=20Go=CC=88k=20Klingel?= Date: Fri, 3 May 2024 08:37:57 +0200 Subject: [PATCH 18/18] add additional listener to the unit test --- .../generate-payload/generate_payload_test.go | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/internal/cmd/load-balancer/generate-payload/generate_payload_test.go b/internal/cmd/load-balancer/generate-payload/generate_payload_test.go index b8f357dd8..a1661d545 100644 --- a/internal/cmd/load-balancer/generate-payload/generate_payload_test.go +++ b/internal/cmd/load-balancer/generate-payload/generate_payload_test.go @@ -221,6 +221,24 @@ func TestModifyListeners(t *testing.T) { IdleTimeout: utils.Ptr(""), }, }, + { + DisplayName: utils.Ptr(""), + Port: utils.Ptr(int64(0)), + Protocol: utils.Ptr(""), + Name: utils.Ptr(""), + ServerNameIndicators: &[]loadbalancer.ServerNameIndicator{ + { + Name: utils.Ptr(""), + }, + }, + TargetPool: utils.Ptr(""), + Tcp: &loadbalancer.OptionsTCP{ + IdleTimeout: utils.Ptr(""), + }, + Udp: &loadbalancer.OptionsUDP{ + IdleTimeout: utils.Ptr(""), + }, + }, }, }, expected: &[]loadbalancer.Listener{ @@ -242,6 +260,24 @@ func TestModifyListeners(t *testing.T) { IdleTimeout: utils.Ptr(""), }, }, + { + DisplayName: utils.Ptr(""), + Port: utils.Ptr(int64(0)), + Protocol: utils.Ptr(""), + Name: nil, + ServerNameIndicators: &[]loadbalancer.ServerNameIndicator{ + { + Name: utils.Ptr(""), + }, + }, + TargetPool: utils.Ptr(""), + Tcp: &loadbalancer.OptionsTCP{ + IdleTimeout: utils.Ptr(""), + }, + Udp: &loadbalancer.OptionsUDP{ + IdleTimeout: utils.Ptr(""), + }, + }, }, }, }