fix: validation_key mandatory

hashicorp · Feb 10, 2023 · 17f9c39 · 17f9c39
1 parent 3880f2e
commit 17f9c39
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 57 deletions.
diff --git a/internal/services/apimanagement/api_management_resource.go b/internal/services/apimanagement/api_management_resource.go
@@ -514,7 +514,7 @@ func resourceApiManagementSchema() map[string]*pluginsdk.Schema {
 					},
 					"validation_key": {
 						Type:      pluginsdk.TypeString,
-						Optional:  true,
+						Required:  true,
 						Sensitive: true,
 					},
 				},
@@ -940,7 +940,7 @@ func resourceApiManagementServiceCreateUpdate(d *pluginsdk.ResourceData, meta in
 	if sku.Name == apimanagement.SkuTypeConsumption && len(delegationSettingsRaw) > 0 {
 		return fmt.Errorf("`delegation` is not support for sku tier `Consumption`")
 	}
-	if sku.Name != apimanagement.SkuTypeConsumption {
+	if sku.Name != apimanagement.SkuTypeConsumption && len(delegationSettingsRaw) {
 		delegationSettings := expandApiManagementDelegationSettings(delegationSettingsRaw)
 		delegationClient := meta.(*clients.Client).ApiManagement.DelegationSettingsClient
 		if _, err := delegationClient.CreateOrUpdate(ctx, id.ResourceGroup, id.ServiceName, delegationSettings, ""); err != nil {
@@ -1866,16 +1866,7 @@ func flattenApiManagementSignInSettings(input apimanagement.PortalSigninSettings
 
 func expandApiManagementDelegationSettings(input []interface{}) apimanagement.PortalDelegationSettings {
 	if len(input) == 0 {
-		return apimanagement.PortalDelegationSettings{
-			PortalDelegationSettingsProperties: &apimanagement.PortalDelegationSettingsProperties{
-				Subscriptions: &apimanagement.SubscriptionsDelegationSettingsProperties{
-					Enabled: utils.Bool(false),
-				},
-				UserRegistration: &apimanagement.RegistrationDelegationSettingsProperties{
-					Enabled: utils.Bool(false),
-				},
-			},
-		}
+		return apimanagement.PortalDelegationSettings{}
 	}
 
 	vs := input[0].(map[string]interface{})

diff --git a/internal/services/apimanagement/api_management_resource_test.go b/internal/services/apimanagement/api_management_resource_test.go
@@ -215,21 +215,6 @@ func TestAccApiManagement_delegationSettings(t *testing.T) {
 	})
 }
 
-func TestAccApiManagement_delegationSettingsComplete(t *testing.T) {
-	data := acceptance.BuildTestData(t, "azurerm_api_management", "test")
-	r := ApiManagementResource{}
-
-	data.ResourceTest(t, r, []acceptance.TestStep{
-		{
-			Config: r.delegationSettingsComplete(data),
-			Check: acceptance.ComposeTestCheckFunc(
-				check.That(data.ResourceName).ExistsInAzure(r),
-			),
-		},
-		data.ImportStep(),
-	})
-}
-
 func TestAccApiManagement_policy(t *testing.T) {
 	data := acceptance.BuildTestData(t, "azurerm_api_management", "test")
 	r := ApiManagementResource{}
@@ -1176,36 +1161,6 @@ resource "azurerm_api_management" "test" {
 `, data.RandomInteger, data.Locations.Primary, data.RandomInteger)
 }
 
-func (ApiManagementResource) delegationSettingsComplete(data acceptance.TestData) string {
-	return fmt.Sprintf(`
-provider "azurerm" {
-  features {}
-}
-
-resource "azurerm_resource_group" "test" {
-  name     = "acctestRG-%d"
-  location = "%s"
-}
-
-resource "azurerm_api_management" "test" {
-  name                = "acctestAM-%d"
-  location            = azurerm_resource_group.test.location
-  resource_group_name = azurerm_resource_group.test.name
-  publisher_name      = "pub1"
-  publisher_email     = "pub1@email.com"
-
-  sku_name = "Developer_1"
-
-  delegation {
-    url                       = "https://google.com"
-    validation_key            = "aW50ZWdyYXRpb24mMjAyMzAzMTAxODMwJkxRaUxzcUVsaUpEaHJRK01YZkJYV3paUi9qdzZDSWMrazhjUXB0bVdyTGxKcVYrd0R4OXRqMGRzTWZXU3hmeGQ0a2V0WjcrcE44U0dJdDNsYUQ3Rk5BPT0="
-    subscriptions_enabled     = true
-    user_registration_enabled = true
-  }
-}
-`, data.RandomInteger, data.Locations.Primary, data.RandomInteger)
-}
-
 func (ApiManagementResource) complete(data acceptance.TestData) string {
 	return fmt.Sprintf(`
 provider "azurerm" {