Skip to content

Commit 40ce909

Browse files
stackit-pipelinerenovate-botGokceGK
authored
fix(deps): update stackit sdk modules (#473)
* fix(deps): update stackit sdk modules * Adaptations to solve issues caused by sdk breaking changes * downgrade loadbalancer --------- Co-authored-by: Renovate Bot <renovate@whitesourcesoftware.com> Co-authored-by: Gökçe Gök Klingel <goekce.goek_klingel@mail.schwarz>
1 parent a35b887 commit 40ce909

5 files changed

Lines changed: 46 additions & 46 deletions

File tree

‎go.mod‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,21 @@ require (
1616
github.com/stackitcloud/stackit-sdk-go/services/dns v0.10.0
1717
github.com/stackitcloud/stackit-sdk-go/services/iaas v0.4.0
1818
github.com/stackitcloud/stackit-sdk-go/services/loadbalancer v0.13.0
19-
github.com/stackitcloud/stackit-sdk-go/services/logme v0.16.0
20-
github.com/stackitcloud/stackit-sdk-go/services/mariadb v0.15.0
19+
github.com/stackitcloud/stackit-sdk-go/services/logme v0.17.0
20+
github.com/stackitcloud/stackit-sdk-go/services/mariadb v0.17.0
2121
github.com/stackitcloud/stackit-sdk-go/services/mongodbflex v0.14.0
2222
github.com/stackitcloud/stackit-sdk-go/services/objectstorage v0.10.0
23-
github.com/stackitcloud/stackit-sdk-go/services/opensearch v0.14.0
23+
github.com/stackitcloud/stackit-sdk-go/services/opensearch v0.16.0
2424
github.com/stackitcloud/stackit-sdk-go/services/postgresflex v0.15.0
2525
github.com/stackitcloud/stackit-sdk-go/services/postgresql v0.12.1
26-
github.com/stackitcloud/stackit-sdk-go/services/rabbitmq v0.15.0
27-
github.com/stackitcloud/stackit-sdk-go/services/redis v0.15.0
26+
github.com/stackitcloud/stackit-sdk-go/services/rabbitmq v0.17.0
27+
github.com/stackitcloud/stackit-sdk-go/services/redis v0.17.0
2828
github.com/stackitcloud/stackit-sdk-go/services/resourcemanager v0.9.0
2929
github.com/stackitcloud/stackit-sdk-go/services/secretsmanager v0.8.0
3030
github.com/stackitcloud/stackit-sdk-go/services/serverbackup v0.1.0
3131
github.com/stackitcloud/stackit-sdk-go/services/serviceenablement v0.2.0
32-
github.com/stackitcloud/stackit-sdk-go/services/ske v0.17.0
33-
github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex v0.2.0
32+
github.com/stackitcloud/stackit-sdk-go/services/ske v0.19.0
33+
github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex v0.3.0
3434
github.com/teambition/rrule-go v1.8.2
3535
golang.org/x/mod v0.19.0
3636
)

‎go.sum‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -154,24 +154,24 @@ github.com/stackitcloud/stackit-sdk-go/services/iaas v0.4.0 h1:W6Zxyq487RpWfEIb6
154154
github.com/stackitcloud/stackit-sdk-go/services/iaas v0.4.0/go.mod h1:XtJA9FMK/yJ0dj4HtRAogmZPRUsZiFcuwUSfHYNASjo=
155155
github.com/stackitcloud/stackit-sdk-go/services/loadbalancer v0.13.0 h1:W7tyIIIXgAilHpALRyrW3CrtQ2UAGZBjAG+P4tcK+QQ=
156156
github.com/stackitcloud/stackit-sdk-go/services/loadbalancer v0.13.0/go.mod h1:wsO3+vXe1XiKLeCIctWAptaHQZ07Un7kmLTQ+drbj7w=
157-
github.com/stackitcloud/stackit-sdk-go/services/logme v0.16.0 h1:Cz4zQnEax6L3Y9gL7jtETPmiTERB7WNQtIzZ1UWeNNk=
158-
github.com/stackitcloud/stackit-sdk-go/services/logme v0.16.0/go.mod h1:bj9cn1treNSxKTRCEmESwqfENN8vCYn60HUnEA0P83c=
159-
github.com/stackitcloud/stackit-sdk-go/services/mariadb v0.15.0 h1:eYYyVUTS9Gjovg3z9+r6ctvsm1p1J4fHLa5QJbWHi0A=
160-
github.com/stackitcloud/stackit-sdk-go/services/mariadb v0.15.0/go.mod h1:kPetkX9hNm9HkRyiKQL/tlgdi8frZdMP8afg0mEvQ9s=
157+
github.com/stackitcloud/stackit-sdk-go/services/logme v0.17.0 h1:S8UZYBu2lHmKCPTR17jZetIal8X7cHO1gVRv101UdPw=
158+
github.com/stackitcloud/stackit-sdk-go/services/logme v0.17.0/go.mod h1:bj9cn1treNSxKTRCEmESwqfENN8vCYn60HUnEA0P83c=
159+
github.com/stackitcloud/stackit-sdk-go/services/mariadb v0.17.0 h1:+amOO/LW/PfUVU2ptxoB8PuNacawjjX2gGh7bHd45RE=
160+
github.com/stackitcloud/stackit-sdk-go/services/mariadb v0.17.0/go.mod h1:kPetkX9hNm9HkRyiKQL/tlgdi8frZdMP8afg0mEvQ9s=
161161
github.com/stackitcloud/stackit-sdk-go/services/mongodbflex v0.14.0 h1:FaJYVfha+atvPfFIf3h3+BFjOjeux9OBHukG1J98kq0=
162162
github.com/stackitcloud/stackit-sdk-go/services/mongodbflex v0.14.0/go.mod h1:iFerEzGmkg6R13ldFUyHUWHm0ac9cS4ftTDLhP0k/dU=
163163
github.com/stackitcloud/stackit-sdk-go/services/objectstorage v0.10.0 h1:tn1MD1nu+gYEbT3lslRI6BrapKwuvHv5Wi2Zw9uVPPc=
164164
github.com/stackitcloud/stackit-sdk-go/services/objectstorage v0.10.0/go.mod h1:dkVMJI88eJ3Xs0ZV15r4tUpgitUGJXcvrX3RL4Zq2bQ=
165-
github.com/stackitcloud/stackit-sdk-go/services/opensearch v0.14.0 h1:zkhm0r0OZ5NbHJFrm+7B+h11QL0bNLC53nzXhqCaLWo=
166-
github.com/stackitcloud/stackit-sdk-go/services/opensearch v0.14.0/go.mod h1:ZecMIf9oYj2DGZqWh93l97WdVaRdLl+tW5Fq3YKGwBM=
165+
github.com/stackitcloud/stackit-sdk-go/services/opensearch v0.16.0 h1:EEjhfIFiC4TsaFKB4mkxz6NFz4InfVs5STmWc+oEjgQ=
166+
github.com/stackitcloud/stackit-sdk-go/services/opensearch v0.16.0/go.mod h1:ZecMIf9oYj2DGZqWh93l97WdVaRdLl+tW5Fq3YKGwBM=
167167
github.com/stackitcloud/stackit-sdk-go/services/postgresflex v0.15.0 h1:05wQYhO37Z4y8xAD+4OTYz6rYu6eJEmwMfCG4tjETEc=
168168
github.com/stackitcloud/stackit-sdk-go/services/postgresflex v0.15.0/go.mod h1:SdrqGLCkilL6wl1+jcxmLtks2IocgIg+bsyeyYUIzR4=
169169
github.com/stackitcloud/stackit-sdk-go/services/postgresql v0.12.1 h1:u2jNFPPLM2TlpM1qUu1UuG9XKx/EYPjwg2nJqAK1HUY=
170170
github.com/stackitcloud/stackit-sdk-go/services/postgresql v0.12.1/go.mod h1:rTbdB/rl+e9o9sJNrT3yMIaSNVBGqR5G2Vh4opKrEwo=
171-
github.com/stackitcloud/stackit-sdk-go/services/rabbitmq v0.15.0 h1:Q7JxjVwb+9ugAX71AXdbfPL87HHmIIwb9LNahn6H/2o=
172-
github.com/stackitcloud/stackit-sdk-go/services/rabbitmq v0.15.0/go.mod h1:eSgnPBknTJh7t+jVKN+xzeAh+Cg1USOlH3QCyfvG20g=
173-
github.com/stackitcloud/stackit-sdk-go/services/redis v0.15.0 h1:/S+LOl94FqGk5Qdi5ehsiSCh6cCPEYJDctNOD0c2dmw=
174-
github.com/stackitcloud/stackit-sdk-go/services/redis v0.15.0/go.mod h1:3LhiTR/DMbKR2HuleTzlFHltR1MT1KD0DeW46X6K2GE=
171+
github.com/stackitcloud/stackit-sdk-go/services/rabbitmq v0.17.0 h1:k8GIrOQj+COIgkkHNNXw5ciUzvWU/RjL5XD7t5DTrOM=
172+
github.com/stackitcloud/stackit-sdk-go/services/rabbitmq v0.17.0/go.mod h1:eSgnPBknTJh7t+jVKN+xzeAh+Cg1USOlH3QCyfvG20g=
173+
github.com/stackitcloud/stackit-sdk-go/services/redis v0.17.0 h1:jnApmhchW5FYNWss1d2hJzH7O3slBOYa2wEseg5pl3o=
174+
github.com/stackitcloud/stackit-sdk-go/services/redis v0.17.0/go.mod h1:3LhiTR/DMbKR2HuleTzlFHltR1MT1KD0DeW46X6K2GE=
175175
github.com/stackitcloud/stackit-sdk-go/services/resourcemanager v0.9.0 h1:qCbvGqdG9saRB++UlhXt5ieCCDCITROqL5K2nm38efU=
176176
github.com/stackitcloud/stackit-sdk-go/services/resourcemanager v0.9.0/go.mod h1:p16qz/pAW8b1gEhqMpIgJfutRPeDPqQLlbVGyCo3f8o=
177177
github.com/stackitcloud/stackit-sdk-go/services/secretsmanager v0.8.0 h1:pJBG455kmtbQFpCxcBfBK8wOuEnmsMv3h90LFcdj3q0=
@@ -180,10 +180,10 @@ github.com/stackitcloud/stackit-sdk-go/services/serverbackup v0.1.0 h1:fYCBNvh4t
180180
github.com/stackitcloud/stackit-sdk-go/services/serverbackup v0.1.0/go.mod h1:ZYI3wj/NnhhWi25ugbdcniwnY/7mF6zN582c5HPe00o=
181181
github.com/stackitcloud/stackit-sdk-go/services/serviceenablement v0.2.0 h1:HAEFciLgeCY+kIcGcb+/zFUF3zt3z326v6JCen6fSjs=
182182
github.com/stackitcloud/stackit-sdk-go/services/serviceenablement v0.2.0/go.mod h1:z6XdA+ndaWzcPW/P0QrUIcTXJzKlajxgGZ5+EwXNS+c=
183-
github.com/stackitcloud/stackit-sdk-go/services/ske v0.17.0 h1:4S3MwNmpMfjzBz9JtKbXvkos7j+7hGeFMf7XsjMLL/g=
184-
github.com/stackitcloud/stackit-sdk-go/services/ske v0.17.0/go.mod h1:0fFs4R7kg+gU7FNAIzzFvlCZJz6gyZ8CFhbK3eSrAwQ=
185-
github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex v0.2.0 h1:aIXxXx6u4+6C02MPb+hdItigeKeen7m+hEEG+Ej9sNs=
186-
github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex v0.2.0/go.mod h1:fQJOQMfasStZ8J9iGX0vTjyJoQtLqMXJ5Npb03QJk84=
183+
github.com/stackitcloud/stackit-sdk-go/services/ske v0.19.0 h1:vmkfa26HO1VA40pKPNnYMHkcNMxBEWAdYbX+5LVIo48=
184+
github.com/stackitcloud/stackit-sdk-go/services/ske v0.19.0/go.mod h1:0fFs4R7kg+gU7FNAIzzFvlCZJz6gyZ8CFhbK3eSrAwQ=
185+
github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex v0.3.0 h1:M6tcXUMNM6XMfHVQeQzB6IjfPdAxnZar3YD+YstRStc=
186+
github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex v0.3.0/go.mod h1:Qnn+06i21XtagtMQ4cTwOCR3OLnXX+t1n+Vf/HH49Yw=
187187
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
188188
github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals=
189189
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=

‎stackit/internal/services/sqlserverflex/user/datasource_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ func TestMapDataSourceFields(t *testing.T) {
2020
{
2121
"default_values",
2222
&sqlserverflex.GetUserResponse{
23-
Item: &sqlserverflex.InstanceResponseUser{},
23+
Item: &sqlserverflex.UserResponseUser{},
2424
},
2525
DataSourceModel{
2626
Id: types.StringValue("pid,iid,uid"),
@@ -37,7 +37,7 @@ func TestMapDataSourceFields(t *testing.T) {
3737
{
3838
"simple_values",
3939
&sqlserverflex.GetUserResponse{
40-
Item: &sqlserverflex.InstanceResponseUser{
40+
Item: &sqlserverflex.UserResponseUser{
4141
Roles: &[]string{
4242
"role_1",
4343
"role_2",
@@ -67,7 +67,7 @@ func TestMapDataSourceFields(t *testing.T) {
6767
{
6868
"null_fields_and_int_conversions",
6969
&sqlserverflex.GetUserResponse{
70-
Item: &sqlserverflex.InstanceResponseUser{
70+
Item: &sqlserverflex.UserResponseUser{
7171
Id: utils.Ptr("uid"),
7272
Roles: &[]string{},
7373
Username: nil,
@@ -102,7 +102,7 @@ func TestMapDataSourceFields(t *testing.T) {
102102
{
103103
"no_resource_id",
104104
&sqlserverflex.GetUserResponse{
105-
Item: &sqlserverflex.InstanceResponseUser{},
105+
Item: &sqlserverflex.UserResponseUser{},
106106
},
107107
DataSourceModel{},
108108
false,

‎stackit/internal/services/sqlserverflex/user/resource.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ func (r *userResource) Create(ctx context.Context, req resource.CreateRequest, r
203203
ctx = tflog.SetField(ctx, "project_id", projectId)
204204
ctx = tflog.SetField(ctx, "instance_id", instanceId)
205205

206-
var roles []sqlserverflex.Role
206+
var roles []string
207207
if !(model.Roles.IsNull() || model.Roles.IsUnknown()) {
208208
diags = model.Roles.ElementsAs(ctx, &roles, false)
209209
resp.Diagnostics.Append(diags...)
@@ -441,7 +441,7 @@ func mapFields(userResp *sqlserverflex.GetUserResponse, model *Model) error {
441441
return nil
442442
}
443443

444-
func toCreatePayload(model *Model, roles []sqlserverflex.Role) (*sqlserverflex.CreateUserPayload, error) {
444+
func toCreatePayload(model *Model, roles []string) (*sqlserverflex.CreateUserPayload, error) {
445445
if model == nil {
446446
return nil, fmt.Errorf("nil model")
447447
}

‎stackit/internal/services/sqlserverflex/user/resource_test.go‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ func TestMapFieldsCreate(t *testing.T) {
2020
{
2121
"default_values",
2222
&sqlserverflex.CreateUserResponse{
23-
Item: &sqlserverflex.User{
23+
Item: &sqlserverflex.SingleUser{
2424
Id: utils.Ptr("uid"),
2525
Password: utils.Ptr(""),
2626
},
@@ -41,7 +41,7 @@ func TestMapFieldsCreate(t *testing.T) {
4141
{
4242
"simple_values",
4343
&sqlserverflex.CreateUserResponse{
44-
Item: &sqlserverflex.User{
44+
Item: &sqlserverflex.SingleUser{
4545
Id: utils.Ptr("uid"),
4646
Roles: &[]string{
4747
"role_1",
@@ -74,7 +74,7 @@ func TestMapFieldsCreate(t *testing.T) {
7474
{
7575
"null_fields_and_int_conversions",
7676
&sqlserverflex.CreateUserResponse{
77-
Item: &sqlserverflex.User{
77+
Item: &sqlserverflex.SingleUser{
7878
Id: utils.Ptr("uid"),
7979
Roles: &[]string{},
8080
Username: nil,
@@ -111,15 +111,15 @@ func TestMapFieldsCreate(t *testing.T) {
111111
{
112112
"no_resource_id",
113113
&sqlserverflex.CreateUserResponse{
114-
Item: &sqlserverflex.User{},
114+
Item: &sqlserverflex.SingleUser{},
115115
},
116116
Model{},
117117
false,
118118
},
119119
{
120120
"no_password",
121121
&sqlserverflex.CreateUserResponse{
122-
Item: &sqlserverflex.User{
122+
Item: &sqlserverflex.SingleUser{
123123
Id: utils.Ptr("uid"),
124124
},
125125
},
@@ -160,7 +160,7 @@ func TestMapFields(t *testing.T) {
160160
{
161161
"default_values",
162162
&sqlserverflex.GetUserResponse{
163-
Item: &sqlserverflex.InstanceResponseUser{},
163+
Item: &sqlserverflex.UserResponseUser{},
164164
},
165165
Model{
166166
Id: types.StringValue("pid,iid,uid"),
@@ -177,7 +177,7 @@ func TestMapFields(t *testing.T) {
177177
{
178178
"simple_values",
179179
&sqlserverflex.GetUserResponse{
180-
Item: &sqlserverflex.InstanceResponseUser{
180+
Item: &sqlserverflex.UserResponseUser{
181181
Roles: &[]string{
182182
"role_1",
183183
"role_2",
@@ -207,7 +207,7 @@ func TestMapFields(t *testing.T) {
207207
{
208208
"null_fields_and_int_conversions",
209209
&sqlserverflex.GetUserResponse{
210-
Item: &sqlserverflex.InstanceResponseUser{
210+
Item: &sqlserverflex.UserResponseUser{
211211
Id: utils.Ptr("uid"),
212212
Roles: &[]string{},
213213
Username: nil,
@@ -242,7 +242,7 @@ func TestMapFields(t *testing.T) {
242242
{
243243
"no_resource_id",
244244
&sqlserverflex.GetUserResponse{
245-
Item: &sqlserverflex.InstanceResponseUser{},
245+
Item: &sqlserverflex.UserResponseUser{},
246246
},
247247
Model{},
248248
false,
@@ -276,16 +276,16 @@ func TestToCreatePayload(t *testing.T) {
276276
tests := []struct {
277277
description string
278278
input *Model
279-
inputRoles []sqlserverflex.Role
279+
inputRoles []string
280280
expected *sqlserverflex.CreateUserPayload
281281
isValid bool
282282
}{
283283
{
284284
"default_values",
285285
&Model{},
286-
[]sqlserverflex.Role{},
286+
[]string{},
287287
&sqlserverflex.CreateUserPayload{
288-
Roles: &[]sqlserverflex.Role{},
288+
Roles: &[]string{},
289289
Username: nil,
290290
},
291291
true,
@@ -295,12 +295,12 @@ func TestToCreatePayload(t *testing.T) {
295295
&Model{
296296
Username: types.StringValue("username"),
297297
},
298-
[]sqlserverflex.Role{
298+
[]string{
299299
"role_1",
300300
"role_2",
301301
},
302302
&sqlserverflex.CreateUserPayload{
303-
Roles: &[]sqlserverflex.Role{
303+
Roles: &[]string{
304304
"role_1",
305305
"role_2",
306306
},
@@ -313,11 +313,11 @@ func TestToCreatePayload(t *testing.T) {
313313
&Model{
314314
Username: types.StringNull(),
315315
},
316-
[]sqlserverflex.Role{
316+
[]string{
317317
"",
318318
},
319319
&sqlserverflex.CreateUserPayload{
320-
Roles: &[]sqlserverflex.Role{
320+
Roles: &[]string{
321321
"",
322322
},
323323
Username: nil,
@@ -327,7 +327,7 @@ func TestToCreatePayload(t *testing.T) {
327327
{
328328
"nil_model",
329329
nil,
330-
[]sqlserverflex.Role{},
330+
[]string{},
331331
nil,
332332
false,
333333
},
@@ -336,9 +336,9 @@ func TestToCreatePayload(t *testing.T) {
336336
&Model{
337337
Username: types.StringValue("username"),
338338
},
339-
[]sqlserverflex.Role{},
339+
[]string{},
340340
&sqlserverflex.CreateUserPayload{
341-
Roles: &[]sqlserverflex.Role{},
341+
Roles: &[]string{},
342342
Username: utils.Ptr("username"),
343343
},
344344
true,

0 commit comments

Comments
 (0)