Skip to content

Commit d5274a8

Browse files
joaopaletjoaopalet
authored
Fix DSA acceptance tests (#7)
* Fix MariaDB acceptance test * Fix PostgreSQL acceptance test * Fix LogMe acceptance test * Fix RabbitMQ acceptance test * Fix Redis acceptance test * Fix OpenSearch acceptance test
1 parent 2c93e4a commit d5274a8

6 files changed

Lines changed: 98 additions & 69 deletions

File tree

‎stackit/services/logme/logme_acc_test.go‎

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@ import (
1919
var instanceResource = map[string]string{
2020
"project_id": testutil.ProjectId,
2121
"name": testutil.ResourceNameWithDateTime("logme"),
22-
"plan_id": "7a54492c-8a2e-4d3c-b6c2-a4f20cb65912",
22+
"plan_id": "201d743c-0f06-4af2-8f20-649baf4819ae",
23+
"plan_name": "stackit-qa-logme2-1.2.50-replica",
24+
"version": "2",
2325
"sgw_acl-1": "192.168.0.0/16",
2426
"sgw_acl-2": "192.168.0.0/24",
2527
}
@@ -30,8 +32,9 @@ func resourceConfig(acls string) string {
3032
3133
resource "stackit_logme_instance" "instance" {
3234
project_id = "%s"
33-
name = "%s"
34-
plan_id = "%s"
35+
name = "%s"
36+
plan_name = "%s"
37+
version = "%s"
3538
parameters = {
3639
sgw_acl = "%s"
3740
}
@@ -45,7 +48,8 @@ func resourceConfig(acls string) string {
4548
testutil.LogMeProviderConfig(),
4649
instanceResource["project_id"],
4750
instanceResource["name"],
48-
instanceResource["plan_id"],
51+
instanceResource["plan_name"],
52+
instanceResource["version"],
4953
acls,
5054
)
5155
}
@@ -63,6 +67,8 @@ func TestAccLogMeResource(t *testing.T) {
6367
resource.TestCheckResourceAttr("stackit_logme_instance.instance", "project_id", instanceResource["project_id"]),
6468
resource.TestCheckResourceAttrSet("stackit_logme_instance.instance", "instance_id"),
6569
resource.TestCheckResourceAttr("stackit_logme_instance.instance", "plan_id", instanceResource["plan_id"]),
70+
resource.TestCheckResourceAttr("stackit_logme_instance.instance", "plan_name", instanceResource["plan_name"]),
71+
resource.TestCheckResourceAttr("stackit_logme_instance.instance", "version", instanceResource["version"]),
6672
resource.TestCheckResourceAttr("stackit_logme_instance.instance", "name", instanceResource["name"]),
6773
resource.TestCheckResourceAttr("stackit_logme_instance.instance", "parameters.sgw_acl", instanceResource["sgw_acl-1"]),
6874

@@ -102,12 +108,9 @@ func TestAccLogMeResource(t *testing.T) {
102108

103109
resource.TestCheckResourceAttrPair("stackit_logme_instance.instance", "instance_id",
104110
"data.stackit_logme_instance.instance", "instance_id"),
105-
106111
resource.TestCheckResourceAttrPair("stackit_logme_credentials.credentials", "credentials_id",
107112
"data.stackit_logme_credentials.credentials", "credentials_id"),
108-
109113
resource.TestCheckResourceAttr("data.stackit_logme_instance.instance", "plan_id", instanceResource["plan_id"]),
110-
111114
resource.TestCheckResourceAttr("data.stackit_logme_instance.instance", "name", instanceResource["name"]),
112115
resource.TestCheckResourceAttr("data.stackit_logme_instance.instance", "parameters.sgw_acl", instanceResource["sgw_acl-1"]),
113116

@@ -131,11 +134,11 @@ func TestAccLogMeResource(t *testing.T) {
131134
if !ok {
132135
return "", fmt.Errorf("couldn't find attribute instance_id")
133136
}
134-
135137
return fmt.Sprintf("%s,%s", testutil.ProjectId, instanceId), nil
136138
},
137-
ImportState: true,
138-
ImportStateVerify: true,
139+
ImportState: true,
140+
ImportStateVerify: true,
141+
ImportStateVerifyIgnore: []string{"plan_name", "version"},
139142
},
140143
{
141144
ResourceName: "stackit_logme_credentials.credentials",
@@ -165,6 +168,8 @@ func TestAccLogMeResource(t *testing.T) {
165168
resource.TestCheckResourceAttr("stackit_logme_instance.instance", "project_id", instanceResource["project_id"]),
166169
resource.TestCheckResourceAttrSet("stackit_logme_instance.instance", "instance_id"),
167170
resource.TestCheckResourceAttr("stackit_logme_instance.instance", "plan_id", instanceResource["plan_id"]),
171+
resource.TestCheckResourceAttr("stackit_logme_instance.instance", "plan_name", instanceResource["plan_name"]),
172+
resource.TestCheckResourceAttr("stackit_logme_instance.instance", "version", instanceResource["version"]),
168173
resource.TestCheckResourceAttr("stackit_logme_instance.instance", "name", instanceResource["name"]),
169174
resource.TestCheckResourceAttr("stackit_logme_instance.instance", "parameters.sgw_acl", instanceResource["sgw_acl-2"]),
170175
),

‎stackit/services/mariadb/mariadb_acc_test.go‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ var instanceResource = map[string]string{
2020
"project_id": testutil.ProjectId,
2121
"name": testutil.ResourceNameWithDateTime("mariadb"),
2222
"plan_id": "683be856-3587-42de-b1b5-a792ff854f52",
23+
"plan_name": "stackit-qa-mariadb-1.4.10-single",
24+
"version": "10.6",
2325
"sgw_acl-1": "192.168.0.0/16",
2426
"sgw_acl-2": "192.168.0.0/24",
2527
}
@@ -30,8 +32,9 @@ func resourceConfig(acls string) string {
3032
3133
resource "stackit_mariadb_instance" "instance" {
3234
project_id = "%s"
33-
name = "%s"
34-
plan_id = "%s"
35+
name = "%s"
36+
plan_name = "%s"
37+
version = "%s"
3538
parameters = {
3639
sgw_acl = "%s"
3740
}
@@ -45,7 +48,8 @@ func resourceConfig(acls string) string {
4548
testutil.MariaDBProviderConfig(),
4649
instanceResource["project_id"],
4750
instanceResource["name"],
48-
instanceResource["plan_id"],
51+
instanceResource["plan_name"],
52+
instanceResource["version"],
4953
acls,
5054
)
5155
}
@@ -63,6 +67,8 @@ func TestAccMariaDBResource(t *testing.T) {
6367
resource.TestCheckResourceAttr("stackit_mariadb_instance.instance", "project_id", instanceResource["project_id"]),
6468
resource.TestCheckResourceAttrSet("stackit_mariadb_instance.instance", "instance_id"),
6569
resource.TestCheckResourceAttr("stackit_mariadb_instance.instance", "plan_id", instanceResource["plan_id"]),
70+
resource.TestCheckResourceAttr("stackit_mariadb_instance.instance", "plan_name", instanceResource["plan_name"]),
71+
resource.TestCheckResourceAttr("stackit_mariadb_instance.instance", "version", instanceResource["version"]),
6672
resource.TestCheckResourceAttr("stackit_mariadb_instance.instance", "name", instanceResource["name"]),
6773
resource.TestCheckResourceAttr("stackit_mariadb_instance.instance", "parameters.sgw_acl", instanceResource["sgw_acl-1"]),
6874

@@ -99,15 +105,11 @@ func TestAccMariaDBResource(t *testing.T) {
99105
Check: resource.ComposeAggregateTestCheckFunc(
100106
// Instance data
101107
resource.TestCheckResourceAttr("data.stackit_mariadb_instance.instance", "project_id", instanceResource["project_id"]),
102-
103108
resource.TestCheckResourceAttrPair("stackit_mariadb_instance.instance", "instance_id",
104109
"data.stackit_mariadb_instance.instance", "instance_id"),
105-
106110
resource.TestCheckResourceAttrPair("stackit_mariadb_credentials.credentials", "credentials_id",
107111
"data.stackit_mariadb_credentials.credentials", "credentials_id"),
108-
109112
resource.TestCheckResourceAttr("data.stackit_mariadb_instance.instance", "plan_id", instanceResource["plan_id"]),
110-
111113
resource.TestCheckResourceAttr("data.stackit_mariadb_instance.instance", "name", instanceResource["name"]),
112114
resource.TestCheckResourceAttr("data.stackit_mariadb_instance.instance", "parameters.sgw_acl", instanceResource["sgw_acl-1"]),
113115

@@ -131,11 +133,11 @@ func TestAccMariaDBResource(t *testing.T) {
131133
if !ok {
132134
return "", fmt.Errorf("couldn't find attribute instance_id")
133135
}
134-
135136
return fmt.Sprintf("%s,%s", testutil.ProjectId, instanceId), nil
136137
},
137-
ImportState: true,
138-
ImportStateVerify: true,
138+
ImportState: true,
139+
ImportStateVerify: true,
140+
ImportStateVerifyIgnore: []string{"plan_name", "version"},
139141
},
140142
{
141143
ResourceName: "stackit_mariadb_credentials.credentials",
@@ -165,6 +167,8 @@ func TestAccMariaDBResource(t *testing.T) {
165167
resource.TestCheckResourceAttr("stackit_mariadb_instance.instance", "project_id", instanceResource["project_id"]),
166168
resource.TestCheckResourceAttrSet("stackit_mariadb_instance.instance", "instance_id"),
167169
resource.TestCheckResourceAttr("stackit_mariadb_instance.instance", "plan_id", instanceResource["plan_id"]),
170+
resource.TestCheckResourceAttr("stackit_mariadb_instance.instance", "plan_name", instanceResource["plan_name"]),
171+
resource.TestCheckResourceAttr("stackit_mariadb_instance.instance", "version", instanceResource["version"]),
168172
resource.TestCheckResourceAttr("stackit_mariadb_instance.instance", "name", instanceResource["name"]),
169173
resource.TestCheckResourceAttr("stackit_mariadb_instance.instance", "parameters.sgw_acl", instanceResource["sgw_acl-2"]),
170174
),

‎stackit/services/opensearch/opensearch_acc_test.go‎

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ var instanceResource = map[string]string{
2020
"project_id": testutil.ProjectId,
2121
"name": testutil.ResourceNameWithDateTime("opensearch"),
2222
"plan_id": "9e4eac4b-b03d-4d7b-b01b-6d1224aa2d68",
23+
"plan_name": "stackit-qa-opensearch-1.2.10-replica",
24+
"version": "2",
2325
"sgw_acl": "192.168.0.0/24",
2426
}
2527

@@ -30,7 +32,8 @@ func resourceConfig() string {
3032
resource "stackit_opensearch_instance" "instance" {
3133
project_id = "%s"
3234
name = "%s"
33-
plan_id = "%s"
35+
plan_name = "%s"
36+
version = "%s"
3437
}
3538
3639
resource "stackit_opensearch_credentials" "credentials" {
@@ -41,7 +44,8 @@ func resourceConfig() string {
4144
testutil.OpenSearchProviderConfig(),
4245
instanceResource["project_id"],
4346
instanceResource["name"],
44-
instanceResource["plan_id"],
47+
instanceResource["plan_name"],
48+
instanceResource["version"],
4549
)
4650
}
4751

@@ -52,7 +56,8 @@ func resourceConfigUpdate() string {
5256
resource "stackit_opensearch_instance" "instance" {
5357
project_id = "%s"
5458
name = "%s"
55-
plan_id = "%s"
59+
plan_name = "%s"
60+
version = "%s"
5661
parameters = {
5762
sgw_acl = "%s"
5863
}
@@ -66,7 +71,8 @@ func resourceConfigUpdate() string {
6671
testutil.OpenSearchProviderConfig(),
6772
instanceResource["project_id"],
6873
instanceResource["name"],
69-
instanceResource["plan_id"],
74+
instanceResource["plan_name"],
75+
instanceResource["version"],
7076
instanceResource["sgw_acl"],
7177
)
7278
}
@@ -85,6 +91,8 @@ func TestAccOpenSearchResource(t *testing.T) {
8591
resource.TestCheckResourceAttr("stackit_opensearch_instance.instance", "project_id", instanceResource["project_id"]),
8692
resource.TestCheckResourceAttrSet("stackit_opensearch_instance.instance", "instance_id"),
8793
resource.TestCheckResourceAttr("stackit_opensearch_instance.instance", "plan_id", instanceResource["plan_id"]),
94+
resource.TestCheckResourceAttr("stackit_opensearch_instance.instance", "plan_name", instanceResource["plan_name"]),
95+
resource.TestCheckResourceAttr("stackit_opensearch_instance.instance", "version", instanceResource["version"]),
8896
resource.TestCheckResourceAttr("stackit_opensearch_instance.instance", "name", instanceResource["name"]),
8997
resource.TestCheckResourceAttrSet("stackit_opensearch_instance.instance", "parameters.sgw_acl"),
9098

@@ -121,15 +129,11 @@ func TestAccOpenSearchResource(t *testing.T) {
121129
Check: resource.ComposeAggregateTestCheckFunc(
122130
// Instance data
123131
resource.TestCheckResourceAttr("data.stackit_opensearch_instance.instance", "project_id", instanceResource["project_id"]),
124-
125132
resource.TestCheckResourceAttrPair("stackit_opensearch_instance.instance", "instance_id",
126133
"data.stackit_opensearch_instance.instance", "instance_id"),
127-
128134
resource.TestCheckResourceAttrPair("stackit_opensearch_credentials.credentials", "credentials_id",
129135
"data.stackit_opensearch_credentials.credentials", "credentials_id"),
130-
131136
resource.TestCheckResourceAttr("data.stackit_opensearch_instance.instance", "plan_id", instanceResource["plan_id"]),
132-
133137
resource.TestCheckResourceAttr("data.stackit_opensearch_instance.instance", "name", instanceResource["name"]),
134138
resource.TestCheckResourceAttrSet("data.stackit_opensearch_instance.instance", "parameters.sgw_acl"),
135139

@@ -156,8 +160,9 @@ func TestAccOpenSearchResource(t *testing.T) {
156160

157161
return fmt.Sprintf("%s,%s", testutil.ProjectId, instanceId), nil
158162
},
159-
ImportState: true,
160-
ImportStateVerify: true,
163+
ImportState: true,
164+
ImportStateVerify: true,
165+
ImportStateVerifyIgnore: []string{"plan_name", "version"},
161166
},
162167
{
163168
ResourceName: "stackit_opensearch_credentials.credentials",
@@ -187,6 +192,8 @@ func TestAccOpenSearchResource(t *testing.T) {
187192
resource.TestCheckResourceAttr("stackit_opensearch_instance.instance", "project_id", instanceResource["project_id"]),
188193
resource.TestCheckResourceAttrSet("stackit_opensearch_instance.instance", "instance_id"),
189194
resource.TestCheckResourceAttr("stackit_opensearch_instance.instance", "plan_id", instanceResource["plan_id"]),
195+
resource.TestCheckResourceAttr("stackit_opensearch_instance.instance", "plan_name", instanceResource["plan_name"]),
196+
resource.TestCheckResourceAttr("stackit_opensearch_instance.instance", "version", instanceResource["version"]),
190197
resource.TestCheckResourceAttr("stackit_opensearch_instance.instance", "name", instanceResource["name"]),
191198
resource.TestCheckResourceAttr("stackit_opensearch_instance.instance", "parameters.sgw_acl", instanceResource["sgw_acl"]),
192199
),

‎stackit/services/postgresql/postgresql_acc_test.go‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ var instanceResource = map[string]string{
2020
"project_id": testutil.ProjectId,
2121
"name": testutil.ResourceNameWithDateTime("postgresql"),
2222
"plan_id": "57d40175-0f4c-4bcc-b52d-cf5d2ee9f5a7",
23+
"plan_name": "stackit-qa-postgresql-1.4.10-single",
24+
"version": "13",
2325
"sgw_acl": "192.168.0.0/16",
2426
"metrics_frequency": "34",
2527
"plugins": "foo-bar",
@@ -31,8 +33,9 @@ func resourceConfig(acls, frequency, plugins string) string {
3133
3234
resource "stackit_postgresql_instance" "instance" {
3335
project_id = "%s"
34-
name = "%s"
35-
plan_id = "%s"
36+
name = "%s"
37+
plan_name = "%s"
38+
version = "%s"
3639
parameters = {
3740
sgw_acl = "%s"
3841
plugins = ["%s"]
@@ -51,7 +54,8 @@ func resourceConfig(acls, frequency, plugins string) string {
5154
testutil.PostgreSQLProviderConfig(),
5255
instanceResource["project_id"],
5356
instanceResource["name"],
54-
instanceResource["plan_id"],
57+
instanceResource["plan_name"],
58+
instanceResource["version"],
5559
acls,
5660
plugins,
5761
frequency,
@@ -71,6 +75,8 @@ func TestAccPostgreSQLResource(t *testing.T) {
7175
resource.TestCheckResourceAttr("stackit_postgresql_instance.instance", "project_id", instanceResource["project_id"]),
7276
resource.TestCheckResourceAttrSet("stackit_postgresql_instance.instance", "instance_id"),
7377
resource.TestCheckResourceAttr("stackit_postgresql_instance.instance", "plan_id", instanceResource["plan_id"]),
78+
resource.TestCheckResourceAttr("stackit_postgresql_instance.instance", "plan_name", instanceResource["plan_name"]),
79+
resource.TestCheckResourceAttr("stackit_postgresql_instance.instance", "version", instanceResource["version"]),
7480
resource.TestCheckResourceAttr("stackit_postgresql_instance.instance", "name", instanceResource["name"]),
7581
resource.TestCheckResourceAttr("stackit_postgresql_instance.instance", "parameters.sgw_acl", instanceResource["sgw_acl"]),
7682

@@ -106,15 +112,11 @@ func TestAccPostgreSQLResource(t *testing.T) {
106112
Check: resource.ComposeAggregateTestCheckFunc(
107113
// Instance data
108114
resource.TestCheckResourceAttr("data.stackit_postgresql_instance.instance", "project_id", instanceResource["project_id"]),
109-
110115
resource.TestCheckResourceAttrPair("stackit_postgresql_instance.instance", "instance_id",
111116
"data.stackit_postgresql_instance.instance", "instance_id"),
112-
113117
resource.TestCheckResourceAttrPair("stackit_postgresql_credentials.credentials", "credentials_id",
114118
"data.stackit_postgresql_credentials.credentials", "credentials_id"),
115-
116119
resource.TestCheckResourceAttr("data.stackit_postgresql_instance.instance", "plan_id", instanceResource["plan_id"]),
117-
118120
resource.TestCheckResourceAttr("data.stackit_postgresql_instance.instance", "name", instanceResource["name"]),
119121
resource.TestCheckResourceAttr("data.stackit_postgresql_instance.instance", "parameters.sgw_acl", instanceResource["sgw_acl"]),
120122
resource.TestCheckResourceAttr("data.stackit_postgresql_instance.instance", "parameters.plugins.#", "1"),
@@ -140,11 +142,11 @@ func TestAccPostgreSQLResource(t *testing.T) {
140142
if !ok {
141143
return "", fmt.Errorf("couldn't find attribute instance_id")
142144
}
143-
144145
return fmt.Sprintf("%s,%s", testutil.ProjectId, instanceId), nil
145146
},
146-
ImportState: true,
147-
ImportStateVerify: true,
147+
ImportState: true,
148+
ImportStateVerify: true,
149+
ImportStateVerifyIgnore: []string{"plan_name", "version"},
148150
},
149151
{
150152
ResourceName: "stackit_postgresql_credentials.credentials",
@@ -161,7 +163,6 @@ func TestAccPostgreSQLResource(t *testing.T) {
161163
if !ok {
162164
return "", fmt.Errorf("couldn't find attribute credentials_id")
163165
}
164-
165166
return fmt.Sprintf("%s,%s,%s", testutil.ProjectId, instanceId, credentialsId), nil
166167
},
167168
ImportState: true,
@@ -175,6 +176,8 @@ func TestAccPostgreSQLResource(t *testing.T) {
175176
resource.TestCheckResourceAttr("stackit_postgresql_instance.instance", "project_id", instanceResource["project_id"]),
176177
resource.TestCheckResourceAttrSet("stackit_postgresql_instance.instance", "instance_id"),
177178
resource.TestCheckResourceAttr("stackit_postgresql_instance.instance", "plan_id", instanceResource["plan_id"]),
179+
resource.TestCheckResourceAttr("stackit_postgresql_instance.instance", "plan_name", instanceResource["plan_name"]),
180+
resource.TestCheckResourceAttr("stackit_postgresql_instance.instance", "version", instanceResource["version"]),
178181
resource.TestCheckResourceAttr("stackit_postgresql_instance.instance", "name", instanceResource["name"]),
179182
resource.TestCheckResourceAttr("stackit_postgresql_instance.instance", "parameters.sgw_acl", instanceResource["sgw_acl"]),
180183
resource.TestCheckResourceAttr("stackit_postgresql_instance.instance", "parameters.plugins.0", fmt.Sprintf("%s-baz", instanceResource["plugins"])),

0 commit comments

Comments
 (0)