Skip to content

Commit 3e81435

Browse files
author
SDKAuto
committed
CodeGen from PR 12581 in Azure/azure-rest-api-specs
Merge aa59f189e74885a807761953fa220d73120db6bd into 47b422a4d1ea9f4736739a4a6a19d4a8a2fe54d9
1 parent ffa4141 commit 3e81435

File tree

39 files changed

+70573
-3224
lines changed

39 files changed

+70573
-3224
lines changed

‎schemas/2015-04-01/Microsoft.DomainRegistration.json‎

Lines changed: 153 additions & 184 deletions
Large diffs are not rendered by default.

‎schemas/2015-08-01-preview/Microsoft.Web.json‎

Lines changed: 1229 additions & 0 deletions
Large diffs are not rendered by default.

‎schemas/2015-08-01/Microsoft.CertificateRegistration.json‎

Lines changed: 133 additions & 303 deletions
Large diffs are not rendered by default.

‎schemas/2015-08-01/Microsoft.DomainRegistration.json‎

Lines changed: 464 additions & 0 deletions
Large diffs are not rendered by default.

‎schemas/2015-08-01/Microsoft.Web.json‎

Lines changed: 9314 additions & 381 deletions
Large diffs are not rendered by default.

‎schemas/2016-03-01/Microsoft.Web.json‎

Lines changed: 160 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -7,74 +7,159 @@
77
"certificates": {
88
"type": "object",
99
"properties": {
10+
"apiVersion": {
11+
"type": "string",
12+
"enum": [
13+
"2016-03-01"
14+
]
15+
},
16+
"kind": {
17+
"type": "string",
18+
"description": "Kind of resource."
19+
},
20+
"location": {
21+
"type": "string",
22+
"description": "Resource Location."
23+
},
24+
"name": {
25+
"type": "string",
26+
"description": "Name of the certificate."
27+
},
28+
"properties": {
29+
"oneOf": [
30+
{
31+
"$ref": "#/definitions/CertificateProperties"
32+
},
33+
{
34+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
35+
}
36+
],
37+
"description": "Certificate resource specific properties"
38+
},
39+
"tags": {
40+
"oneOf": [
41+
{
42+
"type": "object",
43+
"additionalProperties": {
44+
"type": "string"
45+
},
46+
"properties": {}
47+
},
48+
{
49+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
50+
}
51+
],
52+
"description": "Resource tags."
53+
},
1054
"type": {
1155
"type": "string",
1256
"enum": [
1357
"Microsoft.Web/certificates"
1458
]
15-
},
59+
}
60+
},
61+
"required": [
62+
"apiVersion",
63+
"location",
64+
"name",
65+
"properties",
66+
"type"
67+
],
68+
"description": "Microsoft.Web/certificates"
69+
}
70+
},
71+
"tenant_resourceDefinitions": {
72+
"publishingUsers": {
73+
"type": "object",
74+
"properties": {
1675
"apiVersion": {
1776
"type": "string",
1877
"enum": [
1978
"2016-03-01"
2079
]
2180
},
81+
"kind": {
82+
"type": "string",
83+
"description": "Kind of resource."
84+
},
85+
"name": {
86+
"type": "string",
87+
"enum": [
88+
"web"
89+
]
90+
},
2291
"properties": {
2392
"oneOf": [
2493
{
25-
"$ref": "#/definitions/Certificate_properties"
94+
"$ref": "#/definitions/UserProperties"
2695
},
2796
{
2897
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
2998
}
3099
],
31-
"description": "ARM envelope properties"
100+
"description": "User resource specific properties"
101+
},
102+
"type": {
103+
"type": "string",
104+
"enum": [
105+
"Microsoft.Web/publishingUsers"
106+
]
32107
}
33108
},
34109
"required": [
35-
"type",
36110
"apiVersion",
37-
"properties"
111+
"name",
112+
"properties",
113+
"type"
38114
],
39-
"description": "Microsoft.Web/certificates"
115+
"description": "Microsoft.Web/publishingUsers"
40116
},
41-
"csrs": {
117+
"sourcecontrols": {
42118
"type": "object",
43119
"properties": {
44-
"type": {
45-
"type": "string",
46-
"enum": [
47-
"Microsoft.Web/csrs"
48-
]
49-
},
50120
"apiVersion": {
51121
"type": "string",
52122
"enum": [
53123
"2016-03-01"
54124
]
55125
},
126+
"kind": {
127+
"type": "string",
128+
"description": "Kind of resource."
129+
},
130+
"name": {
131+
"type": "string",
132+
"description": "Type of source control"
133+
},
56134
"properties": {
57135
"oneOf": [
58136
{
59-
"$ref": "#/definitions/Csr_properties"
137+
"$ref": "#/definitions/SourceControlProperties"
60138
},
61139
{
62140
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
63141
}
64142
],
65-
"description": "ARM envelope properties"
143+
"description": "SourceControl resource specific properties"
144+
},
145+
"type": {
146+
"type": "string",
147+
"enum": [
148+
"Microsoft.Web/sourcecontrols"
149+
]
66150
}
67151
},
68152
"required": [
69-
"type",
70153
"apiVersion",
71-
"properties"
154+
"name",
155+
"properties",
156+
"type"
72157
],
73-
"description": "Microsoft.Web/csrs"
158+
"description": "Microsoft.Web/sourcecontrols"
74159
}
75160
},
76161
"definitions": {
77-
"Certificate_properties": {
162+
"CertificateProperties": {
78163
"type": "object",
79164
"properties": {
80165
"hostNames": {
@@ -91,74 +176,98 @@
91176
],
92177
"description": "Host names the certificate applies to."
93178
},
179+
"keyVaultId": {
180+
"type": "string",
181+
"description": "Key Vault Csm resource Id."
182+
},
183+
"keyVaultSecretName": {
184+
"type": "string",
185+
"description": "Key Vault secret name."
186+
},
187+
"password": {
188+
"type": "string",
189+
"description": "Certificate password."
190+
},
94191
"pfxBlob": {
95192
"oneOf": [
96193
{
97194
"type": "string",
98-
"contentEncoding": "base64"
195+
"pattern": "^(?:[A-Za-z0-9+\\/]{4})*(?:[A-Za-z0-9+\\/]{2}==|[A-Za-z0-9+\\/]{3}=)?$"
99196
},
100197
{
101198
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
102199
}
103200
],
104201
"description": "Pfx blob."
105202
},
106-
"password": {
203+
"serverFarmId": {
107204
"type": "string",
108-
"description": "Certificate password."
205+
"description": "Resource ID of the associated App Service plan, formatted as: \"/subscriptions/{subscriptionID}/resourceGroups/{groupName}/providers/Microsoft.Web/serverfarms/{appServicePlanName}\"."
206+
}
207+
},
208+
"required": [
209+
"password"
210+
],
211+
"description": "Certificate resource specific properties"
212+
},
213+
"SourceControlProperties": {
214+
"type": "object",
215+
"properties": {
216+
"expirationTime": {
217+
"type": "string",
218+
"format": "date-time",
219+
"description": "OAuth token expiration."
109220
},
110-
"cerBlob": {
221+
"name": {
111222
"type": "string",
112-
"description": "Raw bytes of .cer file"
223+
"description": "Name or source control type."
113224
},
114-
"keyVaultId": {
225+
"refreshToken": {
115226
"type": "string",
116-
"description": "Key Vault Csm resource Id."
227+
"description": "OAuth refresh token."
117228
},
118-
"keyVaultSecretName": {
229+
"token": {
119230
"type": "string",
120-
"description": "Key Vault secret name."
231+
"description": "OAuth access token."
121232
},
122-
"serverFarmId": {
233+
"tokenSecret": {
123234
"type": "string",
124-
"description": "Resource ID of the associated App Service plan, formatted as: \"/subscriptions/{subscriptionID}/resourceGroups/{groupName}/providers/Microsoft.Web/serverfarms/{appServicePlanName}\"."
235+
"description": "OAuth access token secret."
125236
}
126237
},
127-
"description": "ARM envelope properties"
238+
"description": "SourceControl resource specific properties"
128239
},
129-
"Csr_properties": {
240+
"UserProperties": {
130241
"type": "object",
131242
"properties": {
132243
"name": {
133244
"type": "string",
134-
"description": "Name used to locate CSR object."
245+
"description": "Username"
135246
},
136-
"distinguishedName": {
247+
"publishingPassword": {
137248
"type": "string",
138-
"description": "Distinguished name of certificate to be created."
249+
"format": "password",
250+
"description": "Password used for publishing."
139251
},
140-
"csrString": {
252+
"publishingPasswordHash": {
141253
"type": "string",
142-
"description": "Actual CSR string created."
254+
"format": "password",
255+
"description": "Password hash used for publishing."
143256
},
144-
"pfxBlob": {
257+
"publishingPasswordHashSalt": {
145258
"type": "string",
146-
"description": "PFX certifcate of created certificate."
259+
"format": "password",
260+
"description": "Password hash salt used for publishing."
147261
},
148-
"password": {
262+
"publishingUserName": {
149263
"type": "string",
150-
"description": "PFX password."
151-
},
152-
"publicKeyHash": {
153-
"type": "string",
154-
"description": "Hash of the certificate's public key."
155-
},
156-
"hostingEnvironment": {
157-
"type": "string",
158-
"description": "App Service Environment."
264+
"description": "Username used for publishing."
159265
}
160266
},
161-
"description": "ARM envelope properties"
267+
"required": [
268+
"publishingUserName"
269+
],
270+
"description": "User resource specific properties"
162271
}
163272
}
164-
}
273+
}

‎schemas/2016-07-07/Microsoft.ApiManagement.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2843,4 +2843,4 @@
28432843
"description": "Configuration of a virtual network to which API Management service is deployed."
28442844
}
28452845
}
2846-
}
2846+
}

0 commit comments

Comments
 (0)