Skip to content

Commit

Permalink
ibm_container_vpc_worker_pool - remove Computed for secondary_storage…
Browse files Browse the repository at this point in the history 
… property (IBM-Cloud#5720)

* remove Computed from secondary_storage, workerpool test renamings

* worker pool resource test fixes

* workerpool datasource test fixes

---------

Co-authored-by: Zoltan Illes <[email protected]>
  • Loading branch information
@z0za
z0za and Zoltan Illes authored Oct 28, 2024
1 parent d5a0804 commit 15e4757
Show file tree
Hide file tree
Showing 4 changed files with 460 additions and 279 deletions.
2 changes: 1 addition & 1 deletion ibm/acctest/acctest.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1667,7 +1667,7 @@ func init() {
}

KmsAccountID = os.Getenv("IBM_KMS_ACCOUNT_ID")
if CrkID == "" {
if KmsAccountID == "" {
fmt.Println("[INFO] Set the environment variable IBM_KMS_ACCOUNT_ID for ibm_container_vpc_cluster resource or datasource else tests will fail if this is not set correctly")
}

Expand Down
171 changes: 120 additions & 51 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 @@ -13,8 +13,44 @@ import (
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
)

func TestAccIBMContainerVPCClusterWorkerPoolDataSource_basic(t *testing.T) {
name := fmt.Sprintf("tf-vpc-worker-%d", acctest.RandIntRange(10, 100))
func testAccIBMContainerVPCClusterWorkerPoolDataSourceBase(cluster_name string) string {
return fmt.Sprintf(`
data "ibm_resource_group" "resource_group" {
is_default=true
}
resource "ibm_container_vpc_cluster" "cluster" {
name = "%[3]s"
vpc_id = "%[1]s"
flavor = "cx2.2x4"
worker_count = 1
resource_group_id = data.ibm_resource_group.resource_group.id
wait_till = "MasterNodeReady"
zones {
subnet_id = "%[2]s"
name = "us-south-1"
}
}
resource "ibm_container_vpc_worker_pool" "test_pool" {
cluster = ibm_container_vpc_cluster.cluster.id
vpc_id = "%[1]s"
flavor = "cx2.2x4"
worker_count = 1
worker_pool_name = "default"
zones {
subnet_id = "%[2]s"
name = "us-south-1"
}
import_on_create = "true"
orphan_on_delete = "true"
}
`, acc.IksClusterVpcID, acc.IksClusterSubnetID, cluster_name)
}

// TestAccIBMContainerVpcClusterWorkerPoolDataSourceBasic ...
func TestAccIBMContainerVpcClusterWorkerPoolDataSourceBasic(t *testing.T) {
name := fmt.Sprintf("tf-vpc-wp-ds-basic-%d", acctest.RandIntRange(10, 100))
resource.Test(t, resource.TestCase{
PreCheck: func() { acc.TestAccPreCheck(t) },
Providers: acc.TestAccProviders,
Expand All @@ -29,8 +65,23 @@ func TestAccIBMContainerVPCClusterWorkerPoolDataSource_basic(t *testing.T) {
})
}

func TestAccIBMContainerVPCClusterWorkerPoolDataSource_dedicatedhost(t *testing.T) {
name := fmt.Sprintf("tf-vpc-worker-%d", acctest.RandIntRange(10, 100))
func testAccCheckIBMContainerVPCClusterWorkerPoolDataSourceConfig(name string) string {
return testAccIBMContainerVPCClusterWorkerPoolDataSourceBase(name) + `
data "ibm_container_vpc_cluster_worker_pool" "testacc_ds_worker_pool" {
cluster = "${ibm_container_vpc_cluster.cluster.id}"
worker_pool_name = "${ibm_container_vpc_worker_pool.test_pool.worker_pool_name}"
}
`
}

// TestAccIBMContainerVpcClusterWorkerPoolDataSourceDedicatedHost ...
func TestAccIBMContainerVpcClusterWorkerPoolDataSourceDedicatedHost(t *testing.T) {
if acc.HostPoolID == "" {
fmt.Println("[WARN] Skipping TestAccIBMContainerVpcClusterWorkerPoolResourceDedicatedHost - IBM_CONTAINER_DEDICATEDHOST_POOL_ID is unset")
return
}

name := fmt.Sprintf("tf-vpc-wp-ds-dhost-%d", acctest.RandIntRange(10, 100))
hostpoolID := acc.HostPoolID
resource.Test(t, resource.TestCase{
PreCheck: func() { acc.TestAccPreCheck(t) },
Expand All @@ -46,86 +97,104 @@ func TestAccIBMContainerVPCClusterWorkerPoolDataSource_dedicatedhost(t *testing.
})
}

func testAccCheckIBMContainerVPCClusterWorkerPoolDataSourceConfig(name string) string {
return testAccCheckIBMVpcContainerWorkerPoolBasic(name) + `
data "ibm_container_vpc_cluster_worker_pool" "testacc_ds_worker_pool" {
cluster = "${ibm_container_vpc_cluster.cluster.id}"
worker_pool_name = "${ibm_container_vpc_worker_pool.test_pool.worker_pool_name}"
func testAccCheckIBMContainerVPCClusterWorkerPoolDataSourceConfigDedicatedHost(name, hostpoolID string) string {
return testAccCheckIBMVpcContainerWorkerPoolDedicatedHostCreate(
acc.ClusterName, name, "bx2d.4x16", acc.IksClusterSubnetID, acc.IksClusterVpcID, acc.IksClusterResourceGroupID, hostpoolID) + `
data "ibm_container_vpc_worker_pool" "vpc_worker_pool" {
cluster = "${ibm_container_vpc_worker_pool.vpc_worker_pool.cluster}"
worker_pool_name = "${ibm_container_vpc_worker_pool.vpc_worker_pool.worker_pool_name}"
depends_on = [
ibm_container_vpc_worker_pool.vpc_worker_pool
]
}
`
}

func TestAccIBMContainerVPCClusterWorkerPoolDataSourceEnvvar(t *testing.T) {
name := fmt.Sprintf("tf-vpc-wp-%d", acctest.RandIntRange(10, 100))
testChecks := []resource.TestCheckFunc{
resource.TestCheckResourceAttrSet("data.ibm_container_vpc_cluster_worker_pool.testacc_ds_worker_pool", "id"),
resource.TestCheckResourceAttr("data.ibm_container_vpc_cluster_worker_pool.testacc_ds_worker_pool", "autoscale_enabled", "false"),
}
if acc.CrkID != "" {
testChecks = append(testChecks,
resource.TestCheckResourceAttr("data.ibm_container_vpc_cluster_worker_pool.testacc_ds_worker_pool", "crk", acc.CrkID),
resource.TestCheckResourceAttr("data.ibm_container_vpc_cluster_worker_pool.testacc_ds_worker_pool", "kms_instance_id", acc.KmsInstanceID),
)
}
if acc.WorkerPoolSecondaryStorage != "" {
testChecks = append(testChecks, resource.TestCheckResourceAttr(
"data.ibm_container_vpc_cluster_worker_pool.testacc_ds_worker_pool", "secondary_storage.0.name", acc.WorkerPoolSecondaryStorage))
}
// TestAccIBMContainerVpcClusterWorkerPoolDataSourceSecondaryStorage ...
func TestAccIBMContainerVpcClusterWorkerPoolDataSourceSecondaryStorage(t *testing.T) {
name := fmt.Sprintf("tf-vpc-wp-ds-secstorage-%d", acctest.RandIntRange(10, 100))
resource.Test(t, resource.TestCase{
PreCheck: func() { acc.TestAccPreCheck(t) },
Providers: acc.TestAccProviders,
Steps: []resource.TestStep{
{
Config: testAccCheckIBMContainerVPCClusterWorkerPoolDataSourceEnvvar(name),
Check: resource.ComposeTestCheckFunc(testChecks...),
Config: testAccCheckIBMContainerVPCClusterWorkerPoolDataSourceSecStorage(name),
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttrSet("data.ibm_container_vpc_cluster_worker_pool.testacc_ds_worker_pool", "id"),
resource.TestCheckResourceAttr(
"data.ibm_container_vpc_cluster_worker_pool.testacc_ds_worker_pool", "secondary_storage.0.name", acc.WorkerPoolSecondaryStorage)),
},
},
})
}

func TestAccIBMContainerVPCClusterWorkerPoolDataSourceKmsAccountEnvvar(t *testing.T) {
name := fmt.Sprintf("tf-vpc-wp-%d", acctest.RandIntRange(10, 100))
func testAccCheckIBMContainerVPCClusterWorkerPoolDataSourceSecStorage(name string) string {
return testAccCheckIBMVpcContainerWorkerPoolSecStorage(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}"
}
`
}

// TestAccIBMContainerVpcClusterWorkerPoolDataSourceKMS ...
func TestAccIBMContainerVpcClusterWorkerPoolDataSourceKMS(t *testing.T) {
if acc.CrkID == "" {
fmt.Println("[WARN] Skipping TestAccIBMContainerVpcClusterWorkerPoolDataSourceKMS - IBM_CRK_ID is unset")
return
}
name := fmt.Sprintf("tf-vpc-wp-ds-kms-%d", acctest.RandIntRange(10, 100))
resource.Test(t, resource.TestCase{
PreCheck: func() { acc.TestAccPreCheck(t) },
Providers: acc.TestAccProviders,
Steps: []resource.TestStep{
{
Config: testAccCheckIBMContainerVPCClusterWorkerPoolDataSourceKmsAccountEnvvar(name),
Config: testAccCheckIBMContainerVPCClusterWorkerPoolDataSourceKMS(name),
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttrSet("data.ibm_container_vpc_cluster_worker_pool.testacc_ds_kms_worker_pool", "id"),
resource.TestCheckResourceAttr("data.ibm_container_vpc_cluster_worker_pool.testacc_ds_kms_worker_pool", "crk", acc.CrkID),
resource.TestCheckResourceAttr("data.ibm_container_vpc_cluster_worker_pool.testacc_ds_kms_worker_pool", "kms_instance_id", acc.KmsInstanceID),
resource.TestCheckResourceAttr("data.ibm_container_vpc_cluster_worker_pool.testacc_ds_kms_worker_pool", "kms_account_id", acc.KmsAccountID),
resource.TestCheckResourceAttrSet("data.ibm_container_vpc_cluster_worker_pool.testacc_ds_worker_pool", "id"),
resource.TestCheckResourceAttr("data.ibm_container_vpc_cluster_worker_pool.testacc_ds_worker_pool", "autoscale_enabled", "false"),
resource.TestCheckResourceAttr("data.ibm_container_vpc_cluster_worker_pool.testacc_ds_worker_pool", "crk", acc.CrkID),
resource.TestCheckResourceAttr("data.ibm_container_vpc_cluster_worker_pool.testacc_ds_worker_pool", "kms_instance_id", acc.KmsInstanceID),
),
},
},
})
}

func testAccCheckIBMContainerVPCClusterWorkerPoolDataSourceConfigDedicatedHost(name, hostpoolID string) string {
return testAccCheckIBMVpcContainerWorkerPoolDedicatedHostCreate(
acc.ClusterName, name, "bx2d.4x16", acc.IksClusterSubnetID, acc.IksClusterVpcID, acc.IksClusterResourceGroupID, hostpoolID) + `
data "ibm_container_vpc_worker_pool" "vpc_worker_pool" {
cluster = "${ibm_container_vpc_worker_pool.vpc_worker_pool.cluster}"
worker_pool_name = "${ibm_container_vpc_worker_pool.vpc_worker_pool.worker_pool_name}"
depends_on = [
ibm_container_vpc_worker_pool.vpc_worker_pool
]
}
`
}

func testAccCheckIBMContainerVPCClusterWorkerPoolDataSourceEnvvar(name string) string {
return testAccCheckIBMVpcContainerWorkerPoolEnvvar(name) + `
func testAccCheckIBMContainerVPCClusterWorkerPoolDataSourceKMS(name string) string {
return testAccCheckIBMVpcContainerWorkerPoolKMS(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}"
}
`
}

func testAccCheckIBMContainerVPCClusterWorkerPoolDataSourceKmsAccountEnvvar(name string) string {
return testAccCheckIBMVpcContainerWorkerPoolKmsAccountEnvvar(name) + `
// TestAccIBMContainerVpcClusterWorkerPoolDataSourceKmsAccount ...
func TestAccIBMContainerVpcClusterWorkerPoolDataSourceKmsAccount(t *testing.T) {
if acc.KmsAccountID == "" {
fmt.Println("[WARN] Skipping TestAccIBMContainerVpcClusterWorkerPoolDataSourceKmsAccount - IBM_KMS_ACCOUNT_ID is unset")
return
}
name := fmt.Sprintf("tf-vpc-wp-ds-kmsacc-%d", acctest.RandIntRange(10, 100))
resource.Test(t, resource.TestCase{
PreCheck: func() { acc.TestAccPreCheck(t) },
Providers: acc.TestAccProviders,
Steps: []resource.TestStep{
{
Config: testAccCheckIBMContainerVPCClusterWorkerPoolDataSourceKmsAccount(name),
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttrSet("data.ibm_container_vpc_cluster_worker_pool.testacc_ds_kms_worker_pool", "id"),
resource.TestCheckResourceAttr("data.ibm_container_vpc_cluster_worker_pool.testacc_ds_kms_worker_pool", "crk", acc.CrkID),
resource.TestCheckResourceAttr("data.ibm_container_vpc_cluster_worker_pool.testacc_ds_kms_worker_pool", "kms_instance_id", acc.KmsInstanceID),
),
},
},
})
}

func testAccCheckIBMContainerVPCClusterWorkerPoolDataSourceKmsAccount(name string) string {
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
1 change: 0 additions & 1 deletion ibm/service/kubernetes/resource_ibm_container_vpc_worker_pool.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,6 @@ func ResourceIBMContainerVpcWorkerPool() *schema.Resource {
"secondary_storage": {
Type: schema.TypeString,
Optional: true,
Computed: true,
ForceNew: true,
Description: "The secondary storage option for the workers in the worker pool.",
},
Expand Down
Loading

0 comments on commit 15e4757

Please sign in to comment.