stackit-dev-tools/terraform-provider-stackitprivatepreview
2
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

fix(deps): update stackit sdk modules (#473)

Browse source 
* 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>
This commit is contained in:
stackit-pipeline 2024-07-22 09:45:06 +02:00 • committed by GitHub
parent a35b887315
commit 40ce90999b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 46 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

8
stackit/internal/services/sqlserverflex/user/datasource_test.go
View file

@ -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,

4
stackit/internal/services/sqlserverflex/user/resource.go
View file

@ -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")
}

38
stackit/internal/services/sqlserverflex/user/resource_test.go
View file

@ -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,