azurerm_key_vault_certificate_contacts - Update contact to Required in 5.0 (#30461)

Author: QixiaLu

internal/services/keyvault/key_vault_certificate_contacts_resource.go

@@ -13,6 +13,7 @@ import (
 	"github.com/hashicorp/go-azure-helpers/resourcemanager/commonschema"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
 	"github.com/hashicorp/terraform-provider-azurerm/helpers/tf"
+	"github.com/hashicorp/terraform-provider-azurerm/internal/features"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/locks"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/sdk"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/services/keyvault/parse"
@@ -43,7 +44,7 @@ func (r KeyVaultCertificateContactsResource) Arguments() map[string]*pluginsdk.S
 
 		"contact": {
 			Type:     pluginsdk.TypeSet,
-			Optional: true,
+			Required: true,
 			Elem: &pluginsdk.Resource{
 				Schema: map[string]*pluginsdk.Schema{
 					"email": {
@@ -68,6 +69,11 @@ func (r KeyVaultCertificateContactsResource) Arguments() map[string]*pluginsdk.S
 		},
 	}
 
+	if !features.FivePointOh() {
+		schema["contact"].Required = false
+		schema["contact"].Optional = true
+	}
+
 	return schema
 }
 
@@ -132,9 +138,15 @@ func (r KeyVaultCertificateContactsResource) Create() sdk.ResourceFunc {
 				ContactList: expandKeyVaultCertificateContactsContact(state.Contact),
 			}
 
-			if len(*contacts.ContactList) == 0 {
-				if _, err := client.DeleteCertificateContacts(ctx, id.KeyVaultBaseUrl); err != nil {
-					return fmt.Errorf("removing Key Vault Certificate Contacts %s: %+v", id, err)
+			if !features.FivePointOh() {
+				if len(*contacts.ContactList) == 0 {
+					if _, err := client.DeleteCertificateContacts(ctx, id.KeyVaultBaseUrl); err != nil {
+						return fmt.Errorf("removing Key Vault Certificate Contacts %s: %+v", id, err)
+					}
+				} else {
+					if _, err := client.SetCertificateContacts(ctx, *keyVaultBaseUri, contacts); err != nil {
+						return fmt.Errorf("creating Key Vault Certificate Contacts %s: %+v", id, err)
+					}
 				}
 			} else {
 				if _, err := client.SetCertificateContacts(ctx, *keyVaultBaseUri, contacts); err != nil {
@@ -222,9 +234,15 @@ func (r KeyVaultCertificateContactsResource) Update() sdk.ResourceFunc {
 				existing.ContactList = expandKeyVaultCertificateContactsContact(state.Contact)
 			}
 
-			if len(*existing.ContactList) == 0 {
-				if _, err := client.DeleteCertificateContacts(ctx, id.KeyVaultBaseUrl); err != nil {
-					return fmt.Errorf("removing Key Vault Certificate Contacts %s: %+v", id, err)
+			if !features.FivePointOh() {
+				if len(*existing.ContactList) == 0 {
+					if _, err := client.DeleteCertificateContacts(ctx, id.KeyVaultBaseUrl); err != nil {
+						return fmt.Errorf("removing Key Vault Certificate Contacts %s: %+v", id, err)
+					}
+				} else {
+					if _, err := client.SetCertificateContacts(ctx, id.KeyVaultBaseUrl, existing); err != nil {
+						return fmt.Errorf("updating Key Vault Certificate Contacts %s: %+v", id, err)
+					}
 				}
 			} else {
 				if _, err := client.SetCertificateContacts(ctx, id.KeyVaultBaseUrl, existing); err != nil {

internal/services/keyvault/key_vault_certificate_contacts_resource_test.go

@@ -102,37 +102,6 @@ func TestAccKeyVaultCertificateContacts_nonExistentVault(t *testing.T) {
 	})
 }
 
-func TestAccKeyVaultCertificateContacts_remove(t *testing.T) {
-	data := acceptance.BuildTestData(t, "azurerm_key_vault_certificate_contacts", "test")
-	r := KeyVaultCertificateContactsResource{}
-
-	data.ResourceTest(t, r, []acceptance.TestStep{
-		{
-			Config: r.basic(data),
-			Check: acceptance.ComposeTestCheckFunc(
-				check.That(data.ResourceName).ExistsInAzure(r),
-			),
-		},
-		data.ImportStep(),
-		{
-			Config: r.remove(data),
-			Check: acceptance.ComposeTestCheckFunc(
-				check.That(data.ResourceName).ExistsInAzure(r),
-				check.That(data.ResourceName).Key("contact").IsEmpty(),
-			),
-		},
-		data.ImportStep(),
-		{
-			Config: r.basic(data),
-			Check: acceptance.ComposeTestCheckFunc(
-				check.That(data.ResourceName).ExistsInAzure(r),
-				check.That(data.ResourceName).Key("contact").IsNotEmpty(),
-			),
-		},
-		data.ImportStep(),
-	})
-}
-
 func (r KeyVaultCertificateContactsResource) Exists(ctx context.Context, clients *clients.Client, state *pluginsdk.InstanceState) (*bool, error) {
 	id, err := parse.CertificateContactsID(state.ID)
 	if err != nil {
@@ -280,18 +249,3 @@ resource "azurerm_key_vault_access_policy" "test" {
 }
 `, data.Locations.Primary, data.RandomInteger, data.RandomString)
 }
-
-func (r KeyVaultCertificateContactsResource) remove(data acceptance.TestData) string {
-	template := r.template(data)
-	return fmt.Sprintf(`
-%s
-
-resource "azurerm_key_vault_certificate_contacts" "test" {
-  key_vault_id = azurerm_key_vault.test.id
-
-  depends_on = [
-    azurerm_key_vault_access_policy.test
-  ]
-}
-`, template)
-}

website/docs/5.0-upgrade-guide.html.markdown

@@ -389,6 +389,10 @@ Please follow the format in the example below for listing breaking changes in re
 * The deprecated `contact` property has been removed as it is no longer supported by the resource.
 * The deprecated `enable_rbac_authorization` property has been removed in favour of the `rbac_authorization_enabled` property.
 
+### `azurerm_key_vault_certificate_contacts`
+
+* The `contact` property is now Required.
+
 ### `azurerm_kubernetes_cluster`
 
 * The deprecated `default_node_pool.linux_os_config.transparent_huge_page_enabled` property has been removed in favour of the `default_node_pool.linux_os_config.transparent_huge_page` property.

website/docs/r/key_vault_certificate_contacts.html.markdown

@@ -72,7 +72,7 @@ The following arguments are supported:
 
 * `key_vault_id` - (Required) The ID of the Key Vault. Changing this forces a new resource to be created.
 
-* `contact` - (Optional) One or more `contact` blocks as defined below.
+* `contact` - (Required) One or more `contact` blocks as defined below.
 
 ---