Skip to content

Commit 664194e

Browse files
haimschhaimsch
authored
Optionally disable SM crypto key tests (IBM-Cloud#6408)
1 parent b8f8408 commit 664194e

5 files changed

+101
-91
lines changed

‎ibm/service/secretsmanager/data_source_ibm_sm_configurations_test.go‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,19 +28,21 @@ func TestAccIbmSmConfigurationsDataSourceBasic(t *testing.T) {
2828
}
2929

3030
func TestAccIbmSmConfigurationsDataSourceCryptoKey(t *testing.T) {
31-
resource.Test(t, resource.TestCase{
32-
PreCheck: func() { acc.TestAccPreCheck(t) },
33-
Providers: acc.TestAccProviders,
34-
Steps: []resource.TestStep{
35-
resource.TestStep{
36-
Config: testAccCheckIbmSmConfigurationsDataSourceConfigCryptoKey(),
37-
Check: resource.ComposeTestCheckFunc(
38-
resource.TestCheckResourceAttrSet("data.ibm_sm_configurations.sm_configurations", "id"),
39-
resource.TestCheckResourceAttrSet("data.ibm_sm_configurations.sm_configurations", "configurations.#"),
40-
),
31+
if acc.SecretsManagerPrivateCertificateConfigurationCryptoKeyProviderInstanceCrn != "" {
32+
resource.Test(t, resource.TestCase{
33+
PreCheck: func() { acc.TestAccPreCheck(t) },
34+
Providers: acc.TestAccProviders,
35+
Steps: []resource.TestStep{
36+
resource.TestStep{
37+
Config: testAccCheckIbmSmConfigurationsDataSourceConfigCryptoKey(),
38+
Check: resource.ComposeTestCheckFunc(
39+
resource.TestCheckResourceAttrSet("data.ibm_sm_configurations.sm_configurations", "id"),
40+
resource.TestCheckResourceAttrSet("data.ibm_sm_configurations.sm_configurations", "configurations.#"),
41+
),
42+
},
4143
},
42-
},
43-
})
44+
})
45+
}
4446
}
4547

4648
func testAccCheckIbmSmConfigurationsDataSourceConfigBasic() string {

‎ibm/service/secretsmanager/data_source_ibm_sm_private_certificate_configuration_intermediate_ca_test.go‎

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -36,27 +36,29 @@ func TestAccIbmSmPrivateCertificateConfigurationIntermediateCADataSourceBasic(t
3636
}
3737

3838
func TestAccIbmSmPrivateCertificateConfigurationIntermediateCADataSourceCryptoKey(t *testing.T) {
39-
resource.Test(t, resource.TestCase{
40-
PreCheck: func() { acc.TestAccPreCheck(t) },
41-
Providers: acc.TestAccProviders,
42-
Steps: []resource.TestStep{
43-
resource.TestStep{
44-
Config: testAccCheckIbmSmPrivateCertificateConfigurationIntermediateCADataSourceConfigCryptoKey(),
45-
Check: resource.ComposeTestCheckFunc(
46-
resource.TestCheckResourceAttrSet("data.ibm_sm_private_certificate_configuration_intermediate_ca.sm_private_certificate_configuration_intermediate_ca_crypto_key", "id"),
47-
resource.TestCheckResourceAttrSet("data.ibm_sm_private_certificate_configuration_intermediate_ca.sm_private_certificate_configuration_intermediate_ca_crypto_key", "name"),
48-
resource.TestCheckResourceAttrSet("data.ibm_sm_private_certificate_configuration_intermediate_ca.sm_private_certificate_configuration_intermediate_ca_crypto_key", "config_type"),
49-
resource.TestCheckResourceAttrSet("data.ibm_sm_private_certificate_configuration_intermediate_ca.sm_private_certificate_configuration_intermediate_ca_crypto_key", "secret_type"),
50-
//resource.TestCheckResourceAttrSet("data.ibm_sm_private_certificate_configuration_intermediate_ca.sm_private_certificate_configuration_intermediate_ca_crypto_key", "created_by"),
51-
//resource.TestCheckResourceAttrSet("data.ibm_sm_private_certificate_configuration_intermediate_ca.sm_private_certificate_configuration_intermediate_ca_crypto_key", "created_at"),
52-
//resource.TestCheckResourceAttrSet("data.ibm_sm_private_certificate_configuration_intermediate_ca.sm_private_certificate_configuration_intermediate_ca_crypto_key", "updated_at"),
53-
resource.TestCheckResourceAttrSet("data.ibm_sm_private_certificate_configuration_intermediate_ca.sm_private_certificate_configuration_intermediate_ca_crypto_key", "signing_method"),
54-
resource.TestCheckResourceAttrSet("data.ibm_sm_private_certificate_configuration_intermediate_ca.sm_private_certificate_configuration_intermediate_ca_crypto_key", "common_name"),
55-
resource.TestCheckResourceAttrSet("data.ibm_sm_private_certificate_configuration_intermediate_ca.sm_private_certificate_configuration_intermediate_ca_crypto_key", "crypto_key.#"),
56-
),
39+
if acc.SecretsManagerPrivateCertificateConfigurationCryptoKeyProviderInstanceCrn != "" {
40+
resource.Test(t, resource.TestCase{
41+
PreCheck: func() { acc.TestAccPreCheck(t) },
42+
Providers: acc.TestAccProviders,
43+
Steps: []resource.TestStep{
44+
resource.TestStep{
45+
Config: testAccCheckIbmSmPrivateCertificateConfigurationIntermediateCADataSourceConfigCryptoKey(),
46+
Check: resource.ComposeTestCheckFunc(
47+
resource.TestCheckResourceAttrSet("data.ibm_sm_private_certificate_configuration_intermediate_ca.sm_private_certificate_configuration_intermediate_ca_crypto_key", "id"),
48+
resource.TestCheckResourceAttrSet("data.ibm_sm_private_certificate_configuration_intermediate_ca.sm_private_certificate_configuration_intermediate_ca_crypto_key", "name"),
49+
resource.TestCheckResourceAttrSet("data.ibm_sm_private_certificate_configuration_intermediate_ca.sm_private_certificate_configuration_intermediate_ca_crypto_key", "config_type"),
50+
resource.TestCheckResourceAttrSet("data.ibm_sm_private_certificate_configuration_intermediate_ca.sm_private_certificate_configuration_intermediate_ca_crypto_key", "secret_type"),
51+
//resource.TestCheckResourceAttrSet("data.ibm_sm_private_certificate_configuration_intermediate_ca.sm_private_certificate_configuration_intermediate_ca_crypto_key", "created_by"),
52+
//resource.TestCheckResourceAttrSet("data.ibm_sm_private_certificate_configuration_intermediate_ca.sm_private_certificate_configuration_intermediate_ca_crypto_key", "created_at"),
53+
//resource.TestCheckResourceAttrSet("data.ibm_sm_private_certificate_configuration_intermediate_ca.sm_private_certificate_configuration_intermediate_ca_crypto_key", "updated_at"),
54+
resource.TestCheckResourceAttrSet("data.ibm_sm_private_certificate_configuration_intermediate_ca.sm_private_certificate_configuration_intermediate_ca_crypto_key", "signing_method"),
55+
resource.TestCheckResourceAttrSet("data.ibm_sm_private_certificate_configuration_intermediate_ca.sm_private_certificate_configuration_intermediate_ca_crypto_key", "common_name"),
56+
resource.TestCheckResourceAttrSet("data.ibm_sm_private_certificate_configuration_intermediate_ca.sm_private_certificate_configuration_intermediate_ca_crypto_key", "crypto_key.#"),
57+
),
58+
},
5759
},
58-
},
59-
})
60+
})
61+
}
6062
}
6163

6264
func testAccCheckIbmSmPrivateCertificateConfigurationIntermediateCADataSourceConfigBasic() string {

‎ibm/service/secretsmanager/data_source_ibm_sm_private_certificate_configuration_root_ca_test.go‎

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -35,26 +35,28 @@ func TestAccIbmSmPrivateCertificateConfigurationRootCADataSourceBasic(t *testing
3535
}
3636

3737
func TestAccIbmSmPrivateCertificateConfigurationRootCADataSourceCryptoKey(t *testing.T) {
38-
resource.Test(t, resource.TestCase{
39-
PreCheck: func() { acc.TestAccPreCheck(t) },
40-
Providers: acc.TestAccProviders,
41-
Steps: []resource.TestStep{
42-
resource.TestStep{
43-
Config: testAccCheckIbmSmPrivateCertificateConfigurationRootCADataSourceConfigCryptoKey(),
44-
Check: resource.ComposeTestCheckFunc(
45-
resource.TestCheckResourceAttrSet("data.ibm_sm_private_certificate_configuration_root_ca.sm_private_certificate_configuration_root_ca_crypto_key", "id"),
46-
resource.TestCheckResourceAttrSet("data.ibm_sm_private_certificate_configuration_root_ca.sm_private_certificate_configuration_root_ca_crypto_key", "name"),
47-
resource.TestCheckResourceAttrSet("data.ibm_sm_private_certificate_configuration_root_ca.sm_private_certificate_configuration_root_ca_crypto_key", "config_type"),
48-
resource.TestCheckResourceAttrSet("data.ibm_sm_private_certificate_configuration_root_ca.sm_private_certificate_configuration_root_ca_crypto_key", "secret_type"),
49-
resource.TestCheckResourceAttrSet("data.ibm_sm_private_certificate_configuration_root_ca.sm_private_certificate_configuration_root_ca_crypto_key", "created_by"),
50-
resource.TestCheckResourceAttrSet("data.ibm_sm_private_certificate_configuration_root_ca.sm_private_certificate_configuration_root_ca_crypto_key", "created_at"),
51-
resource.TestCheckResourceAttrSet("data.ibm_sm_private_certificate_configuration_root_ca.sm_private_certificate_configuration_root_ca_crypto_key", "updated_at"),
52-
resource.TestCheckResourceAttrSet("data.ibm_sm_private_certificate_configuration_root_ca.sm_private_certificate_configuration_root_ca_crypto_key", "common_name"),
53-
resource.TestCheckResourceAttrSet("data.ibm_sm_private_certificate_configuration_root_ca.sm_private_certificate_configuration_root_ca_crypto_key", "crypto_key.#"),
54-
),
38+
if acc.SecretsManagerPrivateCertificateConfigurationCryptoKeyProviderInstanceCrn != "" {
39+
resource.Test(t, resource.TestCase{
40+
PreCheck: func() { acc.TestAccPreCheck(t) },
41+
Providers: acc.TestAccProviders,
42+
Steps: []resource.TestStep{
43+
resource.TestStep{
44+
Config: testAccCheckIbmSmPrivateCertificateConfigurationRootCADataSourceConfigCryptoKey(),
45+
Check: resource.ComposeTestCheckFunc(
46+
resource.TestCheckResourceAttrSet("data.ibm_sm_private_certificate_configuration_root_ca.sm_private_certificate_configuration_root_ca_crypto_key", "id"),
47+
resource.TestCheckResourceAttrSet("data.ibm_sm_private_certificate_configuration_root_ca.sm_private_certificate_configuration_root_ca_crypto_key", "name"),
48+
resource.TestCheckResourceAttrSet("data.ibm_sm_private_certificate_configuration_root_ca.sm_private_certificate_configuration_root_ca_crypto_key", "config_type"),
49+
resource.TestCheckResourceAttrSet("data.ibm_sm_private_certificate_configuration_root_ca.sm_private_certificate_configuration_root_ca_crypto_key", "secret_type"),
50+
resource.TestCheckResourceAttrSet("data.ibm_sm_private_certificate_configuration_root_ca.sm_private_certificate_configuration_root_ca_crypto_key", "created_by"),
51+
resource.TestCheckResourceAttrSet("data.ibm_sm_private_certificate_configuration_root_ca.sm_private_certificate_configuration_root_ca_crypto_key", "created_at"),
52+
resource.TestCheckResourceAttrSet("data.ibm_sm_private_certificate_configuration_root_ca.sm_private_certificate_configuration_root_ca_crypto_key", "updated_at"),
53+
resource.TestCheckResourceAttrSet("data.ibm_sm_private_certificate_configuration_root_ca.sm_private_certificate_configuration_root_ca_crypto_key", "common_name"),
54+
resource.TestCheckResourceAttrSet("data.ibm_sm_private_certificate_configuration_root_ca.sm_private_certificate_configuration_root_ca_crypto_key", "crypto_key.#"),
55+
),
56+
},
5557
},
56-
},
57-
})
58+
})
59+
}
5860
}
5961

6062
func testAccCheckIbmSmPrivateCertificateConfigurationRootCADataSourceConfigBasic() string {

‎ibm/service/secretsmanager/resource_ibm_sm_private_certificate_configuration_intermediate_ca_test.go‎

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -77,28 +77,30 @@ func TestAccIbmSmPrivateCertificateConfigurationIntermediateCAllArgs(t *testing.
7777
}
7878

7979
func TestAccIbmSmPrivateCertificateConfigurationIntermediateCACryptoKey(t *testing.T) {
80-
resourceName := "ibm_sm_private_certificate_configuration_intermediate_ca.sm_private_cert_intermediate_ca_crypto_key"
80+
if acc.SecretsManagerPrivateCertificateConfigurationCryptoKeyProviderInstanceCrn != "" {
81+
resourceName := "ibm_sm_private_certificate_configuration_intermediate_ca.sm_private_cert_intermediate_ca_crypto_key"
8182

82-
resource.Test(t, resource.TestCase{
83-
PreCheck: func() { acc.TestAccPreCheck(t) },
84-
Providers: acc.TestAccProviders,
85-
CheckDestroy: testAccCheckIbmSmPrivateCertificateConfigurationIntermediateCADestroy,
86-
Steps: []resource.TestStep{
87-
resource.TestStep{
88-
Config: privateCertificateIntermediateCAConfigCryptoKey(),
89-
Check: resource.ComposeAggregateTestCheckFunc(
90-
testAccCheckIbmSmPrivateCertificateConfigurationIntermediateCAExists(resourceName, 94680000., 259200, false, true, true),
91-
),
92-
},
93-
resource.TestStep{
94-
ResourceName: resourceName,
95-
ImportState: true,
96-
ImportStateVerify: true,
97-
ImportStateVerifyIgnore: []string{"crl_expiry", "max_ttl", "max_path_length",
98-
"permitted_dns_domains", "ttl", "use_csr_values"},
83+
resource.Test(t, resource.TestCase{
84+
PreCheck: func() { acc.TestAccPreCheck(t) },
85+
Providers: acc.TestAccProviders,
86+
CheckDestroy: testAccCheckIbmSmPrivateCertificateConfigurationIntermediateCADestroy,
87+
Steps: []resource.TestStep{
88+
resource.TestStep{
89+
Config: privateCertificateIntermediateCAConfigCryptoKey(),
90+
Check: resource.ComposeAggregateTestCheckFunc(
91+
testAccCheckIbmSmPrivateCertificateConfigurationIntermediateCAExists(resourceName, 94680000., 259200, false, true, true),
92+
),
93+
},
94+
resource.TestStep{
95+
ResourceName: resourceName,
96+
ImportState: true,
97+
ImportStateVerify: true,
98+
ImportStateVerifyIgnore: []string{"crl_expiry", "max_ttl", "max_path_length",
99+
"permitted_dns_domains", "ttl", "use_csr_values"},
100+
},
99101
},
100-
},
101-
})
102+
})
103+
}
102104
}
103105

104106
func rootCaConfig() string {

‎ibm/service/secretsmanager/resource_ibm_sm_private_certificate_configuration_root_ca_test.go‎

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -80,27 +80,29 @@ func TestAccIbmSmPrivateCertificateConfigurationRootCAllArgs(t *testing.T) {
8080
}
8181

8282
func TestAccIbmSmPrivateCertificateConfigurationRootCACryptoKey(t *testing.T) {
83-
resourceName := "ibm_sm_private_certificate_configuration_root_ca.sm_private_cert_root_ca_crypto_key"
84-
85-
resource.Test(t, resource.TestCase{
86-
PreCheck: func() { acc.TestAccPreCheck(t) },
87-
Providers: acc.TestAccProviders,
88-
CheckDestroy: testAccCheckIbmSmPrivateCertificateConfigurationRootCADestroy,
89-
Steps: []resource.TestStep{
90-
resource.TestStep{
91-
Config: privateCertificateRootCAConfigCryptoKey(),
92-
Check: resource.ComposeAggregateTestCheckFunc(
93-
testAccCheckIbmSmPrivateCertificateConfigurationRootCAExists(resourceName, 157788000, 259200, false, true, true),
94-
),
83+
if acc.SecretsManagerPrivateCertificateConfigurationCryptoKeyProviderInstanceCrn != "" {
84+
resourceName := "ibm_sm_private_certificate_configuration_root_ca.sm_private_cert_root_ca_crypto_key"
85+
86+
resource.Test(t, resource.TestCase{
87+
PreCheck: func() { acc.TestAccPreCheck(t) },
88+
Providers: acc.TestAccProviders,
89+
CheckDestroy: testAccCheckIbmSmPrivateCertificateConfigurationRootCADestroy,
90+
Steps: []resource.TestStep{
91+
resource.TestStep{
92+
Config: privateCertificateRootCAConfigCryptoKey(),
93+
Check: resource.ComposeAggregateTestCheckFunc(
94+
testAccCheckIbmSmPrivateCertificateConfigurationRootCAExists(resourceName, 157788000, 259200, false, true, true),
95+
),
96+
},
97+
resource.TestStep{
98+
ResourceName: resourceName,
99+
ImportState: true,
100+
ImportStateVerify: true,
101+
ImportStateVerifyIgnore: []string{"crl_expiry", "max_ttl", "ttl"},
102+
},
95103
},
96-
resource.TestStep{
97-
ResourceName: resourceName,
98-
ImportState: true,
99-
ImportStateVerify: true,
100-
ImportStateVerifyIgnore: []string{"crl_expiry", "max_ttl", "ttl"},
101-
},
102-
},
103-
})
104+
})
105+
}
104106
}
105107

106108
var rootCaBasicConfigFormat = `

0 commit comments

Comments
 (0)