diff --git a/go.mod b/go.mod index 5c66d4cd..8835a748 100644 --- a/go.mod +++ b/go.mod @@ -16,21 +16,21 @@ require ( github.com/stackitcloud/stackit-sdk-go/services/dns v0.10.0 github.com/stackitcloud/stackit-sdk-go/services/iaas v0.4.0 github.com/stackitcloud/stackit-sdk-go/services/loadbalancer v0.13.0 - github.com/stackitcloud/stackit-sdk-go/services/logme v0.16.0 - github.com/stackitcloud/stackit-sdk-go/services/mariadb v0.15.0 + github.com/stackitcloud/stackit-sdk-go/services/logme v0.17.0 + github.com/stackitcloud/stackit-sdk-go/services/mariadb v0.17.0 github.com/stackitcloud/stackit-sdk-go/services/mongodbflex v0.14.0 github.com/stackitcloud/stackit-sdk-go/services/objectstorage v0.10.0 - github.com/stackitcloud/stackit-sdk-go/services/opensearch v0.14.0 + github.com/stackitcloud/stackit-sdk-go/services/opensearch v0.16.0 github.com/stackitcloud/stackit-sdk-go/services/postgresflex v0.15.0 github.com/stackitcloud/stackit-sdk-go/services/postgresql v0.12.1 - github.com/stackitcloud/stackit-sdk-go/services/rabbitmq v0.15.0 - github.com/stackitcloud/stackit-sdk-go/services/redis v0.15.0 + github.com/stackitcloud/stackit-sdk-go/services/rabbitmq v0.17.0 + github.com/stackitcloud/stackit-sdk-go/services/redis v0.17.0 github.com/stackitcloud/stackit-sdk-go/services/resourcemanager v0.9.0 github.com/stackitcloud/stackit-sdk-go/services/secretsmanager v0.8.0 github.com/stackitcloud/stackit-sdk-go/services/serverbackup v0.1.0 github.com/stackitcloud/stackit-sdk-go/services/serviceenablement v0.2.0 - github.com/stackitcloud/stackit-sdk-go/services/ske v0.17.0 - github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex v0.2.0 + github.com/stackitcloud/stackit-sdk-go/services/ske v0.19.0 + github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex v0.3.0 github.com/teambition/rrule-go v1.8.2 golang.org/x/mod v0.19.0 ) diff --git a/go.sum b/go.sum index 6c66b088..93960fd4 100644 --- a/go.sum +++ b/go.sum @@ -154,24 +154,24 @@ github.com/stackitcloud/stackit-sdk-go/services/iaas v0.4.0 h1:W6Zxyq487RpWfEIb6 github.com/stackitcloud/stackit-sdk-go/services/iaas v0.4.0/go.mod h1:XtJA9FMK/yJ0dj4HtRAogmZPRUsZiFcuwUSfHYNASjo= github.com/stackitcloud/stackit-sdk-go/services/loadbalancer v0.13.0 h1:W7tyIIIXgAilHpALRyrW3CrtQ2UAGZBjAG+P4tcK+QQ= github.com/stackitcloud/stackit-sdk-go/services/loadbalancer v0.13.0/go.mod h1:wsO3+vXe1XiKLeCIctWAptaHQZ07Un7kmLTQ+drbj7w= -github.com/stackitcloud/stackit-sdk-go/services/logme v0.16.0 h1:Cz4zQnEax6L3Y9gL7jtETPmiTERB7WNQtIzZ1UWeNNk= -github.com/stackitcloud/stackit-sdk-go/services/logme v0.16.0/go.mod h1:bj9cn1treNSxKTRCEmESwqfENN8vCYn60HUnEA0P83c= -github.com/stackitcloud/stackit-sdk-go/services/mariadb v0.15.0 h1:eYYyVUTS9Gjovg3z9+r6ctvsm1p1J4fHLa5QJbWHi0A= -github.com/stackitcloud/stackit-sdk-go/services/mariadb v0.15.0/go.mod h1:kPetkX9hNm9HkRyiKQL/tlgdi8frZdMP8afg0mEvQ9s= +github.com/stackitcloud/stackit-sdk-go/services/logme v0.17.0 h1:S8UZYBu2lHmKCPTR17jZetIal8X7cHO1gVRv101UdPw= +github.com/stackitcloud/stackit-sdk-go/services/logme v0.17.0/go.mod h1:bj9cn1treNSxKTRCEmESwqfENN8vCYn60HUnEA0P83c= +github.com/stackitcloud/stackit-sdk-go/services/mariadb v0.17.0 h1:+amOO/LW/PfUVU2ptxoB8PuNacawjjX2gGh7bHd45RE= +github.com/stackitcloud/stackit-sdk-go/services/mariadb v0.17.0/go.mod h1:kPetkX9hNm9HkRyiKQL/tlgdi8frZdMP8afg0mEvQ9s= github.com/stackitcloud/stackit-sdk-go/services/mongodbflex v0.14.0 h1:FaJYVfha+atvPfFIf3h3+BFjOjeux9OBHukG1J98kq0= github.com/stackitcloud/stackit-sdk-go/services/mongodbflex v0.14.0/go.mod h1:iFerEzGmkg6R13ldFUyHUWHm0ac9cS4ftTDLhP0k/dU= github.com/stackitcloud/stackit-sdk-go/services/objectstorage v0.10.0 h1:tn1MD1nu+gYEbT3lslRI6BrapKwuvHv5Wi2Zw9uVPPc= github.com/stackitcloud/stackit-sdk-go/services/objectstorage v0.10.0/go.mod h1:dkVMJI88eJ3Xs0ZV15r4tUpgitUGJXcvrX3RL4Zq2bQ= -github.com/stackitcloud/stackit-sdk-go/services/opensearch v0.14.0 h1:zkhm0r0OZ5NbHJFrm+7B+h11QL0bNLC53nzXhqCaLWo= -github.com/stackitcloud/stackit-sdk-go/services/opensearch v0.14.0/go.mod h1:ZecMIf9oYj2DGZqWh93l97WdVaRdLl+tW5Fq3YKGwBM= +github.com/stackitcloud/stackit-sdk-go/services/opensearch v0.16.0 h1:EEjhfIFiC4TsaFKB4mkxz6NFz4InfVs5STmWc+oEjgQ= +github.com/stackitcloud/stackit-sdk-go/services/opensearch v0.16.0/go.mod h1:ZecMIf9oYj2DGZqWh93l97WdVaRdLl+tW5Fq3YKGwBM= github.com/stackitcloud/stackit-sdk-go/services/postgresflex v0.15.0 h1:05wQYhO37Z4y8xAD+4OTYz6rYu6eJEmwMfCG4tjETEc= github.com/stackitcloud/stackit-sdk-go/services/postgresflex v0.15.0/go.mod h1:SdrqGLCkilL6wl1+jcxmLtks2IocgIg+bsyeyYUIzR4= github.com/stackitcloud/stackit-sdk-go/services/postgresql v0.12.1 h1:u2jNFPPLM2TlpM1qUu1UuG9XKx/EYPjwg2nJqAK1HUY= github.com/stackitcloud/stackit-sdk-go/services/postgresql v0.12.1/go.mod h1:rTbdB/rl+e9o9sJNrT3yMIaSNVBGqR5G2Vh4opKrEwo= -github.com/stackitcloud/stackit-sdk-go/services/rabbitmq v0.15.0 h1:Q7JxjVwb+9ugAX71AXdbfPL87HHmIIwb9LNahn6H/2o= -github.com/stackitcloud/stackit-sdk-go/services/rabbitmq v0.15.0/go.mod h1:eSgnPBknTJh7t+jVKN+xzeAh+Cg1USOlH3QCyfvG20g= -github.com/stackitcloud/stackit-sdk-go/services/redis v0.15.0 h1:/S+LOl94FqGk5Qdi5ehsiSCh6cCPEYJDctNOD0c2dmw= -github.com/stackitcloud/stackit-sdk-go/services/redis v0.15.0/go.mod h1:3LhiTR/DMbKR2HuleTzlFHltR1MT1KD0DeW46X6K2GE= +github.com/stackitcloud/stackit-sdk-go/services/rabbitmq v0.17.0 h1:k8GIrOQj+COIgkkHNNXw5ciUzvWU/RjL5XD7t5DTrOM= +github.com/stackitcloud/stackit-sdk-go/services/rabbitmq v0.17.0/go.mod h1:eSgnPBknTJh7t+jVKN+xzeAh+Cg1USOlH3QCyfvG20g= +github.com/stackitcloud/stackit-sdk-go/services/redis v0.17.0 h1:jnApmhchW5FYNWss1d2hJzH7O3slBOYa2wEseg5pl3o= +github.com/stackitcloud/stackit-sdk-go/services/redis v0.17.0/go.mod h1:3LhiTR/DMbKR2HuleTzlFHltR1MT1KD0DeW46X6K2GE= github.com/stackitcloud/stackit-sdk-go/services/resourcemanager v0.9.0 h1:qCbvGqdG9saRB++UlhXt5ieCCDCITROqL5K2nm38efU= github.com/stackitcloud/stackit-sdk-go/services/resourcemanager v0.9.0/go.mod h1:p16qz/pAW8b1gEhqMpIgJfutRPeDPqQLlbVGyCo3f8o= 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 github.com/stackitcloud/stackit-sdk-go/services/serverbackup v0.1.0/go.mod h1:ZYI3wj/NnhhWi25ugbdcniwnY/7mF6zN582c5HPe00o= github.com/stackitcloud/stackit-sdk-go/services/serviceenablement v0.2.0 h1:HAEFciLgeCY+kIcGcb+/zFUF3zt3z326v6JCen6fSjs= github.com/stackitcloud/stackit-sdk-go/services/serviceenablement v0.2.0/go.mod h1:z6XdA+ndaWzcPW/P0QrUIcTXJzKlajxgGZ5+EwXNS+c= -github.com/stackitcloud/stackit-sdk-go/services/ske v0.17.0 h1:4S3MwNmpMfjzBz9JtKbXvkos7j+7hGeFMf7XsjMLL/g= -github.com/stackitcloud/stackit-sdk-go/services/ske v0.17.0/go.mod h1:0fFs4R7kg+gU7FNAIzzFvlCZJz6gyZ8CFhbK3eSrAwQ= -github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex v0.2.0 h1:aIXxXx6u4+6C02MPb+hdItigeKeen7m+hEEG+Ej9sNs= -github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex v0.2.0/go.mod h1:fQJOQMfasStZ8J9iGX0vTjyJoQtLqMXJ5Npb03QJk84= +github.com/stackitcloud/stackit-sdk-go/services/ske v0.19.0 h1:vmkfa26HO1VA40pKPNnYMHkcNMxBEWAdYbX+5LVIo48= +github.com/stackitcloud/stackit-sdk-go/services/ske v0.19.0/go.mod h1:0fFs4R7kg+gU7FNAIzzFvlCZJz6gyZ8CFhbK3eSrAwQ= +github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex v0.3.0 h1:M6tcXUMNM6XMfHVQeQzB6IjfPdAxnZar3YD+YstRStc= +github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex v0.3.0/go.mod h1:Qnn+06i21XtagtMQ4cTwOCR3OLnXX+t1n+Vf/HH49Yw= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= diff --git a/stackit/internal/services/sqlserverflex/user/datasource_test.go b/stackit/internal/services/sqlserverflex/user/datasource_test.go index 7a0b1511..427fa120 100644 --- a/stackit/internal/services/sqlserverflex/user/datasource_test.go +++ b/stackit/internal/services/sqlserverflex/user/datasource_test.go @@ -20,7 +20,7 @@ func TestMapDataSourceFields(t *testing.T) { { "default_values", &sqlserverflex.GetUserResponse{ - Item: &sqlserverflex.InstanceResponseUser{}, + Item: &sqlserverflex.UserResponseUser{}, }, DataSourceModel{ Id: types.StringValue("pid,iid,uid"), @@ -37,7 +37,7 @@ func TestMapDataSourceFields(t *testing.T) { { "simple_values", &sqlserverflex.GetUserResponse{ - Item: &sqlserverflex.InstanceResponseUser{ + Item: &sqlserverflex.UserResponseUser{ Roles: &[]string{ "role_1", "role_2", @@ -67,7 +67,7 @@ func TestMapDataSourceFields(t *testing.T) { { "null_fields_and_int_conversions", &sqlserverflex.GetUserResponse{ - Item: &sqlserverflex.InstanceResponseUser{ + Item: &sqlserverflex.UserResponseUser{ Id: utils.Ptr("uid"), Roles: &[]string{}, Username: nil, @@ -102,7 +102,7 @@ func TestMapDataSourceFields(t *testing.T) { { "no_resource_id", &sqlserverflex.GetUserResponse{ - Item: &sqlserverflex.InstanceResponseUser{}, + Item: &sqlserverflex.UserResponseUser{}, }, DataSourceModel{}, false, diff --git a/stackit/internal/services/sqlserverflex/user/resource.go b/stackit/internal/services/sqlserverflex/user/resource.go index c24e6d35..0dd38ebc 100644 --- a/stackit/internal/services/sqlserverflex/user/resource.go +++ b/stackit/internal/services/sqlserverflex/user/resource.go @@ -203,7 +203,7 @@ func (r *userResource) Create(ctx context.Context, req resource.CreateRequest, r ctx = tflog.SetField(ctx, "project_id", projectId) ctx = tflog.SetField(ctx, "instance_id", instanceId) - var roles []sqlserverflex.Role + var roles []string if !(model.Roles.IsNull() || model.Roles.IsUnknown()) { diags = model.Roles.ElementsAs(ctx, &roles, false) resp.Diagnostics.Append(diags...) @@ -441,7 +441,7 @@ func mapFields(userResp *sqlserverflex.GetUserResponse, model *Model) error { return nil } -func toCreatePayload(model *Model, roles []sqlserverflex.Role) (*sqlserverflex.CreateUserPayload, error) { +func toCreatePayload(model *Model, roles []string) (*sqlserverflex.CreateUserPayload, error) { if model == nil { return nil, fmt.Errorf("nil model") } diff --git a/stackit/internal/services/sqlserverflex/user/resource_test.go b/stackit/internal/services/sqlserverflex/user/resource_test.go index 48c8616b..aa6db9ec 100644 --- a/stackit/internal/services/sqlserverflex/user/resource_test.go +++ b/stackit/internal/services/sqlserverflex/user/resource_test.go @@ -20,7 +20,7 @@ func TestMapFieldsCreate(t *testing.T) { { "default_values", &sqlserverflex.CreateUserResponse{ - Item: &sqlserverflex.User{ + Item: &sqlserverflex.SingleUser{ Id: utils.Ptr("uid"), Password: utils.Ptr(""), }, @@ -41,7 +41,7 @@ func TestMapFieldsCreate(t *testing.T) { { "simple_values", &sqlserverflex.CreateUserResponse{ - Item: &sqlserverflex.User{ + Item: &sqlserverflex.SingleUser{ Id: utils.Ptr("uid"), Roles: &[]string{ "role_1", @@ -74,7 +74,7 @@ func TestMapFieldsCreate(t *testing.T) { { "null_fields_and_int_conversions", &sqlserverflex.CreateUserResponse{ - Item: &sqlserverflex.User{ + Item: &sqlserverflex.SingleUser{ Id: utils.Ptr("uid"), Roles: &[]string{}, Username: nil, @@ -111,7 +111,7 @@ func TestMapFieldsCreate(t *testing.T) { { "no_resource_id", &sqlserverflex.CreateUserResponse{ - Item: &sqlserverflex.User{}, + Item: &sqlserverflex.SingleUser{}, }, Model{}, false, @@ -119,7 +119,7 @@ func TestMapFieldsCreate(t *testing.T) { { "no_password", &sqlserverflex.CreateUserResponse{ - Item: &sqlserverflex.User{ + Item: &sqlserverflex.SingleUser{ Id: utils.Ptr("uid"), }, }, @@ -160,7 +160,7 @@ func TestMapFields(t *testing.T) { { "default_values", &sqlserverflex.GetUserResponse{ - Item: &sqlserverflex.InstanceResponseUser{}, + Item: &sqlserverflex.UserResponseUser{}, }, Model{ Id: types.StringValue("pid,iid,uid"), @@ -177,7 +177,7 @@ func TestMapFields(t *testing.T) { { "simple_values", &sqlserverflex.GetUserResponse{ - Item: &sqlserverflex.InstanceResponseUser{ + Item: &sqlserverflex.UserResponseUser{ Roles: &[]string{ "role_1", "role_2", @@ -207,7 +207,7 @@ func TestMapFields(t *testing.T) { { "null_fields_and_int_conversions", &sqlserverflex.GetUserResponse{ - Item: &sqlserverflex.InstanceResponseUser{ + Item: &sqlserverflex.UserResponseUser{ Id: utils.Ptr("uid"), Roles: &[]string{}, Username: nil, @@ -242,7 +242,7 @@ func TestMapFields(t *testing.T) { { "no_resource_id", &sqlserverflex.GetUserResponse{ - Item: &sqlserverflex.InstanceResponseUser{}, + Item: &sqlserverflex.UserResponseUser{}, }, Model{}, false, @@ -276,16 +276,16 @@ func TestToCreatePayload(t *testing.T) { tests := []struct { description string input *Model - inputRoles []sqlserverflex.Role + inputRoles []string expected *sqlserverflex.CreateUserPayload isValid bool }{ { "default_values", &Model{}, - []sqlserverflex.Role{}, + []string{}, &sqlserverflex.CreateUserPayload{ - Roles: &[]sqlserverflex.Role{}, + Roles: &[]string{}, Username: nil, }, true, @@ -295,12 +295,12 @@ func TestToCreatePayload(t *testing.T) { &Model{ Username: types.StringValue("username"), }, - []sqlserverflex.Role{ + []string{ "role_1", "role_2", }, &sqlserverflex.CreateUserPayload{ - Roles: &[]sqlserverflex.Role{ + Roles: &[]string{ "role_1", "role_2", }, @@ -313,11 +313,11 @@ func TestToCreatePayload(t *testing.T) { &Model{ Username: types.StringNull(), }, - []sqlserverflex.Role{ + []string{ "", }, &sqlserverflex.CreateUserPayload{ - Roles: &[]sqlserverflex.Role{ + Roles: &[]string{ "", }, Username: nil, @@ -327,7 +327,7 @@ func TestToCreatePayload(t *testing.T) { { "nil_model", nil, - []sqlserverflex.Role{}, + []string{}, nil, false, }, @@ -336,9 +336,9 @@ func TestToCreatePayload(t *testing.T) { &Model{ Username: types.StringValue("username"), }, - []sqlserverflex.Role{}, + []string{}, &sqlserverflex.CreateUserPayload{ - Roles: &[]sqlserverflex.Role{}, + Roles: &[]string{}, Username: utils.Ptr("username"), }, true,