Skip to content

Commit

Permalink
worker pool resource test fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
Zoltan Illes committed Oct 14, 2024
1 parent c64ce77 commit bc4af60
Show file tree
Hide file tree
Showing 2 changed files with 99 additions and 34 deletions.
4 changes: 2 additions & 2 deletions ibm/service/kubernetes/data_source_ibm_container_vpc_worker_pool_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ func testAccCheckIBMContainerVPCClusterWorkerPoolDataSourceConfigDedicatedHost(n
}

func testAccCheckIBMContainerVPCClusterWorkerPoolDataSourceEnvvar(name string) string {
return testAccCheckIBMVpcContainerWorkerPoolEnvvar(name) + `
return testAccCheckIBMVpcContainerWorkerPoolBasic(name) + `
data "ibm_container_vpc_cluster_worker_pool" "testacc_ds_worker_pool" {
cluster = "${ibm_container_vpc_worker_pool.test_pool.cluster}"
worker_pool_name = "${ibm_container_vpc_worker_pool.test_pool.worker_pool_name}"
Expand All @@ -125,7 +125,7 @@ func testAccCheckIBMContainerVPCClusterWorkerPoolDataSourceEnvvar(name string) s
}

func testAccCheckIBMContainerVPCClusterWorkerPoolDataSourceKmsAccountEnvvar(name string) string {
return testAccCheckIBMVpcContainerWorkerPoolKmsAccountEnvvar(name) + `
return testAccCheckIBMVpcContainerWorkerPoolKmsAccount(name) + `
data "ibm_container_vpc_cluster_worker_pool" "testacc_ds_kms_worker_pool" {
cluster = "${ibm_container_vpc_worker_pool.test_pool.cluster}"
worker_pool_name = "${ibm_container_vpc_worker_pool.test_pool.worker_pool_name}"
Expand Down
129 changes: 97 additions & 32 deletions ibm/service/kubernetes/resource_ibm_container_vpc_worker_pool_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -255,11 +255,6 @@ func TestAccIBMContainerVpcClusterWorkerPoolResourceSecurityGroups(t *testing.T)
"ibm_container_vpc_worker_pool.test_pool", "zones.#", "1"),
),
},
{
ResourceName: "ibm_container_vpc_worker_pool.test_pool",
ImportState: true,
ImportStateVerify: true,
},
},
})
}
Expand Down Expand Up @@ -423,10 +418,27 @@ func TestAccIBMContainerVpcClusterWorkerPoolResourceSecondaryStorage(t *testing.
}

func testAccCheckIBMVpcContainerWorkerPoolSecStorage(name string) string {
return fmt.Sprintf(testAccCheckIBMContainerVpcClusterEnvvar(name)+`
return fmt.Sprintf(`
data "ibm_resource_group" "resource_group" {
is_default=true
}
resource "ibm_container_vpc_cluster" "cluster" {
name = "%[1]s"
vpc_id = "%[2]s"
flavor = "bx2.4x16"
worker_count = 1
resource_group_id = data.ibm_resource_group.resource_group.id
wait_till = "MasterNodeReady"
zones {
subnet_id = "%[3]s"
name = "us-south-1"
}
}
resource "ibm_container_vpc_worker_pool" "test_pool" {
cluster = ibm_container_vpc_cluster.cluster.id
worker_pool_name = "%[1]s"
worker_pool_name = "wp-sec-storage"
flavor = "bx2.4x16"
vpc_id = "%[2]s"
worker_count = 1
Expand All @@ -440,10 +452,27 @@ func testAccCheckIBMVpcContainerWorkerPoolSecStorage(name string) string {
}

func testAccCheckIBMVpcContainerWorkerPoolSecStorageRemove(name string) string {
return fmt.Sprintf(testAccCheckIBMContainerVpcClusterEnvvar(name)+`
return fmt.Sprintf(`
data "ibm_resource_group" "resource_group" {
is_default=true
}
resource "ibm_container_vpc_cluster" "cluster" {
name = "%[1]s"
vpc_id = "%[2]s"
flavor = "bx2.4x16"
worker_count = 1
resource_group_id = data.ibm_resource_group.resource_group.id
wait_till = "MasterNodeReady"
zones {
subnet_id = "%[3]s"
name = "us-south-1"
}
}
resource "ibm_container_vpc_worker_pool" "test_pool" {
cluster = ibm_container_vpc_cluster.cluster.id
worker_pool_name = "%[1]s"
worker_pool_name = "wp-sec-storage"
flavor = "bx2.4x16"
vpc_id = "%[2]s"
worker_count = 1
Expand Down Expand Up @@ -471,11 +500,9 @@ func TestAccIBMContainerVpcClusterWorkerPoolResourceKMS(t *testing.T) {
Config: testAccCheckIBMVpcContainerWorkerPoolKMS(name),
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttr(
"ibm_container_vpc_worker_pool.test_pool", "flavor", "bx2.4x16"),
"ibm_container_vpc_worker_pool.test_pool", "flavor", "cx2.2x4"),
resource.TestCheckResourceAttr(
"ibm_container_vpc_worker_pool.test_pool", "zones.#", "1"),
resource.TestCheckResourceAttr(
"ibm_container_vpc_worker_pool.test_pool", "taints.#", "1"),
resource.TestCheckResourceAttr(
"ibm_container_vpc_worker_pool.test_pool", "kms_instance_id", acc.KmsInstanceID),
resource.TestCheckResourceAttr(
Expand All @@ -486,19 +513,36 @@ func TestAccIBMContainerVpcClusterWorkerPoolResourceKMS(t *testing.T) {
ResourceName: "ibm_container_vpc_worker_pool.test_pool",
ImportState: true,
ImportStateVerify: true,
ImportStateVerifyIgnore: []string{
"kms_instance_id", "crk"},
},
},
})
}

func testAccCheckIBMVpcContainerWorkerPoolKMS(name string) string {
return fmt.Sprintf(testAccCheckIBMContainerVpcClusterEnvvar(name)+`
return fmt.Sprintf(`
data "ibm_resource_group" "resource_group" {
is_default=true
}
resource "ibm_container_vpc_cluster" "cluster" {
name = "%[1]s"
vpc_id = "%[2]s"
flavor = "cx2.2x4"
worker_count = 1
resource_group_id = data.ibm_resource_group.resource_group.id
wait_till = "MasterNodeReady"
zones {
subnet_id = "%[3]s"
name = "us-south-1"
}
kms_instance_id = "%[4]s"
crk = "%[5]s"
}
resource "ibm_container_vpc_worker_pool" "test_pool" {
cluster = ibm_container_vpc_cluster.cluster.id
worker_pool_name = "%[1]s"
flavor = "bx2.4x16"
worker_pool_name = "wp-kms"
flavor = "cx2.2x4"
vpc_id = "%[2]s"
worker_count = 1
zones {
Expand All @@ -508,7 +552,7 @@ func testAccCheckIBMVpcContainerWorkerPoolKMS(name string) string {
kms_instance_id = "%[4]s"
crk = "%[5]s"
}
`, name, acc.IksClusterVpcID, acc.IksClusterSubnetID, acc.KmsInstanceID, acc.CrkID, acc.WorkerPoolSecondaryStorage)
`, name, acc.IksClusterVpcID, acc.IksClusterSubnetID, acc.KmsInstanceID, acc.CrkID)
}

// TestAccIBMContainerVpcClusterWorkerPoolResourceKmsAccount ...
Expand All @@ -524,10 +568,10 @@ func TestAccIBMContainerVpcClusterWorkerPoolResourceKmsAccount(t *testing.T) {
CheckDestroy: testAccCheckIBMVpcContainerWorkerPoolDestroy,
Steps: []resource.TestStep{
{
Config: testAccCheckIBMVpcContainerWorkerPoolKmsAccountEnvvar(name),
Config: testAccCheckIBMVpcContainerWorkerPoolKmsAccount(name),
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttr(
"ibm_container_vpc_worker_pool.test_pool", "flavor", "bx2.4x16"),
"ibm_container_vpc_worker_pool.test_pool", "flavor", "cx2.2x4"),
resource.TestCheckResourceAttr(
"ibm_container_vpc_worker_pool.test_pool", "zones.#", "1"),
resource.TestCheckResourceAttr(
Expand All @@ -539,31 +583,52 @@ func TestAccIBMContainerVpcClusterWorkerPoolResourceKmsAccount(t *testing.T) {
),
},
{
ResourceName: "ibm_container_vpc_worker_pool.test_pool",
ImportState: true,
ImportStateVerify: true,
ResourceName: "ibm_container_vpc_worker_pool.test_pool",
ImportState: true,
ImportStateVerify: true,
ImportStateVerifyIgnore: []string{"kms_account_id"},
},
},
})
}

func testAccCheckIBMVpcContainerWorkerPoolKmsAccount(name string) string {
return fmt.Sprintf(`
data "ibm_resource_group" "resource_group" {
is_default=true
}
resource "ibm_container_vpc_cluster" "cluster" {
name = "%[1]s"
vpc_id = "%[2]s"
flavor = "cx2.2x4"
worker_count = 1
resource_group_id = data.ibm_resource_group.resource_group.id
wait_till = "MasterNodeReady"
zones {
subnet_id = "%[3]s"
name = "us-south-1"
}
kms_instance_id = "%[4]s"
crk = "%[5]s"
kms_account_id = "%[6]s"
}
resource "ibm_container_vpc_worker_pool" "test_pool" {
cluster = "%[2]s"
worker_pool_name = "%[1]s"
flavor = "bx2.4x16"
vpc_id = "%[3]s"
cluster = ibm_container_vpc_cluster.cluster.id
worker_pool_name = "wp-kms"
flavor = "cx2.2x4"
vpc_id = "%[2]s"
worker_count = 1
zones {
subnet_id = "%[4]s"
subnet_id = "%[3]s"
name = "us-south-1"
}
kms_instance_id = "%[5]s"
crk = "%[6]s"
kms_account_id = "%[7]s"
kms_instance_id = "%[4]s"
crk = "%[5]s"
kms_account_id = "%[6]s"
}
`, name, acc.IksClusterID, acc.IksClusterVpcID, acc.IksClusterSubnetID, acc.KmsInstanceID, acc.CrkID, acc.KmsAccountID)
`, name, acc.IksClusterVpcID, acc.IksClusterSubnetID, acc.KmsInstanceID, acc.CrkID, acc.KmsAccountID)
}

// TestAccIBMContainerVpcOpenshiftClusterWorkerPoolBasic ...
Expand Down

0 comments on commit bc4af60

Please sign in to comment.