From 562837b3d1bedaac3dee150896946ada48772d0f Mon Sep 17 00:00:00 2001 From: Xiaoxu Qi Date: Wed, 19 Apr 2023 14:28:47 +0800 Subject: [PATCH 1/4] add constraint for servername --- .../2021-12-01-preview/AzureADAdministrator.json | 16 ++++------------ .../2021-12-01-preview/Configurations.json | 16 ++++------------ .../preview/2021-12-01-preview/Databases.json | 16 ++++------------ .../2021-12-01-preview/FirewallRules.json | 16 ++++------------ .../preview/2021-12-01-preview/LogFiles.json | 12 +----------- 5 files changed, 17 insertions(+), 59 deletions(-) diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/AAD/preview/2021-12-01-preview/AzureADAdministrator.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/AAD/preview/2021-12-01-preview/AzureADAdministrator.json index 1d0778cdd76a..9c2283173b08 100644 --- a/specification/mysql/resource-manager/Microsoft.DBforMySQL/AAD/preview/2021-12-01-preview/AzureADAdministrator.json +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/AAD/preview/2021-12-01-preview/AzureADAdministrator.json @@ -57,7 +57,7 @@ "$ref": "../../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/ServerNameParameter" + "$ref": "../../../common-types/v1/common-types.json#/parameters/ServerNameParameter" }, { "$ref": "#/parameters/AdministratorNameParameter" @@ -119,7 +119,7 @@ "$ref": "../../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/ServerNameParameter" + "$ref": "../../../common-types/v1/common-types.json#/parameters/ServerNameParameter" }, { "$ref": "#/parameters/AdministratorNameParameter" @@ -169,7 +169,7 @@ "$ref": "../../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/ServerNameParameter" + "$ref": "../../../common-types/v1/common-types.json#/parameters/ServerNameParameter" }, { "$ref": "#/parameters/AdministratorNameParameter" @@ -214,7 +214,7 @@ "$ref": "../../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/ServerNameParameter" + "$ref": "../../../common-types/v1/common-types.json#/parameters/ServerNameParameter" } ], "responses": { @@ -322,14 +322,6 @@ } }, "parameters": { - "ServerNameParameter": { - "name": "serverName", - "in": "path", - "required": true, - "type": "string", - "description": "The name of the server.", - "x-ms-parameter-location": "method" - }, "AdministratorNameParameter": { "name": "administratorName", "in": "path", diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/Configurations/preview/2021-12-01-preview/Configurations.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/Configurations/preview/2021-12-01-preview/Configurations.json index 79d64c682f98..afa491f23c41 100644 --- a/specification/mysql/resource-manager/Microsoft.DBforMySQL/Configurations/preview/2021-12-01-preview/Configurations.json +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/Configurations/preview/2021-12-01-preview/Configurations.json @@ -118,7 +118,7 @@ "$ref": "../../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/ServerNameParameter" + "$ref": "../../../common-types/v1/common-types.json#/parameters/ServerNameParameter" }, { "$ref": "#/parameters/ConfigurationNameParameter" @@ -174,7 +174,7 @@ "$ref": "../../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/ServerNameParameter" + "$ref": "../../../common-types/v1/common-types.json#/parameters/ServerNameParameter" }, { "$ref": "#/parameters/ConfigurationNameParameter" @@ -219,7 +219,7 @@ "$ref": "../../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/ServerNameParameter" + "$ref": "../../../common-types/v1/common-types.json#/parameters/ServerNameParameter" }, { "name": "parameters", @@ -277,7 +277,7 @@ "$ref": "../../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/ServerNameParameter" + "$ref": "../../../common-types/v1/common-types.json#/parameters/ServerNameParameter" }, { "$ref": "#/parameters/ConfigurationTagsParameter" @@ -505,14 +505,6 @@ } }, "parameters": { - "ServerNameParameter": { - "name": "serverName", - "in": "path", - "required": true, - "type": "string", - "description": "The name of the server.", - "x-ms-parameter-location": "method" - }, "ConfigurationNameParameter": { "name": "configurationName", "in": "path", diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/Databases/preview/2021-12-01-preview/Databases.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/Databases/preview/2021-12-01-preview/Databases.json index db628b352d0e..2728d5281a91 100644 --- a/specification/mysql/resource-manager/Microsoft.DBforMySQL/Databases/preview/2021-12-01-preview/Databases.json +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/Databases/preview/2021-12-01-preview/Databases.json @@ -57,7 +57,7 @@ "$ref": "../../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/ServerNameParameter" + "$ref": "../../../common-types/v1/common-types.json#/parameters/ServerNameParameter" }, { "$ref": "#/parameters/DatabaseNameParameter" @@ -119,7 +119,7 @@ "$ref": "../../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/ServerNameParameter" + "$ref": "../../../common-types/v1/common-types.json#/parameters/ServerNameParameter" }, { "$ref": "#/parameters/DatabaseNameParameter" @@ -166,7 +166,7 @@ "$ref": "../../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/ServerNameParameter" + "$ref": "../../../common-types/v1/common-types.json#/parameters/ServerNameParameter" }, { "$ref": "#/parameters/DatabaseNameParameter" @@ -211,7 +211,7 @@ "$ref": "../../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/ServerNameParameter" + "$ref": "../../../common-types/v1/common-types.json#/parameters/ServerNameParameter" } ], "responses": { @@ -300,14 +300,6 @@ } }, "parameters": { - "ServerNameParameter": { - "name": "serverName", - "in": "path", - "required": true, - "type": "string", - "description": "The name of the server.", - "x-ms-parameter-location": "method" - }, "DatabaseNameParameter": { "name": "databaseName", "in": "path", diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/Firewall/preview/2021-12-01-preview/FirewallRules.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/Firewall/preview/2021-12-01-preview/FirewallRules.json index cc08678ee321..7ae01a88fc64 100644 --- a/specification/mysql/resource-manager/Microsoft.DBforMySQL/Firewall/preview/2021-12-01-preview/FirewallRules.json +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/Firewall/preview/2021-12-01-preview/FirewallRules.json @@ -57,7 +57,7 @@ "$ref": "../../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/ServerNameParameter" + "$ref": "../../../common-types/v1/common-types.json#/parameters/ServerNameParameter" }, { "$ref": "#/parameters/FirewallRuleNameParameter" @@ -119,7 +119,7 @@ "$ref": "../../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/ServerNameParameter" + "$ref": "../../../common-types/v1/common-types.json#/parameters/ServerNameParameter" }, { "$ref": "#/parameters/FirewallRuleNameParameter" @@ -166,7 +166,7 @@ "$ref": "../../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/ServerNameParameter" + "$ref": "../../../common-types/v1/common-types.json#/parameters/ServerNameParameter" }, { "$ref": "#/parameters/FirewallRuleNameParameter" @@ -211,7 +211,7 @@ "$ref": "../../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/ServerNameParameter" + "$ref": "../../../common-types/v1/common-types.json#/parameters/ServerNameParameter" } ], "responses": { @@ -309,14 +309,6 @@ } }, "parameters": { - "ServerNameParameter": { - "name": "serverName", - "in": "path", - "required": true, - "type": "string", - "description": "The name of the server.", - "x-ms-parameter-location": "method" - }, "FirewallRuleNameParameter": { "name": "firewallRuleName", "in": "path", diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/LogFiles/preview/2021-12-01-preview/LogFiles.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/LogFiles/preview/2021-12-01-preview/LogFiles.json index 9007edfbf3ff..87ef096d9e45 100644 --- a/specification/mysql/resource-manager/Microsoft.DBforMySQL/LogFiles/preview/2021-12-01-preview/LogFiles.json +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/LogFiles/preview/2021-12-01-preview/LogFiles.json @@ -57,7 +57,7 @@ "$ref": "../../../../../../common-types/resource-management/v3/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/ServerNameParameter" + "$ref": "../../../common-types/v1/common-types.json#/parameters/ServerNameParameter" } ], "responses": { @@ -159,15 +159,5 @@ }, "description": "An error response from the Batch service." } - }, - "parameters": { - "ServerNameParameter": { - "name": "serverName", - "in": "path", - "required": true, - "type": "string", - "description": "The name of the server.", - "x-ms-parameter-location": "method" - } } } From b3a076ec681005709fc81f111932d06db2310cd5 Mon Sep 17 00:00:00 2001 From: Xiaoxu Qi Date: Wed, 19 Apr 2023 14:39:19 +0800 Subject: [PATCH 2/4] fix model validation --- .../preview/2021-12-01-preview/Configurations.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/Configurations/preview/2021-12-01-preview/Configurations.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/Configurations/preview/2021-12-01-preview/Configurations.json index afa491f23c41..fb5de4fc44fd 100644 --- a/specification/mysql/resource-manager/Microsoft.DBforMySQL/Configurations/preview/2021-12-01-preview/Configurations.json +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/Configurations/preview/2021-12-01-preview/Configurations.json @@ -57,7 +57,7 @@ "$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/ServerNameParameter" + "$ref": "../../../common-types/v1/common-types.json#/parameters/ServerNameParameter" }, { "$ref": "#/parameters/ConfigurationNameParameter" From 2614fe6e955fbc68de14e79de5916220ddbd8e97 Mon Sep 17 00:00:00 2001 From: Xiaoxu Qi Date: Sun, 23 Apr 2023 11:08:35 +0800 Subject: [PATCH 3/4] update 2022-01-01 for servernameparameter --- .../2022-01-01/AzureADAdministrator.json | 17 +++-------- .../Backups/stable/2022-01-01/Backups.json | 15 ++-------- .../stable/2022-01-01/Configurations.json | 19 ++++-------- .../stable/2022-01-01/Databases.json | 17 +++-------- .../stable/2022-01-01/FirewallRules.json | 17 +++-------- .../stable/2022-01-01/FlexibleServers.json | 29 ++++++------------- .../LogFiles/stable/2022-01-01/LogFiles.json | 13 +-------- .../stable/2022-01-01/ServiceOperations.json | 9 ------ 8 files changed, 30 insertions(+), 106 deletions(-) diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/AAD/stable/2022-01-01/AzureADAdministrator.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/AAD/stable/2022-01-01/AzureADAdministrator.json index d9938451dca5..d92cf0d182c6 100644 --- a/specification/mysql/resource-manager/Microsoft.DBforMySQL/AAD/stable/2022-01-01/AzureADAdministrator.json +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/AAD/stable/2022-01-01/AzureADAdministrator.json @@ -57,7 +57,7 @@ "$ref": "../../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/ServerNameParameter" + "$ref": "../../../common-types/v1/common-types.json#/parameters/ServerNameParameter" }, { "$ref": "#/parameters/AdministratorNameParameter" @@ -124,7 +124,7 @@ "$ref": "../../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/ServerNameParameter" + "$ref": "../../../common-types/v1/common-types.json#/parameters/ServerNameParameter" }, { "$ref": "#/parameters/AdministratorNameParameter" @@ -179,7 +179,7 @@ "$ref": "../../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/ServerNameParameter" + "$ref": "../../../common-types/v1/common-types.json#/parameters/ServerNameParameter" }, { "$ref": "#/parameters/AdministratorNameParameter" @@ -224,7 +224,7 @@ "$ref": "../../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/ServerNameParameter" + "$ref": "../../../common-types/v1/common-types.json#/parameters/ServerNameParameter" } ], "responses": { @@ -332,15 +332,6 @@ } }, "parameters": { - "ServerNameParameter": { - "name": "serverName", - "in": "path", - "required": true, - "type": "string", - "description": "The name of the server.", - "x-ms-parameter-location": "method", - "pattern": "^[a-z0-9][-a-z0-9]*(? Date: Sun, 23 Apr 2023 11:19:58 +0800 Subject: [PATCH 4/4] unify servernameparameter for 2021-12-01-preview --- .../preview/2021-12-01-preview/Backups.json | 14 ++-------- .../2021-12-01-preview/FlexibleServers.json | 28 ++++++------------- .../2021-12-01-preview/ServiceOperations.json | 8 ------ 3 files changed, 12 insertions(+), 38 deletions(-) diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/Backups/preview/2021-12-01-preview/Backups.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/Backups/preview/2021-12-01-preview/Backups.json index 1cc4d2366a3f..e904894b5f8e 100644 --- a/specification/mysql/resource-manager/Microsoft.DBforMySQL/Backups/preview/2021-12-01-preview/Backups.json +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/Backups/preview/2021-12-01-preview/Backups.json @@ -57,7 +57,7 @@ "$ref": "../../../../../../common-types/resource-management/v3/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/ServerNameParameter" + "$ref": "../../../common-types/v1/common-types.json#/parameters/ServerNameParameter" }, { "$ref": "#/parameters/BackupNameParameter" @@ -100,7 +100,7 @@ "$ref": "../../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/ServerNameParameter" + "$ref": "../../../common-types/v1/common-types.json#/parameters/ServerNameParameter" }, { "$ref": "#/parameters/BackupNameParameter" @@ -145,7 +145,7 @@ "$ref": "../../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/ServerNameParameter" + "$ref": "../../../common-types/v1/common-types.json#/parameters/ServerNameParameter" } ], "responses": { @@ -239,14 +239,6 @@ } }, "parameters": { - "ServerNameParameter": { - "name": "serverName", - "in": "path", - "required": true, - "type": "string", - "description": "The name of the server.", - "x-ms-parameter-location": "method" - }, "BackupNameParameter": { "name": "backupName", "in": "path", diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/FlexibleServers/preview/2021-12-01-preview/FlexibleServers.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/FlexibleServers/preview/2021-12-01-preview/FlexibleServers.json index 29565564cfb9..bddf6ad58f8c 100644 --- a/specification/mysql/resource-manager/Microsoft.DBforMySQL/FlexibleServers/preview/2021-12-01-preview/FlexibleServers.json +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/FlexibleServers/preview/2021-12-01-preview/FlexibleServers.json @@ -66,7 +66,7 @@ "$ref": "../../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/ServerNameParameter" + "$ref": "../../../common-types/v1/common-types.json#/parameters/ServerNameParameter" }, { "name": "parameters", @@ -131,7 +131,7 @@ "$ref": "../../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/ServerNameParameter" + "$ref": "../../../common-types/v1/common-types.json#/parameters/ServerNameParameter" }, { "name": "parameters", @@ -184,7 +184,7 @@ "$ref": "../../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/ServerNameParameter" + "$ref": "../../../common-types/v1/common-types.json#/parameters/ServerNameParameter" } ], "responses": { @@ -234,7 +234,7 @@ "$ref": "../../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/ServerNameParameter" + "$ref": "../../../common-types/v1/common-types.json#/parameters/ServerNameParameter" } ], "responses": { @@ -357,7 +357,7 @@ "$ref": "../../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/ServerNameParameter" + "$ref": "../../../common-types/v1/common-types.json#/parameters/ServerNameParameter" } ], "responses": { @@ -400,7 +400,7 @@ "$ref": "../../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/ServerNameParameter" + "$ref": "../../../common-types/v1/common-types.json#/parameters/ServerNameParameter" }, { "name": "parameters", @@ -452,7 +452,7 @@ "$ref": "../../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/ServerNameParameter" + "$ref": "../../../common-types/v1/common-types.json#/parameters/ServerNameParameter" } ], "responses": { @@ -495,7 +495,7 @@ "$ref": "../../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/ServerNameParameter" + "$ref": "../../../common-types/v1/common-types.json#/parameters/ServerNameParameter" } ], "responses": { @@ -538,7 +538,7 @@ "$ref": "../../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" }, { - "$ref": "#/parameters/ServerNameParameter" + "$ref": "../../../common-types/v1/common-types.json#/parameters/ServerNameParameter" } ], "responses": { @@ -1131,15 +1131,5 @@ }, "description": "An error response from the Batch service." } - }, - "parameters": { - "ServerNameParameter": { - "name": "serverName", - "in": "path", - "required": true, - "type": "string", - "description": "The name of the server.", - "x-ms-parameter-location": "method" - } } } diff --git a/specification/mysql/resource-manager/Microsoft.DBforMySQL/ServiceOperations/preview/2021-12-01-preview/ServiceOperations.json b/specification/mysql/resource-manager/Microsoft.DBforMySQL/ServiceOperations/preview/2021-12-01-preview/ServiceOperations.json index 497f61dbe1ff..7cbd53d47b05 100644 --- a/specification/mysql/resource-manager/Microsoft.DBforMySQL/ServiceOperations/preview/2021-12-01-preview/ServiceOperations.json +++ b/specification/mysql/resource-manager/Microsoft.DBforMySQL/ServiceOperations/preview/2021-12-01-preview/ServiceOperations.json @@ -634,14 +634,6 @@ } }, "parameters": { - "ServerNameParameter": { - "name": "serverName", - "in": "path", - "required": true, - "type": "string", - "description": "The name of the server.", - "x-ms-parameter-location": "method" - }, "LocationNameParameter": { "name": "locationName", "in": "path",