fix KMS example code and typos (IBM-Cloud#6337)

* fix main example code bugs and fix typos

* make fixes to cos bucket integration

---------

Co-authored-by: wsiew <[email protected]>

Author: william8siew

examples/ibm-key-protect/main.tf

@@ -26,11 +26,11 @@ data "ibm_kp_key" "test" {
 		key_protect_id = "${ibm_kp_key.test.key_protect_id}" 
 }
 
-resource "ibm_cos_bucket" "flex-us-south" {
+resource "ibm_cos_bucket" "smart-us-south" {
   depends_on           = [ibm_iam_authorization_policy.policy]
   bucket_name          = var.bucket_name
   resource_instance_id = ibm_resource_instance.cos_instance.id
   region_location      = "us-south"
-  storage_class        = "flex"
+  storage_class        = "smart"
   kms_key_crn          = ibm_kp_key.test.id
 }

examples/ibm-key-protect/variables.tf

@@ -41,5 +41,5 @@ variable "standard_key" {
 variable "bucket_name" {
    description = "The cos bucket name"
   type        = string
-  default = "test_buck"
+  default = "kptestbucket"
 }

examples/ibm-kms/main.tf

@@ -28,12 +28,12 @@ data "ibm_kms_keys" "test" {
 		instance_id = "${ibm_kms_key.test.instance_id}" 
 }
 
-resource "ibm_cos_bucket" "flex-us-south" {
+resource "ibm_cos_bucket" "smart-us-south" {
   depends_on           = [ibm_iam_authorization_policy.policy]
   bucket_name          = var.bucket_name
   resource_instance_id = ibm_resource_instance.cos_instance.id
   region_location      = "us-south"
-  storage_class        = "flex"
+  storage_class        = "smart"
   kms_key_crn          = ibm_kms_key.test.id
 }
 
@@ -49,21 +49,20 @@ resource "ibm_kms_kmip_adapter" "myadapter" {
 
 resource "ibm_kms_kmip_client_cert" "mycert" {
   instance_id = "${ibm_kms_key.test.instance_id}" 
-  adapter_id = "${ibm_kms_kmip_adapter.myadapter.id}"
+  adapter_id = "${ibm_kms_kmip_adapter.myadapter.adapter_id}"
   certificate = file("${path.module}/localhost.crt")
   name = var.kmip_cert_name
 }
 
 data "ibm_kms_kmip_adapter" "adapter_data" {
   instance_id = "${ibm_kms_key.test.instance_id}" 
   name = "${ibm_kms_kmip_adapter.myadapter.name}"
-  # adapter_id = "${ibm_kms_kmip_adapter.myadapter.adapter_id}"
 }
 
 data "ibm_kms_kmip_client_cert" "cert1" {
   instance_id = "${ibm_kms_key.test.instance_id}" 
   adapter_name = "${ibm_kms_kmip_adapter.myadapter.name}"
-  cert_id = "${ibm_kms_kmip_client_cert.mycert.id}"
+  cert_id = "${ibm_kms_kmip_client_cert.mycert.cert_id}"
 }
 
 data "ibm_kms_kmip_adapters" "adapters" {
@@ -77,13 +76,13 @@ data "ibm_kms_kmip_client_certs" "cert_list" {
 
 data "ibm_kms_kmip_objects" "objects_list" {
   instance_id = "${ibm_kms_key.test.instance_id}" 
-  adapter_id = "${ibm_kms_kmip_adapter.myadapter.id}"
+  adapter_id = "${ibm_kms_kmip_adapter.myadapter.adapter_id}"
   object_state_filter = [1,2,3,4]
 }
 
-data "ibm_kms_kmip_object" "object1" {
-  count = length(data.ibm_kms_kmip_objects.objects_list.objects) > 0 ? 1 : 0
-  instance_id = "${ibm_kms_key.test.instance_id}" 
-  adapter_id = "${ibm_kms_kmip_adapter.myadapter.id}"
-  object_id = "${data.ibm_kms_kmip_objects.objects_list.objects.0.object_id}"
-}
+# Note: As object creation is not supported via terraform, the below code attempts to pull the id of the first item from the list of kmip objects
+# data "ibm_kms_kmip_object" "object1" {
+#   instance_id = "${ibm_kms_key.test.instance_id}" 
+#   adapter_id = "${ibm_kms_kmip_adapter.myadapter.adapter_id}"
+#   object_id = "${data.ibm_kms_kmip_objects.objects_list.objects.0.object_id}"
+# }

examples/ibm-kms/variables.tf

@@ -41,7 +41,7 @@ variable "standard_key" {
 variable "bucket_name" {
    description = "The cos bucket name"
   type        = string
-  default = "test_buck"
+  default = "kptestbucket"
 }
 variable "kmip_adapter_name" {
    description = "The KMIP adapter name"

ibm/service/kms/data_source_ibm_kms_kmip_client_certificate.go

@@ -114,7 +114,7 @@ func dataSourceIBMKmsKMIPClientCertRead(d *schema.ResourceData, meta interface{}
 	ctx := context.Background()
 	adapter, err := kpAPI.GetKMIPAdapter(ctx, adapterNameOrID)
 	if err != nil {
-		return flex.FmtErrorf("[ERROR] Error while retriving KMIP adapter to get certificate: %s", err)
+		return flex.FmtErrorf("[ERROR] Error while retrieving KMIP adapter to get certificate: %s", err)
 	}
 	if err = d.Set("adapter_id", adapter.ID); err != nil {
 		return flex.FmtErrorf("[ERROR] Error setting adapter_id: %s", err)

ibm/service/kms/data_source_ibm_kms_kmip_client_certificates.go

@@ -111,7 +111,7 @@ func dataSourceIBMKmsKMIPClientCertList(d *schema.ResourceData, meta interface{}
 	ctx := context.Background()
 	adapter, err := api.GetKMIPAdapter(ctx, adapterNameOrID)
 	if err != nil {
-		return flex.FmtErrorf("[ERROR] Error while retriving KMIP adapter to list certificates: %s", err)
+		return flex.FmtErrorf("[ERROR] Error while retrieving KMIP adapter to list certificates: %s", err)
 	}
 	if err = d.Set("adapter_id", adapter.ID); err != nil {
 		return flex.FmtErrorf("[ERROR] Error setting adapter_id: %s", err)

ibm/service/kms/data_source_ibm_kms_kmip_object.go

@@ -139,7 +139,7 @@ func dataSourceIBMKmsKMIPObjectRead(d *schema.ResourceData, meta interface{}) er
 	ctx := context.Background()
 	adapter, err := kpAPI.GetKMIPAdapter(ctx, adapterNameOrID)
 	if err != nil {
-		return flex.FmtErrorf("[ERROR] Error while retriving KMIP adapter to get KMIP object: %s", err)
+		return flex.FmtErrorf("[ERROR] Error while retrieving KMIP adapter to get KMIP object: %s", err)
 	}
 	if err = d.Set("adapter_id", adapter.ID); err != nil {
 		return flex.FmtErrorf("[ERROR] Error setting adapter_id: %s", err)

ibm/service/kms/data_source_ibm_kms_kmip_objects.go

@@ -131,7 +131,7 @@ func dataSourceIBMKmsKMIPObjectList(d *schema.ResourceData, meta interface{}) er
 	ctx := context.Background()
 	adapter, err := kpAPI.GetKMIPAdapter(ctx, adapterNameOrID)
 	if err != nil {
-		return flex.FmtErrorf("[ERROR] Error while retriving KMIP adapter to list KMIP objects: %s", err)
+		return flex.FmtErrorf("[ERROR] Error while retrieving KMIP adapter to list KMIP objects: %s", err)
 	}
 	if err = d.Set("adapter_id", adapter.ID); err != nil {
 		return flex.FmtErrorf("[ERROR] Error setting adapter_id: %s", err)
@@ -141,7 +141,7 @@ func dataSourceIBMKmsKMIPObjectList(d *schema.ResourceData, meta interface{}) er
 	}
 	objs, err := kpAPI.GetKMIPObjects(ctx, adapterNameOrID, opts)
 	if err != nil {
-		return flex.FmtErrorf("[ERROR] Error while retriving KMIP objects associated with adapter ID '%s': %v", adapter.ID, err)
+		return flex.FmtErrorf("[ERROR] Error while retrieving KMIP objects associated with adapter ID '%s': %v", adapter.ID, err)
 	}
 	objsList := objs.Objects
 	// set computed values