From 4d89b188219cede0a8661040b9c1507f84a23d54 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Thu, 4 Jun 2020 08:26:03 +0200 Subject: [PATCH] r/key_vault_certificate: always setting the `certificate_data` and `thumbprint` fields --- .../services/keyvault/key_vault_certificate_resource.go | 9 +++++++-- .../tests/key_vault_certificate_resource_test.go | 1 + 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/azurerm/internal/services/keyvault/key_vault_certificate_resource.go b/azurerm/internal/services/keyvault/key_vault_certificate_resource.go index c002239b5cf8..84c2885e3d86 100644 --- a/azurerm/internal/services/keyvault/key_vault_certificate_resource.go +++ b/azurerm/internal/services/keyvault/key_vault_certificate_resource.go @@ -510,17 +510,22 @@ func resourceArmKeyVaultCertificateRead(d *schema.ResourceData, meta interface{} d.Set("version", id.Version) d.Set("secret_id", cert.Sid) + certificateData := "" if contents := cert.Cer; contents != nil { - d.Set("certificate_data", strings.ToUpper(hex.EncodeToString(*contents))) + certificateData = strings.ToUpper(hex.EncodeToString(*contents)) } + d.Set("certificate_data", certificateData) + thumbprint := "" if v := cert.X509Thumbprint; v != nil { x509Thumbprint, err := base64.RawURLEncoding.DecodeString(*v) if err != nil { return err } - d.Set("thumbprint", strings.ToUpper(hex.EncodeToString(x509Thumbprint))) + + thumbprint = strings.ToUpper(hex.EncodeToString(x509Thumbprint)) } + d.Set("thumbprint", thumbprint) return tags.FlattenAndSet(d, cert.Tags) } diff --git a/azurerm/internal/services/keyvault/tests/key_vault_certificate_resource_test.go b/azurerm/internal/services/keyvault/tests/key_vault_certificate_resource_test.go index 3d66b2748d34..307fb43a4698 100644 --- a/azurerm/internal/services/keyvault/tests/key_vault_certificate_resource_test.go +++ b/azurerm/internal/services/keyvault/tests/key_vault_certificate_resource_test.go @@ -111,6 +111,7 @@ func TestAccAzureRMKeyVaultCertificate_basicGenerate(t *testing.T) { testCheckAzureRMKeyVaultCertificateExists(data.ResourceName), resource.TestCheckResourceAttrSet(data.ResourceName, "secret_id"), resource.TestCheckResourceAttrSet(data.ResourceName, "certificate_data"), + resource.TestCheckResourceAttrSet(data.ResourceName, "thumbprint"), ), }, data.ImportStep(),