fix hashicorp#20849

teowa · Mar 21, 2023 · 00b3e7d · 00b3e7d
1 parent 1694ead
commit 00b3e7d
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 0 deletions.
diff --git a/internal/services/appconfiguration/migration/key_resource_v0_to_v1_test.go b/internal/services/appconfiguration/migration/key_resource_v0_to_v1_test.go
@@ -34,6 +34,13 @@ func TestKeyResourceV0ToV1(t *testing.T) {
 			},
 			expected: utils.String("/subscriptions/12345678-1234-5678-1234-123456789012/resourcegroups/resourceGroup1/providers/Microsoft.AppConfiguration/configurationStores/appConf1/AppConfigurationKey/key:name/test/Label/test:label/name"),
 		},
+		{
+			name: "old id (this is a bug and should be fixed in v1 to v2)",
+			input: map[string]interface{}{
+				"id": "/subscriptions/12345678-1234-5678-1234-123456789012/resourcegroups/resourceGroup1/providers/Microsoft.AppConfiguration/configurationStores/appConf1/AppConfigurationKey/keyName/Label/%00",
+			},
+			expected: utils.String("/subscriptions/12345678-1234-5678-1234-123456789012/resourcegroups/resourceGroup1/providers/Microsoft.AppConfiguration/configurationStores/appConf1/AppConfigurationKey/keyName/Label/\000/AppConfigurationKey/keyName/Label/"),
+		},
 	}
 	for _, test := range testData {
 		t.Logf("Testing %q...", test.name)

diff --git a/internal/services/appconfiguration/migration/key_resource_v1_to_v2.go b/internal/services/appconfiguration/migration/key_resource_v1_to_v2.go
@@ -24,6 +24,12 @@ func (KeyResourceV1ToV2) UpgradeFunc() pluginsdk.StateUpgraderFunc {
 		oldId := rawState["id"].(string)
 		fixedId := oldId
 
+		// if the ID is like below, it should be bugs for no-label, see https://github.com/hashicorp/terraform-provider-azurerm/issues/20849
+		// /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/resourceGroup1/providers/Microsoft.AppConfiguration/configurationStores/appConf1/AppConfigurationKey/appConfKey1/Label/\000/AppConfigurationKey/appConfKey1/Label/
+		if index1, index2 := strings.Index(fixedId, "/AppConfigurationKey/"), strings.LastIndex(fixedId, "/AppConfigurationKey/"); index1 != index2 && fixedId[index2-1] == '\000' && fixedId[index1:index2-1] == fixedId[index2:] {
+			fixedId = fixedId[:index2]
+		}
+
 		if strings.HasSuffix(fixedId, "/Label/\000") {
 			fixedId = strings.TrimSuffix(fixedId, "/Label/\000") + "/Label/%00"
 		}

diff --git a/internal/services/appconfiguration/migration/key_resource_v1_to_v2_test.go b/internal/services/appconfiguration/migration/key_resource_v1_to_v2_test.go
@@ -48,6 +48,13 @@ func TestKeyResourceV1ToV2(t *testing.T) {
 			},
 			expected: utils.String("https://appConf1.azconfig.io/kv/keyName?label="),
 		},
+		{
+			name: "old id (fix bug with no-label)",
+			input: map[string]interface{}{
+				"id": "/subscriptions/12345678-1234-5678-1234-123456789012/resourceGroups/resourceGroup1/providers/Microsoft.AppConfiguration/configurationStores/appConf1/AppConfigurationKey/keyName/Label/\000/AppConfigurationKey/keyName/Label/",
+			},
+			expected: utils.String("https://appConf1.azconfig.io/kv/keyName?label="),
+		},
 	}
 	for _, test := range testData {
 		t.Logf("Testing %q...", test.name)