tests: fix minor issues

Author: sreallymatt

internal/services/web/app_service_certificate_resource.go

@@ -4,7 +4,6 @@
 package web
 
 import (
-	"encoding/base64"
 	"fmt"
 	"time"
 
@@ -172,11 +171,7 @@ func resourceAppServiceCertificateCreate(d *pluginsdk.ResourceData, meta interfa
 	}
 
 	if v := d.Get("pfx_blob").(string); v != "" {
-		decodedPfxBlob, err := base64.StdEncoding.DecodeString(v)
-		if err != nil {
-			return fmt.Errorf("decoding PFX blob: %+v", err)
-		}
-		certificate.Properties.PfxBlob = pointer.To(string(decodedPfxBlob))
+		certificate.Properties.PfxBlob = pointer.To(v)
 	}
 
 	if v := d.Get("key_vault_secret_id").(string); v != "" {
@@ -288,7 +283,7 @@ func resourceAppServiceCertificateRead(d *pluginsdk.ResourceData, meta interface
 				if err != nil {
 					return err
 				}
-				d.Set("server_farm_id", sfID.ID())
+				d.Set("app_service_plan_id", sfID.ID())
 			}
 		}
 	}

internal/services/web/app_service_certificate_resource_test.go

@@ -94,7 +94,20 @@ func TestAccAppServiceCertificate_KeyVaultIdVersionless(t *testing.T) {
 	})
 }
 
-// TODO: add test with `app_service_plan_id` set
+func TestAccAppServiceCertificate_AppServiceID(t *testing.T) {
+	data := acceptance.BuildTestData(t, "azurerm_app_service_certificate", "test")
+	r := AppServiceCertificateResource{}
+
+	data.ResourceTest(t, r, []acceptance.TestStep{
+		{
+			Config: r.pfxWithServicePlan(data),
+			Check: acceptance.ComposeTestCheckFunc(
+				check.That(data.ResourceName).ExistsInAzure(r),
+			),
+		},
+		data.ImportStep("pfx_blob", "password", "app_service_plan_id"),
+	})
+}
 
 func (r AppServiceCertificateResource) Exists(ctx context.Context, clients *clients.Client, state *pluginsdk.InstanceState) (*bool, error) {
 	id, err := certificates.ParseCertificateID(state.ID)
@@ -115,137 +128,78 @@ provider "azurerm" {
   features {}
 }
 
-resource "azurerm_resource_group" "test" {
-  name     = "acctestwebcert%[1]d"
-  location = "%[2]s"
-}
+%[1]s
 
 resource "azurerm_app_service_certificate" "test" {
-  name                = "acctest%[1]d"
+  name                = "acctest%[2]d"
   resource_group_name = azurerm_resource_group.test.name
   location            = azurerm_resource_group.test.location
   pfx_blob            = filebase64("testdata/app_service_certificate.pfx")
   password            = "terraform"
 }
-`, data.RandomInteger, data.Locations.Primary)
+`, r.template(data), data.RandomInteger)
 }
 
-func (r AppServiceCertificateResource) pfxNoPassword(data acceptance.TestData) string {
+func (r AppServiceCertificateResource) pfxWithServicePlan(data acceptance.TestData) string {
 	return fmt.Sprintf(`
 provider "azurerm" {
   features {}
 }
 
-resource "azurerm_resource_group" "test" {
-  name     = "acctestwebcert%[1]d"
-  location = "%[2]s"
+%[1]s
+
+resource "azurerm_service_plan" "test" {
+  name                = "acctest-SP-%[2]d"
+  resource_group_name = azurerm_resource_group.test.name
+  location            = azurerm_resource_group.test.location
+  sku_name            = "B1"
+  os_type             = "Linux"
 }
 
+
 resource "azurerm_app_service_certificate" "test" {
-  name                = "acctest%[1]d"
+  name                = "acctest%[2]d"
   resource_group_name = azurerm_resource_group.test.name
   location            = azurerm_resource_group.test.location
-  pfx_blob            = filebase64("testdata/app_service_certificate_nopassword.pfx")
+  app_service_plan_id = azurerm_service_plan.test.id
+  pfx_blob            = filebase64("testdata/app_service_certificate.pfx")
+  password            = "terraform"
 }
-`, data.RandomInteger, data.Locations.Primary)
+`, r.template(data), data.RandomInteger)
 }
 
-func (r AppServiceCertificateResource) keyVault(data acceptance.TestData) string {
+func (r AppServiceCertificateResource) pfxNoPassword(data acceptance.TestData) string {
 	return fmt.Sprintf(`
 provider "azurerm" {
   features {}
 }
 
-provider "azuread" {}
-
-data "azurerm_client_config" "test" {}
+%[1]s
 
-data "azuread_service_principal" "test" {
-  display_name = "Microsoft Azure App Service"
+resource "azurerm_app_service_certificate" "test" {
+  name                = "acctest%[2]d"
+  resource_group_name = azurerm_resource_group.test.name
+  location            = azurerm_resource_group.test.location
+  pfx_blob            = filebase64("testdata/app_service_certificate_nopassword.pfx")
 }
-
-resource "azurerm_resource_group" "test" {
-  name     = "acctestwebcert%[1]d"
-  location = "%[2]s"
+`, r.template(data), data.RandomInteger)
 }
 
-resource "azurerm_key_vault" "test" {
-  name                = "acctest%[3]s"
-  location            = azurerm_resource_group.test.location
-  resource_group_name = azurerm_resource_group.test.name
-
-  tenant_id = data.azurerm_client_config.test.tenant_id
-
-  sku_name = "standard"
-
-  access_policy {
-    tenant_id = data.azurerm_client_config.test.tenant_id
-    object_id = data.azurerm_client_config.test.object_id
-
-    secret_permissions = [
-      "Delete",
-      "Get",
-      "Purge",
-      "Set",
-    ]
-
-    certificate_permissions = [
-      "Create",
-      "Delete",
-      "Get",
-      "Purge",
-      "Import",
-    ]
-  }
-
-  access_policy {
-    tenant_id = data.azurerm_client_config.test.tenant_id
-    object_id = data.azuread_service_principal.test.object_id
-
-    secret_permissions = [
-      "Get",
-    ]
-
-    certificate_permissions = [
-      "Get",
-    ]
-  }
+func (r AppServiceCertificateResource) keyVault(data acceptance.TestData) string {
+	return fmt.Sprintf(`
+provider "azurerm" {
+  features {}
 }
 
-resource "azurerm_key_vault_certificate" "test" {
-  name         = "acctest%[1]d"
-  key_vault_id = azurerm_key_vault.test.id
-
-  certificate {
-    contents = filebase64("testdata/app_service_certificate.pfx")
-    password = "terraform"
-  }
-
-  certificate_policy {
-    issuer_parameters {
-      name = "Self"
-    }
-
-    key_properties {
-      exportable = true
-      key_size   = 2048
-      key_type   = "RSA"
-      reuse_key  = false
-    }
-
-    secret_properties {
-      content_type = "application/x-pkcs12"
-    }
-  }
-}
+%[1]s
 
 resource "azurerm_app_service_certificate" "test" {
-  name                = "acctest%[1]d"
+  name                = "acctest%[2]d"
   resource_group_name = azurerm_resource_group.test.name
   location            = azurerm_resource_group.test.location
   key_vault_secret_id = azurerm_key_vault_certificate.test.id
 }
-`, data.RandomInteger, data.Locations.Primary, data.RandomString)
+`, r.keyVaultTemplate(data), data.RandomInteger)
 }
 
 func (r AppServiceCertificateResource) keyVaultId(data acceptance.TestData) string {
@@ -254,97 +208,16 @@ provider "azurerm" {
   features {}
 }
 
-provider "azuread" {}
-
-data "azurerm_client_config" "test" {}
-
-data "azuread_service_principal" "test" {
-  display_name = "Microsoft Azure App Service"
-}
-
-resource "azurerm_resource_group" "test" {
-  name     = "acctestwebcert%[1]d"
-  location = "%[2]s"
-}
-
-resource "azurerm_key_vault" "test" {
-  name                = "acctest%[3]s"
-  location            = azurerm_resource_group.test.location
-  resource_group_name = azurerm_resource_group.test.name
-
-  tenant_id = data.azurerm_client_config.test.tenant_id
-
-  sku_name = "standard"
-
-  access_policy {
-    tenant_id = data.azurerm_client_config.test.tenant_id
-    object_id = data.azurerm_client_config.test.object_id
-
-    secret_permissions = [
-      "Delete",
-      "Get",
-      "Purge",
-      "Set",
-    ]
-
-    certificate_permissions = [
-      "Create",
-      "Delete",
-      "Get",
-      "Purge",
-      "Import",
-    ]
-  }
-
-  access_policy {
-    tenant_id = data.azurerm_client_config.test.tenant_id
-    object_id = data.azuread_service_principal.test.object_id
-
-    secret_permissions = [
-      "Get",
-    ]
-
-    certificate_permissions = [
-      "Get",
-    ]
-  }
-}
-
-resource "azurerm_key_vault_certificate" "test" {
-  name         = "acctest%[1]d"
-  key_vault_id = azurerm_key_vault.test.id
-
-  certificate {
-    contents = filebase64("testdata/app_service_certificate.pfx")
-    password = "terraform"
-  }
-
-  certificate_policy {
-    issuer_parameters {
-      name = "Self"
-    }
-
-    key_properties {
-      exportable = true
-      key_size   = 2048
-      key_type   = "RSA"
-      reuse_key  = false
-    }
-
-    secret_properties {
-      content_type = "application/x-pkcs12"
-    }
-  }
-}
+%[1]s
 
 resource "azurerm_app_service_certificate" "test" {
-  name                = "acctest%[1]d"
+  name                = "acctest%[2]d"
   resource_group_name = azurerm_resource_group.test.name
   location            = azurerm_resource_group.test.location
   key_vault_id        = azurerm_key_vault.test.id
   key_vault_secret_id = azurerm_key_vault_certificate.test.id
 }
-`, data.RandomInteger, data.Locations.Primary, data.RandomString)
+`, r.keyVaultTemplate(data), data.RandomInteger)
 }
 
 func (r AppServiceCertificateResource) keyVaultIdVersionless(data acceptance.TestData) string {
@@ -353,21 +226,32 @@ provider "azurerm" {
   features {}
 }
 
+%[1]s
+
+resource "azurerm_app_service_certificate" "test" {
+  name                = "acctest%[2]d"
+  resource_group_name = azurerm_resource_group.test.name
+  location            = azurerm_resource_group.test.location
+  key_vault_id        = azurerm_key_vault.test.id
+  key_vault_secret_id = azurerm_key_vault_certificate.test.versionless_secret_id
+}
+`, r.keyVaultTemplate(data), data.RandomInteger)
+}
+
+func (r AppServiceCertificateResource) keyVaultTemplate(data acceptance.TestData) string {
+	return fmt.Sprintf(`
 provider "azuread" {}
 
+%[1]s
+
 data "azurerm_client_config" "test" {}
 
 data "azuread_service_principal" "test" {
   display_name = "Microsoft Azure App Service"
 }
 
-resource "azurerm_resource_group" "test" {
-  name     = "acctestwebcert%[1]d"
-  location = "%[2]s"
-}
-
 resource "azurerm_key_vault" "test" {
-  name                = "acctest%[3]s"
+  name                = "acctest%[2]s"
   location            = azurerm_resource_group.test.location
   resource_group_name = azurerm_resource_group.test.name
 
@@ -410,7 +294,7 @@ resource "azurerm_key_vault" "test" {
 }
 
 resource "azurerm_key_vault_certificate" "test" {
-  name         = "acctest%[1]d"
+  name         = "acctest%[3]d"
   key_vault_id = azurerm_key_vault.test.id
 
   certificate {
@@ -435,13 +319,14 @@ resource "azurerm_key_vault_certificate" "test" {
     }
   }
 }
+`, r.template(data), data.RandomString, data.RandomInteger)
+}
 
-resource "azurerm_app_service_certificate" "test" {
-  name                = "acctest%[1]d"
-  resource_group_name = azurerm_resource_group.test.name
-  location            = azurerm_resource_group.test.location
-  key_vault_id        = azurerm_key_vault.test.id
-  key_vault_secret_id = azurerm_key_vault_certificate.test.versionless_secret_id
+func (r AppServiceCertificateResource) template(data acceptance.TestData) string {
+	return fmt.Sprintf(`
+resource "azurerm_resource_group" "test" {
+  name     = "acctestwebcert%[1]d"
+  location = "%[2]s"
 }
-`, data.RandomInteger, data.Locations.Primary, data.RandomString)
+`, data.RandomInteger, data.Locations.Primary)
 }