Skip to content

Commit 0f688db

Browse files
committed
ok except for pn detach
1 parent 3b9f6c3 commit 0f688db

File tree

4 files changed

+2485
-24
lines changed

4 files changed

+2485
-24
lines changed

internal/services/container/container_test.go

Lines changed: 24 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -680,28 +680,28 @@ func TestAccContainer_PrivateNetwork(t *testing.T) {
680680
resource.TestCheckResourceAttrPair("scaleway_container.c00", "private_network_id", "scaleway_vpc_private_network.pn00", "id"),
681681
),
682682
},
683-
//{
684-
// Config: `
685-
// resource scaleway_vpc_private_network pn00 {}
686-
// resource scaleway_vpc_private_network pn01 {}
687-
//
688-
// resource scaleway_container_namespace main {
689-
// activate_vpc_integration = true
690-
// }
691-
//
692-
// resource scaleway_container c00 {
693-
// namespace_id = scaleway_container_namespace.main.id
694-
// private_network_id = scaleway_vpc_private_network.pn01.id
695-
// sandbox = "v1"
696-
// }
697-
// `,
698-
// Check: resource.ComposeTestCheckFunc(
699-
// isContainerPresent(tt, "scaleway_container.c00"),
700-
// resource.TestCheckResourceAttr("scaleway_container.c00", "sandbox", "v1"),
701-
// resource.TestCheckResourceAttrPair("scaleway_container.c00", "private_network_id", "scaleway_vpc_private_network.pn01", "id"),
702-
// ),
703-
//},
704-
//{
683+
{
684+
Config: `
685+
resource scaleway_vpc_private_network pn00 {}
686+
resource scaleway_vpc_private_network pn01 {}
687+
688+
resource scaleway_container_namespace main {
689+
activate_vpc_integration = true
690+
}
691+
692+
resource scaleway_container c00 {
693+
namespace_id = scaleway_container_namespace.main.id
694+
private_network_id = scaleway_vpc_private_network.pn01.id
695+
sandbox = "v1"
696+
}
697+
`,
698+
Check: resource.ComposeTestCheckFunc(
699+
isContainerPresent(tt, "scaleway_container.c00"),
700+
resource.TestCheckResourceAttr("scaleway_container.c00", "sandbox", "v1"),
701+
resource.TestCheckResourceAttrPair("scaleway_container.c00", "private_network_id", "scaleway_vpc_private_network.pn01", "id"),
702+
),
703+
},
704+
// {
705705
// Config: `
706706
// resource scaleway_vpc_private_network pn00 {}
707707
// resource scaleway_vpc_private_network pn01 {}
@@ -712,14 +712,15 @@ func TestAccContainer_PrivateNetwork(t *testing.T) {
712712
//
713713
// resource scaleway_container c00 {
714714
// namespace_id = scaleway_container_namespace.main.id
715+
// private_network_id = "00000000-0000-0000-0000-000000000000"
715716
// sandbox = "v1"
716717
// }
717718
// `,
718719
// Check: resource.ComposeTestCheckFunc(
719720
// isContainerPresent(tt, "scaleway_container.c00"),
720721
// resource.TestCheckResourceAttr("scaleway_container.c00", "private_network_id", ""),
721722
// ),
722-
//},
723+
// },
723724
},
724725
})
725726
}

internal/services/container/helpers_container.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ func setUpdateContainerRequest(d *schema.ResourceData, region scw.Region, contai
275275
}
276276

277277
if d.HasChanges("private_network_id") {
278-
if _, newPNID := d.GetChange("private_network_id"); newPNID != nil && newPNID.(string) != "" {
278+
if newPNID, ok := d.GetOk("private_network_id"); ok && newPNID.(string) != "" {
279279
req.PrivateNetworkID = types.ExpandUpdatedStringPtr(locality.ExpandID(newPNID.(string)))
280280
} else {
281281
req.PrivateNetworkID = nil

internal/services/container/namespace_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -266,6 +266,7 @@ func TestAccNamespace_DestroyRegistry(t *testing.T) {
266266
},
267267
})
268268
}
269+
269270
func TestAccNamespace_VPCIntegration(t *testing.T) {
270271
tt := acctest.NewTestTools(t)
271272
defer tt.Cleanup()

0 commit comments

Comments
 (0)