Fix missing secret_id property (IBM-Cloud#6400)

haimsch · web-flow · commit 74546df5c62d · 2025-08-14T14:44:45.000+05:30
diff --git a/ibm/service/secretsmanager/data_source_ibm_sm_arbitrary_secret.go b/ibm/service/secretsmanager/data_source_ibm_sm_arbitrary_secret.go
@@ -195,6 +195,11 @@ func dataSourceIbmSmArbitrarySecretRead(context context.Context, d *schema.Resou
 		return tfErr.GetDiag()
 	}
 
+	if err = d.Set("secret_id", arbitrarySecret.ID); err != nil {
+		tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Error setting secret_id"), fmt.Sprintf("(Data) %s", ArbitrarySecretResourceName), "read")
+		return tfErr.GetDiag()
+	}
+
 	if err = d.Set("secret_group_id", arbitrarySecret.SecretGroupID); err != nil {
 		tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Error setting secret_group_id"), fmt.Sprintf("(Data) %s", ArbitrarySecretResourceName), "read")
 		return tfErr.GetDiag()
diff --git a/ibm/service/secretsmanager/data_source_ibm_sm_arbitrary_secret_test.go b/ibm/service/secretsmanager/data_source_ibm_sm_arbitrary_secret_test.go
@@ -31,6 +31,7 @@ func TestAccIbmSmArbitrarySecretDataSourceBasic(t *testing.T) {
 					resource.TestCheckResourceAttrSet("data.ibm_sm_arbitrary_secret.sm_arbitrary_secret", "versions_total"),
 					resource.TestCheckResourceAttrSet("data.ibm_sm_arbitrary_secret.sm_arbitrary_secret_by_name", "name"),
 					resource.TestCheckResourceAttrSet("data.ibm_sm_arbitrary_secret.sm_arbitrary_secret_by_name", "secret_group_name"),
+					resource.TestCheckResourceAttrSet("data.ibm_sm_arbitrary_secret.sm_arbitrary_secret_by_name", "secret_id"),
 				),
 			},
 		},
diff --git a/ibm/service/secretsmanager/data_source_ibm_sm_custom_credentials_secret.go b/ibm/service/secretsmanager/data_source_ibm_sm_custom_credentials_secret.go
@@ -301,6 +301,11 @@ func dataSourceIbmSmCustomCredentialsSecretRead(context context.Context, d *sche
 		return tfErr.GetDiag()
 	}
 
+	if err = d.Set("secret_id", customCredentialsSecret.ID); err != nil {
+		tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Error setting secret_id"), fmt.Sprintf("(Data) %s", CustomCredentialsSecretResourceName), "read")
+		return tfErr.GetDiag()
+	}
+
 	if err = d.Set("secret_group_id", customCredentialsSecret.SecretGroupID); err != nil {
 		tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Error setting secret_group_id"), fmt.Sprintf("(Data) %s", CustomCredentialsSecretResourceName), "read")
 		return tfErr.GetDiag()
diff --git a/ibm/service/secretsmanager/data_source_ibm_sm_custom_credentials_secret_metadata_test.go b/ibm/service/secretsmanager/data_source_ibm_sm_custom_credentials_secret_metadata_test.go
@@ -14,7 +14,7 @@ import (
 )
 
 func TestAccIbmSmCustomCredentialsSecretMetadataDataSource(t *testing.T) {
-	dataSourceName := "ibm_sm_custom_credentials_secret.sm_custom_credentials_secret"
+	dataSourceName := "data.ibm_sm_custom_credentials_secret_metadata.sm_custom_credentials_secret"
 	resource.Test(t, resource.TestCase{
 		PreCheck:  func() { acc.TestAccPreCheck(t) },
 		Providers: acc.TestAccProviders,
@@ -44,7 +44,7 @@ func TestAccIbmSmCustomCredentialsSecretMetadataDataSource(t *testing.T) {
 func customCredentialsSecretMetadataDataSourceConfig() string {
 	return customCredentialsSecretConfigAllArgs() +
 		fmt.Sprintf(`
-		data "ibm_sm_custom_credentials_secret_metadata" "sm_custom_credenbtials_secret" {
+		data "ibm_sm_custom_credentials_secret_metadata" "sm_custom_credentials_secret" {
 			instance_id = "%s"
 			region = "%s"
 			secret_id = ibm_sm_custom_credentials_secret.sm_custom_credentials_secret.secret_id
diff --git a/ibm/service/secretsmanager/data_source_ibm_sm_custom_credentials_secret_test.go b/ibm/service/secretsmanager/data_source_ibm_sm_custom_credentials_secret_test.go
@@ -5,16 +5,15 @@ package secretsmanager_test
 
 import (
 	"fmt"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 	"strconv"
 	"testing"
 
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
-
 	acc "github.com/IBM-Cloud/terraform-provider-ibm/ibm/acctest"
 )
 
 func TestAccIbmSmCustomCredentialsSecretDataSource(t *testing.T) {
-	dataSourceName := "ibm_sm_custom_credentials_secret.sm_custom_credentials_secret"
+	dataSourceName := "data.ibm_sm_custom_credentials_secret.sm_custom_credentials_secret"
 	expectedStrCredential := customCredentialsStrParam + "_output"
 	expectedBoolCredential := !customCredentialsBoolParam
 	expectedIntCredential := customCredentialsIntParam + 1
@@ -41,6 +40,9 @@ func TestAccIbmSmCustomCredentialsSecretDataSource(t *testing.T) {
 					resource.TestCheckResourceAttr(dataSourceName, "credentials_content.0.string_values.str_credential", expectedStrCredential),
 					resource.TestCheckResourceAttr(dataSourceName, "credentials_content.0.integer_values.int_credential", strconv.Itoa(expectedIntCredential)),
 					resource.TestCheckResourceAttr(dataSourceName, "credentials_content.0.boolean_values.bool_credential", strconv.FormatBool(expectedBoolCredential)),
+					resource.TestCheckResourceAttrSet("data.ibm_sm_custom_credentials_secret.by_name", "name"),
+					resource.TestCheckResourceAttrSet("data.ibm_sm_custom_credentials_secret.by_name", "secret_group_name"),
+					resource.TestCheckResourceAttrSet("data.ibm_sm_custom_credentials_secret.by_name", "secret_id"),
 				),
 			},
 		},
@@ -50,10 +52,17 @@ func TestAccIbmSmCustomCredentialsSecretDataSource(t *testing.T) {
 func customCredentialsSecretDataSourceConfig() string {
 	return customCredentialsSecretConfigAllArgs() +
 		fmt.Sprintf(`
-		data "ibm_sm_custom_credentials_secret" "sm_custom_credenbtials_secret" {
+		data "ibm_sm_custom_credentials_secret" "sm_custom_credentials_secret" {
 			instance_id = "%s"
 			region = "%s"
 			secret_id = ibm_sm_custom_credentials_secret.sm_custom_credentials_secret.secret_id
 		}
-	`, acc.SecretsManagerInstanceID, acc.SecretsManagerInstanceRegion)
+
+		data "ibm_sm_custom_credentials_secret" "by_name" {
+			instance_id   = "%s"
+			region = "%s"
+			name = ibm_sm_custom_credentials_secret.sm_custom_credentials_secret.name
+			secret_group_name = "default"
+		}
+	`, acc.SecretsManagerInstanceID, acc.SecretsManagerInstanceRegion, acc.SecretsManagerInstanceID, acc.SecretsManagerInstanceRegion)
 }
diff --git a/ibm/service/secretsmanager/data_source_ibm_sm_iam_credentials_secret.go b/ibm/service/secretsmanager/data_source_ibm_sm_iam_credentials_secret.go
@@ -266,6 +266,11 @@ func dataSourceIbmSmIamCredentialsSecretRead(context context.Context, d *schema.
 		return tfErr.GetDiag()
 	}
 
+	if err = d.Set("secret_id", iAMCredentialsSecret.ID); err != nil {
+		tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Error setting secret_id"), fmt.Sprintf("(Data) %s", IAMCredentialsSecretResourceName), "read")
+		return tfErr.GetDiag()
+	}
+
 	if err = d.Set("secret_type", iAMCredentialsSecret.SecretType); err != nil {
 		tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Error setting secret_type"), fmt.Sprintf("(Data) %s", IAMCredentialsSecretResourceName), "read")
 		return tfErr.GetDiag()
diff --git a/ibm/service/secretsmanager/data_source_ibm_sm_iam_credentials_secret_test.go b/ibm/service/secretsmanager/data_source_ibm_sm_iam_credentials_secret_test.go
@@ -32,6 +32,7 @@ func TestAccIbmSmIamCredentialsSecretDataSourceBasic(t *testing.T) {
 							resource.TestCheckResourceAttrSet("data.ibm_sm_iam_credentials_secret.sm_iam_credentials_secret", "versions_total"),
 							resource.TestCheckResourceAttrSet("data.ibm_sm_iam_credentials_secret.sm_iam_credentials_secret", "ttl"),
 							resource.TestCheckResourceAttrSet("data.ibm_sm_iam_credentials_secret.sm_iam_credentials_secret", "reuse_api_key"),
+							resource.TestCheckResourceAttrSet("data.ibm_sm_iam_credentials_secret.sm_iam_credentials_secret_by_name", "secret_id"),
 						),
 					},
 				},
diff --git a/ibm/service/secretsmanager/data_source_ibm_sm_imported_certificate.go b/ibm/service/secretsmanager/data_source_ibm_sm_imported_certificate.go
@@ -436,6 +436,11 @@ func dataSourceIbmSmImportedCertificateRead(context context.Context, d *schema.R
 		return tfErr.GetDiag()
 	}
 
+	if err = d.Set("secret_id", importedCertificate.ID); err != nil {
+		tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Error setting secret_id"), fmt.Sprintf("(Data) %s", ImportedCertSecretResourceName), "read")
+		return tfErr.GetDiag()
+	}
+
 	if err = d.Set("secret_type", importedCertificate.SecretType); err != nil {
 		tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Error setting secret_type"), fmt.Sprintf("(Data) %s", ImportedCertSecretResourceName), "read")
 		return tfErr.GetDiag()
diff --git a/ibm/service/secretsmanager/data_source_ibm_sm_imported_certificate_test.go b/ibm/service/secretsmanager/data_source_ibm_sm_imported_certificate_test.go
@@ -39,6 +39,7 @@ func TestAccIbmSmImportedCertificateDataSourceBasic(t *testing.T) {
 					resource.TestCheckResourceAttrSet("data.ibm_sm_imported_certificate.sm_imported_certificate", "certificate"),
 					resource.TestCheckResourceAttrSet("data.ibm_sm_imported_certificate.sm_imported_certificate_by_name", "name"),
 					resource.TestCheckResourceAttrSet("data.ibm_sm_imported_certificate.sm_imported_certificate_by_name", "secret_group_name"),
+					resource.TestCheckResourceAttrSet("data.ibm_sm_imported_certificate.sm_imported_certificate_by_name", "secret_id"),
 				),
 			},
 		},
diff --git a/ibm/service/secretsmanager/data_source_ibm_sm_kv_secret.go b/ibm/service/secretsmanager/data_source_ibm_sm_kv_secret.go
@@ -195,6 +195,11 @@ func dataSourceIbmSmKvSecretRead(context context.Context, d *schema.ResourceData
 		return tfErr.GetDiag()
 	}
 
+	if err = d.Set("secret_id", kVSecret.ID); err != nil {
+		tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Error setting secret_id"), fmt.Sprintf("(Data) %s", KvSecretResourceName), "read")
+		return tfErr.GetDiag()
+	}
+
 	if err = d.Set("secret_group_id", kVSecret.SecretGroupID); err != nil {
 		tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Error setting secret_group_id"), fmt.Sprintf("(Data) %s", KvSecretResourceName), "read")
 		return tfErr.GetDiag()
diff --git a/ibm/service/secretsmanager/data_source_ibm_sm_kv_secret_test.go b/ibm/service/secretsmanager/data_source_ibm_sm_kv_secret_test.go
@@ -32,6 +32,7 @@ func TestAccIbmSmKvSecretDataSourceBasic(t *testing.T) {
 					resource.TestCheckResourceAttrSet("data.ibm_sm_kv_secret.sm_kv_secret", "data.%"),
 					resource.TestCheckResourceAttrSet("data.ibm_sm_kv_secret.sm_kv_secret_by_name", "name"),
 					resource.TestCheckResourceAttrSet("data.ibm_sm_kv_secret.sm_kv_secret_by_name", "secret_group_name"),
+					resource.TestCheckResourceAttrSet("data.ibm_sm_kv_secret.sm_kv_secret_by_name", "secret_id"),
 				),
 			},
 		},
diff --git a/ibm/service/secretsmanager/data_source_ibm_sm_private_certificate.go b/ibm/service/secretsmanager/data_source_ibm_sm_private_certificate.go
@@ -319,6 +319,11 @@ func dataSourceIbmSmPrivateCertificateRead(context context.Context, d *schema.Re
 		return tfErr.GetDiag()
 	}
 
+	if err = d.Set("secret_id", privateCertificate.ID); err != nil {
+		tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Error setting secret_id"), fmt.Sprintf("(Data) %s", PrivateCertSecretResourceName), "read")
+		return tfErr.GetDiag()
+	}
+
 	if err = d.Set("secret_group_id", privateCertificate.SecretGroupID); err != nil {
 		tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Error setting secret_group_id"), fmt.Sprintf("(Data) %s", PrivateCertSecretResourceName), "read")
 		return tfErr.GetDiag()
diff --git a/ibm/service/secretsmanager/data_source_ibm_sm_private_certificate_test.go b/ibm/service/secretsmanager/data_source_ibm_sm_private_certificate_test.go
@@ -39,6 +39,7 @@ func TestAccIbmSmPrivateCertificateDataSourceBasic(t *testing.T) {
 					resource.TestCheckResourceAttrSet("data.ibm_sm_private_certificate.sm_private_certificate", "private_key"),
 					resource.TestCheckResourceAttrSet("data.ibm_sm_private_certificate.sm_private_certificate_by_name", "name"),
 					resource.TestCheckResourceAttrSet("data.ibm_sm_private_certificate.sm_private_certificate_by_name", "secret_group_name"),
+					resource.TestCheckResourceAttrSet("data.ibm_sm_private_certificate.sm_private_certificate_by_name", "secret_id"),
 				),
 			},
 		},
diff --git a/ibm/service/secretsmanager/data_source_ibm_sm_public_certificate.go b/ibm/service/secretsmanager/data_source_ibm_sm_public_certificate.go
@@ -379,6 +379,11 @@ func dataSourceIbmSmPublicCertificateSecretRead(context context.Context, d *sche
 		return tfErr.GetDiag()
 	}
 
+	if err = d.Set("secret_id", publicCertificate.ID); err != nil {
+		tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Error setting secret_id"), fmt.Sprintf("(Data) %s", PublicCertSecretResourceName), "read")
+		return tfErr.GetDiag()
+	}
+
 	if err = d.Set("secret_group_id", publicCertificate.SecretGroupID); err != nil {
 		tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Error setting secret_group_id"), fmt.Sprintf("(Data) %s", PublicCertSecretResourceName), "read")
 		return tfErr.GetDiag()
diff --git a/ibm/service/secretsmanager/data_source_ibm_sm_public_certificate_test.go b/ibm/service/secretsmanager/data_source_ibm_sm_public_certificate_test.go
@@ -32,6 +32,7 @@ func TestAccIbmSmPublicCertificateDataSourceBasic(t *testing.T) {
 					resource.TestCheckResourceAttrSet("data.ibm_sm_public_certificate.sm_public_certificate", "rotation.#"),
 					resource.TestCheckResourceAttrSet("data.ibm_sm_public_certificate.sm_public_certificate_by_name", "name"),
 					resource.TestCheckResourceAttrSet("data.ibm_sm_public_certificate.sm_public_certificate_by_name", "secret_group_name"),
+					resource.TestCheckResourceAttrSet("data.ibm_sm_public_certificate.sm_public_certificate_by_name", "secret_id"),
 				),
 			},
 		},
diff --git a/ibm/service/secretsmanager/data_source_ibm_sm_service_credentials_secret.go b/ibm/service/secretsmanager/data_source_ibm_sm_service_credentials_secret.go
@@ -351,6 +351,11 @@ func dataSourceIbmSmServiceCredentialsSecretRead(context context.Context, d *sch
 		return tfErr.GetDiag()
 	}
 
+	if err = d.Set("secret_id", ServiceCredentialsSecret.ID); err != nil {
+		tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Error setting secret_id"), fmt.Sprintf("(Data) %s", ServiceCredentialsSecretResourceName), "read")
+		return tfErr.GetDiag()
+	}
+
 	if err = d.Set("secret_group_id", ServiceCredentialsSecret.SecretGroupID); err != nil {
 		tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Error setting secret_group_id"), fmt.Sprintf("(Data) %s", ServiceCredentialsSecretResourceName), "read")
 		return tfErr.GetDiag()
diff --git a/ibm/service/secretsmanager/data_source_ibm_sm_service_credentials_secret_test.go b/ibm/service/secretsmanager/data_source_ibm_sm_service_credentials_secret_test.go
@@ -34,6 +34,7 @@ func TestAccIbmSmServiceCredentialsSecretDataSourceBasic(t *testing.T) {
 					resource.TestCheckResourceAttrSet("data.ibm_sm_service_credentials_secret.sm_service_credentials_secret", "source_service.#"),
 					resource.TestCheckResourceAttrSet("data.ibm_sm_service_credentials_secret.sm_service_credentials_secret_by_name", "name"),
 					resource.TestCheckResourceAttrSet("data.ibm_sm_service_credentials_secret.sm_service_credentials_secret_by_name", "secret_group_name"),
+					resource.TestCheckResourceAttrSet("data.ibm_sm_service_credentials_secret.sm_service_credentials_secret_by_name", "secret_id"),
 				),
 			},
 		},
diff --git a/ibm/service/secretsmanager/data_source_ibm_sm_username_password_secret.go b/ibm/service/secretsmanager/data_source_ibm_sm_username_password_secret.go
@@ -265,6 +265,11 @@ func dataSourceIbmSmUsernamePasswordSecretRead(context context.Context, d *schem
 		return tfErr.GetDiag()
 	}
 
+	if err = d.Set("secret_id", usernamePasswordSecret.ID); err != nil {
+		tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Error setting secret_id"), fmt.Sprintf("(Data) %s", UsernamePasswordSecretResourceName), "read")
+		return tfErr.GetDiag()
+	}
+
 	if err = d.Set("secret_type", usernamePasswordSecret.SecretType); err != nil {
 		tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Error setting secret_type"), fmt.Sprintf("(Data) %s", UsernamePasswordSecretResourceName), "read")
 		return tfErr.GetDiag()
diff --git a/ibm/service/secretsmanager/data_source_ibm_sm_username_password_secret_test.go b/ibm/service/secretsmanager/data_source_ibm_sm_username_password_secret_test.go
@@ -35,6 +35,7 @@ func TestAccIbmSmUsernamePasswordSecretDataSourceBasic(t *testing.T) {
 					resource.TestCheckResourceAttrSet("data.ibm_sm_username_password_secret.sm_username_password_secret", "password"),
 					resource.TestCheckResourceAttrSet("data.ibm_sm_username_password_secret.sm_username_password_secret_by_name", "name"),
 					resource.TestCheckResourceAttrSet("data.ibm_sm_username_password_secret.sm_username_password_secret_by_name", "secret_group_name"),
+					resource.TestCheckResourceAttrSet("data.ibm_sm_username_password_secret.sm_username_password_secret_by_name", "secret_id"),
 				),
 			},
 		},
