Skip to content

Commit df7f107

Browse files
ske-renovate-ce[bot]breuerfelix
ske-renovate-ce[bot]
and
breuerfelix
authored
Update module github.com/stackitcloud/stackit-sdk-go/services/iaas to v1.7.0 (#135)
* Update module github.com/stackitcloud/stackit-sdk-go/services/iaas to v1.7.0 * use new iaas default api Signed-off-by: Felix Breuer <f.breuer94@gmail.com> --------- Signed-off-by: Felix Breuer <f.breuer94@gmail.com> Co-authored-by: ske-renovate-ce[bot] <163154779+ske-renovate-ce[bot]@users.noreply.github.com> Co-authored-by: Felix Breuer <f.breuer94@gmail.com>
1 parent df41798 commit df7f107

File tree

5 files changed

+37
-46
lines changed

5 files changed

+37
-46
lines changed

‎go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ require (
77
github.com/onsi/ginkgo/v2 v2.28.1
88
github.com/onsi/gomega v1.39.1
99
github.com/spf13/pflag v1.0.10
10-
github.com/stackitcloud/stackit-sdk-go/core v0.22.0
11-
github.com/stackitcloud/stackit-sdk-go/services/iaas v1.3.5
10+
github.com/stackitcloud/stackit-sdk-go/core v0.23.0
11+
github.com/stackitcloud/stackit-sdk-go/services/iaas v1.7.0
1212
k8s.io/api v0.35.3
1313
k8s.io/apimachinery v0.35.3
1414
k8s.io/component-base v0.35.3

‎go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,10 +107,10 @@ github.com/spf13/cobra v1.10.0/go.mod h1:9dhySC7dnTtEiqzmqfkLj47BslqLCUPMXjG2lj/
107107
github.com/spf13/pflag v1.0.8/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
108108
github.com/spf13/pflag v1.0.10 h1:4EBh2KAYBwaONj6b2Ye1GiHfwjqyROoF4RwYO+vPwFk=
109109
github.com/spf13/pflag v1.0.10/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
110-
github.com/stackitcloud/stackit-sdk-go/core v0.22.0 h1:6rViz7GnNwXSh51Lur5xuDzO8EWSZfN9J0HvEkBKq6c=
111-
github.com/stackitcloud/stackit-sdk-go/core v0.22.0/go.mod h1:osMglDby4csGZ5sIfhNyYq1bS1TxIdPY88+skE/kkmI=
112-
github.com/stackitcloud/stackit-sdk-go/services/iaas v1.3.5 h1:W57+XRa8wTLsi5CV9Tqa7mGgt/PvlRM//RurXSmvII8=
113-
github.com/stackitcloud/stackit-sdk-go/services/iaas v1.3.5/go.mod h1:lTWjW57eAq1bwfM6nsNinhoBr3MHFW/GaFasdAsYfDM=
110+
github.com/stackitcloud/stackit-sdk-go/core v0.23.0 h1:zPrOhf3Xe47rKRs1fg/AqKYUiJJRYjdcv+3qsS50mEs=
111+
github.com/stackitcloud/stackit-sdk-go/core v0.23.0/go.mod h1:osMglDby4csGZ5sIfhNyYq1bS1TxIdPY88+skE/kkmI=
112+
github.com/stackitcloud/stackit-sdk-go/services/iaas v1.7.0 h1:WyOC7tEazOPF9PwlExsycYvhm2l9OcjGQfZHDAckVIc=
113+
github.com/stackitcloud/stackit-sdk-go/services/iaas v1.7.0/go.mod h1:78hDXs5sEokK2sAaBSn79kodytszmDYEAuMS56kPHIw=
114114
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
115115
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
116116
github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=

‎pkg/client/helper.go‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,14 @@ func convertLabelsToSDK(labels map[string]string) map[string]any {
1313
return result
1414
}
1515

16-
// convertLabelsFromSDK converts *map[string]any from SDK to map[string]string
17-
//
18-
//nolint:gocritic // SDK requires *map
19-
func convertLabelsFromSDK(labels *map[string]any) map[string]string {
16+
// convertLabelsFromSDK converts map[string]any from SDK to map[string]string
17+
func convertLabelsFromSDK(labels map[string]any) map[string]string {
2018
if labels == nil {
2119
return nil
2220
}
2321

24-
result := make(map[string]string, len(*labels))
25-
for k, v := range *labels {
22+
result := make(map[string]string, len(labels))
23+
for k, v := range labels {
2624
if strVal, ok := v.(string); ok {
2725
result[k] = strVal
2826
}

‎pkg/client/sdk.go‎

Lines changed: 23 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99

1010
"github.com/stackitcloud/stackit-sdk-go/core/config"
1111
"github.com/stackitcloud/stackit-sdk-go/core/oapierror"
12-
"github.com/stackitcloud/stackit-sdk-go/services/iaas"
12+
iaas "github.com/stackitcloud/stackit-sdk-go/services/iaas/v2api"
1313
)
1414

1515
// SdkStackitClient is an SDK implementation of StackitClient
@@ -136,14 +136,14 @@ func (c *SdkStackitClient) CreateServer(ctx context.Context, projectID, region s
136136
payload.SetSecurityGroups(req.SecurityGroups)
137137
}
138138

139-
// UserData - SDK expects *[]byte (base64-encoded bytes)
139+
// UserData
140140
if req.UserData != "" {
141-
payload.SetUserData([]byte(req.UserData))
141+
payload.SetUserData(req.UserData)
142142
}
143143

144144
// Boot Volume
145145
if req.BootVolume != nil {
146-
bootVolume := iaas.NewServerBootVolume()
146+
bootVolume := iaas.NewBootVolume()
147147
if req.BootVolume.Size > 0 {
148148
bootVolume.SetSize(int64(req.BootVolume.Size))
149149
}
@@ -198,7 +198,7 @@ func (c *SdkStackitClient) CreateServer(ctx context.Context, projectID, region s
198198
}
199199

200200
// Call SDK using the stored client
201-
sdkServer, err := c.iaasClient.CreateServer(ctx, projectID, region).
201+
sdkServer, err := c.iaasClient.DefaultAPI.CreateServer(ctx, projectID, region).
202202
CreateServerPayload(*payload).
203203
Execute()
204204
if err != nil {
@@ -213,7 +213,7 @@ func (c *SdkStackitClient) CreateServer(ctx context.Context, projectID, region s
213213

214214
// GetServer retrieves a server by ID via STACKIT SDK
215215
func (c *SdkStackitClient) GetServer(ctx context.Context, projectID, region, serverID string) (*Server, error) {
216-
sdkServer, err := c.iaasClient.GetServer(ctx, projectID, region, serverID).Execute()
216+
sdkServer, err := c.iaasClient.DefaultAPI.GetServer(ctx, projectID, region, serverID).Execute()
217217
if err != nil {
218218
// Check if error is 404 Not Found
219219
if isNotFoundError(err) {
@@ -230,7 +230,7 @@ func (c *SdkStackitClient) GetServer(ctx context.Context, projectID, region, ser
230230

231231
// DeleteServer deletes a server by ID via STACKIT SDK
232232
func (c *SdkStackitClient) DeleteServer(ctx context.Context, projectID, region, serverID string) error {
233-
err := c.iaasClient.DeleteServer(ctx, projectID, region, serverID).Execute()
233+
err := c.iaasClient.DefaultAPI.DeleteServer(ctx, projectID, region, serverID).Execute()
234234
if err != nil {
235235
// Check if error is 404 Not Found - this is OK (idempotent)
236236
if isNotFoundError(err) {
@@ -244,7 +244,7 @@ func (c *SdkStackitClient) DeleteServer(ctx context.Context, projectID, region,
244244

245245
// ListServers lists all servers in a project via STACKIT SDK
246246
func (c *SdkStackitClient) ListServers(ctx context.Context, projectID, region string, labelSelector map[string]string) ([]*Server, error) {
247-
serverRequest := c.iaasClient.ListServers(ctx, projectID, region)
247+
serverRequest := c.iaasClient.DefaultAPI.ListServers(ctx, projectID, region)
248248

249249
if labelSelector != nil {
250250
sb := strings.Builder{}
@@ -269,30 +269,25 @@ func (c *SdkStackitClient) ListServers(ctx context.Context, projectID, region st
269269

270270
// Convert SDK servers to our Server type
271271
servers := make([]*Server, 0)
272-
if sdkResponse.Items != nil {
273-
for i := range *sdkResponse.Items {
274-
sdkServer := &(*sdkResponse.Items)[i]
275-
server := convertSDKServerToServer(sdkServer)
276-
servers = append(servers, server)
277-
}
272+
273+
for i := range sdkResponse.Items {
274+
sdkServer := &sdkResponse.Items[i]
275+
server := convertSDKServerToServer(sdkServer)
276+
servers = append(servers, server)
278277
}
279278

280279
return servers, nil
281280
}
282281

283282
func (c *SdkStackitClient) GetNICsForServer(ctx context.Context, projectID, region, serverID string) ([]*NIC, error) {
284-
res, err := c.iaasClient.ListServerNICs(ctx, projectID, region, serverID).Execute()
283+
res, err := c.iaasClient.DefaultAPI.ListServerNICs(ctx, projectID, region, serverID).Execute()
285284
if err != nil {
286285
return nil, fmt.Errorf("SDK ListServerNICs failed: %w", err)
287286
}
288287

289-
if res.Items == nil {
290-
return []*NIC{}, nil
291-
}
292-
293288
nics := make([]*NIC, 0)
294-
for _, nic := range *res.Items {
295-
nics = append(nics, convertSDKNICtoNIC(&nic))
289+
for i := range res.Items {
290+
nics = append(nics, convertSDKNICtoNIC(&res.Items[i]))
296291
}
297292

298293
return nics, nil
@@ -301,17 +296,17 @@ func (c *SdkStackitClient) GetNICsForServer(ctx context.Context, projectID, regi
301296
func (c *SdkStackitClient) UpdateNIC(ctx context.Context, projectID, region, networkID, nicID string, allowedAddresses []string) (*NIC, error) {
302297
addresses := make([]iaas.AllowedAddressesInner, len(allowedAddresses))
303298

304-
for i, addr := range allowedAddresses {
299+
for i := range allowedAddresses {
305300
addresses[i] = iaas.AllowedAddressesInner{
306-
String: &addr,
301+
String: &allowedAddresses[i],
307302
}
308303
}
309304

310305
payload := iaas.UpdateNicPayload{
311-
AllowedAddresses: &addresses,
306+
AllowedAddresses: addresses,
312307
}
313308

314-
sdkNic, err := c.iaasClient.UpdateNic(ctx, projectID, region, networkID, nicID).UpdateNicPayload(payload).Execute()
309+
sdkNic, err := c.iaasClient.DefaultAPI.UpdateNic(ctx, projectID, region, networkID, nicID).UpdateNicPayload(payload).Execute()
315310
if err != nil {
316311
return nil, fmt.Errorf("SDK UpdateNic failed: %w", err)
317312
}
@@ -327,11 +322,9 @@ func (c *SdkStackitClient) UpdateNIC(ctx context.Context, projectID, region, net
327322

328323
func convertSDKNICtoNIC(nic *iaas.NIC) *NIC {
329324
addresses := make([]string, 0)
330-
if nic.AllowedAddresses != nil {
331-
for _, addr := range *nic.AllowedAddresses {
332-
if addr.String != nil {
333-
addresses = append(addresses, *addr.String)
334-
}
325+
for _, addr := range nic.AllowedAddresses {
326+
if addr.String != nil {
327+
addresses = append(addresses, *addr.String)
335328
}
336329
}
337330

‎pkg/client/sdk_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ var _ = Describe("SDK Type Conversion Helpers", func() {
144144
"team": "platform",
145145
}
146146

147-
result := convertLabelsFromSDK(&sdkLabels)
147+
result := convertLabelsFromSDK(sdkLabels)
148148

149149
Expect(result).NotTo(BeNil())
150150
Expect(result).To(HaveLen(2))
@@ -155,7 +155,7 @@ var _ = Describe("SDK Type Conversion Helpers", func() {
155155
It("should convert empty SDK labels map", func() {
156156
sdkLabels := map[string]any{}
157157

158-
result := convertLabelsFromSDK(&sdkLabels)
158+
result := convertLabelsFromSDK(sdkLabels)
159159

160160
Expect(result).NotTo(BeNil())
161161
Expect(result).To(BeEmpty())
@@ -169,7 +169,7 @@ var _ = Describe("SDK Type Conversion Helpers", func() {
169169
"team": "platform", // string
170170
}
171171

172-
result := convertLabelsFromSDK(&sdkLabels)
172+
result := convertLabelsFromSDK(sdkLabels)
173173

174174
Expect(result).NotTo(BeNil())
175175
Expect(result).To(HaveLen(2))
@@ -185,7 +185,7 @@ var _ = Describe("SDK Type Conversion Helpers", func() {
185185
"team": nil,
186186
}
187187

188-
result := convertLabelsFromSDK(&sdkLabels)
188+
result := convertLabelsFromSDK(sdkLabels)
189189

190190
Expect(result).NotTo(BeNil())
191191
Expect(result).To(HaveLen(1))

0 commit comments

Comments
 (0)