fix: Correct missing instance_id and region after import (IBM-Cloud#6211)

Co-authored-by: Josh Bennetone <[email protected]>

Author: jbennetone

ibm/service/hpcs/resource_ibm_hpcs_key_template.go

@@ -277,6 +277,15 @@ func ResourceIbmKeyTemplateRead(context context.Context, d *schema.ResourceData,
 	instance_id := id[1]
 	vault_id := id[2]
 	template_id := id[3]
+
+	if err = d.Set("instance_id", instance_id); err != nil {
+		return diag.FromErr(fmt.Errorf("Error setting instance ID: %s", err))
+	}
+
+	if err = d.Set("region", region); err != nil {
+		return diag.FromErr(fmt.Errorf("Error setting region: %s", err))
+	}
+
 	getKeyTemplateOptions.SetID(template_id)
 	getKeyTemplateOptions.SetUKOVault(vault_id)
 

ibm/service/hpcs/resource_ibm_hpcs_keystore.go

@@ -327,6 +327,15 @@ func ResourceIbmKeystoreRead(context context.Context, d *schema.ResourceData, me
 	instance_id := id[1]
 	vault_id := id[2]
 	keystore_id := id[3]
+
+	if err = d.Set("instance_id", instance_id); err != nil {
+		return diag.FromErr(fmt.Errorf("Error setting instance ID: %s", err))
+	}
+
+	if err = d.Set("region", region); err != nil {
+		return diag.FromErr(fmt.Errorf("Error setting region: %s", err))
+	}
+
 	getKeystoreOptions.SetID(keystore_id)
 	getKeystoreOptions.SetUKOVault(vault_id)
 

ibm/service/hpcs/resource_ibm_hpcs_managed_key.go

@@ -409,6 +409,15 @@ func ResourceIbmManagedKeyRead(context context.Context, d *schema.ResourceData,
 	instance_id := id[1]
 	vault_id := id[2]
 	key_id := id[3]
+
+	if err = d.Set("instance_id", instance_id); err != nil {
+		return diag.FromErr(fmt.Errorf("Error setting instance ID: %s", err))
+	}
+
+	if err = d.Set("region", region); err != nil {
+		return diag.FromErr(fmt.Errorf("Error setting region: %s", err))
+	}
+
 	getManagedKeyOptions.SetID(key_id)
 	getManagedKeyOptions.SetUKOVault(vault_id)
 

ibm/service/hpcs/resource_ibm_hpcs_vault.go

@@ -173,6 +173,15 @@ func ResourceIbmVaultRead(context context.Context, d *schema.ResourceData, meta
 	region := id[0]
 	instance_id := id[1]
 	vault_id := id[2]
+
+	if err = d.Set("instance_id", instance_id); err != nil {
+		return diag.FromErr(fmt.Errorf("Error setting instance ID: %s", err))
+	}
+
+	if err = d.Set("region", region); err != nil {
+		return diag.FromErr(fmt.Errorf("Error setting region: %s", err))
+	}
+
 	getVaultOptions.SetID(vault_id)
 
 	url, err := getUkoUrl(context, region, instance_id, ukoClient)