Update docs - nested JSONs and docs fixes

examples/ibm-secrets-manager/README.md

@@ -560,7 +560,7 @@ data "sm_en_registration" "sm_en_registration_instance" {
 | certificate                            | The PEM-encoded contents of your certificate.                                                                                                                                                                                                                                                                                                                                                                                                                                                             | `string`       | false     |
 | intermediate                           | (Optional) The PEM-encoded intermediate certificate to associate with the root certificate.                                                                                                                                                                                                                                                                                                                                                                                                               | `string`       | false     |
 | private_key                            | (Optional) The PEM-encoded private key to associate with the certificate.                                                                                                                                                                                                                                                                                                                                                                                                                                 | `string`       | false     |
-| custom_metadata                        | The secret metadata that a user can customize.                                                                                                                                                                                                                                                                                                                                                                                                                                                            | `map()`        | false     |
+| version_custom_metadata                | The custom metadata of the current secret version.                                                                                                                                                                                                                                                                                                                                                                                                                                                        | `map()`        | false     |
 | rotation                               | Determines whether Secrets Manager rotates your secrets automatically.                                                                                                                                                                                                                                                                                                                                                                                                                                    | ``             | false     |
 | source_service                         | The properties required for creating the service credentials for the specified source service instance.                                                                                                                                                                                                                                                                                                                                                                                                   | ``             | false     |
 | data                                   | The payload data of a key-value secret.                                                                                                                                                                                                                                                                                                                                                                                                                                                                   | `map()`        | false     |

ibm/service/secretsmanager/data_source_ibm_sm_arbitrary_secret.go

@@ -136,7 +136,11 @@ func dataSourceIbmSmArbitrarySecretRead(context context.Context, d *schema.Resou
 		return diagError
 	}
 
-	arbitrarySecret := secret.(*secretsmanagerv2.ArbitrarySecret)
+	arbitrarySecret, ok := secret.(*secretsmanagerv2.ArbitrarySecret)
+	if !ok {
+		tfErr := flex.TerraformErrorf(nil, fmt.Sprintf("Wrong secret type: The provided secret is not an Arbitrary secret."), fmt.Sprintf("(Data) %s", ArbitrarySecretResourceName), "read")
+		return tfErr.GetDiag()
+	}
 	d.SetId(fmt.Sprintf("%s/%s/%s", region, instanceId, *arbitrarySecret.ID))
 
 	var err error

ibm/service/secretsmanager/data_source_ibm_sm_arbitrary_secret_metadata.go

@@ -139,7 +139,11 @@ func dataSourceIbmSmArbitrarySecretMetadataRead(context context.Context, d *sche
 		return tfErr.GetDiag()
 	}
 
-	arbitrarySecretMetadata := arbitrarySecretMetadataIntf.(*secretsmanagerv2.ArbitrarySecretMetadata)
+	arbitrarySecretMetadata, ok := arbitrarySecretMetadataIntf.(*secretsmanagerv2.ArbitrarySecretMetadata)
+	if !ok {
+		tfErr := flex.TerraformErrorf(nil, fmt.Sprintf("Wrong secret type: The provided secret is not an Arbitrary secret."), fmt.Sprintf("(Data) %s_metadata", ArbitrarySecretResourceName), "read")
+		return tfErr.GetDiag()
+	}
 
 	d.SetId(fmt.Sprintf("%s/%s/%s", region, instanceId, secretId))
 

ibm/service/secretsmanager/data_source_ibm_sm_custom_credentials_configuration.go

@@ -157,7 +157,11 @@ func dataSourceIbmSmCustomCredentialsConfigurationRead(context context.Context,
 		tfErr := flex.TerraformErrorf(err, fmt.Sprintf("GetConfigurationWithContext failed %s\n%s", err, response), fmt.Sprintf("(Data) %s", CustomCredentialsConfigResourceName), "read")
 		return tfErr.GetDiag()
 	}
-	config := configIntf.(*secretsmanagerv2.CustomCredentialsConfiguration)
+	config, ok := configIntf.(*secretsmanagerv2.CustomCredentialsConfiguration)
+	if !ok {
+		tfErr := flex.TerraformErrorf(nil, fmt.Sprintf("Wrong configuration type: The provided configuration is not a Custom Credentials configuration."), fmt.Sprintf("(Data) %s", CustomCredentialsConfigResourceName), "read")
+		return tfErr.GetDiag()
+	}
 
 	d.SetId(fmt.Sprintf("%s/%s/%s", region, instanceId, *getConfigurationOptions.Name))
 

ibm/service/secretsmanager/data_source_ibm_sm_custom_credentials_secret.go

@@ -235,7 +235,11 @@ func dataSourceIbmSmCustomCredentialsSecretRead(context context.Context, d *sche
 		return diagError
 	}
 
-	customCredentialsSecret := secret.(*secretsmanagerv2.CustomCredentialsSecret)
+	customCredentialsSecret, ok := secret.(*secretsmanagerv2.CustomCredentialsSecret)
+	if !ok {
+		tfErr := flex.TerraformErrorf(nil, fmt.Sprintf("Wrong secret type: The provided secret is not a Custom Credentials secret."), fmt.Sprintf("(Data) %s", CustomCredentialsSecretResourceName), "read")
+		return tfErr.GetDiag()
+	}
 
 	d.SetId(fmt.Sprintf("%s/%s/%s", region, instanceId, *customCredentialsSecret.ID))
 

ibm/service/secretsmanager/data_source_ibm_sm_custom_credentials_secret_metadata.go

@@ -219,27 +219,31 @@ func dataSourceIbmSmCustomCredentialsSecretMetadataRead(context context.Context,
 		return tfErr.GetDiag()
 	}
 
-	metadata := secretMetadataIntf.(*secretsmanagerv2.CustomCredentialsSecretMetadata)
+	metadata, ok := secretMetadataIntf.(*secretsmanagerv2.CustomCredentialsSecretMetadata)
+	if !ok {
+		tfErr := flex.TerraformErrorf(nil, fmt.Sprintf("Wrong secret type: The provided secret is not a Custom Credentials secret."), fmt.Sprintf("(Data) %s_metadata", CustomCredentialsSecretResourceName), "read")
+		return tfErr.GetDiag()
+	}
 
 	d.SetId(fmt.Sprintf("%s/%s/%s", region, instanceId, secretId))
 
 	if err = d.Set("region", region); err != nil {
-		tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Error setting region"), fmt.Sprintf("(Data) %s", CustomCredentialsSecretResourceName), "read")
+		tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Error setting region"), fmt.Sprintf("(Data) %s_metadata", CustomCredentialsSecretResourceName), "read")
 		return tfErr.GetDiag()
 	}
 
 	if err = d.Set("created_by", metadata.CreatedBy); err != nil {
-		tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Error setting created_by"), fmt.Sprintf("(Data) %s", CustomCredentialsSecretResourceName), "read")
+		tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Error setting created_by"), fmt.Sprintf("(Data) %s_metadata", CustomCredentialsSecretResourceName), "read")
 		return tfErr.GetDiag()
 	}
 
 	if err = d.Set("created_at", DateTimeToRFC3339(metadata.CreatedAt)); err != nil {
-		tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Error setting created_at"), fmt.Sprintf("(Data) %s", CustomCredentialsSecretResourceName), "read")
+		tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Error setting created_at"), fmt.Sprintf("(Data) %s_metadata", CustomCredentialsSecretResourceName), "read")
 		return tfErr.GetDiag()
 	}
 
 	if err = d.Set("crn", metadata.Crn); err != nil {
-		tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Error setting crn"), fmt.Sprintf("(Data) %s", CustomCredentialsSecretResourceName), "read")
+		tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Error setting crn"), fmt.Sprintf("(Data) %s_metadata", CustomCredentialsSecretResourceName), "read")
 		return tfErr.GetDiag()
 	}
 
@@ -250,110 +254,110 @@ func dataSourceIbmSmCustomCredentialsSecretMetadataRead(context context.Context,
 		}
 
 		if err = d.Set("custom_metadata", flex.Flatten(convertedMap)); err != nil {
-			tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Error setting custom_metadata"), fmt.Sprintf("(Data) %s", CustomCredentialsSecretResourceName), "read")
+			tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Error setting custom_metadata"), fmt.Sprintf("(Data) %s_metadata", CustomCredentialsSecretResourceName), "read")
 			return tfErr.GetDiag()
 		}
 		if err != nil {
-			tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Error setting custom_metadata"), fmt.Sprintf("(Data) %s", CustomCredentialsSecretResourceName), "read")
+			tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Error setting custom_metadata"), fmt.Sprintf("(Data) %s_metadata", CustomCredentialsSecretResourceName), "read")
 			return tfErr.GetDiag()
 		}
 	}
 
 	if err = d.Set("description", metadata.Description); err != nil {
-		tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Error setting description"), fmt.Sprintf("(Data) %s", CustomCredentialsSecretResourceName), "read")
+		tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Error setting description"), fmt.Sprintf("(Data) %s_metadata", CustomCredentialsSecretResourceName), "read")
 		return tfErr.GetDiag()
 	}
 
 	if err = d.Set("configuration", metadata.Configuration); err != nil {
-		tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Error setting configuration"), fmt.Sprintf("(Data) %s", CustomCredentialsSecretResourceName), "read")
+		tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Error setting configuration"), fmt.Sprintf("(Data) %s_metadata", CustomCredentialsSecretResourceName), "read")
 		return tfErr.GetDiag()
 	}
 
 	if err = d.Set("downloaded", metadata.Downloaded); err != nil {
-		tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Error setting downloaded"), fmt.Sprintf("(Data) %s", CustomCredentialsSecretResourceName), "read")
+		tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Error setting downloaded"), fmt.Sprintf("(Data) %s_metadata", CustomCredentialsSecretResourceName), "read")
 		return tfErr.GetDiag()
 	}
 
 	if err = d.Set("locks_total", flex.IntValue(metadata.LocksTotal)); err != nil {
-		tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Error setting locks_total"), fmt.Sprintf("(Data) %s", CustomCredentialsSecretResourceName), "read")
+		tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Error setting locks_total"), fmt.Sprintf("(Data) %s_metadata", CustomCredentialsSecretResourceName), "read")
 		return tfErr.GetDiag()
 	}
 
 	if err = d.Set("name", metadata.Name); err != nil {
-		tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Error setting name"), fmt.Sprintf("(Data) %s", CustomCredentialsSecretResourceName), "read")
+		tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Error setting name"), fmt.Sprintf("(Data) %s_metadata", CustomCredentialsSecretResourceName), "read")
 		return tfErr.GetDiag()
 	}
 
 	if err = d.Set("secret_group_id", metadata.SecretGroupID); err != nil {
-		tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Error setting secret_group_id"), fmt.Sprintf("(Data) %s", CustomCredentialsSecretResourceName), "read")
+		tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Error setting secret_group_id"), fmt.Sprintf("(Data) %s_metadata", CustomCredentialsSecretResourceName), "read")
 		return tfErr.GetDiag()
 	}
 
 	if err = d.Set("secret_type", metadata.SecretType); err != nil {
-		tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Error setting secret_type"), fmt.Sprintf("(Data) %s", CustomCredentialsSecretResourceName), "read")
+		tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Error setting secret_type"), fmt.Sprintf("(Data) %s_metadata", CustomCredentialsSecretResourceName), "read")
 		return tfErr.GetDiag()
 	}
 
 	if err = d.Set("state", flex.IntValue(metadata.State)); err != nil {
-		tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Error setting state"), fmt.Sprintf("(Data) %s", CustomCredentialsSecretResourceName), "read")
+		tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Error setting state"), fmt.Sprintf("(Data) %s_metadata", CustomCredentialsSecretResourceName), "read")
 		return tfErr.GetDiag()
 	}
 
 	if err = d.Set("state_description", metadata.StateDescription); err != nil {
-		tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Error setting state_description"), fmt.Sprintf("(Data) %s", CustomCredentialsSecretResourceName), "read")
+		tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Error setting state_description"), fmt.Sprintf("(Data) %s_metadata", CustomCredentialsSecretResourceName), "read")
 		return tfErr.GetDiag()
 	}
 
 	if err = d.Set("ttl", metadata.TTL); err != nil {
-		tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Error setting ttl"), fmt.Sprintf("(Data) %s", CustomCredentialsSecretResourceName), "read")
+		tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Error setting ttl"), fmt.Sprintf("(Data) %s_metadata", CustomCredentialsSecretResourceName), "read")
 		return tfErr.GetDiag()
 	}
 
 	if err = d.Set("updated_at", DateTimeToRFC3339(metadata.UpdatedAt)); err != nil {
-		tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Error setting updated_at"), fmt.Sprintf("(Data) %s", CustomCredentialsSecretResourceName), "read")
+		tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Error setting updated_at"), fmt.Sprintf("(Data) %s_metadata", CustomCredentialsSecretResourceName), "read")
 		return tfErr.GetDiag()
 	}
 
 	if err = d.Set("versions_total", flex.IntValue(metadata.VersionsTotal)); err != nil {
-		tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Error setting versions_total"), fmt.Sprintf("(Data) %s", CustomCredentialsSecretResourceName), "read")
+		tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Error setting versions_total"), fmt.Sprintf("(Data) %s_metadata", CustomCredentialsSecretResourceName), "read")
 		return tfErr.GetDiag()
 	}
 
 	rotation := []map[string]interface{}{}
 	if metadata.Rotation != nil {
 		modelMap, err := customCredentialsSecretRotationPolicyToMap(metadata.Rotation)
 		if err != nil {
-			tfErr := flex.TerraformErrorf(err, "", fmt.Sprintf("(Data) %s", CustomCredentialsSecretResourceName), "read")
+			tfErr := flex.TerraformErrorf(err, "", fmt.Sprintf("(Data) %s_metadata", CustomCredentialsSecretResourceName), "read")
 			return tfErr.GetDiag()
 		}
 		rotation = append(rotation, modelMap)
 	}
 	if err = d.Set("rotation", rotation); err != nil {
-		tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Error setting rotation"), fmt.Sprintf("(Data) %s", CustomCredentialsSecretResourceName), "read")
+		tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Error setting rotation"), fmt.Sprintf("(Data) %s_metadata", CustomCredentialsSecretResourceName), "read")
 		return tfErr.GetDiag()
 	}
 
 	parameters := []map[string]interface{}{}
 	if metadata.Parameters != nil {
 		modelMap, err := customCredentialsSecretFieldsToMap(metadata.Parameters)
 		if err != nil {
-			tfErr := flex.TerraformErrorf(err, "", fmt.Sprintf("(Data) %s", CustomCredentialsSecretResourceName), "read")
+			tfErr := flex.TerraformErrorf(err, "", fmt.Sprintf("(Data) %s_metadata", CustomCredentialsSecretResourceName), "read")
 			return tfErr.GetDiag()
 		}
 		parameters = append(parameters, modelMap)
 	}
 	if err = d.Set("parameters", parameters); err != nil {
-		tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Error setting parameters"), fmt.Sprintf("(Data) %s", CustomCredentialsSecretResourceName), "read")
+		tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Error setting parameters"), fmt.Sprintf("(Data) %s_metadata", CustomCredentialsSecretResourceName), "read")
 		return tfErr.GetDiag()
 	}
 
 	if err = d.Set("expiration_date", DateTimeToRFC3339(metadata.ExpirationDate)); err != nil {
-		tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Error setting expiration_date"), fmt.Sprintf("(Data) %s", CustomCredentialsSecretResourceName), "read")
+		tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Error setting expiration_date"), fmt.Sprintf("(Data) %s_metadata", CustomCredentialsSecretResourceName), "read")
 		return tfErr.GetDiag()
 	}
 
 	if err = d.Set("next_rotation_date", DateTimeToRFC3339(metadata.NextRotationDate)); err != nil {
-		tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Error setting next_rotation_date"), fmt.Sprintf("(Data) %s", CustomCredentialsSecretResourceName), "read")
+		tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Error setting next_rotation_date"), fmt.Sprintf("(Data) %s_metadata", CustomCredentialsSecretResourceName), "read")
 		return tfErr.GetDiag()
 	}
 

ibm/service/secretsmanager/data_source_ibm_sm_iam_credentials_configuration.go

@@ -87,7 +87,12 @@ func dataSourceIbmSmIamCredentialsConfigurationRead(context context.Context, d *
 		tfErr := flex.TerraformErrorf(err, fmt.Sprintf("GetConfigurationWithContext failed %s\n%s", err, response), fmt.Sprintf("(Data) %s", IAMCredentialsConfigResourceName), "read")
 		return tfErr.GetDiag()
 	}
-	iAMCredentialsConfiguration := iAMCredentialsConfigurationIntf.(*secretsmanagerv2.IAMCredentialsConfiguration)
+
+	iAMCredentialsConfiguration, ok := iAMCredentialsConfigurationIntf.(*secretsmanagerv2.IAMCredentialsConfiguration)
+	if !ok {
+		tfErr := flex.TerraformErrorf(nil, fmt.Sprintf("Wrong configuration type: The provided configuration is not an IAM Credentials configuration."), fmt.Sprintf("(Data) %s", IAMCredentialsConfigResourceName), "read")
+		return tfErr.GetDiag()
+	}
 
 	d.SetId(fmt.Sprintf("%s/%s/%s", region, instanceId, *getConfigurationOptions.Name))
 

ibm/service/secretsmanager/data_source_ibm_sm_iam_credentials_secret.go

@@ -202,7 +202,12 @@ func dataSourceIbmSmIamCredentialsSecretRead(context context.Context, d *schema.
 		return diagError
 	}
 
-	iAMCredentialsSecret := iAMCredentialsSecretIntf.(*secretsmanagerv2.IAMCredentialsSecret)
+	iAMCredentialsSecret, ok := iAMCredentialsSecretIntf.(*secretsmanagerv2.IAMCredentialsSecret)
+	if !ok {
+		tfErr := flex.TerraformErrorf(nil, fmt.Sprintf("Wrong secret type: The provided secret is not an IAM Credentials secret."), fmt.Sprintf("(Data) %s", IAMCredentialsSecretResourceName), "read")
+		return tfErr.GetDiag()
+	}
+
 	d.SetId(fmt.Sprintf("%s/%s/%s", region, instanceId, *iAMCredentialsSecret.ID))
 
 	var err error

ibm/service/secretsmanager/data_source_ibm_sm_iam_credentials_secret_metadata.go

@@ -205,7 +205,12 @@ func dataSourceIbmSmIamCredentialsSecretMetadataRead(context context.Context, d
 		tfErr := flex.TerraformErrorf(err, fmt.Sprintf("GetSecretMetadataWithContext failed %s\n%s", err, response), fmt.Sprintf("(Data) %s_metadata", IAMCredentialsSecretResourceName), "read")
 		return tfErr.GetDiag()
 	}
-	iAMCredentialsSecretMetadata := iAMCredentialsSecretMetadataIntf.(*secretsmanagerv2.IAMCredentialsSecretMetadata)
+
+	iAMCredentialsSecretMetadata, ok := iAMCredentialsSecretMetadataIntf.(*secretsmanagerv2.IAMCredentialsSecretMetadata)
+	if !ok {
+		tfErr := flex.TerraformErrorf(nil, fmt.Sprintf("Wrong secret type: The provided secret is not an IAM Credentials secret."), fmt.Sprintf("(Data) %s_metadata", IAMCredentialsSecretResourceName), "read")
+		return tfErr.GetDiag()
+	}
 
 	d.SetId(fmt.Sprintf("%s/%s/%s", region, instanceId, secretId))