From 119223f8bacd87a8c31eb05bf1704165753d2da2 Mon Sep 17 00:00:00 2001 From: Cong <53898691+bruceWangMS@users.noreply.github.com> Date: Fri, 22 Jul 2022 09:55:39 +0000 Subject: [PATCH 1/4] fix name error --- .../Microsoft.DBforMySQL/stable/2021-05-01/mysql.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/stable/2021-05-01/mysql.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/stable/2021-05-01/mysql.json index 3b4a6c483e1f..46c1b5d0aafe 100644 --- a/specification/mysql/resource-manager/Microsoft.DBforMySQL/stable/2021-05-01/mysql.json +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/stable/2021-05-01/mysql.json @@ -1548,7 +1548,7 @@ "type": "string", "description": "Primary user identity resource id" }, - "primaryKeyUri": { + "primaryKeyURI": { "type": "string", "description": "Primary key uri" }, @@ -1556,7 +1556,7 @@ "type": "string", "description": "Geo backup user identity resource id as identity can't cross region, need identity in same region as geo backup" }, - "geoBackupKeyUri": { + "geoBackupKeyURI": { "type": "string", "description": "Geo backup key uri as key vault can't cross region, need cmk in same region as geo backup" }, From c6ffe694979279fcc3e62d703706ad06b44bcaba Mon Sep 17 00:00:00 2001 From: Cong <53898691+bruceWangMS@users.noreply.github.com> Date: Fri, 22 Jul 2022 15:14:46 +0000 Subject: [PATCH 2/4] fix example --- .../stable/2021-05-01/examples/ServerCreateWithBYOK.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/stable/2021-05-01/examples/ServerCreateWithBYOK.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/stable/2021-05-01/examples/ServerCreateWithBYOK.json index 61a447f1c285..a3a754734a7c 100644 --- a/specification/mysql/resource-manager/Microsoft.DBforMySQL/stable/2021-05-01/examples/ServerCreateWithBYOK.json +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/stable/2021-05-01/examples/ServerCreateWithBYOK.json @@ -37,9 +37,9 @@ "dataEncryption": { "type": "AzureKeyVault", "primaryUserAssignedIdentityId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/test-identity", - "primaryKeyUri": "https://test.vault.azure.net/keys/key/c8a92236622244c0a4fdb892666f671a", + "primaryKeyURI": "https://test.vault.azure.net/keys/key/c8a92236622244c0a4fdb892666f671a", "geoBackupUserAssignedIdentityId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/test-geo-identity", - "geoBackupKeyUri": "https://test-geo.vault.azure.net/keys/key/c8a92236622244c0a4fdb892666f671a" + "geoBackupKeyURI": "https://test-geo.vault.azure.net/keys/key/c8a92236622244c0a4fdb892666f671a" } }, "location": "southeastasia", From 6a5f994e195edfedbdd57a523116180cef628a19 Mon Sep 17 00:00:00 2001 From: Cong <53898691+bruceWangMS@users.noreply.github.com> Date: Fri, 22 Jul 2022 15:21:09 +0000 Subject: [PATCH 3/4] fix example --- .../stable/2021-05-01/examples/ServerUpdateWithBYOK.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/stable/2021-05-01/examples/ServerUpdateWithBYOK.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/stable/2021-05-01/examples/ServerUpdateWithBYOK.json index 938eee088dd0..862dd10a3a2f 100644 --- a/specification/mysql/resource-manager/Microsoft.DBforMySQL/stable/2021-05-01/examples/ServerUpdateWithBYOK.json +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/stable/2021-05-01/examples/ServerUpdateWithBYOK.json @@ -15,9 +15,9 @@ "dataEncryption": { "type": "AzureKeyVault", "primaryUserAssignedIdentityId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/test-identity", - "primaryKeyUri": "https://test.vault.azure.net/keys/key/c8a92236622244c0a4fdb892666f671a", + "primaryKeyURI": "https://test.vault.azure.net/keys/key/c8a92236622244c0a4fdb892666f671a", "geoBackupUserAssignedIdentityId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/test-geo-identity", - "geoBackupKeyUri": "https://test-geo.vault.azure.net/keys/key/c8a92236622244c0a4fdb892666f671a" + "geoBackupKeyURI": "https://test-geo.vault.azure.net/keys/key/c8a92236622244c0a4fdb892666f671a" } } } From 90cc38e6b8ceff05dd0fc92aec4fd0c030ad5bec Mon Sep 17 00:00:00 2001 From: Cong <53898691+bruceWangMS@users.noreply.github.com> Date: Fri, 5 Aug 2022 08:24:58 +0000 Subject: [PATCH 4/4] fix properties error --- .../preview/2021-12-01-preview/FlexibleServers.json | 4 ++-- .../2021-12-01-preview/examples/ServerCreateWithBYOK.json | 4 ++-- .../2021-12-01-preview/examples/ServerUpdateWithBYOK.json | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2021-12-01-preview/FlexibleServers.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2021-12-01-preview/FlexibleServers.json index 63ac90dd284d..8ca575fad2a2 100644 --- a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2021-12-01-preview/FlexibleServers.json +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2021-12-01-preview/FlexibleServers.json @@ -604,7 +604,7 @@ "type": "string", "description": "Primary user identity resource id" }, - "primaryKeyUri": { + "primaryKeyURI": { "type": "string", "description": "Primary key uri" }, @@ -612,7 +612,7 @@ "type": "string", "description": "Geo backup user identity resource id as identity can't cross region, need identity in same region as geo backup" }, - "geoBackupKeyUri": { + "geoBackupKeyURI": { "type": "string", "description": "Geo backup key uri as key vault can't cross region, need cmk in same region as geo backup" }, diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2021-12-01-preview/examples/ServerCreateWithBYOK.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2021-12-01-preview/examples/ServerCreateWithBYOK.json index 228e0c1859b1..c0bfca2d9f1c 100644 --- a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2021-12-01-preview/examples/ServerCreateWithBYOK.json +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2021-12-01-preview/examples/ServerCreateWithBYOK.json @@ -37,9 +37,9 @@ "dataEncryption": { "type": "AzureKeyVault", "primaryUserAssignedIdentityId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/test-identity", - "primaryKeyUri": "https://test.vault.azure.net/keys/key/c8a92236622244c0a4fdb892666f671a", + "primaryKeyURI": "https://test.vault.azure.net/keys/key/c8a92236622244c0a4fdb892666f671a", "geoBackupUserAssignedIdentityId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/test-geo-identity", - "geoBackupKeyUri": "https://test-geo.vault.azure.net/keys/key/c8a92236622244c0a4fdb892666f671a" + "geoBackupKeyURI": "https://test-geo.vault.azure.net/keys/key/c8a92236622244c0a4fdb892666f671a" } }, "location": "southeastasia", diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2021-12-01-preview/examples/ServerUpdateWithBYOK.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2021-12-01-preview/examples/ServerUpdateWithBYOK.json index bd785423fea5..03ccb6ab63cc 100644 --- a/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2021-12-01-preview/examples/ServerUpdateWithBYOK.json +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/preview/2021-12-01-preview/examples/ServerUpdateWithBYOK.json @@ -15,9 +15,9 @@ "dataEncryption": { "type": "AzureKeyVault", "primaryUserAssignedIdentityId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/test-identity", - "primaryKeyUri": "https://test.vault.azure.net/keys/key/c8a92236622244c0a4fdb892666f671a", + "primaryKeyURI": "https://test.vault.azure.net/keys/key/c8a92236622244c0a4fdb892666f671a", "geoBackupUserAssignedIdentityId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/test-geo-identity", - "geoBackupKeyUri": "https://test-geo.vault.azure.net/keys/key/c8a92236622244c0a4fdb892666f671a" + "geoBackupKeyURI": "https://test-geo.vault.azure.net/keys/key/c8a92236622244c0a4fdb892666f671a" } } }