Skip to content

Commit 1e971d6

Browse files
quantumsheepquantumsheep
authored
tests(mnq): update to one namespace limit (#2120)
1 parent 9a6a523 commit 1e971d6

11 files changed

+3154
-1902
lines changed

‎scaleway/resource_container_trigger_test.go

+9-2
Original file line numberDiff line numberDiff line change
@@ -50,16 +50,23 @@ func TestAccScalewayContainerTrigger_SQS(t *testing.T) {
5050
defer tt.Cleanup()
5151

5252
basicConfig := `
53+
resource "scaleway_account_project" "project" {
54+
name = "tf_tests_container_trigger_sqs"
55+
}
56+
5357
resource scaleway_container_namespace main {
58+
project_id = scaleway_account_project.project.id
5459
}
5560
5661
resource scaleway_container main {
5762
namespace_id = scaleway_container_namespace.main.id
5863
}
5964
60-
resource scaleway_mnq_namespace main {
65+
resource "scaleway_mnq_namespace" "main" {
66+
name = "main"
6167
protocol = "sqs_sns"
62-
name = "test-container-trigger-sqs"
68+
69+
project_id = scaleway_account_project.project.id
6370
}
6471
6572
resource "scaleway_mnq_credential" "main" {

‎scaleway/resource_function_trigger_test.go

+16-2
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,13 @@ func TestAccScalewayFunctionTrigger_SQS(t *testing.T) {
5656
Steps: []resource.TestStep{
5757
{
5858
Config: `
59+
resource "scaleway_account_project" "project" {
60+
name = "tf_tests_function_trigger_sqs"
61+
}
62+
5963
resource scaleway_function_namespace main {
6064
name = "test-function-trigger-sqs"
65+
project_id = scaleway_account_project.project.id
6166
}
6267
6368
resource scaleway_function main {
@@ -70,7 +75,9 @@ func TestAccScalewayFunctionTrigger_SQS(t *testing.T) {
7075
7176
resource scaleway_mnq_namespace main {
7277
protocol = "sqs_sns"
73-
name = "test-function-trigger-sqs"
78+
name = "main"
79+
80+
project_id = scaleway_account_project.project.id
7481
}
7582
7683
resource "scaleway_mnq_credential" "main" {
@@ -114,8 +121,13 @@ func TestAccScalewayFunctionTrigger_SQS(t *testing.T) {
114121
},
115122
{
116123
Config: `
124+
resource "scaleway_account_project" "project" {
125+
name = "tf_tests_function_trigger_sqs"
126+
}
127+
117128
resource scaleway_function_namespace main {
118129
name = "test-function-trigger-sqs"
130+
project_id = scaleway_account_project.project.id
119131
}
120132
121133
resource scaleway_function main {
@@ -128,7 +140,9 @@ func TestAccScalewayFunctionTrigger_SQS(t *testing.T) {
128140
129141
resource scaleway_mnq_namespace main {
130142
protocol = "sqs_sns"
131-
name = "test-function-trigger-sqs"
143+
name = "main"
144+
145+
project_id = scaleway_account_project.project.id
132146
}
133147
134148
resource "scaleway_mnq_credential" "main" {

‎scaleway/resource_mnq_credential_test.go

+32-8
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,15 @@ func TestAccScalewayMNQCreeds_Basic(t *testing.T) {
2020
Steps: []resource.TestStep{
2121
{
2222
Config: `
23+
resource "scaleway_account_project" "project" {
24+
name = "tf_tests_mnq_credentials_basic_1"
25+
}
26+
2327
resource "scaleway_mnq_namespace" "main" {
24-
name = "test-mnq-creds-basic-1"
25-
protocol = "nats"
28+
name = "main"
29+
protocol = "nats"
30+
31+
project_id = scaleway_account_project.project.id
2632
}
2733
2834
resource "scaleway_mnq_credential" "main" {
@@ -39,9 +45,15 @@ func TestAccScalewayMNQCreeds_Basic(t *testing.T) {
3945
},
4046
{
4147
Config: `
48+
resource "scaleway_account_project" "project" {
49+
name = "tf_tests_mnq_credentials_basic_2"
50+
}
51+
4252
resource "scaleway_mnq_namespace" "main" {
43-
name = "test-mnq-creds-basic-2"
44-
protocol = "sqs_sns"
53+
name = "main"
54+
protocol = "sqs_sns"
55+
56+
project_id = scaleway_account_project.project.id
4557
}
4658
4759
resource "scaleway_mnq_credential" "main" {
@@ -70,9 +82,15 @@ func TestAccScalewayMNQCreeds_Basic(t *testing.T) {
7082
},
7183
{
7284
Config: `
85+
resource "scaleway_account_project" "project" {
86+
name = "tf_tests_mnq_credentials_basic_3"
87+
}
88+
7389
resource "scaleway_mnq_namespace" "main" {
74-
name = "test-mnq-creds-basic-3"
75-
protocol = "sqs_sns"
90+
name = "main"
91+
protocol = "sqs_sns"
92+
93+
project_id = scaleway_account_project.project.id
7694
}
7795
7896
resource "scaleway_mnq_credential" "main" {
@@ -101,9 +119,15 @@ func TestAccScalewayMNQCreeds_Basic(t *testing.T) {
101119
},
102120
{
103121
Config: `
122+
resource "scaleway_account_project" "project" {
123+
name = "tf_tests_mnq_credentials_basic_3"
124+
}
125+
104126
resource "scaleway_mnq_namespace" "main" {
105-
name = "test-mnq-creds-basic-3"
106-
protocol = "sqs_sns"
127+
name = "main"
128+
protocol = "sqs_sns"
129+
130+
project_id = scaleway_account_project.project.id
107131
}
108132
109133
resource "scaleway_mnq_credential" "main" {

‎scaleway/resource_mnq_namespace_test.go

+13-28
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,15 @@ func TestAccScalewayMNQNamespace_Basic(t *testing.T) {
5555
Steps: []resource.TestStep{
5656
{
5757
Config: `
58+
resource "scaleway_account_project" "project" {
59+
name = "tf_tests_mnq_namespace_basic_1"
60+
}
61+
5862
resource "scaleway_mnq_namespace" "main" {
59-
name = "test-mnq-ns-basic-1"
60-
protocol = "nats"
63+
name = "main"
64+
protocol = "nats"
65+
66+
project_id = scaleway_account_project.project.id
6167
}
6268
`,
6369
Check: resource.ComposeTestCheckFunc(
@@ -71,34 +77,13 @@ func TestAccScalewayMNQNamespace_Basic(t *testing.T) {
7177
},
7278
{
7379
Config: `
74-
resource scaleway_mnq_namespace main {
75-
name = "test-mnq-ns-basic-2"
76-
protocol = "nats"
77-
}
78-
`,
79-
Check: resource.ComposeTestCheckFunc(
80-
testAccCheckScalewayMNQNamespaceExists(tt, "scaleway_mnq_namespace.main"),
81-
resource.TestCheckResourceAttr("scaleway_mnq_namespace.main", "name", "test-mnq-ns-basic-2"),
82-
),
83-
},
84-
{
85-
Config: `
86-
resource "scaleway_mnq_namespace" "main" {
87-
name = "test-mnq-ns-basic-1"
88-
protocol = "nats"
89-
region = "fr-par"
80+
resource "scaleway_account_project" "project" {
81+
name = "tf_tests_mnq_namespace_basic_1"
9082
}
91-
`,
92-
Check: resource.ComposeTestCheckFunc(
93-
testAccCheckScalewayMNQNamespaceExists(tt, "scaleway_mnq_namespace.main"),
94-
resource.TestCheckResourceAttr("scaleway_mnq_namespace.main", "name", "test-mnq-ns-basic-1"),
95-
resource.TestCheckResourceAttr("scaleway_mnq_namespace.main", "region", "fr-par"),
96-
),
97-
},
98-
{
99-
Config: `
83+
10084
resource "scaleway_mnq_namespace" "main" {
101-
protocol = "sqs_sns"
85+
protocol = "sqs_sns"
86+
project_id = scaleway_account_project.project.id
10287
}
10388
`,
10489
Check: resource.ComposeTestCheckFunc(

‎scaleway/resource_mnq_queue_test.go

+42-6
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,15 @@ func TestAccScalewayMNQQueue_BasicSQS(t *testing.T) {
2525
Steps: []resource.TestStep{
2626
{
2727
Config: `
28+
resource "scaleway_account_project" "project" {
29+
name = "tf_tests_mnq_basic_sqs"
30+
}
31+
2832
resource "scaleway_mnq_namespace" "main" {
29-
name = "test-mnq-queue-basic-1"
33+
name = "main"
3034
protocol = "sqs_sns"
35+
36+
project_id = scaleway_account_project.project.id
3137
}
3238
3339
resource "scaleway_mnq_credential" "main" {
@@ -69,9 +75,15 @@ func TestAccScalewayMNQQueue_BasicSQS(t *testing.T) {
6975
},
7076
{
7177
Config: `
78+
resource "scaleway_account_project" "project" {
79+
name = "tf_tests_mnq_basic_sqs"
80+
}
81+
7282
resource "scaleway_mnq_namespace" "main" {
73-
name = "test-mnq-queue-basic-1"
83+
name = "main"
7484
protocol = "sqs_sns"
85+
86+
project_id = scaleway_account_project.project.id
7587
}
7688
7789
resource "scaleway_mnq_credential" "main" {
@@ -102,9 +114,15 @@ func TestAccScalewayMNQQueue_BasicSQS(t *testing.T) {
102114
},
103115
{
104116
Config: `
117+
resource "scaleway_account_project" "project" {
118+
name = "tf_tests_mnq_basic_sqs"
119+
}
120+
105121
resource "scaleway_mnq_namespace" "main" {
106-
name = "test-mnq-queue-basic-1"
122+
name = "main"
107123
protocol = "sqs_sns"
124+
125+
project_id = scaleway_account_project.project.id
108126
}
109127
110128
resource "scaleway_mnq_credential" "main" {
@@ -139,9 +157,15 @@ func TestAccScalewayMNQQueue_BasicSQS(t *testing.T) {
139157
},
140158
{
141159
Config: `
160+
resource "scaleway_account_project" "project" {
161+
name = "tf_tests_mnq_basic_sqs"
162+
}
163+
142164
resource "scaleway_mnq_namespace" "main" {
143-
name = "test-mnq-queue-basic-1"
165+
name = "main"
144166
protocol = "sqs_sns"
167+
168+
project_id = scaleway_account_project.project.id
145169
}
146170
147171
resource "scaleway_mnq_credential" "main" {
@@ -194,9 +218,15 @@ func TestAccScalewayMNQQueue_BasicNATS(t *testing.T) {
194218
Steps: []resource.TestStep{
195219
{
196220
Config: `
221+
resource "scaleway_account_project" "project" {
222+
name = "tf_tests_mnq_basic_nats"
223+
}
224+
197225
resource "scaleway_mnq_namespace" "main" {
198-
name = "test-mnq-nats-basic"
226+
name = "main"
199227
protocol = "nats"
228+
229+
project_id = scaleway_account_project.project.id
200230
}
201231
202232
resource "scaleway_mnq_credential" "main" {
@@ -222,9 +252,15 @@ func TestAccScalewayMNQQueue_BasicNATS(t *testing.T) {
222252
},
223253
{
224254
Config: `
255+
resource "scaleway_account_project" "project" {
256+
name = "tf_tests_mnq_basic_nats"
257+
}
258+
225259
resource "scaleway_mnq_namespace" "main" {
226-
name = "test-mnq-nats-basic"
260+
name = "main"
227261
protocol = "nats"
262+
263+
project_id = scaleway_account_project.project.id
228264
}
229265
230266
resource "scaleway_mnq_credential" "main" {

0 commit comments

Comments
 (0)