From 802bc87218d0e96b86c03acad0a30c3aec33b391 Mon Sep 17 00:00:00 2001 From: Shirley Jiang Date: Wed, 13 Jan 2021 13:26:51 -0800 Subject: [PATCH 01/19] changed all "accepted" to 202 --- .../Microsoft.Cdn/stable/2020-09-01/afdx.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/afdx.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/afdx.json index 169f15f3e2a4..aed7df0dd0f4 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/afdx.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/afdx.json @@ -416,7 +416,7 @@ } ], "responses": { - "200": { + "202": { "description": "Accepted" }, "204": { @@ -770,7 +770,7 @@ } ], "responses": { - "200": { + "202": { "description": "Accepted" }, "204": { @@ -1251,7 +1251,7 @@ } ], "responses": { - "200": { + "202": { "description": "Accepted" }, "204": { @@ -1639,7 +1639,7 @@ } ], "responses": { - "200": { + "202": { "description": "Accepted" }, "204": { @@ -1971,7 +1971,7 @@ } ], "responses": { - "200": { + "202": { "description": "Accepted" }, "204": { @@ -2586,7 +2586,7 @@ } ], "responses": { - "200": { + "202": { "description": "Accepted" }, "204": { @@ -2883,7 +2883,7 @@ } ], "responses": { - "200": { + "202": { "description": "Accepted" }, "204": { @@ -3180,7 +3180,7 @@ } ], "responses": { - "200": { + "202": { "description": "Accepted" }, "204": { From 28f69bb0c57188d6c62b2284f03df12baf5c6057 Mon Sep 17 00:00:00 2001 From: Shirley Jiang Date: Fri, 15 Jan 2021 13:22:07 -0800 Subject: [PATCH 02/19] fix validation errors --- .../Microsoft.Cdn/stable/2020-09-01/afdx.json | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/afdx.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/afdx.json index aed7df0dd0f4..b94b03346d16 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/afdx.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/afdx.json @@ -416,6 +416,9 @@ } ], "responses": { + "200":{ + "description": "OK. The request has succeeded." + }, "202": { "description": "Accepted" }, @@ -770,6 +773,9 @@ } ], "responses": { + "200":{ + "description": "OK. The request has succeeded." + }, "202": { "description": "Accepted" }, @@ -1251,6 +1257,9 @@ } ], "responses": { + "200":{ + "description": "OK. The request has succeeded." + }, "202": { "description": "Accepted" }, @@ -1639,6 +1648,9 @@ } ], "responses": { + "200":{ + "description": "OK. The request has succeeded." + }, "202": { "description": "Accepted" }, @@ -1971,6 +1983,9 @@ } ], "responses": { + "200":{ + "description": "OK. The request has succeeded." + }, "202": { "description": "Accepted" }, @@ -2586,6 +2601,9 @@ } ], "responses": { + "200":{ + "description": "OK. The request has succeeded." + }, "202": { "description": "Accepted" }, @@ -2883,6 +2901,9 @@ } ], "responses": { + "200":{ + "description": "OK. The request has succeeded." + }, "202": { "description": "Accepted" }, @@ -3180,6 +3201,9 @@ } ], "responses": { + "200":{ + "description": "OK. The request has succeeded." + }, "202": { "description": "Accepted" }, From 81f03a166d74d5fef0cc5ad618121286d731bfd3 Mon Sep 17 00:00:00 2001 From: Shirley Jiang Date: Fri, 15 Jan 2021 13:27:05 -0800 Subject: [PATCH 03/19] adding 202 to examples --- .../stable/2020-09-01/examples/AFDCustomDomains_Delete.json | 1 + .../stable/2020-09-01/examples/AFDEndpoints_Delete.json | 1 + .../stable/2020-09-01/examples/AFDOriginGroups_Delete.json | 1 + .../stable/2020-09-01/examples/AFDOrigins_Delete.json | 1 + .../Microsoft.Cdn/stable/2020-09-01/examples/Routes_Delete.json | 1 + .../Microsoft.Cdn/stable/2020-09-01/examples/Rules_Delete.json | 1 + .../Microsoft.Cdn/stable/2020-09-01/examples/Secrets_Delete.json | 1 + .../stable/2020-09-01/examples/SecurityPolicies_Delete.json | 1 + 8 files changed, 8 insertions(+) diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/AFDCustomDomains_Delete.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/AFDCustomDomains_Delete.json index 38d320c0f1fa..f233c45af357 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/AFDCustomDomains_Delete.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/AFDCustomDomains_Delete.json @@ -8,6 +8,7 @@ }, "responses": { "200": {}, + "202": {}, "204": {} } } diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/AFDEndpoints_Delete.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/AFDEndpoints_Delete.json index c571c70d52c3..605da1b63877 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/AFDEndpoints_Delete.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/AFDEndpoints_Delete.json @@ -8,6 +8,7 @@ }, "responses": { "200": {}, + "202": {}, "204": {} } } diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/AFDOriginGroups_Delete.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/AFDOriginGroups_Delete.json index b80edaab2cdf..a87851b7b7b2 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/AFDOriginGroups_Delete.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/AFDOriginGroups_Delete.json @@ -8,6 +8,7 @@ }, "responses": { "200": {}, + "202": {}, "204": {} } } diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/AFDOrigins_Delete.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/AFDOrigins_Delete.json index fb3830579403..9fdf16cd95a9 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/AFDOrigins_Delete.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/AFDOrigins_Delete.json @@ -9,6 +9,7 @@ }, "responses": { "200": {}, + "202": {}, "204": {} } } diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Routes_Delete.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Routes_Delete.json index ac780fb5573e..b23efb044f8e 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Routes_Delete.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Routes_Delete.json @@ -9,6 +9,7 @@ }, "responses": { "200": {}, + "202": {}, "204": {} } } diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Rules_Delete.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Rules_Delete.json index 06ed6ae89044..c3ea629d2bd7 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Rules_Delete.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Rules_Delete.json @@ -9,6 +9,7 @@ }, "responses": { "200": {}, + "202": {}, "204": {} } } diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Secrets_Delete.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Secrets_Delete.json index d605d3376be5..15ecc49306c0 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Secrets_Delete.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Secrets_Delete.json @@ -8,6 +8,7 @@ }, "responses": { "200": {}, + "202": {}, "204": {} } } diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/SecurityPolicies_Delete.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/SecurityPolicies_Delete.json index 23195d9576c3..471269f41d67 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/SecurityPolicies_Delete.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/SecurityPolicies_Delete.json @@ -8,6 +8,7 @@ }, "responses": { "200": {}, + "202": {}, "204": {} } } From 52036d3bccf0b5e0b1be6369937012294d2fe608 Mon Sep 17 00:00:00 2001 From: Shirley Jiang Date: Fri, 15 Jan 2021 13:40:09 -0800 Subject: [PATCH 04/19] prettier check --- .../Microsoft.Cdn/stable/2020-09-01/afdx.json | 16 ++-- .../2020-11-01/webapplicationfirewall.json | 35 +++++---- .../DeleteRoleDefinition-example.json | 56 +++++++------- .../examples/GetRoleDefinition-example.json | 56 +++++++------- .../examples/PutRoleDefinition-example.json | 75 ++++++++++--------- 5 files changed, 122 insertions(+), 116 deletions(-) diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/afdx.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/afdx.json index b94b03346d16..42b937c2fb43 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/afdx.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/afdx.json @@ -416,7 +416,7 @@ } ], "responses": { - "200":{ + "200": { "description": "OK. The request has succeeded." }, "202": { @@ -773,7 +773,7 @@ } ], "responses": { - "200":{ + "200": { "description": "OK. The request has succeeded." }, "202": { @@ -1257,7 +1257,7 @@ } ], "responses": { - "200":{ + "200": { "description": "OK. The request has succeeded." }, "202": { @@ -1648,7 +1648,7 @@ } ], "responses": { - "200":{ + "200": { "description": "OK. The request has succeeded." }, "202": { @@ -1983,7 +1983,7 @@ } ], "responses": { - "200":{ + "200": { "description": "OK. The request has succeeded." }, "202": { @@ -2601,7 +2601,7 @@ } ], "responses": { - "200":{ + "200": { "description": "OK. The request has succeeded." }, "202": { @@ -2901,7 +2901,7 @@ } ], "responses": { - "200":{ + "200": { "description": "OK. The request has succeeded." }, "202": { @@ -3201,7 +3201,7 @@ } ], "responses": { - "200":{ + "200": { "description": "OK. The request has succeeded." }, "202": { diff --git a/specification/frontdoor/resource-manager/Microsoft.Network/stable/2020-11-01/webapplicationfirewall.json b/specification/frontdoor/resource-manager/Microsoft.Network/stable/2020-11-01/webapplicationfirewall.json index e99c00931d41..b3d6bec99686 100644 --- a/specification/frontdoor/resource-manager/Microsoft.Network/stable/2020-11-01/webapplicationfirewall.json +++ b/specification/frontdoor/resource-manager/Microsoft.Network/stable/2020-11-01/webapplicationfirewall.json @@ -1,4 +1,3 @@ - { "swagger": "2.0", "info": { @@ -339,24 +338,24 @@ } }, "Sku": { - "description": "The pricing tier of the web application firewall policy.", - "properties": { - "name": { - "description": "Name of the pricing tier.", - "enum": [ - "Classic_AzureFrontDoor", - "Standard_AzureFrontDoor", - "Premium_AzureFrontDoor" - ], - "type": "string", - "x-ms-enum": { - "name": "SkuName", - "modelAsString": true + "description": "The pricing tier of the web application firewall policy.", + "properties": { + "name": { + "description": "Name of the pricing tier.", + "enum": [ + "Classic_AzureFrontDoor", + "Standard_AzureFrontDoor", + "Premium_AzureFrontDoor" + ], + "type": "string", + "x-ms-enum": { + "name": "SkuName", + "modelAsString": true + } } - } + }, + "type": "object" }, - "type": "object" - }, "WebApplicationFirewallPolicyList": { "description": "Defines a list of WebApplicationFirewallPolicies. It contains a list of WebApplicationFirewallPolicy objects and a URL link to get the next set of results.", "properties": { @@ -951,4 +950,4 @@ "description": "Name of the Resource group within the Azure subscription." } } -} \ No newline at end of file +} diff --git a/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.2-preview/examples/DeleteRoleDefinition-example.json b/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.2-preview/examples/DeleteRoleDefinition-example.json index d707b2b24e5a..19cfc1f4c14f 100644 --- a/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.2-preview/examples/DeleteRoleDefinition-example.json +++ b/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.2-preview/examples/DeleteRoleDefinition-example.json @@ -1,30 +1,32 @@ { - "parameters": { - "vaultBaseUrl": "https://myvault.vault.azure.net/", - "scope": "", - "api-version": "7.2-preview", - "roleDefinitionName": "00000000-0000-0000-0000-000000000000" - }, - "responses": { - "200": { - "body": { - "properties": { - "roleName": "My custom role", - "type": "CustomRole", - "description": "Role description", - "assignableScopes": [ - "/" - ], - "permissions": [ - { - "dataActions": [ "Microsoft.KeyVault/managedHsm/keys/sign/action" ], - } - ] - }, - "id": "Microsoft.KeyVault/providers/Microsoft.Authorization/roleDefinitions/00000000-0000-0000-0000-000000000000", - "type": "Microsoft.Authorization/roleDefinitions", - "name": "00000000-0000-0000-0000-000000000000" + "parameters": { + "vaultBaseUrl": "https://myvault.vault.azure.net/", + "scope": "", + "api-version": "7.2-preview", + "roleDefinitionName": "00000000-0000-0000-0000-000000000000" + }, + "responses": { + "200": { + "body": { + "properties": { + "roleName": "My custom role", + "type": "CustomRole", + "description": "Role description", + "assignableScopes": [ + "/" + ], + "permissions": [ + { + "dataActions": [ + "Microsoft.KeyVault/managedHsm/keys/sign/action" + ] } - } + ] + }, + "id": "Microsoft.KeyVault/providers/Microsoft.Authorization/roleDefinitions/00000000-0000-0000-0000-000000000000", + "type": "Microsoft.Authorization/roleDefinitions", + "name": "00000000-0000-0000-0000-000000000000" + } } -} \ No newline at end of file + } +} diff --git a/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.2-preview/examples/GetRoleDefinition-example.json b/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.2-preview/examples/GetRoleDefinition-example.json index d707b2b24e5a..19cfc1f4c14f 100644 --- a/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.2-preview/examples/GetRoleDefinition-example.json +++ b/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.2-preview/examples/GetRoleDefinition-example.json @@ -1,30 +1,32 @@ { - "parameters": { - "vaultBaseUrl": "https://myvault.vault.azure.net/", - "scope": "", - "api-version": "7.2-preview", - "roleDefinitionName": "00000000-0000-0000-0000-000000000000" - }, - "responses": { - "200": { - "body": { - "properties": { - "roleName": "My custom role", - "type": "CustomRole", - "description": "Role description", - "assignableScopes": [ - "/" - ], - "permissions": [ - { - "dataActions": [ "Microsoft.KeyVault/managedHsm/keys/sign/action" ], - } - ] - }, - "id": "Microsoft.KeyVault/providers/Microsoft.Authorization/roleDefinitions/00000000-0000-0000-0000-000000000000", - "type": "Microsoft.Authorization/roleDefinitions", - "name": "00000000-0000-0000-0000-000000000000" + "parameters": { + "vaultBaseUrl": "https://myvault.vault.azure.net/", + "scope": "", + "api-version": "7.2-preview", + "roleDefinitionName": "00000000-0000-0000-0000-000000000000" + }, + "responses": { + "200": { + "body": { + "properties": { + "roleName": "My custom role", + "type": "CustomRole", + "description": "Role description", + "assignableScopes": [ + "/" + ], + "permissions": [ + { + "dataActions": [ + "Microsoft.KeyVault/managedHsm/keys/sign/action" + ] } - } + ] + }, + "id": "Microsoft.KeyVault/providers/Microsoft.Authorization/roleDefinitions/00000000-0000-0000-0000-000000000000", + "type": "Microsoft.Authorization/roleDefinitions", + "name": "00000000-0000-0000-0000-000000000000" + } } -} \ No newline at end of file + } +} diff --git a/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.2-preview/examples/PutRoleDefinition-example.json b/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.2-preview/examples/PutRoleDefinition-example.json index 473984477f83..5fc91af6df4e 100644 --- a/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.2-preview/examples/PutRoleDefinition-example.json +++ b/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.2-preview/examples/PutRoleDefinition-example.json @@ -1,43 +1,46 @@ { + "parameters": { + "vaultBaseUrl": "https://myvault.vault.azure.net/", + "scope": "keys", + "roleDefinitionName": "00000000-0000-0000-0000-000000000000", "parameters": { - "vaultBaseUrl": "https://myvault.vault.azure.net/", - "scope": "keys", - "roleDefinitionName": "00000000-0000-0000-0000-000000000000", - "parameters": { - "properties": { - "roleName": "My custom role", - "type": "CustomRole", - "description": "Role description", - "permissions": [ - { - "dataActions": [ "Microsoft.KeyVault/managedHsm/keys/sign/action" ], - } + "properties": { + "roleName": "My custom role", + "type": "CustomRole", + "description": "Role description", + "permissions": [ + { + "dataActions": [ + "Microsoft.KeyVault/managedHsm/keys/sign/action" ] - } - }, - "api-version": "7.2-preview" + } + ] + } }, - "responses": { - "201": { - "body": { - "properties": { - "roleName": "My custom role", - "type": "CustomRole", - "description": "Role description", - "assignableScopes": [ - "/" - ], - "permissions": [ - { - "dataActions": [ "Microsoft.KeyVault/managedHsm/keys/sign/action" ], - } - ] - }, - "id": "Microsoft.KeyVault/providers/Microsoft.Authorization/roleDefinitions/00000000-0000-0000-0000-000000000000", - "type": "Microsoft.Authorization/roleDefinitions", - "name": "00000000-0000-0000-0000-000000000000" - } + "api-version": "7.2-preview" + }, + "responses": { + "201": { + "body": { + "properties": { + "roleName": "My custom role", + "type": "CustomRole", + "description": "Role description", + "assignableScopes": [ + "/" + ], + "permissions": [ + { + "dataActions": [ + "Microsoft.KeyVault/managedHsm/keys/sign/action" + ] + } + ] + }, + "id": "Microsoft.KeyVault/providers/Microsoft.Authorization/roleDefinitions/00000000-0000-0000-0000-000000000000", + "type": "Microsoft.Authorization/roleDefinitions", + "name": "00000000-0000-0000-0000-000000000000" } } } - \ No newline at end of file +} From 180555031057bc253cfe09432585a680b5c2a7cf Mon Sep 17 00:00:00 2001 From: Shirley Jiang Date: Wed, 20 Jan 2021 16:51:26 -0800 Subject: [PATCH 05/19] updated maxRanking, removed certificate association, and reverted prettifier changes to KV --- .../Microsoft.Cdn/stable/2020-09-01/afdx.json | 12 ++--- .../DeleteRoleDefinition-example.json | 50 +++++++++---------- .../examples/GetRoleDefinition-example.json | 50 +++++++++---------- .../examples/PutRoleDefinition-example.json | 50 +++++++++---------- 4 files changed, 75 insertions(+), 87 deletions(-) diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/afdx.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/afdx.json index 42b937c2fb43..f2411c956ea1 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/afdx.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/afdx.json @@ -3473,7 +3473,8 @@ "name": "maxRanking", "in": "query", "required": true, - "type": "number" + "type": "integer", + "format": "int32" }, { "name": "dateTimeBegin", @@ -3791,7 +3792,8 @@ "name": "maxRanking", "in": "query", "required": true, - "type": "number" + "type": "integer", + "format": "int32" }, { "name": "rankings", @@ -4484,9 +4486,6 @@ "allOf": [ { "$ref": "#/definitions/SecretParameters" - }, - { - "$ref": "#/definitions/Certificate" } ] }, @@ -4497,9 +4496,6 @@ "allOf": [ { "$ref": "#/definitions/SecretParameters" - }, - { - "$ref": "#/definitions/Certificate" } ], "required": [ diff --git a/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.2-preview/examples/DeleteRoleDefinition-example.json b/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.2-preview/examples/DeleteRoleDefinition-example.json index 19cfc1f4c14f..f31cb93f0330 100644 --- a/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.2-preview/examples/DeleteRoleDefinition-example.json +++ b/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.2-preview/examples/DeleteRoleDefinition-example.json @@ -1,32 +1,30 @@ { "parameters": { - "vaultBaseUrl": "https://myvault.vault.azure.net/", - "scope": "", - "api-version": "7.2-preview", - "roleDefinitionName": "00000000-0000-0000-0000-000000000000" + "vaultBaseUrl": "https://myvault.vault.azure.net/", + "scope": "", + "api-version": "7.2-preview", + "roleDefinitionName": "00000000-0000-0000-0000-000000000000" }, "responses": { - "200": { - "body": { - "properties": { - "roleName": "My custom role", - "type": "CustomRole", - "description": "Role description", - "assignableScopes": [ - "/" - ], - "permissions": [ - { - "dataActions": [ - "Microsoft.KeyVault/managedHsm/keys/sign/action" - ] - } - ] - }, - "id": "Microsoft.KeyVault/providers/Microsoft.Authorization/roleDefinitions/00000000-0000-0000-0000-000000000000", - "type": "Microsoft.Authorization/roleDefinitions", - "name": "00000000-0000-0000-0000-000000000000" + "200": { + "body": { + "properties": { + "roleName": "My custom role", + "type": "CustomRole", + "description": "Role description", + "assignableScopes": [ + "/" + ], + "permissions": [ + { + "dataActions": [ "Microsoft.KeyVault/managedHsm/keys/sign/action" ], + } + ] + }, + "id": "Microsoft.KeyVault/providers/Microsoft.Authorization/roleDefinitions/00000000-0000-0000-0000-000000000000", + "type": "Microsoft.Authorization/roleDefinitions", + "name": "00000000-0000-0000-0000-000000000000" + } } - } } -} +} \ No newline at end of file diff --git a/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.2-preview/examples/GetRoleDefinition-example.json b/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.2-preview/examples/GetRoleDefinition-example.json index 19cfc1f4c14f..f31cb93f0330 100644 --- a/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.2-preview/examples/GetRoleDefinition-example.json +++ b/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.2-preview/examples/GetRoleDefinition-example.json @@ -1,32 +1,30 @@ { "parameters": { - "vaultBaseUrl": "https://myvault.vault.azure.net/", - "scope": "", - "api-version": "7.2-preview", - "roleDefinitionName": "00000000-0000-0000-0000-000000000000" + "vaultBaseUrl": "https://myvault.vault.azure.net/", + "scope": "", + "api-version": "7.2-preview", + "roleDefinitionName": "00000000-0000-0000-0000-000000000000" }, "responses": { - "200": { - "body": { - "properties": { - "roleName": "My custom role", - "type": "CustomRole", - "description": "Role description", - "assignableScopes": [ - "/" - ], - "permissions": [ - { - "dataActions": [ - "Microsoft.KeyVault/managedHsm/keys/sign/action" - ] - } - ] - }, - "id": "Microsoft.KeyVault/providers/Microsoft.Authorization/roleDefinitions/00000000-0000-0000-0000-000000000000", - "type": "Microsoft.Authorization/roleDefinitions", - "name": "00000000-0000-0000-0000-000000000000" + "200": { + "body": { + "properties": { + "roleName": "My custom role", + "type": "CustomRole", + "description": "Role description", + "assignableScopes": [ + "/" + ], + "permissions": [ + { + "dataActions": [ "Microsoft.KeyVault/managedHsm/keys/sign/action" ], + } + ] + }, + "id": "Microsoft.KeyVault/providers/Microsoft.Authorization/roleDefinitions/00000000-0000-0000-0000-000000000000", + "type": "Microsoft.Authorization/roleDefinitions", + "name": "00000000-0000-0000-0000-000000000000" + } } - } } -} +} \ No newline at end of file diff --git a/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.2-preview/examples/PutRoleDefinition-example.json b/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.2-preview/examples/PutRoleDefinition-example.json index 5fc91af6df4e..edf93f7bf699 100644 --- a/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.2-preview/examples/PutRoleDefinition-example.json +++ b/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.2-preview/examples/PutRoleDefinition-example.json @@ -5,16 +5,14 @@ "roleDefinitionName": "00000000-0000-0000-0000-000000000000", "parameters": { "properties": { - "roleName": "My custom role", - "type": "CustomRole", - "description": "Role description", - "permissions": [ - { - "dataActions": [ - "Microsoft.KeyVault/managedHsm/keys/sign/action" - ] - } - ] + "roleName": "My custom role", + "type": "CustomRole", + "description": "Role description", + "permissions": [ + { + "dataActions": [ "Microsoft.KeyVault/managedHsm/keys/sign/action" ], + } + ] } }, "api-version": "7.2-preview" @@ -22,24 +20,22 @@ "responses": { "201": { "body": { - "properties": { - "roleName": "My custom role", - "type": "CustomRole", - "description": "Role description", - "assignableScopes": [ - "/" - ], - "permissions": [ - { - "dataActions": [ - "Microsoft.KeyVault/managedHsm/keys/sign/action" + "properties": { + "roleName": "My custom role", + "type": "CustomRole", + "description": "Role description", + "assignableScopes": [ + "/" + ], + "permissions": [ + { + "dataActions": [ "Microsoft.KeyVault/managedHsm/keys/sign/action" ], + } ] - } - ] - }, - "id": "Microsoft.KeyVault/providers/Microsoft.Authorization/roleDefinitions/00000000-0000-0000-0000-000000000000", - "type": "Microsoft.Authorization/roleDefinitions", - "name": "00000000-0000-0000-0000-000000000000" + }, + "id": "Microsoft.KeyVault/providers/Microsoft.Authorization/roleDefinitions/00000000-0000-0000-0000-000000000000", + "type": "Microsoft.Authorization/roleDefinitions", + "name": "00000000-0000-0000-0000-000000000000" } } } From 76828a79decd37aaff63a45b6be5c918645321a8 Mon Sep 17 00:00:00 2001 From: Shirley Jiang Date: Wed, 20 Jan 2021 16:54:47 -0800 Subject: [PATCH 06/19] reverting prettifier changes again --- .../DeleteRoleDefinition-example.json | 48 +++++++++-------- .../examples/GetRoleDefinition-example.json | 48 +++++++++-------- .../examples/PutRoleDefinition-example.json | 52 ++++++++++--------- 3 files changed, 78 insertions(+), 70 deletions(-) diff --git a/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.2-preview/examples/DeleteRoleDefinition-example.json b/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.2-preview/examples/DeleteRoleDefinition-example.json index f31cb93f0330..2f1f9696de2f 100644 --- a/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.2-preview/examples/DeleteRoleDefinition-example.json +++ b/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.2-preview/examples/DeleteRoleDefinition-example.json @@ -1,30 +1,32 @@ { - "parameters": { + "parameters": { "vaultBaseUrl": "https://myvault.vault.azure.net/", "scope": "", "api-version": "7.2-preview", "roleDefinitionName": "00000000-0000-0000-0000-000000000000" - }, - "responses": { + }, + "responses": { "200": { - "body": { - "properties": { - "roleName": "My custom role", - "type": "CustomRole", - "description": "Role description", - "assignableScopes": [ - "/" - ], - "permissions": [ - { - "dataActions": [ "Microsoft.KeyVault/managedHsm/keys/sign/action" ], - } - ] - }, - "id": "Microsoft.KeyVault/providers/Microsoft.Authorization/roleDefinitions/00000000-0000-0000-0000-000000000000", - "type": "Microsoft.Authorization/roleDefinitions", - "name": "00000000-0000-0000-0000-000000000000" - } + "body": { + "properties": { + "roleName": "My custom role", + "type": "CustomRole", + "description": "Role description", + "assignableScopes": [ + "/" + ], + "permissions": [ + { + "dataActions": [ + "Microsoft.KeyVault/managedHsm/keys/sign/action" + ] + } + ] + }, + "id": "Microsoft.KeyVault/providers/Microsoft.Authorization/roleDefinitions/00000000-0000-0000-0000-000000000000", + "type": "Microsoft.Authorization/roleDefinitions", + "name": "00000000-0000-0000-0000-000000000000" + } } - } -} \ No newline at end of file + } + } \ No newline at end of file diff --git a/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.2-preview/examples/GetRoleDefinition-example.json b/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.2-preview/examples/GetRoleDefinition-example.json index f31cb93f0330..2f1f9696de2f 100644 --- a/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.2-preview/examples/GetRoleDefinition-example.json +++ b/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.2-preview/examples/GetRoleDefinition-example.json @@ -1,30 +1,32 @@ { - "parameters": { + "parameters": { "vaultBaseUrl": "https://myvault.vault.azure.net/", "scope": "", "api-version": "7.2-preview", "roleDefinitionName": "00000000-0000-0000-0000-000000000000" - }, - "responses": { + }, + "responses": { "200": { - "body": { - "properties": { - "roleName": "My custom role", - "type": "CustomRole", - "description": "Role description", - "assignableScopes": [ - "/" - ], - "permissions": [ - { - "dataActions": [ "Microsoft.KeyVault/managedHsm/keys/sign/action" ], - } - ] - }, - "id": "Microsoft.KeyVault/providers/Microsoft.Authorization/roleDefinitions/00000000-0000-0000-0000-000000000000", - "type": "Microsoft.Authorization/roleDefinitions", - "name": "00000000-0000-0000-0000-000000000000" - } + "body": { + "properties": { + "roleName": "My custom role", + "type": "CustomRole", + "description": "Role description", + "assignableScopes": [ + "/" + ], + "permissions": [ + { + "dataActions": [ + "Microsoft.KeyVault/managedHsm/keys/sign/action" + ] + } + ] + }, + "id": "Microsoft.KeyVault/providers/Microsoft.Authorization/roleDefinitions/00000000-0000-0000-0000-000000000000", + "type": "Microsoft.Authorization/roleDefinitions", + "name": "00000000-0000-0000-0000-000000000000" + } } - } -} \ No newline at end of file + } + } \ No newline at end of file diff --git a/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.2-preview/examples/PutRoleDefinition-example.json b/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.2-preview/examples/PutRoleDefinition-example.json index edf93f7bf699..eec9e4285764 100644 --- a/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.2-preview/examples/PutRoleDefinition-example.json +++ b/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.2-preview/examples/PutRoleDefinition-example.json @@ -5,14 +5,16 @@ "roleDefinitionName": "00000000-0000-0000-0000-000000000000", "parameters": { "properties": { - "roleName": "My custom role", - "type": "CustomRole", - "description": "Role description", - "permissions": [ - { - "dataActions": [ "Microsoft.KeyVault/managedHsm/keys/sign/action" ], - } - ] + "roleName": "My custom role", + "type": "CustomRole", + "description": "Role description", + "permissions": [ + { + "dataActions": [ + "Microsoft.KeyVault/managedHsm/keys/sign/action" + ] + } + ] } }, "api-version": "7.2-preview" @@ -20,23 +22,25 @@ "responses": { "201": { "body": { - "properties": { - "roleName": "My custom role", - "type": "CustomRole", - "description": "Role description", - "assignableScopes": [ - "/" - ], - "permissions": [ - { - "dataActions": [ "Microsoft.KeyVault/managedHsm/keys/sign/action" ], - } + "properties": { + "roleName": "My custom role", + "type": "CustomRole", + "description": "Role description", + "assignableScopes": [ + "/" + ], + "permissions": [ + { + "dataActions": [ + "Microsoft.KeyVault/managedHsm/keys/sign/action" ] - }, - "id": "Microsoft.KeyVault/providers/Microsoft.Authorization/roleDefinitions/00000000-0000-0000-0000-000000000000", - "type": "Microsoft.Authorization/roleDefinitions", - "name": "00000000-0000-0000-0000-000000000000" + } + ] + }, + "id": "Microsoft.KeyVault/providers/Microsoft.Authorization/roleDefinitions/00000000-0000-0000-0000-000000000000", + "type": "Microsoft.Authorization/roleDefinitions", + "name": "00000000-0000-0000-0000-000000000000" } } } -} +} \ No newline at end of file From 101d6050af62224b30413d8f2fcd80ed68e15f51 Mon Sep 17 00:00:00 2001 From: Shirley Jiang Date: Wed, 20 Jan 2021 16:58:45 -0800 Subject: [PATCH 07/19] revert yet again --- .../2020-11-01/webapplicationfirewall.json | 35 ++++----- .../DeleteRoleDefinition-example.json | 50 ++++++------- .../examples/GetRoleDefinition-example.json | 50 ++++++------- .../examples/PutRoleDefinition-example.json | 75 +++++++++---------- 4 files changed, 102 insertions(+), 108 deletions(-) diff --git a/specification/frontdoor/resource-manager/Microsoft.Network/stable/2020-11-01/webapplicationfirewall.json b/specification/frontdoor/resource-manager/Microsoft.Network/stable/2020-11-01/webapplicationfirewall.json index b3d6bec99686..e99c00931d41 100644 --- a/specification/frontdoor/resource-manager/Microsoft.Network/stable/2020-11-01/webapplicationfirewall.json +++ b/specification/frontdoor/resource-manager/Microsoft.Network/stable/2020-11-01/webapplicationfirewall.json @@ -1,3 +1,4 @@ + { "swagger": "2.0", "info": { @@ -338,24 +339,24 @@ } }, "Sku": { - "description": "The pricing tier of the web application firewall policy.", - "properties": { - "name": { - "description": "Name of the pricing tier.", - "enum": [ - "Classic_AzureFrontDoor", - "Standard_AzureFrontDoor", - "Premium_AzureFrontDoor" - ], - "type": "string", - "x-ms-enum": { - "name": "SkuName", - "modelAsString": true - } + "description": "The pricing tier of the web application firewall policy.", + "properties": { + "name": { + "description": "Name of the pricing tier.", + "enum": [ + "Classic_AzureFrontDoor", + "Standard_AzureFrontDoor", + "Premium_AzureFrontDoor" + ], + "type": "string", + "x-ms-enum": { + "name": "SkuName", + "modelAsString": true } - }, - "type": "object" + } }, + "type": "object" + }, "WebApplicationFirewallPolicyList": { "description": "Defines a list of WebApplicationFirewallPolicies. It contains a list of WebApplicationFirewallPolicy objects and a URL link to get the next set of results.", "properties": { @@ -950,4 +951,4 @@ "description": "Name of the Resource group within the Azure subscription." } } -} +} \ No newline at end of file diff --git a/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.2-preview/examples/DeleteRoleDefinition-example.json b/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.2-preview/examples/DeleteRoleDefinition-example.json index 2f1f9696de2f..d707b2b24e5a 100644 --- a/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.2-preview/examples/DeleteRoleDefinition-example.json +++ b/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.2-preview/examples/DeleteRoleDefinition-example.json @@ -1,32 +1,30 @@ { "parameters": { - "vaultBaseUrl": "https://myvault.vault.azure.net/", - "scope": "", - "api-version": "7.2-preview", - "roleDefinitionName": "00000000-0000-0000-0000-000000000000" + "vaultBaseUrl": "https://myvault.vault.azure.net/", + "scope": "", + "api-version": "7.2-preview", + "roleDefinitionName": "00000000-0000-0000-0000-000000000000" }, "responses": { - "200": { - "body": { - "properties": { - "roleName": "My custom role", - "type": "CustomRole", - "description": "Role description", - "assignableScopes": [ - "/" - ], - "permissions": [ - { - "dataActions": [ - "Microsoft.KeyVault/managedHsm/keys/sign/action" - ] - } - ] - }, - "id": "Microsoft.KeyVault/providers/Microsoft.Authorization/roleDefinitions/00000000-0000-0000-0000-000000000000", - "type": "Microsoft.Authorization/roleDefinitions", - "name": "00000000-0000-0000-0000-000000000000" + "200": { + "body": { + "properties": { + "roleName": "My custom role", + "type": "CustomRole", + "description": "Role description", + "assignableScopes": [ + "/" + ], + "permissions": [ + { + "dataActions": [ "Microsoft.KeyVault/managedHsm/keys/sign/action" ], + } + ] + }, + "id": "Microsoft.KeyVault/providers/Microsoft.Authorization/roleDefinitions/00000000-0000-0000-0000-000000000000", + "type": "Microsoft.Authorization/roleDefinitions", + "name": "00000000-0000-0000-0000-000000000000" + } } - } } - } \ No newline at end of file +} \ No newline at end of file diff --git a/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.2-preview/examples/GetRoleDefinition-example.json b/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.2-preview/examples/GetRoleDefinition-example.json index 2f1f9696de2f..d707b2b24e5a 100644 --- a/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.2-preview/examples/GetRoleDefinition-example.json +++ b/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.2-preview/examples/GetRoleDefinition-example.json @@ -1,32 +1,30 @@ { "parameters": { - "vaultBaseUrl": "https://myvault.vault.azure.net/", - "scope": "", - "api-version": "7.2-preview", - "roleDefinitionName": "00000000-0000-0000-0000-000000000000" + "vaultBaseUrl": "https://myvault.vault.azure.net/", + "scope": "", + "api-version": "7.2-preview", + "roleDefinitionName": "00000000-0000-0000-0000-000000000000" }, "responses": { - "200": { - "body": { - "properties": { - "roleName": "My custom role", - "type": "CustomRole", - "description": "Role description", - "assignableScopes": [ - "/" - ], - "permissions": [ - { - "dataActions": [ - "Microsoft.KeyVault/managedHsm/keys/sign/action" - ] - } - ] - }, - "id": "Microsoft.KeyVault/providers/Microsoft.Authorization/roleDefinitions/00000000-0000-0000-0000-000000000000", - "type": "Microsoft.Authorization/roleDefinitions", - "name": "00000000-0000-0000-0000-000000000000" + "200": { + "body": { + "properties": { + "roleName": "My custom role", + "type": "CustomRole", + "description": "Role description", + "assignableScopes": [ + "/" + ], + "permissions": [ + { + "dataActions": [ "Microsoft.KeyVault/managedHsm/keys/sign/action" ], + } + ] + }, + "id": "Microsoft.KeyVault/providers/Microsoft.Authorization/roleDefinitions/00000000-0000-0000-0000-000000000000", + "type": "Microsoft.Authorization/roleDefinitions", + "name": "00000000-0000-0000-0000-000000000000" + } } - } } - } \ No newline at end of file +} \ No newline at end of file diff --git a/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.2-preview/examples/PutRoleDefinition-example.json b/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.2-preview/examples/PutRoleDefinition-example.json index eec9e4285764..473984477f83 100644 --- a/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.2-preview/examples/PutRoleDefinition-example.json +++ b/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.2-preview/examples/PutRoleDefinition-example.json @@ -1,46 +1,43 @@ { - "parameters": { - "vaultBaseUrl": "https://myvault.vault.azure.net/", - "scope": "keys", - "roleDefinitionName": "00000000-0000-0000-0000-000000000000", "parameters": { - "properties": { - "roleName": "My custom role", - "type": "CustomRole", - "description": "Role description", - "permissions": [ - { - "dataActions": [ - "Microsoft.KeyVault/managedHsm/keys/sign/action" + "vaultBaseUrl": "https://myvault.vault.azure.net/", + "scope": "keys", + "roleDefinitionName": "00000000-0000-0000-0000-000000000000", + "parameters": { + "properties": { + "roleName": "My custom role", + "type": "CustomRole", + "description": "Role description", + "permissions": [ + { + "dataActions": [ "Microsoft.KeyVault/managedHsm/keys/sign/action" ], + } ] - } - ] - } + } + }, + "api-version": "7.2-preview" }, - "api-version": "7.2-preview" - }, - "responses": { - "201": { - "body": { - "properties": { - "roleName": "My custom role", - "type": "CustomRole", - "description": "Role description", - "assignableScopes": [ - "/" - ], - "permissions": [ - { - "dataActions": [ - "Microsoft.KeyVault/managedHsm/keys/sign/action" - ] - } - ] - }, - "id": "Microsoft.KeyVault/providers/Microsoft.Authorization/roleDefinitions/00000000-0000-0000-0000-000000000000", - "type": "Microsoft.Authorization/roleDefinitions", - "name": "00000000-0000-0000-0000-000000000000" + "responses": { + "201": { + "body": { + "properties": { + "roleName": "My custom role", + "type": "CustomRole", + "description": "Role description", + "assignableScopes": [ + "/" + ], + "permissions": [ + { + "dataActions": [ "Microsoft.KeyVault/managedHsm/keys/sign/action" ], + } + ] + }, + "id": "Microsoft.KeyVault/providers/Microsoft.Authorization/roleDefinitions/00000000-0000-0000-0000-000000000000", + "type": "Microsoft.Authorization/roleDefinitions", + "name": "00000000-0000-0000-0000-000000000000" + } } } } -} \ No newline at end of file + \ No newline at end of file From 7321d7de018f9ee121c8ebe783277fb7e7252fe2 Mon Sep 17 00:00:00 2001 From: Shirley Jiang Date: Thu, 21 Jan 2021 10:18:28 -0800 Subject: [PATCH 08/19] fixed secrets examples --- .../stable/2020-09-01/examples/Secrets_Create.json | 9 --------- .../stable/2020-09-01/examples/Secrets_Get.json | 3 --- .../2020-09-01/examples/Secrets_ListByProfile.json | 3 --- .../stable/2020-09-01/examples/Secrets_Update.json | 9 --------- 4 files changed, 24 deletions(-) diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Secrets_Create.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Secrets_Create.json index 490b7cb8ee66..d6cf0981d93c 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Secrets_Create.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Secrets_Create.json @@ -9,15 +9,12 @@ "properties": { "parameters": { "type": "CustomerCertificate", - "subject": "www.foo.contoso.com", "subjectAlternativeNames": [ "foo.contoso.com", "www3.foo.contoso.com" ], "secretVersion": "67c452f83c804aed80aa3a21e523c226", "certificateAuthority": "Symantec", - "expirationDate": "2020-11-03T12:10:13", - "thumbprint": "fjio4pu930t2909irf2304809", "secretSource": { "id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.KeyVault/vault/kvName/certificate/certName" }, @@ -35,15 +32,12 @@ "properties": { "parameters": { "type": "CustomerCertificate", - "subject": "www.foo.contoso.com", "subjectAlternativeNames": [ "foo.contoso.com", "www3.foo.contoso.com" ], "secretVersion": "67c452f83c804aed80aa3a21e523c226", "certificateAuthority": "Symantec", - "expirationDate": "2020-11-03T12:10:13", - "thumbprint": "fjio4pu930t2909irf2304809", "secretSource": { "id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.KeyVault/vault/kvName/certificate/certName" }, @@ -62,15 +56,12 @@ "properties": { "parameters": { "type": "CustomerCertificate", - "subject": "www.foo.contoso.com", "subjectAlternativeNames": [ "foo.contoso.com", "www3.foo.contoso.com" ], "secretVersion": "67c452f83c804aed80aa3a21e523c226", "certificateAuthority": "Symantec", - "expirationDate": "2020-11-03T12:10:13", - "thumbprint": "fjio4pu930t2909irf2304809", "secretSource": { "id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.KeyVault/vault/kvName/certificate/certName" }, diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Secrets_Get.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Secrets_Get.json index 1cbb7eaa0811..1537e5fcf730 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Secrets_Get.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Secrets_Get.json @@ -15,15 +15,12 @@ "properties": { "parameters": { "type": "CustomerCertificate", - "subject": "www.foo.contoso.com", "subjectAlternativeNames": [ "foo.contoso.com", "www3.foo.contoso.com" ], "secretVersion": "67c452f83c804aed80aa3a21e523c226", "certificateAuthority": "Symantec", - "expirationDate": "2020-11-03T12:10:13", - "thumbprint": "fjio4pu930t2909irf2304809", "secretSource": { "id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.KeyVault/vault/kvName/certificate/certName" }, diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Secrets_ListByProfile.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Secrets_ListByProfile.json index d62b06e79bef..93411098c05f 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Secrets_ListByProfile.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Secrets_ListByProfile.json @@ -16,15 +16,12 @@ "properties": { "parameters": { "type": "CustomerCertificate", - "subject": "www.foo.contoso.com", "subjectAlternativeNames": [ "foo.contoso.com", "www3.foo.contoso.com" ], "secretVersion": "67c452f83c804aed80aa3a21e523c226", "certificateAuthority": "Symantec", - "expirationDate": "2020-11-03T12:10:13", - "thumbprint": "fjio4pu930t2909irf2304809", "secretSource": { "id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.KeyVault/vault/kvName/certificate/certName" }, diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Secrets_Update.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Secrets_Update.json index a1b497d552b8..5568194cfc96 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Secrets_Update.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Secrets_Update.json @@ -8,15 +8,12 @@ "secretProperties": { "parameters": { "type": "CustomerCertificate", - "subject": "www.foo.contoso.com", "subjectAlternativeNames": [ "foo.contoso.com", "www3.foo.contoso.com" ], "secretVersion": "67c452f83c804aed80aa3a21e523c226", "certificateAuthority": "Symantec", - "expirationDate": "2020-11-03T12:10:13", - "thumbprint": "fjio4pu930t2909irf2304809", "secretSource": { "id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.KeyVault/vault/kvName/certificate/certName" }, @@ -33,15 +30,12 @@ "properties": { "parameters": { "type": "CustomerCertificate", - "subject": "www.foo.contoso.com", "subjectAlternativeNames": [ "foo.contoso.com", "www3.foo.contoso.com" ], "secretVersion": "67c452f83c804aed80aa3a21e523c226", "certificateAuthority": "Symantec", - "expirationDate": "2020-11-03T12:10:13", - "thumbprint": "fjio4pu930t2909irf2304809", "secretSource": { "id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.KeyVault/vault/kvName/certificate/certName" }, @@ -60,15 +54,12 @@ "properties": { "parameters": { "type": "CustomerCertificate", - "subject": "www.foo.contoso.com", "subjectAlternativeNames": [ "foo.contoso.com", "www3.foo.contoso.com" ], "secretVersion": "67c452f83c804aed80aa3a21e523c226", "certificateAuthority": "Symantec", - "expirationDate": "2020-11-03T12:10:13", - "thumbprint": "fjio4pu930t2909irf2304809", "secretSource": { "id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.KeyVault/vault/kvName/certificate/certName" }, From 2a83a3d5e26bde2bca09b81ec94f5ef16d55c24b Mon Sep 17 00:00:00 2001 From: Shirley Jiang Date: Thu, 21 Jan 2021 11:01:01 -0800 Subject: [PATCH 09/19] remove optimization type --- .../Microsoft.Cdn/stable/2020-09-01/afdx.json | 4 ---- .../stable/2020-09-01/examples/Routes_Create.json | 3 --- .../Microsoft.Cdn/stable/2020-09-01/examples/Routes_Get.json | 1 - .../stable/2020-09-01/examples/Routes_ListByEndpoint.json | 1 - .../stable/2020-09-01/examples/Routes_Update.json | 3 --- 5 files changed, 12 deletions(-) diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/afdx.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/afdx.json index f2411c956ea1..6da8db69f49d 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/afdx.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/afdx.json @@ -4954,10 +4954,6 @@ "description": "Defines how AzureFrontDoor caches requests that include query strings. You can ignore any query strings when caching, bypass caching to prevent requests that contain query strings from being cached, or cache every request with a unique URL.", "$ref": "./cdn.json#/definitions/QueryStringCachingBehavior" }, - "optimizationType": { - "description": "Specifies what scenario the customer wants this AzureFrontDoor endpoint to optimize for, e.g. Download, Media services. With this information, AzureFrontDoor can apply scenario driven optimization.", - "$ref": "./cdn.json#/definitions/OptimizationType" - }, "forwardingProtocol": { "description": "Protocol this rule will use when forwarding traffic to backends.", "type": "string", diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Routes_Create.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Routes_Create.json index 1e2dd06b6037..66ba041b271b 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Routes_Create.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Routes_Create.json @@ -37,7 +37,6 @@ "isCompressionEnabled": true }, "queryStringCachingBehavior": "IgnoreQueryString", - "optimizationType": "DynamicSiteAcceleration", "forwardingProtocol": "MatchRequest", "linkToDefaultDomain": "Enabled", "httpsRedirect": "Enabled", @@ -81,7 +80,6 @@ "isCompressionEnabled": true }, "queryStringCachingBehavior": "IgnoreQueryString", - "optimizationType": "DynamicSiteAcceleration", "forwardingProtocol": "MatchRequest", "linkToDefaultDomain": "Enabled", "httpsRedirect": "Enabled", @@ -126,7 +124,6 @@ "isCompressionEnabled": true }, "queryStringCachingBehavior": "IgnoreQueryString", - "optimizationType": "DynamicSiteAcceleration", "forwardingProtocol": "MatchRequest", "linkToDefaultDomain": "Enabled", "httpsRedirect": "Enabled", diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Routes_Get.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Routes_Get.json index f67ed9182cc5..19e7d4264281 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Routes_Get.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Routes_Get.json @@ -43,7 +43,6 @@ "isCompressionEnabled": true }, "queryStringCachingBehavior": "IgnoreQueryString", - "optimizationType": "DynamicSiteAcceleration", "forwardingProtocol": "MatchRequest", "linkToDefaultDomain": "Enabled", "httpsRedirect": "Enabled", diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Routes_ListByEndpoint.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Routes_ListByEndpoint.json index 782b0b8c46f3..eee9b5c490bf 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Routes_ListByEndpoint.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Routes_ListByEndpoint.json @@ -44,7 +44,6 @@ "isCompressionEnabled": true }, "queryStringCachingBehavior": "IgnoreQueryString", - "optimizationType": "DynamicSiteAcceleration", "forwardingProtocol": "MatchRequest", "linkToDefaultDomain": "Enabled", "httpsRedirect": "Enabled", diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Routes_Update.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Routes_Update.json index 102f6a3baf43..87e91a83a923 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Routes_Update.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Routes_Update.json @@ -37,7 +37,6 @@ "isCompressionEnabled": true }, "queryStringCachingBehavior": "IgnoreQueryString", - "optimizationType": "DynamicSiteAcceleration", "forwardingProtocol": "MatchRequest", "linkToDefaultDomain": "Enabled", "httpsRedirect": "Enabled", @@ -81,7 +80,6 @@ "isCompressionEnabled": true }, "queryStringCachingBehavior": "IgnoreQueryString", - "optimizationType": "DynamicSiteAcceleration", "forwardingProtocol": "MatchRequest", "linkToDefaultDomain": "Enabled", "httpsRedirect": "Enabled", @@ -126,7 +124,6 @@ "isCompressionEnabled": true }, "queryStringCachingBehavior": "IgnoreQueryString", - "optimizationType": "DynamicSiteAcceleration", "forwardingProtocol": "MatchRequest", "linkToDefaultDomain": "Enabled", "httpsRedirect": "Enabled", From e734461a09e5e72e928dfc7c7e14fc63250715db Mon Sep 17 00:00:00 2001 From: Shirley Jiang Date: Thu, 21 Jan 2021 18:54:55 -0800 Subject: [PATCH 10/19] add 202 for all PUT calls, change validateSecret from 200 to 202 for async, removed bypasscache for afdx --- .../Microsoft.Cdn/stable/2020-09-01/afdx.json | 73 +++++++++++++++++-- .../examples/AFDCustomDomains_Create.json | 27 +++++++ .../examples/AFDEndpoints_Create.json | 16 ++++ .../examples/AFDOriginGroups_Create.json | 24 ++++++ .../examples/AFDOrigins_Create.json | 18 +++++ .../2020-09-01/examples/Routes_Create.json | 44 +++++++++++ .../2020-09-01/examples/RuleSets_Create.json | 11 +++ .../2020-09-01/examples/Rules_Create.json | 34 +++++++++ .../2020-09-01/examples/Secrets_Create.json | 24 ++++++ .../examples/SecurityPolicies_Create.json | 33 +++++++++ .../2020-09-01/examples/Validate_Secret.json | 2 +- 11 files changed, 300 insertions(+), 6 deletions(-) diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/afdx.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/afdx.json index 6da8db69f49d..13e9a64060fa 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/afdx.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/afdx.json @@ -297,6 +297,12 @@ "$ref": "#/definitions/AFDDomain" } }, + "202": { + "description": "Accepted. The request has been accepted for processing and the operation will complete asynchronously.", + "schema": { + "$ref": "#/definitions/AFDDomain" + } + }, "default": { "description": "CDN error response describing why the operation failed.", "schema": { @@ -654,6 +660,12 @@ "$ref": "#/definitions/AFDEndpoint" } }, + "202": { + "description": "Accepted. The request has been accepted for processing and the operation will complete asynchronously.", + "schema": { + "$ref": "#/definitions/AFDEndpoint" + } + }, "default": { "description": "CDN error response describing why the operation failed.", "schema": { @@ -1138,6 +1150,12 @@ "$ref": "#/definitions/AFDOriginGroup" } }, + "202": { + "description": "Accepted. The request has been accepted for processing and the operation will complete asynchronously.", + "schema": { + "$ref": "#/definitions/AFDOriginGroup" + } + }, "default": { "description": "CDN error response describing why the operation failed.", "schema": { @@ -1515,6 +1533,12 @@ "$ref": "#/definitions/AFDOrigin" } }, + "202": { + "description": "Accepted. The request has been accepted for processing and the operation will complete asynchronously.", + "schema": { + "$ref": "#/definitions/AFDOrigin" + } + }, "default": { "description": "CDN error response describing why the operation failed.", "schema": { @@ -1850,6 +1874,12 @@ "$ref": "#/definitions/Route" } }, + "202": { + "description": "Accepted. The request has been accepted for processing and the operation will complete asynchronously.", + "schema": { + "$ref": "#/definitions/Route" + } + }, "default": { "description": "CDN error response describing why the operation failed.", "schema": { @@ -2164,6 +2194,12 @@ "$ref": "#/definitions/RuleSet" } }, + "202": { + "description": "Accepted. The request has been accepted for processing and the operation will complete asynchronously.", + "schema": { + "$ref": "#/definitions/RuleSet" + } + }, "default": { "description": "CDN error response describing why the operation failed.", "schema": { @@ -2468,6 +2504,12 @@ "$ref": "#/definitions/Rule" } }, + "202": { + "description": "Accepted. The request has been accepted for processing and the operation will complete asynchronously.", + "schema": { + "$ref": "#/definitions/Rule" + } + }, "default": { "description": "CDN error response describing why the operation failed.", "schema": { @@ -2782,6 +2824,12 @@ "$ref": "#/definitions/SecurityPolicy" } }, + "202": { + "description": "Accepted. The request has been accepted for processing and the operation will complete asynchronously.", + "schema": { + "$ref": "#/definitions/SecurityPolicy" + } + }, "default": { "description": "CDN error response describing why the operation failed.", "schema": { @@ -3082,6 +3130,12 @@ "$ref": "#/definitions/Secret" } }, + "202": { + "description": "Accepted. The request has been accepted for processing and the operation will complete asynchronously.", + "schema": { + "$ref": "#/definitions/Secret" + } + }, "default": { "description": "CDN error response describing why the operation failed.", "schema": { @@ -3253,8 +3307,8 @@ } ], "responses": { - "200": { - "description": "OK", + "202": { + "description": "Accepted. The request has been accepted for processing and the operation will complete asynchronously.", "schema": { "$ref": "#/definitions/ValidateSecretOutput" } @@ -4950,9 +5004,18 @@ "$ref": "#/definitions/CompressionSettings" } }, - "queryStringCachingBehavior": { - "description": "Defines how AzureFrontDoor caches requests that include query strings. You can ignore any query strings when caching, bypass caching to prevent requests that contain query strings from being cached, or cache every request with a unique URL.", - "$ref": "./cdn.json#/definitions/QueryStringCachingBehavior" + "QueryStringCachingBehavior": { + "description": "Defines how CDN caches requests that include query strings. You can ignore any query strings when caching, bypass caching to prevent requests that contain query strings from being cached, or cache every request with a unique URL.", + "enum": [ + "IgnoreQueryString", + "UseQueryString", + "NotSet" + ], + "type": "string", + "x-ms-enum": { + "name": "AfdQueryStringCachingBehavior", + "modelAsString": false + } }, "forwardingProtocol": { "description": "Protocol this rule will use when forwarding traffic to backends.", diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/AFDCustomDomains_Create.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/AFDCustomDomains_Create.json index cca23a4999a4..ac7ad359abcd 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/AFDCustomDomains_Create.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/AFDCustomDomains_Create.json @@ -72,6 +72,33 @@ "deploymentStatus": "NotStarted" } } + }, + "202": { + "body": { + "id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.Cdn/profiles/profile1/domains/domain1", + "name": "domain1", + "type": "Microsoft.Cdn/Profiles/CustomDomains", + "properties": { + "hostName": "www.contoso.com", + "tlsSettings": { + "certificateType": "ManagedCertificate", + "minimumTlsVersion": "TLS12", + "secret": { + "id": "" + } + }, + "azureDnsZone": { + "id": "" + }, + "validationProperties": { + "validationToken": "", + "expirationDate": "" + }, + "domainValidationState": "Submitting", + "provisioningState": "Updating", + "deploymentStatus": "NotStarted" + } + } } } } diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/AFDEndpoints_Create.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/AFDEndpoints_Create.json index 8abf3e6dd3fd..f20efbe3ee41 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/AFDEndpoints_Create.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/AFDEndpoints_Create.json @@ -46,6 +46,22 @@ "deploymentStatus": "NotStarted" } } + }, + "202": { + "body": { + "name": "endpoint1", + "id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.Cdn/profiles/profile1/afdEndpoints/endpoint1", + "type": "Microsoft.Cdn/profiles/afdEndpoints", + "tags": {}, + "location": "CentralUs", + "properties": { + "hostName": "endpoint1.azureedge.net", + "originResponseTimeoutSeconds": 30, + "enabledState": "Enabled", + "provisioningState": "Creating", + "deploymentStatus": "NotStarted" + } + } } } } diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/AFDOriginGroups_Create.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/AFDOriginGroups_Create.json index 3f5156a1b004..6ad670e4b279 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/AFDOriginGroups_Create.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/AFDOriginGroups_Create.json @@ -70,6 +70,30 @@ "deploymentStatus": "NotStarted" } } + }, + "202": { + "body": { + "id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.Cdn/profiles/profile1/origingroups/origingroup1", + "type": "Microsoft.Cdn/profiles/origingroups", + "name": "origingroup1", + "properties": { + "loadBalancingSettings": { + "sampleSize": 3, + "successfulSamplesRequired": 3, + "additionalLatencyInMilliseconds": 1000 + }, + "healthProbeSettings": { + "probePath": "/path1", + "probeRequestType": "HEAD", + "probeProtocol": "Http", + "probeIntervalInSeconds": 10 + }, + "responseBasedAfdOriginErrorDetectionSettings": null, + "trafficRestorationTimeToHealedOrNewEndpointsInMinutes": 5, + "provisioningState": "Succeeded", + "deploymentStatus": "NotStarted" + } + } } } } diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/AFDOrigins_Create.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/AFDOrigins_Create.json index ecce3ed86a3e..90d449ea6c26 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/AFDOrigins_Create.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/AFDOrigins_Create.json @@ -52,6 +52,24 @@ "deploymentStatus": "NotStarted" } } + }, + "202": { + "body": { + "id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.Cdn/profiles/profile1/origingroups/origingroup1/origins/origin1", + "type": "Microsoft.Cdn/profiles/origingroups/origins", + "name": "origin1", + "properties": { + "hostName": "host1.blob.core.windows.net", + "httpPort": 80, + "httpsPort": 443, + "originHostHeader": "host1.foo.com", + "priority": null, + "weight": null, + "enabledState": "Enabled", + "provisioningState": "Succeeded", + "deploymentStatus": "NotStarted" + } + } } } } diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Routes_Create.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Routes_Create.json index 66ba041b271b..11f98fed0027 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Routes_Create.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Routes_Create.json @@ -132,6 +132,50 @@ "deploymentStatus": "NotStarted" } } + }, + "202": { + "body": { + "name": "route1", + "id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.Cdn/profiles/profile1/afdendpoints/endpoint1/routes/route1", + "type": "Microsoft.Cdn/profiles/afdendpoints/routes", + "properties": { + "customDomains": [ + { + "id": "/subscriptions/subid/resourceGroups/RG/providers/Microsoft.Cdn/profiles/profile1/customDomains/domain1" + } + ], + "originGroup": { + "id": "/subscriptions/subid/resourceGroups/RG/providers/Microsoft.Cdn/profiles/profile1/originGroups/originGroup1" + }, + "originPath": null, + "ruleSets": [ + { + "id": "/subscriptions/subid/resourceGroups/RG/providers/Microsoft.Cdn/profiles/profile1/ruleSets/ruleSet1" + } + ], + "supportedProtocols": [ + "Https", + "Http" + ], + "patternsToMatch": [ + "/*" + ], + "compressionSettings": { + "contentTypesToCompress": [ + "text/html", + "application/octet-stream" + ], + "isCompressionEnabled": true + }, + "queryStringCachingBehavior": "IgnoreQueryString", + "forwardingProtocol": "MatchRequest", + "linkToDefaultDomain": "Enabled", + "httpsRedirect": "Enabled", + "enabledState": "Enabled", + "provisioningState": "Creating", + "deploymentStatus": "NotStarted" + } + } } } } diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/RuleSets_Create.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/RuleSets_Create.json index 793b1a05514a..ea41f23ccdac 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/RuleSets_Create.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/RuleSets_Create.json @@ -31,6 +31,17 @@ "deploymentStatus": "NotStarted" } } + }, + "202": { + "body": { + "name": "ruleSet1", + "id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.Cdn/profiles/profile1/rulesets/ruleSet1", + "type": "Microsoft.Cdn/profiles/rulesets", + "properties": { + "provisioningState": "Succeeded", + "deploymentStatus": "NotStarted" + } + } } } } diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Rules_Create.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Rules_Create.json index 954581d4d4b5..5e6f24136ee2 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Rules_Create.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Rules_Create.json @@ -104,6 +104,40 @@ ] } } + }, + "202": { + "body": { + "name": "rule1", + "id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.Cdn/profiles/profile1/ruleSets/ruleSet1/rules/rule1", + "type": "Microsoft.Cdn/profiles/ruleSets/rules", + "properties": { + "order": 1, + "conditions": [ + { + "name": "RequestMethod", + "parameters": { + "@odata.type": "#Microsoft.Azure.Cdn.Models.DeliveryRuleRequestMethodConditionParameters", + "operator": "Equal", + "matchValues": [ + "GET" + ], + "negateCondition": false + } + } + ], + "actions": [ + { + "name": "ModifyResponseHeader", + "parameters": { + "@odata.type": "#Microsoft.Azure.Cdn.Models.DeliveryRuleHeaderActionParameters", + "headerAction": "Overwrite", + "headerName": "X-CDN", + "value": "MSFT" + } + } + ] + } + } } } } diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Secrets_Create.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Secrets_Create.json index d6cf0981d93c..8e702054ba5e 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Secrets_Create.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Secrets_Create.json @@ -71,6 +71,30 @@ "deploymentStatus": "NotStarted" } } + }, + "202": { + "body": { + "name": "secret1", + "id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.Cdn/profiles/profile1/secrets/secret1", + "type": "Microsoft.Cdn/profiles/secrets", + "properties": { + "parameters": { + "type": "CustomerCertificate", + "subjectAlternativeNames": [ + "foo.contoso.com", + "www3.foo.contoso.com" + ], + "secretVersion": "67c452f83c804aed80aa3a21e523c226", + "certificateAuthority": "Symantec", + "secretSource": { + "id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.KeyVault/vault/kvName/certificate/certName" + }, + "useLatestVersion": false + }, + "provisioningState": "Succeeded", + "deploymentStatus": "NotStarted" + } + } } } } diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/SecurityPolicies_Create.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/SecurityPolicies_Create.json index cb0a62d65d2b..7d5965c522a4 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/SecurityPolicies_Create.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/SecurityPolicies_Create.json @@ -98,6 +98,39 @@ "provisioningState": "Creating" } } + }, + "202": { + "body": { + "name": "securityPolicy1", + "id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.Cdn/profiles/profile1/securityPolicies/securityPolicy1", + "type": "Microsoft.Cdn/profiles/securityPolicies", + "properties": { + "parameters": { + "type": "WebApplicationFirewall", + "wafPolicy": { + "id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.Network/frontdoorwebapplicationfirewallpolicies/wafTest" + }, + "associations": [ + { + "domains": [ + { + "id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.Cdn/profiles/profile1/afddomains/testdomain1" + }, + { + "id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.Cdn/profiles/profile1/afddomains/testdomain2" + } + ], + "patternsToMatch": [ + "/images", + "/videos" + ] + } + ] + }, + "deploymentStatus": "NotStarted", + "provisioningState": "Creating" + } + } } } } diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Validate_Secret.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Validate_Secret.json index 61fcc61d29e9..699d2a24516c 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Validate_Secret.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Validate_Secret.json @@ -12,7 +12,7 @@ } }, "responses": { - "200": { + "202": { "body": { "status": "Valid", "message": null From 3524bc3f46f9afab94ec21e0114ae019db9cc38e Mon Sep 17 00:00:00 2001 From: Shirley Jiang Date: Fri, 22 Jan 2021 10:29:48 -0800 Subject: [PATCH 11/19] correct validation errors --- .../Microsoft.Cdn/stable/2020-09-01/afdx.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/afdx.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/afdx.json index 13e9a64060fa..6ec0f8480cbc 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/afdx.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/afdx.json @@ -3318,6 +3318,10 @@ "schema": { "$ref": "#/definitions/AfdErrorResponse" } + }, + "x-ms-long-running-operation": true, + "x-ms-long-running-operation-options": { + "final-state-via": "azure-async-operation" } } } @@ -5013,7 +5017,7 @@ ], "type": "string", "x-ms-enum": { - "name": "AfdQueryStringCachingBehavior", + "name": "afdxQueryStringCachingBehavior", "modelAsString": false } }, From 69e9199ae726544b7dac8fe59b2652368b3d1f07 Mon Sep 17 00:00:00 2001 From: Shirley Jiang Date: Fri, 22 Jan 2021 10:44:00 -0800 Subject: [PATCH 12/19] fixes --- .../Microsoft.Cdn/stable/2020-09-01/afdx.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/afdx.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/afdx.json index 6ec0f8480cbc..7e64f23800fd 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/afdx.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/afdx.json @@ -3318,11 +3318,11 @@ "schema": { "$ref": "#/definitions/AfdErrorResponse" } - }, - "x-ms-long-running-operation": true, - "x-ms-long-running-operation-options": { - "final-state-via": "azure-async-operation" } + }, + "x-ms-long-running-operation": true, + "x-ms-long-running-operation-options": { + "final-state-via": "azure-async-operation" } } }, @@ -5008,7 +5008,7 @@ "$ref": "#/definitions/CompressionSettings" } }, - "QueryStringCachingBehavior": { + "queryStringCachingBehavior": { "description": "Defines how CDN caches requests that include query strings. You can ignore any query strings when caching, bypass caching to prevent requests that contain query strings from being cached, or cache every request with a unique URL.", "enum": [ "IgnoreQueryString", From 1a906c68a01370ba16b340d27222124d2b5706c0 Mon Sep 17 00:00:00 2001 From: Shirley Jiang Date: Fri, 22 Jan 2021 11:09:08 -0800 Subject: [PATCH 13/19] add afdx into custom words --- custom-words.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/custom-words.txt b/custom-words.txt index e5feb4011746..bfd4045bd236 100644 --- a/custom-words.txt +++ b/custom-words.txt @@ -38,6 +38,7 @@ adminmanagement ADSIs ADTO adultscore +afdx affinitized AFRINIC agentpool From 350d1e8e2912927e447762561f1dd05fe5971429 Mon Sep 17 00:00:00 2001 From: Shirley Jiang Date: Fri, 22 Jan 2021 13:03:31 -0800 Subject: [PATCH 14/19] revert the validate secret api change --- .../Microsoft.Cdn/stable/2020-09-01/afdx.json | 6 +----- .../stable/2020-09-01/examples/Validate_Secret.json | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/afdx.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/afdx.json index 7e64f23800fd..b986e0182a3c 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/afdx.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/afdx.json @@ -3307,7 +3307,7 @@ } ], "responses": { - "202": { + "200": { "description": "Accepted. The request has been accepted for processing and the operation will complete asynchronously.", "schema": { "$ref": "#/definitions/ValidateSecretOutput" @@ -3319,10 +3319,6 @@ "$ref": "#/definitions/AfdErrorResponse" } } - }, - "x-ms-long-running-operation": true, - "x-ms-long-running-operation-options": { - "final-state-via": "azure-async-operation" } } }, diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Validate_Secret.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Validate_Secret.json index 699d2a24516c..61fcc61d29e9 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Validate_Secret.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/Validate_Secret.json @@ -12,7 +12,7 @@ } }, "responses": { - "202": { + "200": { "body": { "status": "Valid", "message": null From 48d899a6309700d22618fec2b8fa820351d1edaa Mon Sep 17 00:00:00 2001 From: Shirley Jiang Date: Fri, 22 Jan 2021 13:05:34 -0800 Subject: [PATCH 15/19] missed the message --- .../resource-manager/Microsoft.Cdn/stable/2020-09-01/afdx.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/afdx.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/afdx.json index b986e0182a3c..817e90c74034 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/afdx.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/afdx.json @@ -3308,7 +3308,7 @@ ], "responses": { "200": { - "description": "Accepted. The request has been accepted for processing and the operation will complete asynchronously.", + "description": "OK", "schema": { "$ref": "#/definitions/ValidateSecretOutput" } From c7228b599945f8e5ff4aaad4a8fc04dff96af959 Mon Sep 17 00:00:00 2001 From: Shirley Jiang Date: Fri, 22 Jan 2021 13:14:06 -0800 Subject: [PATCH 16/19] change from afdx to afd --- custom-words.txt | 2 +- .../resource-manager/Microsoft.Cdn/stable/2020-09-01/afdx.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/custom-words.txt b/custom-words.txt index bfd4045bd236..f3b455d341dd 100644 --- a/custom-words.txt +++ b/custom-words.txt @@ -38,7 +38,7 @@ adminmanagement ADSIs ADTO adultscore -afdx +afd affinitized AFRINIC agentpool diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/afdx.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/afdx.json index 817e90c74034..f4875fa8d80f 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/afdx.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/afdx.json @@ -5013,7 +5013,7 @@ ], "type": "string", "x-ms-enum": { - "name": "afdxQueryStringCachingBehavior", + "name": "afdQueryStringCachingBehavior", "modelAsString": false } }, From de7a0c2b9835ea95c0439c1be466fc2cc3abeacf Mon Sep 17 00:00:00 2001 From: Shirley Jiang Date: Fri, 22 Jan 2021 15:14:23 -0800 Subject: [PATCH 17/19] fix security policies --- .../Microsoft.Cdn/stable/2020-09-01/afdx.json | 8 ++-- .../examples/SecurityPolicies_Patch.json | 40 ++++++++++--------- 2 files changed, 26 insertions(+), 22 deletions(-) diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/afdx.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/afdx.json index f4875fa8d80f..026667a760f3 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/afdx.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/afdx.json @@ -2872,12 +2872,12 @@ "type": "string" }, { - "name": "securityPolicyParameters", + "name": "securityPolicyProperties", "in": "body", "description": "Security policy update properties", "required": true, "schema": { - "$ref": "#/definitions/SecurityPolicyWebApplicationFirewallParameters" + "$ref": "#/definitions/SecurityPolicyProperties" } }, { @@ -4228,7 +4228,7 @@ "properties": { "parameters": { "description": "object which contains security policy parameters", - "$ref": "#/definitions/SecurityPolicyWebApplicationFirewallParameters" + "$ref": "#/definitions/SecurityPolicyParameters" } } }, @@ -5649,4 +5649,4 @@ "description": "Name of the Resource group within the Azure subscription." } } -} +} \ No newline at end of file diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/SecurityPolicies_Patch.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/SecurityPolicies_Patch.json index 11a78be0ce97..75db362c00b1 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/SecurityPolicies_Patch.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/SecurityPolicies_Patch.json @@ -5,27 +5,31 @@ "resourceGroupName": "RG", "profileName": "profile1", "securityPolicyName": "securityPolicy1", - "securityPolicyParameters": { - "type": "WebApplicationFirewall", - "wafPolicy": { - "id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.Network/frontdoorwebapplicationfirewallpolicies/wafTest" - }, - "associations": [ - { - "domains": [ - { - "id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.Cdn/profiles/profile1/afddomains/testdomain1" - }, + "securityPolicyProperties": { + "properties": { + "parameters": { + "type": "WebApplicationFirewall", + "wafPolicy": { + "id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.Network/frontdoorwebapplicationfirewallpolicies/wafTest" + }, + "associations": [ { - "id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.Cdn/profiles/profile1/afddomains/testdomain2" + "domains": [ + { + "id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.Cdn/profiles/profile1/afddomains/testdomain1" + }, + { + "id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.Cdn/profiles/profile1/afddomains/testdomain2" + } + ], + "patternsToMatch": [ + "/images", + "/videos" + ] } - ], - "patternsToMatch": [ - "/images", - "/videos" ] } - ] + } } }, "responses": { @@ -96,4 +100,4 @@ } } } -} +} \ No newline at end of file From 29144cbce7a9163c127ddfa4b14fc9722f6e099b Mon Sep 17 00:00:00 2001 From: Shirley Jiang Date: Fri, 22 Jan 2021 15:23:51 -0800 Subject: [PATCH 18/19] remove addtional properties --- .../examples/SecurityPolicies_Patch.json | 48 +++++++++---------- 1 file changed, 23 insertions(+), 25 deletions(-) diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/SecurityPolicies_Patch.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/SecurityPolicies_Patch.json index 75db362c00b1..a51b35f0582c 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/SecurityPolicies_Patch.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/SecurityPolicies_Patch.json @@ -5,31 +5,29 @@ "resourceGroupName": "RG", "profileName": "profile1", "securityPolicyName": "securityPolicy1", - "securityPolicyProperties": { - "properties": { - "parameters": { - "type": "WebApplicationFirewall", - "wafPolicy": { - "id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.Network/frontdoorwebapplicationfirewallpolicies/wafTest" - }, - "associations": [ - { - "domains": [ - { - "id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.Cdn/profiles/profile1/afddomains/testdomain1" - }, - { - "id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.Cdn/profiles/profile1/afddomains/testdomain2" - } - ], - "patternsToMatch": [ - "/images", - "/videos" - ] - } - ] - } - } + "securityPolicyProperties": { + "parameters": { + "type": "WebApplicationFirewall", + "wafPolicy": { + "id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.Network/frontdoorwebapplicationfirewallpolicies/wafTest" + }, + "associations": [ + { + "domains": [ + { + "id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.Cdn/profiles/profile1/afddomains/testdomain1" + }, + { + "id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.Cdn/profiles/profile1/afddomains/testdomain2" + } + ], + "patternsToMatch": [ + "/images", + "/videos" + ] + } + ] + } } }, "responses": { From e09a9122585d5994980c9ac1beb10f5c00d51693 Mon Sep 17 00:00:00 2001 From: Shirley Jiang Date: Fri, 22 Jan 2021 15:29:09 -0800 Subject: [PATCH 19/19] prettier --- .../Microsoft.Cdn/stable/2020-09-01/afdx.json | 2 +- .../stable/2020-09-01/examples/SecurityPolicies_Patch.json | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/afdx.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/afdx.json index 026667a760f3..135609cdde58 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/afdx.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/afdx.json @@ -5649,4 +5649,4 @@ "description": "Name of the Resource group within the Azure subscription." } } -} \ No newline at end of file +} diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/SecurityPolicies_Patch.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/SecurityPolicies_Patch.json index a51b35f0582c..cfcfa9f3e10b 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/SecurityPolicies_Patch.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/SecurityPolicies_Patch.json @@ -5,7 +5,7 @@ "resourceGroupName": "RG", "profileName": "profile1", "securityPolicyName": "securityPolicy1", - "securityPolicyProperties": { + "securityPolicyProperties": { "parameters": { "type": "WebApplicationFirewall", "wafPolicy": { @@ -27,7 +27,7 @@ ] } ] - } + } } }, "responses": { @@ -98,4 +98,4 @@ } } } -} \ No newline at end of file +}