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

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

Browse source 
* fix(deps): update stackit sdk modules

* remove deprecated fields from credentials resources

* remove deprecated fields from credentials resources

* add newly added fields to credentials resources

* remove deprecated fields from credentials datasource

* add newly added credential fields to datasources

* update acceptance tests

---------

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-04-15 09:52:35 +02:00 • committed by GitHub
parent 4917eda1ad
commit 18d3f4d1fb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
22 changed files with 262 additions and 284 deletions
Download patch file Download diff file Expand all files Collapse all files

3
stackit/internal/services/mariadb/credential/datasource.go
View file

@ -120,9 +120,6 @@ func (r *credentialDataSource) Schema(_ context.Context, _ datasource.SchemaRequ
ElementType: types.StringType,
Computed: true,
},
"http_api_uri": schema.StringAttribute{
Computed: true,
},
"name": schema.StringAttribute{
Computed: true,
},

5
stackit/internal/services/mariadb/credential/resource.go
View file

@ -36,7 +36,6 @@ type Model struct {
ProjectId types.String `tfsdk:"project_id"`
Host types.String `tfsdk:"host"`
Hosts types.List `tfsdk:"hosts"`
HttpAPIURI types.String `tfsdk:"http_api_uri"`
Name types.String `tfsdk:"name"`
Password types.String `tfsdk:"password"`
Port types.Int64 `tfsdk:"port"`
@ -157,9 +156,6 @@ func (r *credentialResource) Schema(_ context.Context, _ resource.SchemaRequest,
ElementType: types.StringType,
Computed: true,
},
"http_api_uri": schema.StringAttribute{
Computed: true,
},
"name": schema.StringAttribute{
Computed: true,
},
@ -360,7 +356,6 @@ func mapFields(credentialsResp *mariadb.CredentialsResponse, model *Model) error
model.Hosts = hostsList
}
model.Host = types.StringPointerValue(credentials.Host)
model.HttpAPIURI = types.StringPointerValue(credentials.HttpApiUri)
model.Name = types.StringPointerValue(credentials.Name)
model.Password = types.StringPointerValue(credentials.Password)
model.Port = types.Int64PointerValue(credentials.Port)

39
stackit/internal/services/mariadb/credential/resource_test.go
View file

@ -30,7 +30,6 @@ func TestMapFields(t *testing.T) {
ProjectId: types.StringValue("pid"),
Host: types.StringNull(),
Hosts: types.ListNull(types.StringType),
HttpAPIURI: types.StringNull(),
Name: types.StringNull(),
Password: types.StringNull(),
Port: types.Int64Null(),
@ -50,12 +49,11 @@ func TestMapFields(t *testing.T) {
"host_1",
"",
},
HttpApiUri: utils.Ptr("http"),
Name: utils.Ptr("name"),
Password: utils.Ptr("password"),
Port: utils.Ptr(int64(1234)),
Uri: utils.Ptr("uri"),
Username: utils.Ptr("username"),
Name: utils.Ptr("name"),
Password: utils.Ptr("password"),
Port: utils.Ptr(int64(1234)),
Uri: utils.Ptr("uri"),
Username: utils.Ptr("username"),
},
},
},
@ -69,12 +67,11 @@ func TestMapFields(t *testing.T) {
types.StringValue("host_1"),
types.StringValue(""),
}),
HttpAPIURI: types.StringValue("http"),
Name: types.StringValue("name"),
Password: types.StringValue("password"),
Port: types.Int64Value(1234),
Uri: types.StringValue("uri"),
Username: types.StringValue("username"),
Name: types.StringValue("name"),
Password: types.StringValue("password"),
Port: types.Int64Value(1234),
Uri: types.StringValue("uri"),
Username: types.StringValue("username"),
},
true,
},
@ -84,14 +81,13 @@ func TestMapFields(t *testing.T) {
Id: utils.Ptr("cid"),
Raw: &mariadb.RawCredentials{
Credentials: &mariadb.Credentials{
Host: utils.Ptr(""),
Hosts: &[]string{},
HttpApiUri: nil,
Name: nil,
Password: utils.Ptr(""),
Port: utils.Ptr(int64(2123456789)),
Uri: nil,
Username: utils.Ptr(""),
Host: utils.Ptr(""),
Hosts: &[]string{},
Name: nil,
Password: utils.Ptr(""),
Port: utils.Ptr(int64(2123456789)),
Uri: nil,
Username: utils.Ptr(""),
},
},
},
@ -102,7 +98,6 @@ func TestMapFields(t *testing.T) {
ProjectId: types.StringValue("pid"),
Host: types.StringValue(""),
Hosts: types.ListValueMust(types.StringType, []attr.Value{}),
HttpAPIURI: types.StringNull(),
Name: types.StringNull(),
Password: types.StringValue(""),
Port: types.Int64Value(2123456789),

6
stackit/internal/services/mariadb/mariadb_acc_test.go
View file

@ -21,7 +21,7 @@ var instanceResource = map[string]string{
"project_id": testutil.ProjectId,
"name": testutil.ResourceNameWithDateTime("mariadb"),
"plan_id": "683be856-3587-42de-b1b5-a792ff854f52",
"plan_name": "stackit-qa-mariadb-1.4.10-single",
"plan_name": "stackit-mariadb-1.4.10-single",
"version": "10.6",
"sgw_acl-1": "192.168.0.0/16",
"sgw_acl-2": "192.168.0.0/24",
@ -183,7 +183,9 @@ func testAccCheckMariaDBDestroy(s *terraform.State) error {
var client *mariadb.APIClient
var err error
if testutil.MariaDBCustomEndpoint == "" {
client, err = mariadb.NewAPIClient()
client, err = mariadb.NewAPIClient(
config.WithRegion("eu01"),
)
} else {
client, err = mariadb.NewAPIClient(
config.WithEndpoint(testutil.MariaDBCustomEndpoint),