Bug Fix Policy

IBM-Cloud · Dec 16, 2021 · 7b4887a · 7b4887a
1 parent f5535fb
commit 7b4887a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/ibm/resource_ibm_kms_key.go b/ibm/resource_ibm_kms_key.go
@@ -439,7 +439,9 @@ func resourceIBMKmsKeyRead(d *schema.ResourceData, meta interface{}) error {
 		d.Set("endpoint_type", "public")
 	}
 	d.Set("type", crnData[4])
-	d.Set("force_delete", d.Get("force_delete").(bool))
+	if d.Get("force_delete") != nil {
+		d.Set("force_delete", d.Get("force_delete").(bool))
+	}
 	d.Set("key_ring_id", key.KeyRingID)
 	if key.Expiration != nil {
 		expiration := key.Expiration

diff --git a/ibm/resource_ibm_kms_key_policies.go b/ibm/resource_ibm_kms_key_policies.go
@@ -204,7 +204,7 @@ func resourceIBMKmsKeyPolicyCreate(context context.Context, d *schema.ResourceDa
 		return diag.Errorf("Could not create policies: %s", err)
 	}
 	d.SetId(key.CRN)
-	return resourceIBMKmsKeyPolicyUpdate(context, d, meta)
+	return resourceIBMKmsKeyPolicyRead(context, d, meta)
 }
 
 func resourceIBMKmsKeyPolicyRead(context context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
@@ -296,6 +296,10 @@ func resourceIBMKmsKeyPolicyUpdate(context context.Context, d *schema.ResourceDa
 		}
 
 		instanceID := d.Get("instance_id").(string)
+		CrnInstanceID := strings.Split(instanceID, ":")
+		if len(CrnInstanceID) > 3 {
+			instanceID = CrnInstanceID[len(CrnInstanceID)-3]
+		}
 		endpointType := d.Get("endpoint_type").(string)
 
 		rsConClient, err := meta.(ClientSession).ResourceControllerV2API()