Skip to content

Commit 00dcf7f

Browse files
remyleoneremyleone
authored
chore: add explicit vpc in usage of a private network (#3372)
* chore: add explicit vpc in usage of a private network * Fix * add explicit name to vpc to identify them more easily * record cassettes * fix test * Fix * Fix
1 parent 27a6b65 commit 00dcf7f

File tree

53 files changed

+120697
-37127
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+120697
-37127
lines changed

‎docs/guides/using-vpc-bastion-ssh.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,14 @@ variable "machine_count" {
3434
}
3535
3636
# SCALEWAY VPC PRIVATE NETWORK
37+
resource scaleway_vpc "main" {
38+
region = "fr-par"
39+
}
40+
3741
resource scaleway_vpc_private_network "pn" {
3842
name = "myprivatenetwork"
3943
zone = "fr-par-1"
44+
vpc_id = scaleway_vpc.main.id
4045
}
4146
4247
# SCALEWAY VPC VIRTUAL MACHINES

‎internal/services/container/container_test.go‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -648,11 +648,17 @@ func TestAccContainer_PrivateNetwork(t *testing.T) {
648648
Steps: []resource.TestStep{
649649
{
650650
Config: `
651+
resource scaleway_vpc main {
652+
name = "TestAccContainer_PrivateNetwork"
653+
}
654+
651655
resource scaleway_vpc_private_network pn00 {
652656
name = "test-acc-container-pn-pn00"
657+
vpc_id = scaleway_vpc.main.id
653658
}
654659
resource scaleway_vpc_private_network pn01 {
655660
name = "test-acc-container-pn-pn01"
661+
vpc_id = scaleway_vpc.main.id
656662
}
657663
658664
resource scaleway_container_namespace main {
@@ -675,11 +681,17 @@ func TestAccContainer_PrivateNetwork(t *testing.T) {
675681
},
676682
{
677683
Config: `
684+
resource scaleway_vpc main {
685+
name = "TestAccContainer_PrivateNetwork"
686+
}
687+
678688
resource scaleway_vpc_private_network pn00 {
679689
name = "test-acc-container-pn-pn00"
690+
vpc_id = scaleway_vpc.main.id
680691
}
681692
resource scaleway_vpc_private_network pn01 {
682693
name = "test-acc-container-pn-pn01"
694+
vpc_id = scaleway_vpc.main.id
683695
}
684696
685697
resource scaleway_container_namespace main {
@@ -721,11 +733,18 @@ func TestAccContainer_PrivateNetwork(t *testing.T) {
721733
},
722734
{
723735
Config: `
736+
resource scaleway_vpc main {
737+
name = "TestAccContainer_PrivateNetwork"
738+
}
739+
724740
resource scaleway_vpc_private_network pn00 {
725741
name = "test-acc-container-pn-pn00"
742+
vpc_id = scaleway_vpc.main.id
726743
}
744+
727745
resource scaleway_vpc_private_network pn01 {
728746
name = "test-acc-container-pn-pn01"
747+
vpc_id = scaleway_vpc.main.id
729748
}
730749
731750
resource scaleway_container_namespace main {

‎internal/services/container/namespace_test.go‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,13 @@ func TestAccNamespace_VPCIntegration(t *testing.T) {
283283
Steps: []resource.TestStep{
284284
{
285285
Config: `
286-
resource scaleway_vpc_private_network main {}
286+
resource scaleway_vpc main {
287+
name = "TestAccNamespace_VPCIntegration"
288+
}
289+
290+
resource scaleway_vpc_private_network main {
291+
vpc_id = scaleway_vpc.main.id
292+
}
287293
288294
resource scaleway_container_namespace main {}
289295
@@ -300,7 +306,13 @@ func TestAccNamespace_VPCIntegration(t *testing.T) {
300306
},
301307
{
302308
Config: `
303-
resource scaleway_vpc_private_network main {}
309+
resource scaleway_vpc main {
310+
name = "TestAccNamespace_VPCIntegration"
311+
}
312+
313+
resource scaleway_vpc_private_network main {
314+
vpc_id = scaleway_vpc.main.id
315+
}
304316
305317
resource scaleway_container_namespace main {
306318
activate_vpc_integration = true

‎internal/services/container/testdata/container-private-network.cassette.yaml‎

Lines changed: 1240 additions & 799 deletions
Large diffs are not rendered by default.

‎internal/services/container/testdata/namespace-vpc-integration.cassette.yaml‎

Lines changed: 732 additions & 389 deletions
Large diffs are not rendered by default.

‎internal/services/function/function_test.go‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -426,11 +426,18 @@ func TestAccFunction_PrivateNetwork(t *testing.T) {
426426
Steps: []resource.TestStep{
427427
{
428428
Config: `
429+
resource scaleway_vpc main {
430+
name = "TestAccFunction_PrivateNetwork"
431+
}
432+
429433
resource scaleway_vpc_private_network pn00 {
430434
name = "test-acc-function-pn-pn00"
435+
vpc_id = scaleway_vpc.main.id
431436
}
437+
432438
resource scaleway_vpc_private_network pn01 {
433439
name = "test-acc-function-pn-pn01"
440+
vpc_id = scaleway_vpc.main.id
434441
}
435442
436443
resource scaleway_function_namespace main {
@@ -456,11 +463,18 @@ func TestAccFunction_PrivateNetwork(t *testing.T) {
456463
},
457464
{
458465
Config: `
466+
resource scaleway_vpc main {
467+
name = "TestAccFunction_PrivateNetwork"
468+
}
469+
459470
resource scaleway_vpc_private_network pn00 {
460471
name = "test-acc-function-pn-pn00"
472+
vpc_id = scaleway_vpc.main.id
461473
}
474+
462475
resource scaleway_vpc_private_network pn01 {
463476
name = "test-acc-function-pn-pn01"
477+
vpc_id = scaleway_vpc.main.id
464478
}
465479
466480
resource scaleway_function_namespace main {
@@ -511,11 +525,18 @@ func TestAccFunction_PrivateNetwork(t *testing.T) {
511525
},
512526
{
513527
Config: `
528+
resource scaleway_vpc main {
529+
name = "TestAccFunction_PrivateNetwork"
530+
}
531+
514532
resource scaleway_vpc_private_network pn00 {
515533
name = "test-acc-function-pn-pn00"
534+
vpc_id = scaleway_vpc.main.id
516535
}
536+
517537
resource scaleway_vpc_private_network pn01 {
518538
name = "test-acc-function-pn-pn01"
539+
vpc_id = scaleway_vpc.main.id
519540
}
520541
521542
resource scaleway_function_namespace main {

‎internal/services/function/namespace_test.go‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,13 @@ func TestAccFunctionNamespace_VPCIntegration(t *testing.T) {
197197
Steps: []resource.TestStep{
198198
{
199199
Config: `
200-
resource scaleway_vpc_private_network main {}
200+
resource scaleway_vpc main {
201+
name = "TestAccFunctionNamespace_VPCIntegration"
202+
}
203+
204+
resource scaleway_vpc_private_network main {
205+
vpc_id = scaleway_vpc.main.id
206+
}
201207
202208
resource scaleway_function_namespace main {}
203209
@@ -217,7 +223,13 @@ func TestAccFunctionNamespace_VPCIntegration(t *testing.T) {
217223
},
218224
{
219225
Config: `
220-
resource scaleway_vpc_private_network main {}
226+
resource scaleway_vpc main {
227+
name = "TestAccFunctionNamespace_VPCIntegration"
228+
}
229+
230+
resource scaleway_vpc_private_network main {
231+
vpc_id = scaleway_vpc.main.id
232+
}
221233
222234
resource scaleway_function_namespace main {
223235
activate_vpc_integration = true

0 commit comments

Comments
 (0)