Skip to content

Commit deb09db

Browse files
j1n-o9rj1n-o9r
committed
fix(load-balancer): start migration
1 parent b2baf90 commit deb09db

37 files changed

Lines changed: 72 additions & 72 deletions

‎go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -265,14 +265,14 @@ require (
265265
github.com/spf13/afero v1.15.0 // indirect
266266
github.com/spf13/cast v1.10.0 // indirect
267267
github.com/stackitcloud/stackit-sdk-go/services/kms v1.3.2
268-
github.com/stackitcloud/stackit-sdk-go/services/loadbalancer v1.8.0
268+
github.com/stackitcloud/stackit-sdk-go/services/loadbalancer v1.14.0
269269
github.com/stackitcloud/stackit-sdk-go/services/logme v0.25.6
270270
github.com/stackitcloud/stackit-sdk-go/services/mariadb v0.25.6
271271
github.com/stackitcloud/stackit-sdk-go/services/objectstorage v1.7.0
272272
github.com/stackitcloud/stackit-sdk-go/services/observability v0.17.0
273273
github.com/stackitcloud/stackit-sdk-go/services/rabbitmq v0.26.0
274274
github.com/stackitcloud/stackit-sdk-go/services/redis v0.25.6
275-
github.com/stackitcloud/stackit-sdk-go/services/sfs v0.9.0
275+
github.com/stackitcloud/stackit-sdk-go/services/sfs v0.11.0
276276
github.com/subosito/gotenv v1.6.0 // indirect
277277
golang.org/x/sys v0.43.0 // indirect
278278
gopkg.in/yaml.v3 v3.0.1 // indirect

‎go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -614,8 +614,8 @@ github.com/stackitcloud/stackit-sdk-go/services/intake v0.7.1 h1:7ZSrwps/zI41rl+
614614
github.com/stackitcloud/stackit-sdk-go/services/intake v0.7.1/go.mod h1:ZIvwBZwEMFO+YfJLCNXqabslI0Fp9zxV7ZBwlZjk7uE=
615615
github.com/stackitcloud/stackit-sdk-go/services/kms v1.3.2 h1:2ulSL2IkIAKND59eAjbEhVkOoBMyvm48ojwz1a3t0U0=
616616
github.com/stackitcloud/stackit-sdk-go/services/kms v1.3.2/go.mod h1:cuIaMMiHeHQsbvy7BOFMutoV3QtN+ZBx7Tg3GmYUw7s=
617-
github.com/stackitcloud/stackit-sdk-go/services/loadbalancer v1.8.0 h1:DxrN85V738CRLynu6MULQHO+OXyYnkhVPgoZKULfFIs=
618-
github.com/stackitcloud/stackit-sdk-go/services/loadbalancer v1.8.0/go.mod h1:ClPE4TOM1FeaJiwTXvApq4gWaSgTLq6nU3PPHAIQDN4=
617+
github.com/stackitcloud/stackit-sdk-go/services/loadbalancer v1.14.0 h1:1dvL7tX91ziklayQmOupniE3jM4D5Nbtc0auNcx2p18=
618+
github.com/stackitcloud/stackit-sdk-go/services/loadbalancer v1.14.0/go.mod h1:+Ld3dn648I+YKcBV3fEkYpDSr3fel421+LurJGywSBs=
619619
github.com/stackitcloud/stackit-sdk-go/services/logme v0.25.6 h1:4x30lC+YBmo7XpsAzTn0W+C/oP5flnLVgIh5u3O/P0o=
620620
github.com/stackitcloud/stackit-sdk-go/services/logme v0.25.6/go.mod h1:ewaYUiZcBTSS6urE5zEJBPCqxu70w2IjnBHCvnKdFKE=
621621
github.com/stackitcloud/stackit-sdk-go/services/logs v0.5.2 h1:vr4atxFRT+EL+DqONMT5R44f7AzEMbePa9U7PEE0THU=
@@ -650,8 +650,8 @@ github.com/stackitcloud/stackit-sdk-go/services/serviceaccount v0.12.0 h1:l1EDIl
650650
github.com/stackitcloud/stackit-sdk-go/services/serviceaccount v0.12.0/go.mod h1:EXq8/J7t9p8zPmdIq+atuxyAbnQwxrQT18fI+Qpv98k=
651651
github.com/stackitcloud/stackit-sdk-go/services/serviceenablement v1.2.7 h1:M2PYLF8k3zmAwYWSKfUiCTNTXr7ROGuJganVVEQA3YI=
652652
github.com/stackitcloud/stackit-sdk-go/services/serviceenablement v1.2.7/go.mod h1:jitkQuP2K/SH63Qor0C4pcqz1GDCy/lK2H4t8/VDse4=
653-
github.com/stackitcloud/stackit-sdk-go/services/sfs v0.9.0 h1:JWAFnskRbNKT8x62pZcAMCC+p5hyTEkAyxqFwy39jFA=
654-
github.com/stackitcloud/stackit-sdk-go/services/sfs v0.9.0/go.mod h1:jMlBoXqrPNX5nXbo6oT7exalqilw1jiLPoIp4Cn0CdI=
653+
github.com/stackitcloud/stackit-sdk-go/services/sfs v0.11.0 h1:YhQ2GF+AyHVUps1iEjLj7z6OlzBzMGyD5nwHaZ0pXus=
654+
github.com/stackitcloud/stackit-sdk-go/services/sfs v0.11.0/go.mod h1:jMlBoXqrPNX5nXbo6oT7exalqilw1jiLPoIp4Cn0CdI=
655655
github.com/stackitcloud/stackit-sdk-go/services/ske v1.11.0 h1:QoKyQPe8FqDqJLNgE5uRlZ/y1c1GUxjV1DDLu5QEBD8=
656656
github.com/stackitcloud/stackit-sdk-go/services/ske v1.11.0/go.mod h1:KhVYCR58wETqdI7Quwhe3OR3BhB2T/b7DzaMsfDnr8g=
657657
github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex v1.4.3 h1:AQrcr+qeIuZob+3TT2q1L4WOPtpsu5SEpkTnOUHDqfE=

‎internal/cmd/load-balancer/create/create.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import (
99

1010
"github.com/google/uuid"
1111
"github.com/spf13/cobra"
12-
"github.com/stackitcloud/stackit-sdk-go/services/loadbalancer"
13-
"github.com/stackitcloud/stackit-sdk-go/services/loadbalancer/wait"
12+
loadbalancer "github.com/stackitcloud/stackit-sdk-go/services/loadbalancer/v2api"
13+
"github.com/stackitcloud/stackit-sdk-go/services/loadbalancer/v2api/wait"
1414

1515
"github.com/stackitcloud/stackit-cli/internal/pkg/args"
1616
"github.com/stackitcloud/stackit-cli/internal/pkg/errors"
@@ -95,7 +95,7 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
9595
// Wait for async operation, if async mode not enabled
9696
if !model.Async {
9797
err := spinner.Run(params.Printer, "Creating load balancer", func() error {
98-
_, err = wait.CreateLoadBalancerWaitHandler(ctx, apiClient, model.ProjectId, model.Region, *model.Payload.Name).WaitWithContext(ctx)
98+
_, err = wait.CreateLoadBalancerWaitHandler(ctx, apiClient.DefaultAPI, model.ProjectId, model.Region, *model.Payload.Name).WaitWithContext(ctx)
9999
return err
100100
})
101101
if err != nil {
@@ -148,7 +148,7 @@ func parseInput(p *print.Printer, cmd *cobra.Command, _ []string) (*inputModel,
148148
}
149149

150150
func buildRequest(ctx context.Context, model *inputModel, apiClient *loadbalancer.APIClient) loadbalancer.ApiCreateLoadBalancerRequest {
151-
req := apiClient.CreateLoadBalancer(ctx, model.ProjectId, model.Region)
151+
req := apiClient.DefaultAPI.CreateLoadBalancer(ctx, model.ProjectId, model.Region)
152152
req = req.CreateLoadBalancerPayload(*model.Payload)
153153
req = req.XRequestID(xRequestId)
154154
return req

‎internal/cmd/load-balancer/create/create_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"context"
55
"testing"
66

7-
"github.com/stackitcloud/stackit-sdk-go/services/loadbalancer"
7+
loadbalancer "github.com/stackitcloud/stackit-sdk-go/services/loadbalancer/v2api"
88

99
"github.com/stackitcloud/stackit-cli/internal/pkg/globalflags"
1010
"github.com/stackitcloud/stackit-cli/internal/pkg/testutils"

‎internal/cmd/load-balancer/delete/delete.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ import (
1515
"github.com/stackitcloud/stackit-cli/internal/pkg/spinner"
1616

1717
"github.com/spf13/cobra"
18-
"github.com/stackitcloud/stackit-sdk-go/services/loadbalancer"
19-
"github.com/stackitcloud/stackit-sdk-go/services/loadbalancer/wait"
18+
loadbalancer "github.com/stackitcloud/stackit-sdk-go/services/loadbalancer/v2api"
19+
"github.com/stackitcloud/stackit-sdk-go/services/loadbalancer/v2api/wait"
2020
)
2121

2222
const (
@@ -67,7 +67,7 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
6767
// Wait for async operation, if async mode not enabled
6868
if !model.Async {
6969
err := spinner.Run(params.Printer, "Deleting load balancer", func() error {
70-
_, err = wait.DeleteLoadBalancerWaitHandler(ctx, apiClient, model.ProjectId, model.Region, model.LoadBalancerName).WaitWithContext(ctx)
70+
_, err = wait.DeleteLoadBalancerWaitHandler(ctx, apiClient.DefaultAPI, model.ProjectId, model.Region, model.LoadBalancerName).WaitWithContext(ctx)
7171
return err
7272
})
7373
if err != nil {
@@ -104,6 +104,6 @@ func parseInput(p *print.Printer, cmd *cobra.Command, inputArgs []string) (*inpu
104104
}
105105

106106
func buildRequest(ctx context.Context, model *inputModel, apiClient *loadbalancer.APIClient) loadbalancer.ApiDeleteLoadBalancerRequest {
107-
req := apiClient.DeleteLoadBalancer(ctx, model.ProjectId, model.Region, model.LoadBalancerName)
107+
req := apiClient.DefaultAPI.DeleteLoadBalancer(ctx, model.ProjectId, model.Region, model.LoadBalancerName)
108108
return req
109109
}

‎internal/cmd/load-balancer/delete/delete_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"github.com/google/go-cmp/cmp"
1111
"github.com/google/go-cmp/cmp/cmpopts"
1212
"github.com/google/uuid"
13-
"github.com/stackitcloud/stackit-sdk-go/services/loadbalancer"
13+
loadbalancer "github.com/stackitcloud/stackit-sdk-go/services/loadbalancer/v2api"
1414
)
1515

1616
const (

‎internal/cmd/load-balancer/describe/describe.go‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import (
1717
"github.com/stackitcloud/stackit-cli/internal/pkg/utils"
1818

1919
"github.com/spf13/cobra"
20-
"github.com/stackitcloud/stackit-sdk-go/services/loadbalancer"
20+
loadbalancer "github.com/stackitcloud/stackit-sdk-go/services/loadbalancer/v2api"
2121
)
2222

2323
const (
@@ -86,7 +86,7 @@ func parseInput(p *print.Printer, cmd *cobra.Command, inputArgs []string) (*inpu
8686
}
8787

8888
func buildRequest(ctx context.Context, model *inputModel, apiClient *loadbalancer.APIClient) loadbalancer.ApiGetLoadBalancerRequest {
89-
req := apiClient.GetLoadBalancer(ctx, model.ProjectId, model.Region, model.LoadBalancerName)
89+
req := apiClient.DefaultAPI.GetLoadBalancer(ctx, model.ProjectId, model.Region, model.LoadBalancerName)
9090
return req
9191
}
9292

@@ -100,10 +100,10 @@ func outputResult(p *print.Printer, outputFormat string, loadBalancer *loadbalan
100100
content = append(content, buildLoadBalancerTable(loadBalancer))
101101

102102
if loadBalancer.Listeners != nil {
103-
content = append(content, buildListenersTable(*loadBalancer.Listeners))
103+
content = append(content, buildListenersTable(loadBalancer.Listeners))
104104
}
105105
if loadBalancer.TargetPools != nil {
106-
content = append(content, buildTargetPoolsTable(*loadBalancer.TargetPools))
106+
content = append(content, buildTargetPoolsTable(loadBalancer.TargetPools))
107107
}
108108

109109
err := tables.DisplayTables(p, content)
@@ -120,7 +120,7 @@ func buildLoadBalancerTable(loadBalancer *loadbalancer.LoadBalancer) tables.Tabl
120120
privateAccessOnly := false
121121
if loadBalancer.Options != nil {
122122
if loadBalancer.Options.AccessControl != nil && loadBalancer.Options.AccessControl.AllowedSourceRanges != nil {
123-
acl = *loadBalancer.Options.AccessControl.AllowedSourceRanges
123+
acl = loadBalancer.Options.AccessControl.AllowedSourceRanges
124124
}
125125

126126
if loadBalancer.Options.PrivateNetworkOnly != nil {
@@ -129,16 +129,16 @@ func buildLoadBalancerTable(loadBalancer *loadbalancer.LoadBalancer) tables.Tabl
129129
}
130130

131131
networkId := "-"
132-
if loadBalancer.Networks != nil && len(*loadBalancer.Networks) > 0 {
133-
networks := *loadBalancer.Networks
132+
if loadBalancer.Networks != nil && len(loadBalancer.Networks) > 0 {
133+
networks := loadBalancer.Networks
134134
networkId = *networks[0].NetworkId
135135
}
136136

137137
externalAddress := utils.PtrStringDefault(loadBalancer.ExternalAddress, "-")
138138

139-
errorDescriptions := []string{}
140-
if loadBalancer.Errors != nil && len((*loadBalancer.Errors)) > 0 {
141-
for _, err := range *loadBalancer.Errors {
139+
var errorDescriptions []string
140+
if loadBalancer.Errors != nil && len(loadBalancer.Errors) > 0 {
141+
for _, err := range loadBalancer.Errors {
142142
errorDescriptions = append(errorDescriptions, *err.Description)
143143
}
144144
}
@@ -184,7 +184,7 @@ func buildTargetPoolsTable(targetPools []loadbalancer.TargetPool) tables.Table {
184184
table.SetTitle("Target Pools")
185185
table.SetHeader("NAME", "PORT", "TARGETS")
186186
for _, targetPool := range targetPools {
187-
table.AddRow(utils.PtrString(targetPool.Name), utils.PtrString(targetPool.TargetPort), len(*targetPool.Targets))
187+
table.AddRow(utils.PtrString(targetPool.Name), utils.PtrString(targetPool.TargetPort), len(targetPool.Targets))
188188
}
189189
return table
190190
}

‎internal/cmd/load-balancer/describe/describe_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"github.com/google/go-cmp/cmp"
88
"github.com/google/go-cmp/cmp/cmpopts"
99
"github.com/google/uuid"
10-
"github.com/stackitcloud/stackit-sdk-go/services/loadbalancer"
10+
loadbalancer "github.com/stackitcloud/stackit-sdk-go/services/loadbalancer/v2api"
1111

1212
"github.com/stackitcloud/stackit-cli/internal/pkg/testparams"
1313

‎internal/cmd/load-balancer/generate-payload/generate_payload.go‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77

88
"github.com/stackitcloud/stackit-cli/internal/pkg/types"
99

10-
"github.com/stackitcloud/stackit-sdk-go/services/loadbalancer"
10+
loadbalancer "github.com/stackitcloud/stackit-sdk-go/services/loadbalancer/v2api"
1111

1212
"github.com/stackitcloud/stackit-cli/internal/pkg/args"
1313
"github.com/stackitcloud/stackit-cli/internal/pkg/errors"
@@ -36,9 +36,9 @@ type inputModel struct {
3636
var (
3737
defaultPayloadListener = &loadbalancer.Listener{
3838
DisplayName: utils.Ptr(""),
39-
Port: utils.Ptr(int64(0)),
39+
Port: utils.Ptr(int32(0)),
4040
Protocol: loadbalancer.ListenerProtocol("").Ptr(),
41-
ServerNameIndicators: &[]loadbalancer.ServerNameIndicator{
41+
ServerNameIndicators: []loadbalancer.ServerNameIndicator{
4242
{
4343
Name: utils.Ptr(""),
4444
},
@@ -59,18 +59,18 @@ var (
5959

6060
defaultPayloadTargetPool = &loadbalancer.TargetPool{
6161
ActiveHealthCheck: &loadbalancer.ActiveHealthCheck{
62-
HealthyThreshold: utils.Ptr(int64(0)),
62+
HealthyThreshold: utils.Ptr(int32(0)),
6363
Interval: utils.Ptr(""),
6464
IntervalJitter: utils.Ptr(""),
6565
Timeout: utils.Ptr(""),
66-
UnhealthyThreshold: utils.Ptr(int64(0)),
66+
UnhealthyThreshold: utils.Ptr(int32(0)),
6767
},
6868
Name: utils.Ptr(""),
6969
SessionPersistence: &loadbalancer.SessionPersistence{
7070
UseSourceIpAddress: utils.Ptr(false),
7171
},
72-
TargetPort: utils.Ptr(int64(0)),
73-
Targets: &[]loadbalancer.Target{
72+
TargetPort: utils.Ptr(int32(0)),
73+
Targets: []loadbalancer.Target{
7474
{
7575
DisplayName: utils.Ptr(""),
7676
Ip: utils.Ptr(""),
@@ -80,16 +80,16 @@ var (
8080

8181
DefaultCreateLoadBalancerPayload = loadbalancer.CreateLoadBalancerPayload{
8282
ExternalAddress: utils.Ptr(""),
83-
Listeners: &[]loadbalancer.Listener{
83+
Listeners: []loadbalancer.Listener{
8484
*defaultPayloadListener,
8585
},
8686
Name: utils.Ptr(""),
87-
Networks: &[]loadbalancer.Network{
87+
Networks: []loadbalancer.Network{
8888
*defaultPayloadNetwork,
8989
},
9090
Options: &loadbalancer.LoadBalancerOptions{
9191
AccessControl: &loadbalancer.LoadbalancerOptionAccessControl{
92-
AllowedSourceRanges: &[]string{
92+
AllowedSourceRanges: []string{
9393
"",
9494
},
9595
},
@@ -106,7 +106,7 @@ var (
106106
},
107107
PrivateNetworkOnly: utils.Ptr(false),
108108
},
109-
TargetPools: &[]loadbalancer.TargetPool{
109+
TargetPools: []loadbalancer.TargetPool{
110110
*defaultPayloadTargetPool,
111111
},
112112
}
@@ -203,7 +203,7 @@ func parseInput(p *print.Printer, cmd *cobra.Command, _ []string) (*inputModel,
203203
}
204204

205205
func buildRequest(ctx context.Context, model *inputModel, apiClient *loadbalancer.APIClient) loadbalancer.ApiGetLoadBalancerRequest {
206-
req := apiClient.GetLoadBalancer(ctx, model.ProjectId, model.Region, *model.LoadBalancerName)
206+
req := apiClient.DefaultAPI.GetLoadBalancer(ctx, model.ProjectId, model.Region, *model.LoadBalancerName)
207207
return req
208208
}
209209

@@ -249,12 +249,12 @@ func outputUpdateResult(p *print.Printer, filePath *string, payload *loadbalance
249249
return nil
250250
}
251251

252-
func modifyListener(resp *loadbalancer.LoadBalancer) *[]loadbalancer.Listener {
253-
listeners := *resp.Listeners
252+
func modifyListener(resp *loadbalancer.LoadBalancer) []loadbalancer.Listener {
253+
listeners := resp.Listeners
254254

255255
for i := range listeners {
256256
listeners[i].Name = nil
257257
}
258258

259-
return &listeners
259+
return listeners
260260
}

‎internal/cmd/load-balancer/generate-payload/generate_payload_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"github.com/google/go-cmp/cmp"
1010
"github.com/google/go-cmp/cmp/cmpopts"
1111
"github.com/google/uuid"
12-
"github.com/stackitcloud/stackit-sdk-go/services/loadbalancer"
12+
loadbalancer "github.com/stackitcloud/stackit-sdk-go/services/loadbalancer/v2api"
1313

1414
"github.com/stackitcloud/stackit-cli/internal/pkg/globalflags"
1515
"github.com/stackitcloud/stackit-cli/internal/pkg/testutils"

0 commit comments

Comments
 (0)