Skip to content

Commit 4cec863

Browse files
haimschhaimsch
authored
Fix Secrets Manager tests (IBM-Cloud#5948)
1 parent 31732cc commit 4cec863

6 files changed

+11
-74
lines changed

‎ibm/service/secretsmanager/data_source_ibm_sm_service_credentials_secret_metadata_test.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ func testAccCheckIbmSmServiceCredentialsSecretMetadataDataSourceConfigBasic() st
5858
instance {
5959
crn = "%s"
6060
}
61-
parameters = %s
6261
role {
6362
crn = "%s"
6463
}
@@ -70,5 +69,5 @@ func testAccCheckIbmSmServiceCredentialsSecretMetadataDataSourceConfigBasic() st
7069
region = "%s"
7170
secret_id = ibm_sm_service_credentials_secret.sm_service_credentials_secret_instance.secret_id
7271
}
73-
`, acc.SecretsManagerInstanceID, acc.SecretsManagerInstanceRegion, serviceCredentialsTtl, acc.SecretsManagerServiceCredentialsCosCrn, serviceCredentialsParameters, serviceCredentialsRoleCrn, acc.SecretsManagerInstanceID, acc.SecretsManagerInstanceRegion)
72+
`, acc.SecretsManagerInstanceID, acc.SecretsManagerInstanceRegion, serviceCredentialsTtl, acc.SecretsManagerENInstanceCrn, serviceCredentialsRoleCrn, acc.SecretsManagerInstanceID, acc.SecretsManagerInstanceRegion)
7473
}

‎ibm/service/secretsmanager/data_source_ibm_sm_service_credentials_secret_test.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ func testAccCheckIbmSmServiceCredentialsSecretDataSourceConfigBasic() string {
6060
instance {
6161
crn = "%s"
6262
}
63-
parameters = %s
6463
role {
6564
crn = "%s"
6665
}
@@ -79,5 +78,5 @@ func testAccCheckIbmSmServiceCredentialsSecretDataSourceConfigBasic() string {
7978
name = ibm_sm_service_credentials_secret.sm_service_credentials_secret_instance.name
8079
secret_group_name = "default"
8180
}
82-
`, acc.SecretsManagerInstanceID, acc.SecretsManagerInstanceRegion, serviceCredentialsTtl, acc.SecretsManagerServiceCredentialsCosCrn, serviceCredentialsParameters, serviceCredentialsRoleCrn, acc.SecretsManagerInstanceID, acc.SecretsManagerInstanceRegion, acc.SecretsManagerInstanceID, acc.SecretsManagerInstanceRegion)
81+
`, acc.SecretsManagerInstanceID, acc.SecretsManagerInstanceRegion, serviceCredentialsTtl, acc.SecretsManagerENInstanceCrn, serviceCredentialsRoleCrn, acc.SecretsManagerInstanceID, acc.SecretsManagerInstanceRegion, acc.SecretsManagerInstanceID, acc.SecretsManagerInstanceRegion)
8382
}

‎ibm/service/secretsmanager/resource_ibm_sm_private_certificate_configuration_action_sign_csr_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ func testAccCheckIbmSmPrivateCertificateConfigurationActionSignCsrConfigBasic()
5959
ttl = "2h"
6060
name = ibm_sm_private_certificate_configuration_root_ca.ibm_sm_private_certificate_configuration_root_ca_instance.name
6161
csr = ibm_sm_private_certificate_configuration_intermediate_ca.sm_private_certificate_configuration_intermediate_ca.data[0].csr
62-
max_path_length = 80
62+
max_path_length = 8
6363
}
6464
6565
resource "ibm_sm_private_certificate_configuration_action_set_signed" "ibm_sm_private_certificate_configuration_action_set_signed_instance" {

‎ibm/service/secretsmanager/resource_ibm_sm_private_certificate_configuration_intermediate_ca_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ func privateCertificateIntermediateCAConfigAllArgs(maxTtl, crlExpiry, crlDisable
161161
ttl = "5000000"
162162
permitted_dns_domains = ["example.com"]
163163
use_csr_values = true
164-
max_path_length = 80
164+
max_path_length = 10
165165
}
166166
`, acc.SecretsManagerInstanceID, acc.SecretsManagerInstanceRegion, maxTtl, crlExpiry, crlDisable,
167167
crlDistributionPointsEncoded, issuingCertificatesUrlsEncoded)

‎ibm/service/secretsmanager/resource_ibm_sm_private_certificate_configuration_root_ca_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ var rootCaFullConfigFormat = `
132132
private_key_format = "pkcs8"
133133
key_type = "ec"
134134
key_bits = 384
135-
max_path_length = 80
135+
max_path_length = 8
136136
exclude_cn_from_sans = true
137137
permitted_dns_domains = ["example.com"]
138138
ou = ["ou1", "ou2"]

‎ibm/service/secretsmanager/resource_ibm_sm_service_credentials_secret_test.go‎

Lines changed: 6 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import (
1818

1919
var serviceCredentialsSecretName = "terraform-test-sc-secret"
2020
var modifiedServiceCredentialsSecretName = "modified-terraform-test-sc-secret"
21-
var serviceCredentialsParameters = `{"HMAC":"true"}`
2221
var serviceCredentialsParametersWithServiceId = `{"serviceid_crn": ibm_iam_service_id.ibm_iam_service_id_instance.crn}`
2322
var serviceCredentialsTtl = "172800"
2423
var modifiedServiceCredentialsTtl = "6048000"
@@ -95,39 +94,6 @@ func TestAccIbmSmServiceCredentialsSecretAllArgs(t *testing.T) {
9594
})
9695
}
9796

98-
func TestAccIbmSmServiceCredentialsSecretAllArgsWithExistingServiceId(t *testing.T) {
99-
resourceName := "ibm_sm_service_credentials_secret.sm_service_credentials_secret_service_id"
100-
101-
resource.Test(t, resource.TestCase{
102-
PreCheck: func() { acc.TestAccPreCheck(t) },
103-
Providers: acc.TestAccProviders,
104-
CheckDestroy: testAccCheckIbmSmServiceCredentialsSecretDestroy,
105-
Steps: []resource.TestStep{
106-
resource.TestStep{
107-
Config: serviceCredentialsSecretConfigAllArgsWithExistingServiceId(),
108-
Check: resource.ComposeAggregateTestCheckFunc(
109-
testAccCheckIbmSmServiceCredentialsSecretCreated(resourceName),
110-
resource.TestCheckResourceAttrSet(resourceName, "secret_id"),
111-
resource.TestCheckResourceAttrSet(resourceName, "created_by"),
112-
resource.TestCheckResourceAttrSet(resourceName, "created_at"),
113-
resource.TestCheckResourceAttrSet(resourceName, "updated_at"),
114-
resource.TestCheckResourceAttrSet(resourceName, "crn"),
115-
resource.TestCheckResourceAttrSet(resourceName, "downloaded"),
116-
resource.TestCheckResourceAttrSet(resourceName, "next_rotation_date"),
117-
resource.TestCheckResourceAttr(resourceName, "state", "1"),
118-
resource.TestCheckResourceAttr(resourceName, "versions_total", "1"),
119-
),
120-
},
121-
resource.TestStep{
122-
ResourceName: resourceName,
123-
ImportState: true,
124-
ImportStateVerify: true,
125-
ImportStateVerifyIgnore: []string{"ttl"},
126-
},
127-
},
128-
})
129-
}
130-
13197
var serviceCredentialsSecretBasicConfigFormat = `
13298
resource "ibm_sm_service_credentials_secret" "sm_service_credentials_secret_basic" {
13399
instance_id = "%s"
@@ -166,28 +132,6 @@ var serviceCredentialsSecretFullConfigFormat = `
166132
rotation %s
167133
}`
168134

169-
var serviceCredentialsSecretFullConfigFormatWithExistingServiceId = `
170-
resource "ibm_sm_service_credentials_secret" "sm_service_credentials_secret_service_id" {
171-
instance_id = "%s"
172-
region = "%s"
173-
name = "%s"
174-
description = "%s"
175-
labels = ["%s"]
176-
source_service {
177-
instance {
178-
crn = "%s"
179-
}
180-
parameters = %s
181-
role {
182-
crn = "%s"
183-
}
184-
}
185-
ttl = "%s"
186-
custom_metadata = %s
187-
secret_group_id = "default"
188-
rotation %s
189-
}`
190-
191135
func iamServiceIdConfig() string {
192136
return fmt.Sprintf(`
193137
resource "ibm_iam_service_id" "ibm_iam_service_id_instance" {
@@ -197,22 +141,17 @@ func iamServiceIdConfig() string {
197141

198142
func serviceCredentialsSecretConfigBasic() string {
199143
return fmt.Sprintf(serviceCredentialsSecretBasicConfigFormat, acc.SecretsManagerInstanceID, acc.SecretsManagerInstanceRegion,
200-
serviceCredentialsSecretName, acc.SecretsManagerServiceCredentialsCosCrn, serviceCredentialsRoleCrn, serviceCredentialsTtl)
144+
serviceCredentialsSecretName, acc.SecretsManagerENInstanceCrn, serviceCredentialsRoleCrn, serviceCredentialsTtl)
201145
}
202146

203147
func serviceCredentialsSecretConfigAllArgs() string {
204-
return fmt.Sprintf(serviceCredentialsSecretFullConfigFormat, acc.SecretsManagerInstanceID, acc.SecretsManagerInstanceRegion,
205-
serviceCredentialsSecretName, description, label, acc.SecretsManagerServiceCredentialsCosCrn, serviceCredentialsParameters, serviceCredentialsRoleCrn, serviceCredentialsTtl, customMetadata, rotationPolicy)
206-
}
207-
208-
func serviceCredentialsSecretConfigAllArgsWithExistingServiceId() string {
209-
return iamServiceIdConfig() + fmt.Sprintf(serviceCredentialsSecretFullConfigFormatWithExistingServiceId, acc.SecretsManagerInstanceID, acc.SecretsManagerInstanceRegion,
210-
serviceCredentialsSecretName, description, label, acc.SecretsManagerServiceCredentialsCosCrn, serviceCredentialsParametersWithServiceId, serviceCredentialsRoleCrn, serviceCredentialsTtl, customMetadata, rotationPolicy)
148+
return iamServiceIdConfig() + fmt.Sprintf(serviceCredentialsSecretFullConfigFormat, acc.SecretsManagerInstanceID, acc.SecretsManagerInstanceRegion,
149+
serviceCredentialsSecretName, description, label, acc.SecretsManagerENInstanceCrn, serviceCredentialsParametersWithServiceId, serviceCredentialsRoleCrn, serviceCredentialsTtl, customMetadata, rotationPolicy)
211150
}
212151

213152
func serviceCredentialsSecretConfigUpdated() string {
214-
return fmt.Sprintf(serviceCredentialsSecretFullConfigFormat, acc.SecretsManagerInstanceID, acc.SecretsManagerInstanceRegion,
215-
modifiedServiceCredentialsSecretName, modifiedDescription, modifiedLabel, acc.SecretsManagerServiceCredentialsCosCrn, serviceCredentialsParameters, serviceCredentialsRoleCrn,
153+
return iamServiceIdConfig() + fmt.Sprintf(serviceCredentialsSecretFullConfigFormat, acc.SecretsManagerInstanceID, acc.SecretsManagerInstanceRegion,
154+
modifiedServiceCredentialsSecretName, modifiedDescription, modifiedLabel, acc.SecretsManagerENInstanceCrn, serviceCredentialsParametersWithServiceId, serviceCredentialsRoleCrn,
216155
modifiedServiceCredentialsTtl, modifiedCustomMetadata, modifiedRotationPolicy)
217156
}
218157

@@ -251,7 +190,7 @@ func testAccCheckIbmSmServiceCredentialsSecretCreated(n string) resource.TestChe
251190
if err := verifyAttr(*secret.TTL, serviceCredentialsTtl, "ttl"); err != nil {
252191
return err
253192
}
254-
if err := verifyAttr(*secret.SourceService.Instance.Crn, acc.SecretsManagerServiceCredentialsCosCrn, "source_service.Instance.Crn"); err != nil {
193+
if err := verifyAttr(*secret.SourceService.Instance.Crn, acc.SecretsManagerENInstanceCrn, "source_service.Instance.Crn"); err != nil {
255194
return err
256195
}
257196
if err := verifyAttr(*secret.SourceService.Role.Crn, serviceCredentialsRoleCrn, "source_service.Role.Crn"); err != nil {

0 commit comments

Comments
 (0)