Skip to content

Commit 2772d64

Browse files
committed
chore(iaas): bump sdk version to use v1 api instead of v1beta
1 parent dc5a436 commit 2772d64

File tree

6 files changed

+12
-8
lines changed

6 files changed

+12
-8
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ require (
1414
github.com/stackitcloud/stackit-sdk-go/core v0.16.0
1515
github.com/stackitcloud/stackit-sdk-go/services/argus v0.11.0
1616
github.com/stackitcloud/stackit-sdk-go/services/dns v0.13.0
17-
github.com/stackitcloud/stackit-sdk-go/services/iaas v0.21.1
17+
github.com/stackitcloud/stackit-sdk-go/services/iaas v0.22.0
1818
github.com/stackitcloud/stackit-sdk-go/services/loadbalancer v1.0.0
1919
github.com/stackitcloud/stackit-sdk-go/services/logme v0.21.0
2020
github.com/stackitcloud/stackit-sdk-go/services/mariadb v0.21.0

go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,8 @@ github.com/stackitcloud/stackit-sdk-go/services/dns v0.13.0 h1:gEoA2oj3OcDg3XI0K
161161
github.com/stackitcloud/stackit-sdk-go/services/dns v0.13.0/go.mod h1:JE8POcTfSxTo+g1MkgVQ+OjT4jWEr08MIY8qx3Hi+Tw=
162162
github.com/stackitcloud/stackit-sdk-go/services/iaas v0.21.1 h1:ZFFJr54FcYTUBjE+5E3Cx92jTDdHGKT2DTIvvJSRrTc=
163163
github.com/stackitcloud/stackit-sdk-go/services/iaas v0.21.1/go.mod h1:9p5IIdOKOM5/DIjbenKrWvz6GlSps4jsPJZkH7QJuRU=
164+
github.com/stackitcloud/stackit-sdk-go/services/iaas v0.22.0 h1:xaNory8kBIsBG7PJnBfPP1cERc+ERqjebxmEmEOvRHU=
165+
github.com/stackitcloud/stackit-sdk-go/services/iaas v0.22.0/go.mod h1:LVOYlzNt5BXDC42AHd/GZj6KvlCg4w94of/E6pZOj5k=
164166
github.com/stackitcloud/stackit-sdk-go/services/loadbalancer v0.18.0 h1:7nNjIIcBQRDVnW4NL7+R8DaCKEqxxxsmVsgOVe50ZMU=
165167
github.com/stackitcloud/stackit-sdk-go/services/loadbalancer v0.18.0/go.mod h1:UFujBT+JlNvl6JNrY96UpLGqp+lZTD+JWL7siqhGPlw=
166168
github.com/stackitcloud/stackit-sdk-go/services/loadbalancer v1.0.0 h1:z2p0OobEAgSE5bQr+KR+4Y1QTvDbSC2a7w2eCV/oSp4=

stackit/internal/services/iaas/networkarea/resource_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -963,14 +963,14 @@ func TestUpdateNetworkRanges(t *testing.T) {
963963

964964
// Setup server and client
965965
router := mux.NewRouter()
966-
router.HandleFunc("/v1beta1/organizations/{organizationId}/network-areas/{areaId}/network-ranges", func(w http.ResponseWriter, r *http.Request) {
966+
router.HandleFunc("/v1/organizations/{organizationId}/network-areas/{areaId}/network-ranges", func(w http.ResponseWriter, r *http.Request) {
967967
if r.Method == "GET" {
968968
getAllNetworkRangesHandler(w, r)
969969
} else if r.Method == "POST" {
970970
createNetworkRangeHandler(w, r)
971971
}
972972
})
973-
router.HandleFunc("/v1beta1/organizations/{organizationId}/network-areas/{areaId}/network-ranges/{networkRangeId}", deleteNetworkRangeHandler)
973+
router.HandleFunc("/v1/organizations/{organizationId}/network-areas/{areaId}/network-ranges/{networkRangeId}", deleteNetworkRangeHandler)
974974
mockedServer := httptest.NewServer(router)
975975
defer mockedServer.Close()
976976
client, err := iaas.NewAPIClient(

stackit/internal/services/iaas/publicipranges/datasource.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ func (d *publicIpRangesDataSource) Read(ctx context.Context, req datasource.Read
128128
if resp.Diagnostics.HasError() {
129129
return
130130
}
131-
publicIpRangeResp, err := d.client.ListPublicIpRangesExecute(ctx)
131+
publicIpRangeResp, err := d.client.ListPublicIPRangesExecute(ctx)
132132
if err != nil {
133133
oapiErr, ok := err.(*oapierror.GenericOpenAPIError) //nolint:errorlint //complaining that error.As should be used to catch wrapped errors, but this error should not be wrapped
134134
if ok && oapiErr.StatusCode == http.StatusNotFound {

stackit/internal/services/iaas/server/resource.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -968,9 +968,11 @@ func toCreatePayload(ctx context.Context, model *Model) (*iaas.CreateServerPaylo
968968
}
969969
}
970970

971-
var userData *string
971+
var userData *[]byte
972972
if !model.UserData.IsNull() && !model.UserData.IsUnknown() {
973-
encodedUserData := base64.StdEncoding.EncodeToString([]byte(model.UserData.ValueString()))
973+
src := []byte(model.UserData.ValueString())
974+
encodedUserData := make([]byte, base64.StdEncoding.EncodedLen(len(src)))
975+
base64.StdEncoding.Encode(encodedUserData, src)
974976
userData = &encodedUserData
975977
}
976978

stackit/internal/services/iaas/server/resource_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ func TestToCreatePayload(t *testing.T) {
216216
ImageId: utils.Ptr("image"),
217217
KeypairName: utils.Ptr("keypair"),
218218
MachineType: utils.Ptr("machine_type"),
219-
UserData: utils.Ptr(base64EncodedUserData),
219+
UserData: utils.Ptr([]byte(base64EncodedUserData)),
220220
},
221221
true,
222222
},
@@ -258,7 +258,7 @@ func TestToCreatePayload(t *testing.T) {
258258
ImageId: utils.Ptr("image"),
259259
KeypairName: utils.Ptr("keypair"),
260260
MachineType: utils.Ptr("machine_type"),
261-
UserData: utils.Ptr(base64EncodedUserData),
261+
UserData: utils.Ptr([]byte(base64EncodedUserData)),
262262
},
263263
true,
264264
},

0 commit comments

Comments
 (0)