azurerm_app_configuration_key, azurerm_app_configuration_feature - change resource ID to Data Plane URL format

internal/services/appconfiguration/app_configuration_feature_resource.go

@@ -70,9 +70,10 @@ func (k FeatureResource) Arguments() map[string]*pluginsdk.Schema {
 			Optional: true,
 		},
 		"label": {
-			Type:     pluginsdk.TypeString,
-			Optional: true,
-			ForceNew: true,
+			Type:         pluginsdk.TypeString,
+			Optional:     true,
+			ForceNew:     true,
+			ValidateFunc: validate.AppConfigurationLabel,
 		},
 		"locked": {
 			Type:     pluginsdk.TypeBool,

internal/services/appconfiguration/app_configuration_key_resource.go

@@ -75,9 +75,10 @@ func (k KeyResource) Arguments() map[string]*pluginsdk.Schema {
 			Optional: true,
 		},
 		"label": {
-			Type:     pluginsdk.TypeString,
-			Optional: true,
-			ForceNew: true,
+			Type:         pluginsdk.TypeString,
+			Optional:     true,
+			ForceNew:     true,
+			ValidateFunc: validate.AppConfigurationLabel,
 		},
 		"value": {
 			Type:     pluginsdk.TypeString,

internal/services/appconfiguration/app_configuration_key_resource_test.go

@@ -45,6 +45,21 @@ func TestAccAppConfigurationKey_basicNoLabel(t *testing.T) {
 	})
 }
 
+func TestAccAppConfigurationKey_complicatedKeyLabel(t *testing.T) {
+	data := acceptance.BuildTestData(t, "azurerm_app_configuration_key", "test")
+	r := AppConfigurationKeyResource{}
+	data.ResourceTest(t, r, []acceptance.TestStep{
+		{
+			Config: r.complicatedKeyLabel(data),
+			Check: acceptance.ComposeTestCheckFunc(
+				check.That(data.ResourceName).ExistsInAzure(r),
+				check.That(data.ResourceName).Key("etag").IsSet(),
+			),
+		},
+		data.ImportStep(),
+	})
+}
+
 func TestAccAppConfigurationKey_basicNoLabel_afterLabel(t *testing.T) {
 	data := acceptance.BuildTestData(t, "azurerm_app_configuration_key", "test")
 	r := AppConfigurationKeyResource{}
@@ -212,6 +227,20 @@ resource "azurerm_app_configuration_key" "test" {
 `, t.base(data), data.RandomInteger, data.RandomInteger)
 }
 
+func (t AppConfigurationKeyResource) complicatedKeyLabel(data acceptance.TestData) string {
+	return fmt.Sprintf(`
+%s
+
+resource "azurerm_app_configuration_key" "test" {
+  configuration_store_id = azurerm_app_configuration.test.id
+  key                    = "acctest-ackey-%d/Label/AppConfigurationKey/Label/"
+  content_type           = "test"
+  label                  = "/AppConfigurationKey/acctest-ackeylabel-%d"
+  value                  = "a test"
+}
+`, t.base(data), data.RandomInteger, data.RandomInteger)
+}
+
 func (t AppConfigurationKeyResource) slash(data acceptance.TestData) string {
 	return fmt.Sprintf(`
 %s

internal/services/appconfiguration/parse/app_configuration_feature.go

@@ -58,7 +58,7 @@ func FeatureId(input string) (*AppConfigurationFeatureId, error) {
 
 // a workaround to support "/" in id
 func handleSlashInIdForFeature(input string) string {
-	oldNames := regexp.MustCompile(`AppConfigurationFeature\/(.+)\/Label`).FindStringSubmatch(input)
+	oldNames := regexp.MustCompile(`AppConfigurationFeature\/(.+)\/Label\/`).FindStringSubmatch(input)
 	if len(oldNames) == 2 {
 		input = strings.Replace(input, oldNames[1], url.QueryEscape(oldNames[1]), 1)
 	}

internal/services/appconfiguration/parse/app_configuration_key.go

@@ -58,7 +58,7 @@ func KeyId(input string) (*AppConfigurationKeyId, error) {
 
 // a workaround to support "/" in id
 func handleSlashInIdForKey(input string) string {
-	oldNames := regexp.MustCompile(`AppConfigurationKey\/(.+)\/Label`).FindStringSubmatch(input)
+	oldNames := regexp.MustCompile(`AppConfigurationKey\/(.+)\/Label\/`).FindStringSubmatch(input)
 	if len(oldNames) == 2 {
 		input = strings.Replace(input, oldNames[1], url.QueryEscape(oldNames[1]), 1)
 	}

internal/services/appconfiguration/validate/app_configuration_label.go

@@ -0,0 +1,19 @@
+package validate
+
+import (
+	"fmt"
+	"strings"
+)
+
+func AppConfigurationLabel(input interface{}, key string) (warnings []string, errors []error) {
+	v, ok := input.(string)
+	if !ok {
+		return nil, []error{fmt.Errorf("expected type of %q to be string", key)}
+	}
+
+	if idx := strings.Index(v, "/Label/"); idx != -1 {
+		return nil, []error{fmt.Errorf(`'/Label/' is not allowed in %q`, key)}
+	}
+
+	return nil, nil
+}

website/docs/r/app_configuration_feature.html.markdown

@@ -46,6 +46,8 @@ The following arguments are supported:
 
 * `label` - (Optional) The label of the App Configuration Feature. Changing this forces a new resource to be created.
 
+~> **NOTE:** `label` property should not contain `/Label/` literal to avoid conflict in ID parsing.
+
 * `locked` - (Optional) Should this App Configuration Feature be Locked to prevent changes?
 
 * `name` - (Required) The name of the App Configuration Feature. Changing this forces a new resource to be created.

website/docs/r/app_configuration_key.html.markdown

@@ -127,6 +127,8 @@ The following arguments are supported:
 
 * `label` - (Optional) The label of the App Configuration Key. Changing this forces a new resource to be created.
 
+~> **NOTE:** `label` property should not contain `/Label/` literal to avoid conflict in ID parsing.
+
 * `value` - (Optional) The value of the App Configuration Key. This should only be set when type is set to `kv`.
 
 * `locked` - (Optional) Should this App Configuration Key be Locked to prevent changes?