From b0dae31bdc41e56657c0687184bd9575f0ac773f Mon Sep 17 00:00:00 2001 From: "Sanja.Malesevic" Date: Tue, 1 Oct 2019 19:17:24 +0200 Subject: [PATCH 1/7] AdministratorName parameter should take constant value defined in enum --- .../managedInstanceAdministrators.json | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/managedInstanceAdministrators.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/managedInstanceAdministrators.json index 11bbcfa10e89..3a45b954a092 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/managedInstanceAdministrators.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/managedInstanceAdministrators.json @@ -77,7 +77,10 @@ "in": "path", "description": "The administrator name.", "required": true, - "type": "string" + "type": "string", + "enum": [ + "ActiveDirectory" + ] }, { "$ref": "#/parameters/SubscriptionIdParameter" @@ -121,7 +124,10 @@ "in": "path", "description": "The requested administrator name.", "required": true, - "type": "string" + "type": "string", + "enum": [ + "ActiveDirectory" + ] }, { "name": "parameters", @@ -187,7 +193,10 @@ "in": "path", "description": "The administrator name.", "required": true, - "type": "string" + "type": "string", + "enum": [ + "ActiveDirectory" + ] }, { "$ref": "#/parameters/SubscriptionIdParameter" From 32a132507f777638cf2e26b0178d9b8104753bf8 Mon Sep 17 00:00:00 2001 From: SanjaMalesevic <53555921+SanjaMalesevic@users.noreply.github.com> Date: Wed, 6 Nov 2019 15:09:43 +0100 Subject: [PATCH 2/7] Code review fixes --- .../managedInstanceAdministrators.json | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/managedInstanceAdministrators.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/managedInstanceAdministrators.json index 3a45b954a092..8b796ab90bac 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/managedInstanceAdministrators.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/managedInstanceAdministrators.json @@ -78,9 +78,12 @@ "description": "The administrator name.", "required": true, "type": "string", - "enum": [ - "ActiveDirectory" - ] + "enum": [ + "ActiveDirectory" + ], + "x-ms-enum": { + "name": "ServerAdministratorName" + } }, { "$ref": "#/parameters/SubscriptionIdParameter" From f20be645a748cae6147290a5e091c348a9924902 Mon Sep 17 00:00:00 2001 From: SanjaMalesevic <53555921+SanjaMalesevic@users.noreply.github.com> Date: Wed, 6 Nov 2019 15:12:14 +0100 Subject: [PATCH 3/7] Code review fixes --- .../managedInstanceAdministrators.json | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/managedInstanceAdministrators.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/managedInstanceAdministrators.json index 8b796ab90bac..2720585618a2 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/managedInstanceAdministrators.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/managedInstanceAdministrators.json @@ -128,9 +128,12 @@ "description": "The requested administrator name.", "required": true, "type": "string", - "enum": [ - "ActiveDirectory" - ] + "enum": [ + "ActiveDirectory" + ], + "x-ms-enum": { + "name": "ServerAdministratorName" + } }, { "name": "parameters", @@ -197,9 +200,12 @@ "description": "The administrator name.", "required": true, "type": "string", - "enum": [ - "ActiveDirectory" - ] + "enum": [ + "ActiveDirectory" + ], + "x-ms-enum": { + "name": "ServerAdministratorName" + } }, { "$ref": "#/parameters/SubscriptionIdParameter" From d8f256cca26760e0e845af8fff73137484504016 Mon Sep 17 00:00:00 2001 From: "Sanja.Malesevic" Date: Wed, 6 Nov 2019 18:03:46 +0100 Subject: [PATCH 4/7] Fix tabs and spaces --- .../managedInstanceAdministrators.json | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/managedInstanceAdministrators.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/managedInstanceAdministrators.json index 2720585618a2..1aff37e22df7 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/managedInstanceAdministrators.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/managedInstanceAdministrators.json @@ -78,11 +78,11 @@ "description": "The administrator name.", "required": true, "type": "string", - "enum": [ - "ActiveDirectory" - ], + "enum": [ + "ActiveDirectory" + ], "x-ms-enum": { - "name": "ServerAdministratorName" + "name": "AdministratorName" } }, { @@ -128,11 +128,11 @@ "description": "The requested administrator name.", "required": true, "type": "string", - "enum": [ - "ActiveDirectory" - ], + "enum": [ + "ActiveDirectory" + ], "x-ms-enum": { - "name": "ServerAdministratorName" + "name": "AdministratorName" } }, { @@ -200,11 +200,11 @@ "description": "The administrator name.", "required": true, "type": "string", - "enum": [ - "ActiveDirectory" - ], + "enum": [ + "ActiveDirectory" + ], "x-ms-enum": { - "name": "ServerAdministratorName" + "name": "AdministratorName" } }, { From 31de475ddfded8bab2b468a2a1ce066f14a12d46 Mon Sep 17 00:00:00 2001 From: "Sanja.Malesevic" Date: Wed, 6 Nov 2019 18:55:42 +0100 Subject: [PATCH 5/7] Fix example with get --- .../examples/ManagedInstanceAdministratorGet.json | 1 - 1 file changed, 1 deletion(-) diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/examples/ManagedInstanceAdministratorGet.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/examples/ManagedInstanceAdministratorGet.json index b4874c326b52..cfab4d128232 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/examples/ManagedInstanceAdministratorGet.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/examples/ManagedInstanceAdministratorGet.json @@ -11,7 +11,6 @@ "body": { "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/Default-SQL-SouthEastAsia/providers/Microsoft.Sql/managedInstances/managedInstance/administrators/ActiveDirectory", "location": "southeastasia", - "name": "ActiveDirectory", "properties": { "administratorType": "ActiveDirectory", "login": "bob@contoso.com", From 57fa02d749f723f3c0610d544cc52a486754565a Mon Sep 17 00:00:00 2001 From: "Sanja.Malesevic" Date: Wed, 6 Nov 2019 18:59:47 +0100 Subject: [PATCH 6/7] revert example with get --- .../examples/ManagedInstanceAdministratorGet.json | 1 + 1 file changed, 1 insertion(+) diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/examples/ManagedInstanceAdministratorGet.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/examples/ManagedInstanceAdministratorGet.json index cfab4d128232..b4874c326b52 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/examples/ManagedInstanceAdministratorGet.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/examples/ManagedInstanceAdministratorGet.json @@ -11,6 +11,7 @@ "body": { "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/Default-SQL-SouthEastAsia/providers/Microsoft.Sql/managedInstances/managedInstance/administrators/ActiveDirectory", "location": "southeastasia", + "name": "ActiveDirectory", "properties": { "administratorType": "ActiveDirectory", "login": "bob@contoso.com", From e76547413e03da7a8f4ec5287b4c5a866f375f64 Mon Sep 17 00:00:00 2001 From: "Sanja.Malesevic" Date: Thu, 7 Nov 2019 10:39:57 +0100 Subject: [PATCH 7/7] Fix examples --- .../examples/ManagedInstanceAdministratorCreate.json | 2 -- .../examples/ManagedInstanceAdministratorGet.json | 1 - .../examples/ManagedInstanceAdministratorListByInstance.json | 1 - .../examples/ManagedInstanceAdministratorUpdate.json | 2 -- 4 files changed, 6 deletions(-) diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/examples/ManagedInstanceAdministratorCreate.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/examples/ManagedInstanceAdministratorCreate.json index 9ba28b304bba..ba5a0e293963 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/examples/ManagedInstanceAdministratorCreate.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/examples/ManagedInstanceAdministratorCreate.json @@ -18,7 +18,6 @@ "200": { "body": { "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/Default-SQL-SouthEastAsia/providers/Microsoft.Sql/managedInstances/managedInstance/administrators/ActiveDirectory", - "location": "southeastasia", "name": "ActiveDirectory", "properties": { "administratorType": "ActiveDirectory", @@ -32,7 +31,6 @@ "201": { "body": { "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/Default-SQL-SouthEastAsia/providers/Microsoft.Sql/managedInstances/managedInstance/administrators/ActiveDirectory", - "location": "southeastasia", "name": "ActiveDirectory", "properties": { "administratorType": "ActiveDirectory", diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/examples/ManagedInstanceAdministratorGet.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/examples/ManagedInstanceAdministratorGet.json index b4874c326b52..9513968e3acf 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/examples/ManagedInstanceAdministratorGet.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/examples/ManagedInstanceAdministratorGet.json @@ -10,7 +10,6 @@ "200": { "body": { "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/Default-SQL-SouthEastAsia/providers/Microsoft.Sql/managedInstances/managedInstance/administrators/ActiveDirectory", - "location": "southeastasia", "name": "ActiveDirectory", "properties": { "administratorType": "ActiveDirectory", diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/examples/ManagedInstanceAdministratorListByInstance.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/examples/ManagedInstanceAdministratorListByInstance.json index 5170d55e2d88..998aadc86516 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/examples/ManagedInstanceAdministratorListByInstance.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/examples/ManagedInstanceAdministratorListByInstance.json @@ -11,7 +11,6 @@ "value": [ { "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/Default-SQL-SouthEastAsia/providers/Microsoft.Sql/managedInstances/managedInstance/administrators/ActiveDirectory", - "location": "southeastasia", "name": "ActiveDirectory", "properties": { "administratorType": "ActiveDirectory", diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/examples/ManagedInstanceAdministratorUpdate.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/examples/ManagedInstanceAdministratorUpdate.json index 9ba28b304bba..ba5a0e293963 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/examples/ManagedInstanceAdministratorUpdate.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/examples/ManagedInstanceAdministratorUpdate.json @@ -18,7 +18,6 @@ "200": { "body": { "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/Default-SQL-SouthEastAsia/providers/Microsoft.Sql/managedInstances/managedInstance/administrators/ActiveDirectory", - "location": "southeastasia", "name": "ActiveDirectory", "properties": { "administratorType": "ActiveDirectory", @@ -32,7 +31,6 @@ "201": { "body": { "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/Default-SQL-SouthEastAsia/providers/Microsoft.Sql/managedInstances/managedInstance/administrators/ActiveDirectory", - "location": "southeastasia", "name": "ActiveDirectory", "properties": { "administratorType": "ActiveDirectory",