Skip to content

Commit 571d9c7

Browse files
Mia-CrossMia-Cross
authored
Merge branch 'master' into instance_doc_volume_resize
2 parents b7fbc15 + 9ad9217 commit 571d9c7

File tree

8 files changed

+1109
-1213
lines changed

8 files changed

+1109
-1213
lines changed

‎internal/services/container/container_test.go‎

Lines changed: 53 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -643,32 +643,28 @@ func TestAccContainer_PrivateNetwork(t *testing.T) {
643643
name = "TestAccContainer_PrivateNetwork"
644644
}
645645
646-
resource scaleway_vpc_private_network pn00 {
647-
name = "test-acc-container-pn-pn00"
648-
vpc_id = scaleway_vpc.main.id
649-
}
650-
resource scaleway_vpc_private_network pn01 {
651-
name = "test-acc-container-pn-pn01"
646+
resource scaleway_vpc_private_network start {
647+
name = "test-acc-container-pn-start"
652648
vpc_id = scaleway_vpc.main.id
653649
}
654650
655651
resource scaleway_container_namespace main {
656652
activate_vpc_integration = true
657653
}
658654
659-
resource scaleway_container c00 {
660-
name = "test-acc-container-pn-c00"
655+
resource scaleway_container to_stay {
656+
name = "test-acc-container-pn-to-stay"
661657
namespace_id = scaleway_container_namespace.main.id
662-
private_network_id = scaleway_vpc_private_network.pn00.id
658+
private_network_id = scaleway_vpc_private_network.start.id
663659
sandbox = "v1"
664-
tags = [ "c00" ]
660+
tags = [ "to-stay" ]
665661
}
666662
`,
667663
Check: resource.ComposeTestCheckFunc(
668-
isContainerPresent(tt, "scaleway_container.c00"),
664+
isContainerPresent(tt, "scaleway_container.to_stay"),
669665
resource.TestCheckResourceAttr("scaleway_container_namespace.main", "activate_vpc_integration", "true"),
670-
resource.TestCheckResourceAttr("scaleway_container.c00", "sandbox", "v1"),
671-
resource.TestCheckResourceAttrPair("scaleway_container.c00", "private_network_id", "scaleway_vpc_private_network.pn00", "id"),
666+
resource.TestCheckResourceAttr("scaleway_container.to_stay", "sandbox", "v1"),
667+
resource.TestCheckResourceAttrPair("scaleway_container.to_stay", "private_network_id", "scaleway_vpc_private_network.start", "id"),
672668
),
673669
},
674670
{
@@ -677,53 +673,49 @@ func TestAccContainer_PrivateNetwork(t *testing.T) {
677673
name = "TestAccContainer_PrivateNetwork"
678674
}
679675
680-
resource scaleway_vpc_private_network pn00 {
681-
name = "test-acc-container-pn-pn00"
682-
vpc_id = scaleway_vpc.main.id
683-
}
684-
resource scaleway_vpc_private_network pn01 {
685-
name = "test-acc-container-pn-pn01"
676+
resource scaleway_vpc_private_network start {
677+
name = "test-acc-container-pn-start"
686678
vpc_id = scaleway_vpc.main.id
687679
}
688680
689681
resource scaleway_container_namespace main {
690682
activate_vpc_integration = true
691683
}
692684
693-
resource scaleway_container c00 {
694-
name = "test-acc-container-pn-c00"
685+
resource scaleway_container to_stay {
686+
name = "test-acc-container-pn-to-stay"
695687
namespace_id = scaleway_container_namespace.main.id
696-
private_network_id = scaleway_vpc_private_network.pn00.id
688+
private_network_id = scaleway_vpc_private_network.start.id
697689
sandbox = "v1"
698-
tags = [ "c00" ]
690+
tags = [ "to-stay" ]
699691
}
700692
701-
resource scaleway_container c01 {
702-
name = "test-acc-container-pn-c01"
693+
resource scaleway_container to_change {
694+
name = "test-acc-container-pn-to-change"
703695
namespace_id = scaleway_container_namespace.main.id
704-
private_network_id = scaleway_vpc_private_network.pn00.id
696+
private_network_id = scaleway_vpc_private_network.start.id
705697
sandbox = "v1"
706-
tags = [ "c01" ]
698+
tags = [ "to-change" ]
707699
}
708700
709-
resource scaleway_container c02 {
710-
name = "test-acc-container-pn-c02"
701+
resource scaleway_container to_remove {
702+
name = "test-acc-container-pn-to-remove"
711703
namespace_id = scaleway_container_namespace.main.id
712-
private_network_id = scaleway_vpc_private_network.pn00.id
704+
private_network_id = scaleway_vpc_private_network.start.id
713705
sandbox = "v1"
714-
tags = [ "c02" ]
706+
tags = [ "to-remove" ]
715707
}
716708
`,
717709
Check: resource.ComposeTestCheckFunc(
718-
isContainerPresent(tt, "scaleway_container.c00"),
719-
isContainerPresent(tt, "scaleway_container.c01"),
720-
isContainerPresent(tt, "scaleway_container.c02"),
721-
resource.TestCheckResourceAttr("scaleway_container.c00", "sandbox", "v1"),
722-
resource.TestCheckResourceAttr("scaleway_container.c01", "sandbox", "v1"),
723-
resource.TestCheckResourceAttr("scaleway_container.c02", "sandbox", "v1"),
724-
resource.TestCheckResourceAttrPair("scaleway_container.c00", "private_network_id", "scaleway_vpc_private_network.pn00", "id"),
725-
resource.TestCheckResourceAttrPair("scaleway_container.c01", "private_network_id", "scaleway_vpc_private_network.pn00", "id"),
726-
resource.TestCheckResourceAttrPair("scaleway_container.c02", "private_network_id", "scaleway_vpc_private_network.pn00", "id"),
710+
isContainerPresent(tt, "scaleway_container.to_stay"),
711+
isContainerPresent(tt, "scaleway_container.to_change"),
712+
isContainerPresent(tt, "scaleway_container.to_remove"),
713+
resource.TestCheckResourceAttr("scaleway_container.to_stay", "sandbox", "v1"),
714+
resource.TestCheckResourceAttr("scaleway_container.to_change", "sandbox", "v1"),
715+
resource.TestCheckResourceAttr("scaleway_container.to_remove", "sandbox", "v1"),
716+
resource.TestCheckResourceAttrPair("scaleway_container.to_stay", "private_network_id", "scaleway_vpc_private_network.start", "id"),
717+
resource.TestCheckResourceAttrPair("scaleway_container.to_change", "private_network_id", "scaleway_vpc_private_network.start", "id"),
718+
resource.TestCheckResourceAttrPair("scaleway_container.to_remove", "private_network_id", "scaleway_vpc_private_network.start", "id"),
727719
),
728720
},
729721
{
@@ -732,50 +724,50 @@ func TestAccContainer_PrivateNetwork(t *testing.T) {
732724
name = "TestAccContainer_PrivateNetwork"
733725
}
734726
735-
resource scaleway_vpc_private_network pn00 {
736-
name = "test-acc-container-pn-pn00"
727+
resource scaleway_vpc_private_network start {
728+
name = "test-acc-container-pn-start"
737729
vpc_id = scaleway_vpc.main.id
738730
}
739731
740-
resource scaleway_vpc_private_network pn01 {
741-
name = "test-acc-container-pn-pn01"
732+
resource scaleway_vpc_private_network new {
733+
name = "test-acc-container-pn-new"
742734
vpc_id = scaleway_vpc.main.id
743735
}
744736
745737
resource scaleway_container_namespace main {
746738
activate_vpc_integration = true
747739
}
748740
749-
resource scaleway_container c00 {
750-
name = "test-acc-container-pn-c00"
741+
resource scaleway_container to_stay {
742+
name = "test-acc-container-pn-to-stay"
751743
namespace_id = scaleway_container_namespace.main.id
744+
private_network_id = scaleway_vpc_private_network.start.id
752745
sandbox = "v1"
753-
tags = [ "c00" ]
746+
tags = [ "to-stay" ]
754747
}
755748
756-
resource scaleway_container c01 {
757-
name = "test-acc-container-pn-c01"
749+
resource scaleway_container to_change {
750+
name = "test-acc-container-pn-to-change"
758751
namespace_id = scaleway_container_namespace.main.id
759-
private_network_id = scaleway_vpc_private_network.pn01.id
752+
private_network_id = scaleway_vpc_private_network.new.id
760753
sandbox = "v1"
761-
tags = [ "c01" ]
754+
tags = [ "to-change" ]
762755
}
763756
764-
resource scaleway_container c02 {
765-
name = "test-acc-container-pn-c02"
757+
resource scaleway_container to_remove {
758+
name = "test-acc-container-pn-to-remove"
766759
namespace_id = scaleway_container_namespace.main.id
767-
private_network_id = scaleway_vpc_private_network.pn00.id
768760
sandbox = "v1"
769-
tags = [ "c02" ]
761+
tags = [ "to-remove" ]
770762
}
771763
`,
772764
Check: resource.ComposeTestCheckFunc(
773-
isContainerPresent(tt, "scaleway_container.c00"),
774-
isContainerPresent(tt, "scaleway_container.c01"),
775-
isContainerPresent(tt, "scaleway_container.c02"),
776-
resource.TestCheckResourceAttr("scaleway_container.c00", "private_network_id", ""),
777-
resource.TestCheckResourceAttrPair("scaleway_container.c01", "private_network_id", "scaleway_vpc_private_network.pn01", "id"),
778-
resource.TestCheckResourceAttrPair("scaleway_container.c02", "private_network_id", "scaleway_vpc_private_network.pn00", "id"),
765+
isContainerPresent(tt, "scaleway_container.to_stay"),
766+
isContainerPresent(tt, "scaleway_container.to_change"),
767+
isContainerPresent(tt, "scaleway_container.to_remove"),
768+
resource.TestCheckResourceAttrPair("scaleway_container.to_stay", "private_network_id", "scaleway_vpc_private_network.start", "id"),
769+
resource.TestCheckResourceAttrPair("scaleway_container.to_change", "private_network_id", "scaleway_vpc_private_network.new", "id"),
770+
resource.TestCheckResourceAttr("scaleway_container.to_remove", "private_network_id", ""),
779771
),
780772
},
781773
},

0 commit comments

Comments
 (0)