Skip to content

Commit 7c683f5

Browse files
SDKAutosolankisamirmaksimkimpromoishaREDMOND\glfeokti
committed
CodeGen from PR 11549 in Azure/azure-rest-api-specs
Api Management - make /tenant endpoints ARM compliant in 2020-06-01-preview version (#11549) * Adds base for updating Microsoft.ApiManagement from version stable/2019-12-01 to version 2020-06-01-preview * Updates readme * Updates API version in new specs and examples * Add support in API Management for Availability Zones (#10284) * apim in azs * fix prettier check * PATCH should return 200 OK (#10328) * add support for PATCH returning 200 OK * CI fixes prettier fix CI fixes part 2 * Password no longer a mandatory property when uploading Certificates * add missing x-ms-odata extension for filter support * +gatewayhostnameconfiguration protocol changes (#10292) * [2020-06-01-preview] Update Oauth Server secrets Contract (#10602) * Oauth server secrets contract * fix azureMonitor enum * API Management Service Deleted Services Resource (#10607) * API Management Service Deleted Services Resource * Path fix * Lint + custom-words fixes * Location URI parameter for deletedservices Resource * GET for deletedservices by service name * Remove resourceGroupName from resource path * fixes * schema for purge operation * perttier applied * 204 response code added Co-authored-by: REDMOND\glfeokti <glfeokti@microsoft.com> * OperationNameFormat property added to Diagnostic contract (#10641) * OperationNameFormat property added to Diagnostic contract * add azuremonitor to update contract Co-authored-by: REDMOND\glfeokti <glfeokti@microsoft.com> * [Microsoft.ApiManagement][2020-06-01-preview] Change Network Status response contract (#10331) * Change Network Status response contract * Update examples for network status contract * ApiManagement - tenant/settings endpoints * ApiManagement - tenant/settings endpoints fix * ApiManagement - tenant/settings endpoints fix prettier * ApiManagement - tenant/settings endpoints fix 3 * ApiManagement - tenant/settings endpoints fix 4 * ApiManagement - tenant/settings endpoints fix 5 Co-authored-by: Samir Solanki <samirsolanki@outlook.com> Co-authored-by: maksimkim <maksim.kim@gmail.com> Co-authored-by: promoisha <feoktistovgg@gmail.com> Co-authored-by: REDMOND\glfeokti <glfeokti@microsoft.com> Co-authored-by: RupengLiu <rliu1211@terpmail.umd.edu> Co-authored-by: vfedonkin <vifedo@microsoft.com>
1 parent 9cd73d3 commit 7c683f5

File tree

9 files changed

+141
-9
lines changed

9 files changed

+141
-9
lines changed

‎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+
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3427,4 +3427,4 @@
34273427
"description": "Configuration of a virtual network to which API Management service is deployed."
34283428
}
34293429
}
3430-
}
3430+
}

‎schemas/2017-03-01/Microsoft.ApiManagement.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6460,4 +6460,4 @@
64606460
"description": "Properties of server X509Names."
64616461
}
64626462
}
6463-
}
6463+
}

‎schemas/2018-01-01/Microsoft.ApiManagement.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6513,4 +6513,4 @@
65136513
"description": "Properties of server X509Names."
65146514
}
65156515
}
6516-
}
6516+
}

‎schemas/2018-06-01-preview/Microsoft.ApiManagement.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6668,4 +6668,4 @@
66686668
"description": "Properties of server X509Names."
66696669
}
66706670
}
6671-
}
6671+
}

‎schemas/2019-01-01/Microsoft.ApiManagement.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6580,4 +6580,4 @@
65806580
"description": "Properties of server X509Names."
65816581
}
65826582
}
6583-
}
6583+
}

‎schemas/2019-12-01-preview/Microsoft.ApiManagement.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7019,4 +7019,4 @@
70197019
"description": "Properties of server X509Names."
70207020
}
70217021
}
7022-
}
7022+
}

‎schemas/2019-12-01/Microsoft.ApiManagement.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7149,4 +7149,4 @@
71497149
"description": "Properties of server X509Names."
71507150
}
71517151
}
7152-
}
7152+
}

‎schemas/2020-06-01-preview/Microsoft.ApiManagement.json‎

Lines changed: 133 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,9 @@
120120
{
121121
"$ref": "#/definitions/service_subscriptions_childResource"
122122
},
123+
{
124+
"$ref": "#/definitions/service_tenant_childResource"
125+
},
123126
{
124127
"$ref": "#/definitions/service_users_childResource"
125128
}
@@ -2241,6 +2244,56 @@
22412244
],
22422245
"description": "Microsoft.ApiManagement/service/templates"
22432246
},
2247+
"service_tenant": {
2248+
"type": "object",
2249+
"properties": {
2250+
"apiVersion": {
2251+
"type": "string",
2252+
"enum": [
2253+
"2020-06-01-preview"
2254+
]
2255+
},
2256+
"name": {
2257+
"oneOf": [
2258+
{
2259+
"type": "string",
2260+
"enum": [
2261+
"access",
2262+
"getAccess"
2263+
]
2264+
},
2265+
{
2266+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
2267+
}
2268+
],
2269+
"description": "The identifier of the Access configuration."
2270+
},
2271+
"properties": {
2272+
"oneOf": [
2273+
{
2274+
"$ref": "#/definitions/AccessInformationCreateParameterProperties"
2275+
},
2276+
{
2277+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
2278+
}
2279+
],
2280+
"description": "Tenant access information update parameters of the API Management service"
2281+
},
2282+
"type": {
2283+
"type": "string",
2284+
"enum": [
2285+
"Microsoft.ApiManagement/service/tenant"
2286+
]
2287+
}
2288+
},
2289+
"required": [
2290+
"apiVersion",
2291+
"name",
2292+
"properties",
2293+
"type"
2294+
],
2295+
"description": "Microsoft.ApiManagement/service/tenant"
2296+
},
22442297
"service_users": {
22452298
"type": "object",
22462299
"properties": {
@@ -2284,6 +2337,35 @@
22842337
}
22852338
},
22862339
"definitions": {
2340+
"AccessInformationCreateParameterProperties": {
2341+
"type": "object",
2342+
"properties": {
2343+
"enabled": {
2344+
"oneOf": [
2345+
{
2346+
"type": "boolean"
2347+
},
2348+
{
2349+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
2350+
}
2351+
],
2352+
"description": "Determines whether direct access is enabled."
2353+
},
2354+
"primaryKey": {
2355+
"type": "string",
2356+
"description": "Primary access key. This property will not be filled on 'GET' operations! Use '/listSecrets' POST request to get the value."
2357+
},
2358+
"principalId": {
2359+
"type": "string",
2360+
"description": "Principal (User) Identifier."
2361+
},
2362+
"secondaryKey": {
2363+
"type": "string",
2364+
"description": "Secondary access key. This property will not be filled on 'GET' operations! Use '/listSecrets' POST request to get the value."
2365+
}
2366+
},
2367+
"description": "Tenant access information update parameters of the API Management service"
2368+
},
22872369
"AdditionalLocation": {
22882370
"type": "object",
22892371
"properties": {
@@ -6965,6 +7047,56 @@
69657047
],
69667048
"description": "Microsoft.ApiManagement/service/templates"
69677049
},
7050+
"service_tenant_childResource": {
7051+
"type": "object",
7052+
"properties": {
7053+
"apiVersion": {
7054+
"type": "string",
7055+
"enum": [
7056+
"2020-06-01-preview"
7057+
]
7058+
},
7059+
"name": {
7060+
"oneOf": [
7061+
{
7062+
"type": "string",
7063+
"enum": [
7064+
"access",
7065+
"getAccess"
7066+
]
7067+
},
7068+
{
7069+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
7070+
}
7071+
],
7072+
"description": "The identifier of the Access configuration."
7073+
},
7074+
"properties": {
7075+
"oneOf": [
7076+
{
7077+
"$ref": "#/definitions/AccessInformationCreateParameterProperties"
7078+
},
7079+
{
7080+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
7081+
}
7082+
],
7083+
"description": "Tenant access information update parameters of the API Management service"
7084+
},
7085+
"type": {
7086+
"type": "string",
7087+
"enum": [
7088+
"tenant"
7089+
]
7090+
}
7091+
},
7092+
"required": [
7093+
"apiVersion",
7094+
"name",
7095+
"properties",
7096+
"type"
7097+
],
7098+
"description": "Microsoft.ApiManagement/service/tenant"
7099+
},
69687100
"service_users_childResource": {
69697101
"type": "object",
69707102
"properties": {
@@ -7345,4 +7477,4 @@
73457477
"description": "Properties of server X509Names."
73467478
}
73477479
}
7348-
}
7480+
}

0 commit comments

Comments
 (0)