Skip to content

Commit 6e85df0

Browse files
authored
azurerm_container_app_environment_certificate - fix empty password scenario and add test (#31335)
[BUG] * `azurerm_container_app_environment_certificate` - fix an issue that prevented creating the resource with an empty value for `certificate_password`
1 parent a5ff526 commit 6e85df0

File tree

2 files changed

+33
-1
lines changed

2 files changed

+33
-1
lines changed

internal/services/containerapps/container_app_environment_certificate_resource.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ func (r ContainerAppEnvironmentCertificateResource) Create() sdk.ResourceFunc {
192192
Tags: tags.Expand(cert.Tags),
193193
}
194194

195-
if cert.CertificateBlob != "" && cert.CertificatePassword != "" {
195+
if cert.CertificateBlob != "" {
196196
model.Properties.Password = pointer.To(cert.CertificatePassword)
197197
model.Properties.Value = pointer.To(cert.CertificateBlob)
198198
} else if len(cert.CertificateKeyVault) > 0 {

internal/services/containerapps/container_app_environment_certificate_resource_test.go

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,21 @@ func TestAccContainerAppEnvironmentCertificate_basic(t *testing.T) {
3434
})
3535
}
3636

37+
func TestAccContainerAppEnvironmentCertificate_basicEmptyPassword(t *testing.T) {
38+
data := acceptance.BuildTestData(t, "azurerm_container_app_environment_certificate", "test")
39+
r := ContainerAppEnvironmentCertificateResource{}
40+
41+
data.ResourceTest(t, r, []acceptance.TestStep{
42+
{
43+
Config: r.basicEmptyPassword(data),
44+
Check: acceptance.ComposeTestCheckFunc(
45+
check.That(data.ResourceName).ExistsInAzure(r),
46+
),
47+
},
48+
data.ImportStep("certificate_blob_base64", "certificate_password"),
49+
})
50+
}
51+
3752
func TestAccContainerAppEnvironmentCertificate_basicUpdateTags(t *testing.T) {
3853
data := acceptance.BuildTestData(t, "azurerm_container_app_environment_certificate", "test")
3954
r := ContainerAppEnvironmentCertificateResource{}
@@ -119,6 +134,23 @@ resource "azurerm_container_app_environment_certificate" "test" {
119134
`, r.template(data), data.RandomInteger)
120135
}
121136

137+
func (r ContainerAppEnvironmentCertificateResource) basicEmptyPassword(data acceptance.TestData) string {
138+
return fmt.Sprintf(`
139+
provider "azurerm" {
140+
features {}
141+
}
142+
143+
%[1]s
144+
145+
resource "azurerm_container_app_environment_certificate" "test" {
146+
name = "acctest-cacert%[2]d"
147+
container_app_environment_id = azurerm_container_app_environment.test.id
148+
certificate_blob_base64 = filebase64("testdata/testacc_nopassword.pfx")
149+
certificate_password = ""
150+
}
151+
`, r.template(data), data.RandomInteger)
152+
}
153+
122154
func (r ContainerAppEnvironmentCertificateResource) basicAddTags(data acceptance.TestData) string {
123155
return fmt.Sprintf(`
124156
provider "azurerm" {

0 commit comments

Comments
 (0)