Skip to content

Commit fda03ac

Browse files
xiaoxuqi-msxiaoxuqi-ms
authored
add constraint for servername (#23623)
* add constraint for servername * fix model validation * update 2022-01-01 for servernameparameter * unify servernameparameter for 2021-12-01-preview
1 parent fd0b301 commit fda03ac

File tree

16 files changed

+60
-204
lines changed

16 files changed

+60
-204
lines changed

‎specification/mysql/resource-manager/Microsoft.DBforMySQL/AAD/preview/2021-12-01-preview/AzureADAdministrator.json‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
"$ref": "../../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter"
5858
},
5959
{
60-
"$ref": "#/parameters/ServerNameParameter"
60+
"$ref": "../../../common-types/v1/common-types.json#/parameters/ServerNameParameter"
6161
},
6262
{
6363
"$ref": "#/parameters/AdministratorNameParameter"
@@ -119,7 +119,7 @@
119119
"$ref": "../../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter"
120120
},
121121
{
122-
"$ref": "#/parameters/ServerNameParameter"
122+
"$ref": "../../../common-types/v1/common-types.json#/parameters/ServerNameParameter"
123123
},
124124
{
125125
"$ref": "#/parameters/AdministratorNameParameter"
@@ -169,7 +169,7 @@
169169
"$ref": "../../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter"
170170
},
171171
{
172-
"$ref": "#/parameters/ServerNameParameter"
172+
"$ref": "../../../common-types/v1/common-types.json#/parameters/ServerNameParameter"
173173
},
174174
{
175175
"$ref": "#/parameters/AdministratorNameParameter"
@@ -214,7 +214,7 @@
214214
"$ref": "../../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter"
215215
},
216216
{
217-
"$ref": "#/parameters/ServerNameParameter"
217+
"$ref": "../../../common-types/v1/common-types.json#/parameters/ServerNameParameter"
218218
}
219219
],
220220
"responses": {
@@ -322,14 +322,6 @@
322322
}
323323
},
324324
"parameters": {
325-
"ServerNameParameter": {
326-
"name": "serverName",
327-
"in": "path",
328-
"required": true,
329-
"type": "string",
330-
"description": "The name of the server.",
331-
"x-ms-parameter-location": "method"
332-
},
333325
"AdministratorNameParameter": {
334326
"name": "administratorName",
335327
"in": "path",

‎specification/mysql/resource-manager/Microsoft.DBforMySQL/AAD/stable/2022-01-01/AzureADAdministrator.json‎

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
"$ref": "../../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter"
5858
},
5959
{
60-
"$ref": "#/parameters/ServerNameParameter"
60+
"$ref": "../../../common-types/v1/common-types.json#/parameters/ServerNameParameter"
6161
},
6262
{
6363
"$ref": "#/parameters/AdministratorNameParameter"
@@ -124,7 +124,7 @@
124124
"$ref": "../../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter"
125125
},
126126
{
127-
"$ref": "#/parameters/ServerNameParameter"
127+
"$ref": "../../../common-types/v1/common-types.json#/parameters/ServerNameParameter"
128128
},
129129
{
130130
"$ref": "#/parameters/AdministratorNameParameter"
@@ -179,7 +179,7 @@
179179
"$ref": "../../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter"
180180
},
181181
{
182-
"$ref": "#/parameters/ServerNameParameter"
182+
"$ref": "../../../common-types/v1/common-types.json#/parameters/ServerNameParameter"
183183
},
184184
{
185185
"$ref": "#/parameters/AdministratorNameParameter"
@@ -224,7 +224,7 @@
224224
"$ref": "../../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter"
225225
},
226226
{
227-
"$ref": "#/parameters/ServerNameParameter"
227+
"$ref": "../../../common-types/v1/common-types.json#/parameters/ServerNameParameter"
228228
}
229229
],
230230
"responses": {
@@ -332,15 +332,6 @@
332332
}
333333
},
334334
"parameters": {
335-
"ServerNameParameter": {
336-
"name": "serverName",
337-
"in": "path",
338-
"required": true,
339-
"type": "string",
340-
"description": "The name of the server.",
341-
"x-ms-parameter-location": "method",
342-
"pattern": "^[a-z0-9][-a-z0-9]*(?<!-)$"
343-
},
344335
"AdministratorNameParameter": {
345336
"name": "administratorName",
346337
"in": "path",

‎specification/mysql/resource-manager/Microsoft.DBforMySQL/Backups/preview/2021-12-01-preview/Backups.json‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
"$ref": "../../../../../../common-types/resource-management/v3/types.json#/parameters/ResourceGroupNameParameter"
5858
},
5959
{
60-
"$ref": "#/parameters/ServerNameParameter"
60+
"$ref": "../../../common-types/v1/common-types.json#/parameters/ServerNameParameter"
6161
},
6262
{
6363
"$ref": "#/parameters/BackupNameParameter"
@@ -100,7 +100,7 @@
100100
"$ref": "../../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter"
101101
},
102102
{
103-
"$ref": "#/parameters/ServerNameParameter"
103+
"$ref": "../../../common-types/v1/common-types.json#/parameters/ServerNameParameter"
104104
},
105105
{
106106
"$ref": "#/parameters/BackupNameParameter"
@@ -145,7 +145,7 @@
145145
"$ref": "../../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter"
146146
},
147147
{
148-
"$ref": "#/parameters/ServerNameParameter"
148+
"$ref": "../../../common-types/v1/common-types.json#/parameters/ServerNameParameter"
149149
}
150150
],
151151
"responses": {
@@ -239,14 +239,6 @@
239239
}
240240
},
241241
"parameters": {
242-
"ServerNameParameter": {
243-
"name": "serverName",
244-
"in": "path",
245-
"required": true,
246-
"type": "string",
247-
"description": "The name of the server.",
248-
"x-ms-parameter-location": "method"
249-
},
250242
"BackupNameParameter": {
251243
"name": "backupName",
252244
"in": "path",

‎specification/mysql/resource-manager/Microsoft.DBforMySQL/Backups/stable/2022-01-01/Backups.json‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
"$ref": "../../../../../../common-types/resource-management/v3/types.json#/parameters/ResourceGroupNameParameter"
5858
},
5959
{
60-
"$ref": "#/parameters/ServerNameParameter"
60+
"$ref": "../../../common-types/v1/common-types.json#/parameters/ServerNameParameter"
6161
},
6262
{
6363
"$ref": "#/parameters/BackupNameParameter"
@@ -100,7 +100,7 @@
100100
"$ref": "../../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter"
101101
},
102102
{
103-
"$ref": "#/parameters/ServerNameParameter"
103+
"$ref": "../../../common-types/v1/common-types.json#/parameters/ServerNameParameter"
104104
},
105105
{
106106
"$ref": "#/parameters/BackupNameParameter"
@@ -145,7 +145,7 @@
145145
"$ref": "../../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter"
146146
},
147147
{
148-
"$ref": "#/parameters/ServerNameParameter"
148+
"$ref": "../../../common-types/v1/common-types.json#/parameters/ServerNameParameter"
149149
}
150150
],
151151
"responses": {
@@ -239,15 +239,6 @@
239239
}
240240
},
241241
"parameters": {
242-
"ServerNameParameter": {
243-
"name": "serverName",
244-
"in": "path",
245-
"required": true,
246-
"type": "string",
247-
"description": "The name of the server.",
248-
"x-ms-parameter-location": "method",
249-
"pattern": "^[a-z0-9][-a-z0-9]*(?<!-)$"
250-
},
251242
"BackupNameParameter": {
252243
"name": "backupName",
253244
"in": "path",

‎specification/mysql/resource-manager/Microsoft.DBforMySQL/Configurations/preview/2021-12-01-preview/Configurations.json‎

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
"$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
5858
},
5959
{
60-
"$ref": "#/parameters/ServerNameParameter"
60+
"$ref": "../../../common-types/v1/common-types.json#/parameters/ServerNameParameter"
6161
},
6262
{
6363
"$ref": "#/parameters/ConfigurationNameParameter"
@@ -118,7 +118,7 @@
118118
"$ref": "../../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter"
119119
},
120120
{
121-
"$ref": "#/parameters/ServerNameParameter"
121+
"$ref": "../../../common-types/v1/common-types.json#/parameters/ServerNameParameter"
122122
},
123123
{
124124
"$ref": "#/parameters/ConfigurationNameParameter"
@@ -174,7 +174,7 @@
174174
"$ref": "../../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter"
175175
},
176176
{
177-
"$ref": "#/parameters/ServerNameParameter"
177+
"$ref": "../../../common-types/v1/common-types.json#/parameters/ServerNameParameter"
178178
},
179179
{
180180
"$ref": "#/parameters/ConfigurationNameParameter"
@@ -219,7 +219,7 @@
219219
"$ref": "../../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter"
220220
},
221221
{
222-
"$ref": "#/parameters/ServerNameParameter"
222+
"$ref": "../../../common-types/v1/common-types.json#/parameters/ServerNameParameter"
223223
},
224224
{
225225
"name": "parameters",
@@ -277,7 +277,7 @@
277277
"$ref": "../../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter"
278278
},
279279
{
280-
"$ref": "#/parameters/ServerNameParameter"
280+
"$ref": "../../../common-types/v1/common-types.json#/parameters/ServerNameParameter"
281281
},
282282
{
283283
"$ref": "#/parameters/ConfigurationTagsParameter"
@@ -505,14 +505,6 @@
505505
}
506506
},
507507
"parameters": {
508-
"ServerNameParameter": {
509-
"name": "serverName",
510-
"in": "path",
511-
"required": true,
512-
"type": "string",
513-
"description": "The name of the server.",
514-
"x-ms-parameter-location": "method"
515-
},
516508
"ConfigurationNameParameter": {
517509
"name": "configurationName",
518510
"in": "path",

‎specification/mysql/resource-manager/Microsoft.DBforMySQL/Configurations/stable/2022-01-01/Configurations.json‎

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
"$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter"
5858
},
5959
{
60-
"$ref": "#/parameters/ServerNameParameter"
60+
"$ref": "../../../common-types/v1/common-types.json#/parameters/ServerNameParameter"
6161
},
6262
{
6363
"$ref": "#/parameters/ConfigurationNameParameter"
@@ -118,7 +118,7 @@
118118
"$ref": "../../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter"
119119
},
120120
{
121-
"$ref": "#/parameters/ServerNameParameter"
121+
"$ref": "../../../common-types/v1/common-types.json#/parameters/ServerNameParameter"
122122
},
123123
{
124124
"$ref": "#/parameters/ConfigurationNameParameter"
@@ -179,7 +179,7 @@
179179
"$ref": "../../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter"
180180
},
181181
{
182-
"$ref": "#/parameters/ServerNameParameter"
182+
"$ref": "../../../common-types/v1/common-types.json#/parameters/ServerNameParameter"
183183
},
184184
{
185185
"$ref": "#/parameters/ConfigurationNameParameter"
@@ -224,7 +224,7 @@
224224
"$ref": "../../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter"
225225
},
226226
{
227-
"$ref": "#/parameters/ServerNameParameter"
227+
"$ref": "../../../common-types/v1/common-types.json#/parameters/ServerNameParameter"
228228
},
229229
{
230230
"name": "parameters",
@@ -287,7 +287,7 @@
287287
"$ref": "../../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter"
288288
},
289289
{
290-
"$ref": "#/parameters/ServerNameParameter"
290+
"$ref": "../../../common-types/v1/common-types.json#/parameters/ServerNameParameter"
291291
},
292292
{
293293
"$ref": "#/parameters/ConfigurationTagsParameter"
@@ -515,15 +515,6 @@
515515
}
516516
},
517517
"parameters": {
518-
"ServerNameParameter": {
519-
"name": "serverName",
520-
"in": "path",
521-
"required": true,
522-
"type": "string",
523-
"description": "The name of the server.",
524-
"x-ms-parameter-location": "method",
525-
"pattern": "^[a-z0-9][-a-z0-9]*(?<!-)$"
526-
},
527518
"ConfigurationNameParameter": {
528519
"name": "configurationName",
529520
"in": "path",

‎specification/mysql/resource-manager/Microsoft.DBforMySQL/Databases/preview/2021-12-01-preview/Databases.json‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
"$ref": "../../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter"
5858
},
5959
{
60-
"$ref": "#/parameters/ServerNameParameter"
60+
"$ref": "../../../common-types/v1/common-types.json#/parameters/ServerNameParameter"
6161
},
6262
{
6363
"$ref": "#/parameters/DatabaseNameParameter"
@@ -119,7 +119,7 @@
119119
"$ref": "../../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter"
120120
},
121121
{
122-
"$ref": "#/parameters/ServerNameParameter"
122+
"$ref": "../../../common-types/v1/common-types.json#/parameters/ServerNameParameter"
123123
},
124124
{
125125
"$ref": "#/parameters/DatabaseNameParameter"
@@ -166,7 +166,7 @@
166166
"$ref": "../../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter"
167167
},
168168
{
169-
"$ref": "#/parameters/ServerNameParameter"
169+
"$ref": "../../../common-types/v1/common-types.json#/parameters/ServerNameParameter"
170170
},
171171
{
172172
"$ref": "#/parameters/DatabaseNameParameter"
@@ -211,7 +211,7 @@
211211
"$ref": "../../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter"
212212
},
213213
{
214-
"$ref": "#/parameters/ServerNameParameter"
214+
"$ref": "../../../common-types/v1/common-types.json#/parameters/ServerNameParameter"
215215
}
216216
],
217217
"responses": {
@@ -300,14 +300,6 @@
300300
}
301301
},
302302
"parameters": {
303-
"ServerNameParameter": {
304-
"name": "serverName",
305-
"in": "path",
306-
"required": true,
307-
"type": "string",
308-
"description": "The name of the server.",
309-
"x-ms-parameter-location": "method"
310-
},
311303
"DatabaseNameParameter": {
312304
"name": "databaseName",
313305
"in": "path",

0 commit comments

Comments
 (0)