Skip to content

Commit cad7632

Browse files
author
msftbot[bot]
authored
[ReleasePR postgresql] Fix S360 items for FSPG swagger (#2372)
Create to sync Azure/azure-rest-api-specs#18870 [ReCreate this PR](https://github.com/azure-resource-manager-schemas/compare/main...azure-sdk:sdkAuto/postgresql?expand=1)
2 parents 3cc70ed + 885f497 commit cad7632

File tree

2 files changed

+98
-0
lines changed

2 files changed

+98
-0
lines changed

schemas/2021-06-01-preview/Microsoft.DBforPostgreSQL.json

Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,9 @@
4141
},
4242
{
4343
"$ref": "#/definitions/flexibleServers_configurations_childResource"
44+
},
45+
{
46+
"$ref": "#/definitions/flexibleServers_databases_childResource"
4447
}
4548
]
4649
}
@@ -126,6 +129,45 @@
126129
],
127130
"description": "Microsoft.DBforPostgreSQL/flexibleServers/configurations"
128131
},
132+
"flexibleServers_databases": {
133+
"type": "object",
134+
"properties": {
135+
"apiVersion": {
136+
"type": "string",
137+
"enum": [
138+
"2021-06-01-preview"
139+
]
140+
},
141+
"name": {
142+
"type": "string",
143+
"description": "The name of the database."
144+
},
145+
"properties": {
146+
"oneOf": [
147+
{
148+
"$ref": "#/definitions/DatabaseProperties"
149+
},
150+
{
151+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
152+
}
153+
],
154+
"description": "The properties of a database."
155+
},
156+
"type": {
157+
"type": "string",
158+
"enum": [
159+
"Microsoft.DBforPostgreSQL/flexibleServers/databases"
160+
]
161+
}
162+
},
163+
"required": [
164+
"apiVersion",
165+
"name",
166+
"properties",
167+
"type"
168+
],
169+
"description": "Microsoft.DBforPostgreSQL/flexibleServers/databases"
170+
},
129171
"flexibleServers_firewallRules": {
130172
"type": "object",
131173
"properties": {
@@ -214,6 +256,20 @@
214256
},
215257
"description": "The properties of a configuration."
216258
},
259+
"DatabaseProperties": {
260+
"type": "object",
261+
"properties": {
262+
"charset": {
263+
"type": "string",
264+
"description": "The charset of the database."
265+
},
266+
"collation": {
267+
"type": "string",
268+
"description": "The collation of the database."
269+
}
270+
},
271+
"description": "The properties of a database."
272+
},
217273
"FirewallRuleProperties": {
218274
"type": "object",
219275
"properties": {
@@ -287,6 +343,45 @@
287343
],
288344
"description": "Microsoft.DBforPostgreSQL/flexibleServers/configurations"
289345
},
346+
"flexibleServers_databases_childResource": {
347+
"type": "object",
348+
"properties": {
349+
"apiVersion": {
350+
"type": "string",
351+
"enum": [
352+
"2021-06-01-preview"
353+
]
354+
},
355+
"name": {
356+
"type": "string",
357+
"description": "The name of the database."
358+
},
359+
"properties": {
360+
"oneOf": [
361+
{
362+
"$ref": "#/definitions/DatabaseProperties"
363+
},
364+
{
365+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
366+
}
367+
],
368+
"description": "The properties of a database."
369+
},
370+
"type": {
371+
"type": "string",
372+
"enum": [
373+
"databases"
374+
]
375+
}
376+
},
377+
"required": [
378+
"apiVersion",
379+
"name",
380+
"properties",
381+
"type"
382+
],
383+
"description": "Microsoft.DBforPostgreSQL/flexibleServers/databases"
384+
},
290385
"flexibleServers_firewallRules_childResource": {
291386
"type": "object",
292387
"properties": {

schemas/common/autogeneratedResources.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6352,6 +6352,9 @@
63526352
{
63536353
"$ref": "https://schema.management.azure.com/schemas/2021-06-01-preview/Microsoft.DBforPostgreSQL.json#/resourceDefinitions/flexibleServers_configurations"
63546354
},
6355+
{
6356+
"$ref": "https://schema.management.azure.com/schemas/2021-06-01-preview/Microsoft.DBforPostgreSQL.json#/resourceDefinitions/flexibleServers_databases"
6357+
},
63556358
{
63566359
"$ref": "https://schema.management.azure.com/schemas/2021-06-01-preview/Microsoft.DBforPostgreSQL.json#/resourceDefinitions/flexibleServers_firewallRules"
63576360
},

0 commit comments

Comments
 (0)