Skip to content

test(k8s): reorder CheckDestroy #2227

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 15, 2023
Merged

test(k8s): reorder CheckDestroy #2227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions scaleway/data_source_k8s_cluster_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ func TestAccScalewayDataSourceK8SCluster_Basic(t *testing.T) {
PreCheck: func() { testAccPreCheck(t) },
ProviderFactories: tt.ProviderFactories,
CheckDestroy: resource.ComposeTestCheckFunc(
testAccCheckScalewayVPCPrivateNetworkDestroy(tt),
testAccCheckScalewayK8SClusterDestroy(tt),
testAccCheckScalewayK8SPoolDestroy(tt, "scaleway_k8s_pool.default"),
testAccCheckScalewayK8SClusterDestroy(tt),
testAccCheckScalewayVPCPrivateNetworkDestroy(tt),
),
Steps: []resource.TestStep{
{
Expand Down
4 changes: 2 additions & 2 deletions scaleway/data_source_k8s_pool_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ func TestAccScalewayDataSourceK8SPool_Basic(t *testing.T) {
PreCheck: func() { testAccPreCheck(t) },
ProviderFactories: tt.ProviderFactories,
CheckDestroy: resource.ComposeTestCheckFunc(
testAccCheckScalewayVPCPrivateNetworkDestroy(tt),
testAccCheckScalewayK8SClusterDestroy(tt),
testAccCheckScalewayK8SPoolDestroy(tt, "scaleway_k8s_pool.default"),
testAccCheckScalewayK8SClusterDestroy(tt),
testAccCheckScalewayVPCPrivateNetworkDestroy(tt),
),
Steps: []resource.TestStep{
{
Expand Down
12 changes: 6 additions & 6 deletions scaleway/resource_k8s_cluster_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,8 @@ func TestAccScalewayK8SCluster_Basic(t *testing.T) {
},
ProviderFactories: tt.ProviderFactories,
CheckDestroy: resource.ComposeTestCheckFunc(
testAccCheckScalewayVPCPrivateNetworkDestroy(tt),
testAccCheckScalewayK8SClusterDestroy(tt),
testAccCheckScalewayVPCPrivateNetworkDestroy(tt),
),
Steps: []resource.TestStep{
{
Expand Down Expand Up @@ -183,8 +183,8 @@ func TestAccScalewayK8SCluster_Autoscaling(t *testing.T) {
},
ProviderFactories: tt.ProviderFactories,
CheckDestroy: resource.ComposeTestCheckFunc(
testAccCheckScalewayVPCPrivateNetworkDestroy(tt),
testAccCheckScalewayK8SClusterDestroy(tt),
testAccCheckScalewayVPCPrivateNetworkDestroy(tt),
),
Steps: []resource.TestStep{
{
Expand Down Expand Up @@ -259,8 +259,8 @@ func TestAccScalewayK8SCluster_OIDC(t *testing.T) {
},
ProviderFactories: tt.ProviderFactories,
CheckDestroy: resource.ComposeTestCheckFunc(
testAccCheckScalewayVPCPrivateNetworkDestroy(tt),
testAccCheckScalewayK8SClusterDestroy(tt),
testAccCheckScalewayVPCPrivateNetworkDestroy(tt),
),
Steps: []resource.TestStep{
{
Expand Down Expand Up @@ -329,8 +329,8 @@ func TestAccScalewayK8SCluster_AutoUpgrade(t *testing.T) {
},
ProviderFactories: tt.ProviderFactories,
CheckDestroy: resource.ComposeTestCheckFunc(
testAccCheckScalewayVPCPrivateNetworkDestroy(tt),
testAccCheckScalewayK8SClusterDestroy(tt),
testAccCheckScalewayVPCPrivateNetworkDestroy(tt),
),
Steps: []resource.TestStep{
{
Expand Down Expand Up @@ -411,8 +411,8 @@ func TestAccScalewayK8SCluster_PrivateNetwork(t *testing.T) {
},
ProviderFactories: tt.ProviderFactories,
CheckDestroy: resource.ComposeTestCheckFunc(
testAccCheckScalewayVPCPrivateNetworkDestroy(tt),
testAccCheckScalewayK8SClusterDestroy(tt),
testAccCheckScalewayVPCPrivateNetworkDestroy(tt),
),
Steps: []resource.TestStep{
{
Expand Down Expand Up @@ -476,8 +476,8 @@ func TestAccScalewayK8SCluster_TypeChange(t *testing.T) {
},
ProviderFactories: tt.ProviderFactories,
CheckDestroy: resource.ComposeTestCheckFunc(
testAccCheckScalewayVPCPrivateNetworkDestroy(tt),
testAccCheckScalewayK8SClusterDestroy(tt),
testAccCheckScalewayVPCPrivateNetworkDestroy(tt),
),
Steps: []resource.TestStep{
{
Expand Down
100 changes: 24 additions & 76 deletions scaleway/resource_k8s_pool_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ func TestAccScalewayK8SCluster_PoolBasic(t *testing.T) {
PreCheck: func() { testAccPreCheck(t) },
ProviderFactories: tt.ProviderFactories,
CheckDestroy: resource.ComposeTestCheckFunc(
testAccCheckScalewayVPCPrivateNetworkDestroy(tt),
testAccCheckScalewayK8SClusterDestroy(tt),
testAccCheckScalewayK8SPoolDestroy(tt, "scaleway_k8s_pool.default"),
testAccCheckScalewayK8SPoolDestroy(tt, "scaleway_k8s_pool.minimal"),
testAccCheckScalewayK8SClusterDestroy(tt),
testAccCheckScalewayVPCPrivateNetworkDestroy(tt),
),
Steps: []resource.TestStep{
{
Expand All @@ -42,6 +42,7 @@ func TestAccScalewayK8SCluster_PoolBasic(t *testing.T) {
resource.TestCheckResourceAttr("scaleway_k8s_pool.default", "tags.0", "terraform-test"),
resource.TestCheckResourceAttr("scaleway_k8s_pool.default", "tags.1", "scaleway_k8s_cluster"),
resource.TestCheckResourceAttr("scaleway_k8s_pool.default", "tags.2", "default"),
testAccCheckScalewayK8SPoolServersAreInPrivateNetwork(tt, "scaleway_k8s_cluster.minimal", "scaleway_k8s_pool.default", "scaleway_vpc_private_network.minimal"),
),
},
{
Expand All @@ -58,13 +59,17 @@ func TestAccScalewayK8SCluster_PoolBasic(t *testing.T) {
resource.TestCheckResourceAttr("scaleway_k8s_pool.minimal", "tags.0", "terraform-test"),
resource.TestCheckResourceAttr("scaleway_k8s_pool.minimal", "tags.1", "scaleway_k8s_cluster"),
resource.TestCheckResourceAttr("scaleway_k8s_pool.minimal", "tags.2", "minimal"),
testAccCheckScalewayK8SPoolServersAreInPrivateNetwork(tt, "scaleway_k8s_cluster.minimal", "scaleway_k8s_pool.default", "scaleway_vpc_private_network.minimal"),
testAccCheckScalewayK8SPoolServersAreInPrivateNetwork(tt, "scaleway_k8s_cluster.minimal", "scaleway_k8s_pool.minimal", "scaleway_vpc_private_network.minimal"),
),
},
{
Config: testAccCheckScalewayK8SPoolConfigMinimal(latestK8SVersion, false),
Check: resource.ComposeTestCheckFunc(
testAccCheckScalewayK8SClusterExists(tt, "scaleway_k8s_cluster.minimal"),
testAccCheckScalewayK8SPoolExists(tt, "scaleway_k8s_pool.default"),
testAccCheckScalewayK8SPoolDestroy(tt, "scaleway_k8s_pool.minimal"),
testAccCheckScalewayK8SPoolServersAreInPrivateNetwork(tt, "scaleway_k8s_cluster.minimal", "scaleway_k8s_pool.default", "scaleway_vpc_private_network.minimal"),
),
},
},
Expand All @@ -79,10 +84,10 @@ func TestAccScalewayK8SCluster_PoolWait(t *testing.T) {
PreCheck: func() { testAccPreCheck(t) },
ProviderFactories: tt.ProviderFactories,
CheckDestroy: resource.ComposeTestCheckFunc(
testAccCheckScalewayVPCPrivateNetworkDestroy(tt),
testAccCheckScalewayK8SClusterDestroy(tt),
testAccCheckScalewayK8SPoolDestroy(tt, "scaleway_k8s_pool.default"),
testAccCheckScalewayK8SPoolDestroy(tt, "scaleway_k8s_pool.minimal"),
testAccCheckScalewayK8SClusterDestroy(tt),
testAccCheckScalewayVPCPrivateNetworkDestroy(tt),
),
Steps: []resource.TestStep{
{
Expand Down Expand Up @@ -160,10 +165,10 @@ func TestAccScalewayK8SCluster_PoolPlacementGroup(t *testing.T) {
PreCheck: func() { testAccPreCheck(t) },
ProviderFactories: tt.ProviderFactories,
CheckDestroy: resource.ComposeTestCheckFunc(
testAccCheckScalewayVPCPrivateNetworkDestroy(tt),
testAccCheckScalewayK8SClusterDestroy(tt),
testAccCheckScalewayK8SPoolDestroy(tt, "scaleway_k8s_pool.placement_group"),
testAccCheckScalewayK8SPoolDestroy(tt, "scaleway_k8s_pool.placement_group_2"),
testAccCheckScalewayK8SClusterDestroy(tt),
testAccCheckScalewayVPCPrivateNetworkDestroy(tt),
),
Steps: []resource.TestStep{
{
Expand Down Expand Up @@ -217,9 +222,9 @@ func TestAccScalewayK8SCluster_PoolUpgradePolicy(t *testing.T) {
PreCheck: func() { testAccPreCheck(t) },
ProviderFactories: tt.ProviderFactories,
CheckDestroy: resource.ComposeTestCheckFunc(
testAccCheckScalewayVPCPrivateNetworkDestroy(tt),
testAccCheckScalewayK8SClusterDestroy(tt),
testAccCheckScalewayK8SPoolDestroy(tt, "scaleway_k8s_pool.upgrade_policy"),
testAccCheckScalewayK8SClusterDestroy(tt),
testAccCheckScalewayVPCPrivateNetworkDestroy(tt),
),
Steps: []resource.TestStep{
{
Expand Down Expand Up @@ -272,9 +277,9 @@ func TestAccScalewayK8SCluster_PoolKubeletArgs(t *testing.T) {
PreCheck: func() { testAccPreCheck(t) },
ProviderFactories: tt.ProviderFactories,
CheckDestroy: resource.ComposeTestCheckFunc(
testAccCheckScalewayVPCPrivateNetworkDestroy(tt),
testAccCheckScalewayK8SClusterDestroy(tt),
testAccCheckScalewayK8SPoolDestroy(tt, "scaleway_k8s_pool.kubelet_args"),
testAccCheckScalewayK8SClusterDestroy(tt),
testAccCheckScalewayVPCPrivateNetworkDestroy(tt),
),
Steps: []resource.TestStep{
{
Expand Down Expand Up @@ -311,9 +316,9 @@ func TestAccScalewayK8SCluster_PoolZone(t *testing.T) {
PreCheck: func() { testAccPreCheck(t) },
ProviderFactories: tt.ProviderFactories,
CheckDestroy: resource.ComposeTestCheckFunc(
testAccCheckScalewayVPCPrivateNetworkDestroy(tt),
testAccCheckScalewayK8SClusterDestroy(tt),
testAccCheckScalewayK8SPoolDestroy(tt, "scaleway_k8s_pool.zone"),
testAccCheckScalewayK8SClusterDestroy(tt),
testAccCheckScalewayVPCPrivateNetworkDestroy(tt),
),
Steps: []resource.TestStep{
{
Expand All @@ -340,9 +345,9 @@ func TestAccScalewayK8SCluster_PoolSize(t *testing.T) {
PreCheck: func() { testAccPreCheck(t) },
ProviderFactories: tt.ProviderFactories,
CheckDestroy: resource.ComposeTestCheckFunc(
testAccCheckScalewayVPCPrivateNetworkDestroy(tt),
testAccCheckScalewayK8SClusterDestroy(tt),
testAccCheckScalewayK8SPoolDestroy(tt, "scaleway_k8s_pool.pool"),
testAccCheckScalewayK8SClusterDestroy(tt),
testAccCheckScalewayVPCPrivateNetworkDestroy(tt),
),
Steps: []resource.TestStep{
{
Expand Down Expand Up @@ -407,63 +412,6 @@ func TestAccScalewayK8SCluster_PoolSize(t *testing.T) {
})
}

func TestAccScalewayK8SCluster_PoolPrivateNetwork(t *testing.T) {
tt := NewTestTools(t)
defer tt.Cleanup()

latestK8SVersion := testAccScalewayK8SClusterGetLatestK8SVersion(tt)

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
ProviderFactories: tt.ProviderFactories,
CheckDestroy: resource.ComposeTestCheckFunc(
testAccCheckScalewayVPCPrivateNetworkDestroy(tt),
testAccCheckScalewayK8SClusterDestroy(tt),
testAccCheckScalewayK8SPoolDestroy(tt, "scaleway_k8s_pool.pool_with_pn"),
),
Steps: []resource.TestStep{
{
Config: fmt.Sprintf(`
resource "scaleway_vpc" "vpc" {
name = "test-k8s-private-network"
}
resource "scaleway_vpc_private_network" "pn" {
name = "test-k8s-private-network"
vpc_id = scaleway_vpc.vpc.id
}

resource "scaleway_k8s_cluster" "cluster_with_pn" {
name = "test-k8s-private-network"
version = "%s"
cni = "cilium"
private_network_id = scaleway_vpc_private_network.pn.id
tags = [ "terraform-test", "scaleway_k8s_cluster", "private_network" ]
delete_additional_resources = true
depends_on = [scaleway_vpc_private_network.pn]
}

resource "scaleway_k8s_pool" "pool_with_pn" {
cluster_id = scaleway_k8s_cluster.cluster_with_pn.id
name = "pool"
node_type = "gp1_xs"
size = 2
autoscaling = false
autohealing = true
wait_for_pool_ready = true
depends_on = [scaleway_vpc_private_network.pn]
}`, latestK8SVersion),
Check: resource.ComposeTestCheckFunc(
testAccCheckScalewayK8SClusterExists(tt, "scaleway_k8s_cluster.cluster_with_pn"),
testAccCheckScalewayVPCPrivateNetworkExists(tt, "scaleway_vpc_private_network.pn"),
testAccCheckScalewayK8SPoolExists(tt, "scaleway_k8s_pool.pool_with_pn"),
testAccCheckScalewayK8sClusterPrivateNetworkID(tt, "scaleway_k8s_cluster.cluster_with_pn", "scaleway_vpc_private_network.pn"),
testAccCheckScalewayK8SPoolServersAreInPrivateNetwork(tt, "scaleway_k8s_cluster.cluster_with_pn", "scaleway_k8s_pool.pool_with_pn", "scaleway_vpc_private_network.pn"),
),
},
},
})
}

func TestAccScalewayK8SCluster_PoolPublicIPDisabled(t *testing.T) {
tt := NewTestTools(t)
defer tt.Cleanup()
Expand All @@ -474,12 +422,12 @@ func TestAccScalewayK8SCluster_PoolPublicIPDisabled(t *testing.T) {
PreCheck: func() { testAccPreCheck(t) },
ProviderFactories: tt.ProviderFactories,
CheckDestroy: resource.ComposeTestCheckFunc(
testAccCheckScalewayVPCPrivateNetworkDestroy(tt),
testAccCheckScalewayVPCPublicGatewayDestroy(tt),
testAccCheckScalewayVPCPublicGatewayDHCPDestroy(tt),
testAccCheckScalewayVPCGatewayNetworkDestroy(tt),
testAccCheckScalewayK8SClusterDestroy(tt),
testAccCheckScalewayK8SPoolDestroy(tt, "scaleway_k8s_pool.public_ip"),
testAccCheckScalewayK8SClusterDestroy(tt),
testAccCheckScalewayVPCGatewayNetworkDestroy(tt),
testAccCheckScalewayVPCPublicGatewayDHCPDestroy(tt),
testAccCheckScalewayVPCPublicGatewayDestroy(tt),
testAccCheckScalewayVPCPrivateNetworkDestroy(tt),
),
Steps: []resource.TestStep{
{
Expand Down
Loading