From b93e70932234d9b04de538133db289dd69442e8c Mon Sep 17 00:00:00 2001 From: Chenglong Liu Date: Fri, 9 Jul 2021 10:34:05 +0800 Subject: [PATCH 1/4] Update odatatype --- .../Microsoft.Cdn/stable/2021-06-01/cdn.json | 150 +++++++++--------- 1 file changed, 75 insertions(+), 75 deletions(-) diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/cdn.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/cdn.json index 881048f2d377..97dd5816d6ad 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/cdn.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/cdn.json @@ -3066,13 +3066,13 @@ "description": "Defines the parameters for RemoteAddress match conditions", "required": [ "operator", - "@odata.type" + "typeName" ], "properties": { - "@odata.type": { + "typeName": { "type": "string", "enum": [ - "#Microsoft.Azure.Cdn.Models.DeliveryRuleRemoteAddressConditionParameters" + "DeliveryRuleRemoteAddressConditionParameters" ] }, "operator": { @@ -3112,13 +3112,13 @@ "description": "Defines the parameters for RequestMethod match conditions", "required": [ "operator", - "@odata.type" + "typeName" ], "properties": { - "@odata.type": { + "typeName": { "type": "string", "enum": [ - "#Microsoft.Azure.Cdn.Models.DeliveryRuleRequestMethodConditionParameters" + "DeliveryRuleRequestMethodConditionParameters" ] }, "operator": { @@ -3158,13 +3158,13 @@ "description": "Defines the parameters for QueryString match conditions", "required": [ "operator", - "@odata.type" + "typeName" ], "properties": { - "@odata.type": { + "typeName": { "type": "string", "enum": [ - "#Microsoft.Azure.Cdn.Models.DeliveryRuleQueryStringConditionParameters" + "DeliveryRuleQueryStringConditionParameters" ] }, "operator": { @@ -3211,13 +3211,13 @@ "description": "Defines the parameters for PostArgs match conditions", "required": [ "operator", - "@odata.type" + "typeName" ], "properties": { - "@odata.type": { + "typeName": { "type": "string", "enum": [ - "#Microsoft.Azure.Cdn.Models.DeliveryRulePostArgsConditionParameters" + "DeliveryRulePostArgsConditionParameters" ] }, "selector": { @@ -3268,13 +3268,13 @@ "description": "Defines the parameters for RequestUri match conditions", "required": [ "operator", - "@odata.type" + "typeName" ], "properties": { - "@odata.type": { + "typeName": { "type": "string", "enum": [ - "#Microsoft.Azure.Cdn.Models.DeliveryRuleRequestUriConditionParameters" + "DeliveryRuleRequestUriConditionParameters" ] }, "operator": { @@ -3321,13 +3321,13 @@ "description": "Defines the parameters for RequestHeader match conditions", "required": [ "operator", - "@odata.type" + "typeName" ], "properties": { - "@odata.type": { + "typeName": { "type": "string", "enum": [ - "#Microsoft.Azure.Cdn.Models.DeliveryRuleRequestHeaderConditionParameters" + "DeliveryRuleRequestHeaderConditionParameters" ] }, "selector": { @@ -3378,13 +3378,13 @@ "description": "Defines the parameters for RequestBody match conditions", "required": [ "operator", - "@odata.type" + "typeName" ], "properties": { - "@odata.type": { + "typeName": { "type": "string", "enum": [ - "#Microsoft.Azure.Cdn.Models.DeliveryRuleRequestBodyConditionParameters" + "DeliveryRuleRequestBodyConditionParameters" ] }, "operator": { @@ -3431,13 +3431,13 @@ "description": "Defines the parameters for RequestScheme match conditions ", "required": [ "operator", - "@odata.type" + "typeName" ], "properties": { - "@odata.type": { + "typeName": { "type": "string", "enum": [ - "#Microsoft.Azure.Cdn.Models.DeliveryRuleRequestSchemeConditionParameters" + "DeliveryRuleRequestSchemeConditionParameters" ] }, "operator": { @@ -3468,13 +3468,13 @@ "description": "Defines the parameters for UrlPath match conditions", "required": [ "operator", - "@odata.type" + "typeName" ], "properties": { - "@odata.type": { + "typeName": { "type": "string", "enum": [ - "#Microsoft.Azure.Cdn.Models.DeliveryRuleUrlPathMatchConditionParameters" + "DeliveryRuleUrlPathMatchConditionParameters" ] }, "operator": { @@ -3522,13 +3522,13 @@ "description": "Defines the parameters for UrlFileExtension match conditions", "required": [ "operator", - "@odata.type" + "typeName" ], "properties": { - "@odata.type": { + "typeName": { "type": "string", "enum": [ - "#Microsoft.Azure.Cdn.Models.DeliveryRuleUrlFileExtensionMatchConditionParameters" + "DeliveryRuleUrlFileExtensionMatchConditionParameters" ] }, "operator": { @@ -3575,13 +3575,13 @@ "description": "Defines the parameters for UrlFilename match conditions", "required": [ "operator", - "@odata.type" + "typeName" ], "properties": { - "@odata.type": { + "typeName": { "type": "string", "enum": [ - "#Microsoft.Azure.Cdn.Models.DeliveryRuleUrlFilenameConditionParameters" + "DeliveryRuleUrlFilenameConditionParameters" ] }, "operator": { @@ -3628,13 +3628,13 @@ "description": "Defines the parameters for HttpVersion match conditions", "required": [ "operator", - "@odata.type" + "typeName" ], "properties": { - "@odata.type": { + "typeName": { "type": "string", "enum": [ - "#Microsoft.Azure.Cdn.Models.DeliveryRuleHttpVersionConditionParameters" + "DeliveryRuleHttpVersionConditionParameters" ] }, "operator": { @@ -3665,13 +3665,13 @@ "description": "Defines the parameters for Cookies match conditions", "required": [ "operator", - "@odata.type" + "typeName" ], "properties": { - "@odata.type": { + "typeName": { "type": "string", "enum": [ - "#Microsoft.Azure.Cdn.Models.DeliveryRuleCookiesConditionParameters" + "DeliveryRuleCookiesConditionParameters" ] }, "selector": { @@ -3722,13 +3722,13 @@ "description": "Defines the parameters for IsDevice match conditions", "required": [ "operator", - "@odata.type" + "typeName" ], "properties": { - "@odata.type": { + "typeName": { "type": "string", "enum": [ - "#Microsoft.Azure.Cdn.Models.DeliveryRuleIsDeviceConditionParameters" + "DeliveryRuleIsDeviceConditionParameters" ] }, "operator": { @@ -3816,13 +3816,13 @@ "description": "Defines the parameters for the url redirect action.", "required": [ "redirectType", - "@odata.type" + "typeName" ], "properties": { - "@odata.type": { + "typeName": { "type": "string", "enum": [ - "#Microsoft.Azure.Cdn.Models.DeliveryRuleUrlRedirectActionParameters" + "DeliveryRuleUrlRedirectActionParameters" ] }, "redirectType": { @@ -3891,13 +3891,13 @@ "UrlSigningActionParameters": { "description": "Defines the parameters for the Url Signing action.", "required": [ - "@odata.type" + "typeName" ], "properties": { - "@odata.type": { + "typeName": { "type": "string", "enum": [ - "#Microsoft.Azure.Cdn.Models.DeliveryRuleUrlSigningActionParameters" + "DeliveryRuleUrlSigningActionParameters" ] }, "algorithm": { @@ -3968,13 +3968,13 @@ "description": "Defines the parameters for the origin group override action.", "required": [ "originGroup", - "@odata.type" + "typeName" ], "properties": { - "@odata.type": { + "typeName": { "type": "string", "enum": [ - "#Microsoft.Azure.Cdn.Models.DeliveryRuleOriginGroupOverrideActionParameters" + "DeliveryRuleOriginGroupOverrideActionParameters" ] }, "originGroup": { @@ -4020,13 +4020,13 @@ "required": [ "sourcePattern", "destination", - "@odata.type" + "typeName" ], "properties": { - "@odata.type": { + "typeName": { "type": "string", "enum": [ - "#Microsoft.Azure.Cdn.Models.DeliveryRuleUrlRewriteActionParameters" + "DeliveryRuleUrlRewriteActionParameters" ] }, "sourcePattern": { @@ -4084,13 +4084,13 @@ "required": [ "headerAction", "headerName", - "@odata.type" + "typeName" ], "properties": { - "@odata.type": { + "typeName": { "type": "string", "enum": [ - "#Microsoft.Azure.Cdn.Models.DeliveryRuleHeaderActionParameters" + "DeliveryRuleHeaderActionParameters" ] }, "headerAction": { @@ -4139,13 +4139,13 @@ "required": [ "cacheBehavior", "cacheType", - "@odata.type" + "typeName" ], "properties": { - "@odata.type": { + "typeName": { "type": "string", "enum": [ - "#Microsoft.Azure.Cdn.Models.DeliveryRuleCacheExpirationActionParameters" + "DeliveryRuleCacheExpirationActionParameters" ] }, "cacheBehavior": { @@ -4201,13 +4201,13 @@ "description": "Defines the parameters for the cache-key query string action.", "required": [ "queryStringBehavior", - "@odata.type" + "typeName" ], "properties": { - "@odata.type": { + "typeName": { "type": "string", "enum": [ - "#Microsoft.Azure.Cdn.Models.DeliveryRuleCacheKeyQueryStringBehaviorActionParameters" + "DeliveryRuleCacheKeyQueryStringBehaviorActionParameters" ] }, "queryStringBehavior": { @@ -4252,13 +4252,13 @@ "CacheConfigurationActionParameters": { "description": "Defines the parameters for the cache configuration action. To disable caching, do not provide a cacheConfiguration object.", "required": [ - "@odata.type" + "typeName" ], "properties": { - "@odata.type": { + "typeName": { "type": "string", "enum": [ - "#Microsoft.Azure.Cdn.Models.DeliveryRuleCacheConfigurationActionParameters" + "DeliveryRuleCacheConfigurationActionParameters" ] }, "enableCache": { @@ -4562,7 +4562,7 @@ "KeyVaultSigningKeyParameters": { "description": "Describes the parameters for using a user's KeyVault for URL Signing Key.", "required": [ - "@odata.type", + "typeName", "subscriptionId", "resourceGroupName", "vaultName", @@ -4570,10 +4570,10 @@ "secretVersion" ], "properties": { - "@odata.type": { + "typeName": { "type": "string", "enum": [ - "#Microsoft.Azure.Cdn.Models.KeyVaultSigningKeyParameters" + "KeyVaultSigningKeyParameters" ] }, "subscriptionId": { @@ -5137,14 +5137,14 @@ "CdnCertificateSourceParameters": { "description": "Defines the parameters for using CDN managed certificate for securing custom domain.", "required": [ - "@odata.type", + "typeName", "certificateType" ], "properties": { - "@odata.type": { + "typeName": { "type": "string", "enum": [ - "#Microsoft.Azure.Cdn.Models.CdnCertificateSourceParameters" + "CdnCertificateSourceParameters" ] }, "certificateType": { @@ -5182,7 +5182,7 @@ "KeyVaultCertificateSourceParameters": { "description": "Describes the parameters for using a user's KeyVault certificate for securing custom domain.", "required": [ - "@odata.type", + "typeName", "subscriptionId", "resourceGroupName", "vaultName", @@ -5191,10 +5191,10 @@ "deleteRule" ], "properties": { - "@odata.type": { + "typeName": { "type": "string", "enum": [ - "#Microsoft.Azure.Cdn.Models.KeyVaultCertificateSourceParameters" + "KeyVaultCertificateSourceParameters" ] }, "subscriptionId": { From 74f68928e726e17caf8b98ec50a1dcf944bb646a Mon Sep 17 00:00:00 2001 From: Chenglong Liu Date: Fri, 9 Jul 2021 11:19:35 +0800 Subject: [PATCH 2/4] Update odatatype --- ...tomDomains_EnableCustomHttpsUsingBYOC.json | 2 +- ...CustomHttpsUsingCDNManagedCertificate.json | 2 +- .../2021-06-01/examples/Endpoints_Create.json | 32 +++++++++---------- .../2021-06-01/examples/Rules_Create.json | 16 +++++----- .../stable/2021-06-01/examples/Rules_Get.json | 4 +-- .../examples/Rules_ListByRuleSet.json | 4 +-- .../2021-06-01/examples/Rules_Update.json | 10 +++--- 7 files changed, 35 insertions(+), 35 deletions(-) diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/CustomDomains_EnableCustomHttpsUsingBYOC.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/CustomDomains_EnableCustomHttpsUsingBYOC.json index 8142dbf4a7d5..48936e97582c 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/CustomDomains_EnableCustomHttpsUsingBYOC.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/CustomDomains_EnableCustomHttpsUsingBYOC.json @@ -11,7 +11,7 @@ "certificateSource": "AzureKeyVault", "protocolType": "ServerNameIndication", "certificateSourceParameters": { - "OData.type": "#Microsoft.Azure.Cdn.Models.KeyVaultCertificateSourceParameters", + "TypeName": "KeyVaultCertificateSourceParameters", "subscriptionId": "subid", "resourceGroupName": "RG", "vaultName": "kv", diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/CustomDomains_EnableCustomHttpsUsingCDNManagedCertificate.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/CustomDomains_EnableCustomHttpsUsingCDNManagedCertificate.json index 2ed757bcd2fa..e74e6d2383fb 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/CustomDomains_EnableCustomHttpsUsingCDNManagedCertificate.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/CustomDomains_EnableCustomHttpsUsingCDNManagedCertificate.json @@ -11,7 +11,7 @@ "certificateSource": "Cdn", "protocolType": "ServerNameIndication", "certificateSourceParameters": { - "OData.type": "#Microsoft.Azure.Cdn.Models.CdnCertificateSourceParameters", + "TypeName": "CdnCertificateSourceParameters", "certificateType": "Shared" } } diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Endpoints_Create.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Endpoints_Create.json index 2945a99f186d..f9bf46a94bd2 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Endpoints_Create.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Endpoints_Create.json @@ -40,7 +40,7 @@ "192.168.1.0/24", "10.0.0.0/24" ], - "@odata.type": "#Microsoft.Azure.Cdn.Models.DeliveryRuleRemoteAddressConditionParameters" + "typename": "DeliveryRuleRemoteAddressConditionParameters" } } ], @@ -50,7 +50,7 @@ "parameters": { "cacheBehavior": "Override", "cacheDuration": "10:10:09", - "@odata.type": "#Microsoft.Azure.Cdn.Models.DeliveryRuleCacheExpirationActionParameters", + "typename": "DeliveryRuleCacheExpirationActionParameters", "cacheType": "All" } }, @@ -60,7 +60,7 @@ "headerAction": "Overwrite", "headerName": "Access-Control-Allow-Origin", "value": "*", - "@odata.type": "#Microsoft.Azure.Cdn.Models.DeliveryRuleHeaderActionParameters" + "typename": "DeliveryRuleHeaderActionParameters" } }, { @@ -69,7 +69,7 @@ "headerAction": "Overwrite", "headerName": "Accept-Encoding", "value": "gzip", - "@odata.type": "#Microsoft.Azure.Cdn.Models.DeliveryRuleHeaderActionParameters" + "typename": "DeliveryRuleHeaderActionParameters" } } ] @@ -221,7 +221,7 @@ { "name": "RemoteAddress", "parameters": { - "@odata.type": "#Microsoft.Azure.Cdn.Models.DeliveryRuleRemoteAddressConditionParameters", + "typename": "DeliveryRuleRemoteAddressConditionParameters", "operator": "IPMatch", "negateCondition": true, "matchValues": [ @@ -236,7 +236,7 @@ { "name": "CacheExpiration", "parameters": { - "@odata.type": "#Microsoft.Azure.Cdn.Models.DeliveryRuleCacheExpirationActionParameters", + "typename": "DeliveryRuleCacheExpirationActionParameters", "cacheBehavior": "Override", "cacheDuration": "10:10:09", "cacheType": "All" @@ -245,7 +245,7 @@ { "name": "ModifyResponseHeader", "parameters": { - "@odata.type": "#Microsoft.Azure.Cdn.Models.DeliveryRuleHeaderActionParameters", + "typename": "DeliveryRuleHeaderActionParameters", "headerAction": "Overwrite", "headerName": "Access-Control-Allow-Origin", "value": "*" @@ -254,7 +254,7 @@ { "name": "ModifyRequestHeader", "parameters": { - "@odata.type": "#Microsoft.Azure.Cdn.Models.DeliveryRuleHeaderActionParameters", + "typename": "DeliveryRuleHeaderActionParameters", "headerAction": "Overwrite", "headerName": "Accept-Encoding", "value": "gzip" @@ -357,7 +357,7 @@ { "name": "RemoteAddress", "parameters": { - "@odata.type": "#Microsoft.Azure.Cdn.Models.DeliveryRuleRemoteAddressConditionParameters", + "typename": "DeliveryRuleRemoteAddressConditionParameters", "operator": "IPMatch", "negateCondition": true, "matchValues": [ @@ -372,7 +372,7 @@ { "name": "CacheExpiration", "parameters": { - "@odata.type": "#Microsoft.Azure.Cdn.Models.DeliveryRuleCacheExpirationActionParameters", + "typename": "DeliveryRuleCacheExpirationActionParameters", "cacheBehavior": "Override", "cacheDuration": "10:10:09", "cacheType": "All" @@ -381,7 +381,7 @@ { "name": "ModifyResponseHeader", "parameters": { - "@odata.type": "#Microsoft.Azure.Cdn.Models.DeliveryRuleHeaderActionParameters", + "typename": "DeliveryRuleHeaderActionParameters", "headerAction": "Overwrite", "headerName": "Access-Control-Allow-Origin", "value": "*" @@ -390,7 +390,7 @@ { "name": "ModifyRequestHeader", "parameters": { - "@odata.type": "#Microsoft.Azure.Cdn.Models.DeliveryRuleHeaderActionParameters", + "typename": "DeliveryRuleHeaderActionParameters", "headerAction": "Overwrite", "headerName": "Accept-Encoding", "value": "gzip" @@ -493,7 +493,7 @@ { "name": "RemoteAddress", "parameters": { - "@odata.type": "#Microsoft.Azure.Cdn.Models.DeliveryRuleRemoteAddressConditionParameters", + "typename": "DeliveryRuleRemoteAddressConditionParameters", "operator": "IPMatch", "negateCondition": true, "matchValues": [ @@ -508,7 +508,7 @@ { "name": "CacheExpiration", "parameters": { - "@odata.type": "#Microsoft.Azure.Cdn.Models.DeliveryRuleCacheExpirationActionParameters", + "typename": "DeliveryRuleCacheExpirationActionParameters", "cacheBehavior": "Override", "cacheDuration": "10:10:09", "cacheType": "All" @@ -517,7 +517,7 @@ { "name": "ModifyResponseHeader", "parameters": { - "@odata.type": "#Microsoft.Azure.Cdn.Models.DeliveryRuleHeaderActionParameters", + "typename": "DeliveryRuleHeaderActionParameters", "headerAction": "Overwrite", "headerName": "Access-Control-Allow-Origin", "value": "*" @@ -526,7 +526,7 @@ { "name": "ModifyRequestHeader", "parameters": { - "@odata.type": "#Microsoft.Azure.Cdn.Models.DeliveryRuleHeaderActionParameters", + "typename": "DeliveryRuleHeaderActionParameters", "headerAction": "Overwrite", "headerName": "Accept-Encoding", "value": "gzip" diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Rules_Create.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Rules_Create.json index 2e977776a1ef..df23a2862950 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Rules_Create.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Rules_Create.json @@ -13,7 +13,7 @@ { "name": "RequestMethod", "parameters": { - "@odata.type": "#Microsoft.Azure.Cdn.Models.DeliveryRuleRequestMethodConditionParameters", + "typename": "DeliveryRuleRequestMethodConditionParameters", "operator": "Equal", "matchValues": [ "GET" @@ -26,7 +26,7 @@ { "name": "ModifyResponseHeader", "parameters": { - "@odata.type": "#Microsoft.Azure.Cdn.Models.DeliveryRuleHeaderActionParameters", + "typename": "DeliveryRuleHeaderActionParameters", "headerAction": "Overwrite", "headerName": "X-CDN", "value": "MSFT" @@ -48,7 +48,7 @@ { "name": "RequestMethod", "parameters": { - "@odata.type": "#Microsoft.Azure.Cdn.Models.DeliveryRuleRequestMethodConditionParameters", + "typename": "DeliveryRuleRequestMethodConditionParameters", "operator": "Equal", "matchValues": [ "GET" @@ -61,7 +61,7 @@ { "name": "ModifyResponseHeader", "parameters": { - "@odata.type": "#Microsoft.Azure.Cdn.Models.DeliveryRuleHeaderActionParameters", + "typename": "DeliveryRuleHeaderActionParameters", "headerAction": "Overwrite", "headerName": "X-CDN", "value": "MSFT" @@ -82,7 +82,7 @@ { "name": "RequestMethod", "parameters": { - "@odata.type": "#Microsoft.Azure.Cdn.Models.DeliveryRuleRequestMethodConditionParameters", + "typename": "DeliveryRuleRequestMethodConditionParameters", "operator": "Equal", "matchValues": [ "GET" @@ -95,7 +95,7 @@ { "name": "ModifyResponseHeader", "parameters": { - "@odata.type": "#Microsoft.Azure.Cdn.Models.DeliveryRuleHeaderActionParameters", + "typename": "DeliveryRuleHeaderActionParameters", "headerAction": "Overwrite", "headerName": "X-CDN", "value": "MSFT" @@ -116,7 +116,7 @@ { "name": "RequestMethod", "parameters": { - "@odata.type": "#Microsoft.Azure.Cdn.Models.DeliveryRuleRequestMethodConditionParameters", + "typename": "DeliveryRuleRequestMethodConditionParameters", "operator": "Equal", "matchValues": [ "GET" @@ -129,7 +129,7 @@ { "name": "ModifyResponseHeader", "parameters": { - "@odata.type": "#Microsoft.Azure.Cdn.Models.DeliveryRuleHeaderActionParameters", + "typename": "DeliveryRuleHeaderActionParameters", "headerAction": "Overwrite", "headerName": "X-CDN", "value": "MSFT" diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Rules_Get.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Rules_Get.json index 63ef52e3748b..306f109b3448 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Rules_Get.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Rules_Get.json @@ -19,7 +19,7 @@ { "name": "RequestMethod", "parameters": { - "@odata.type": "#Microsoft.Azure.Cdn.Models.DeliveryRuleRequestMethodConditionParameters", + "typename": "DeliveryRuleRequestMethodConditionParameters", "operator": "Equal", "matchValues": [ "GET" @@ -32,7 +32,7 @@ { "name": "ModifyResponseHeader", "parameters": { - "@odata.type": "#Microsoft.Azure.Cdn.Models.DeliveryRuleHeaderActionParameters", + "typename": "DeliveryRuleHeaderActionParameters", "headerAction": "Overwrite", "headerName": "X-CDN", "value": "MSFT" diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Rules_ListByRuleSet.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Rules_ListByRuleSet.json index da8ebbd72d3e..2a0c3ccb303e 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Rules_ListByRuleSet.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Rules_ListByRuleSet.json @@ -20,7 +20,7 @@ { "name": "RequestMethod", "parameters": { - "@odata.type": "#Microsoft.Azure.Cdn.Models.DeliveryRuleRequestMethodConditionParameters", + "typename": "DeliveryRuleRequestMethodConditionParameters", "operator": "Equal", "matchValues": [ "GET" @@ -33,7 +33,7 @@ { "name": "ModifyResponseHeader", "parameters": { - "@odata.type": "#Microsoft.Azure.Cdn.Models.DeliveryRuleHeaderActionParameters", + "typename": "DeliveryRuleHeaderActionParameters", "headerAction": "Overwrite", "headerName": "X-CDN", "value": "MSFT" diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Rules_Update.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Rules_Update.json index f4e42ea47fc7..462cf0b937ea 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Rules_Update.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Rules_Update.json @@ -13,7 +13,7 @@ { "name": "ModifyResponseHeader", "parameters": { - "@odata.type": "#Microsoft.Azure.Cdn.Models.DeliveryRuleHeaderActionParameters", + "typename": "DeliveryRuleHeaderActionParameters", "headerAction": "Overwrite", "headerName": "X-CDN", "value": "MSFT" @@ -35,7 +35,7 @@ { "name": "RequestMethod", "parameters": { - "@odata.type": "#Microsoft.Azure.Cdn.Models.DeliveryRuleRequestMethodConditionParameters", + "typename": "DeliveryRuleRequestMethodConditionParameters", "operator": "Equal", "matchValues": [ "GET" @@ -48,7 +48,7 @@ { "name": "ModifyResponseHeader", "parameters": { - "@odata.type": "#Microsoft.Azure.Cdn.Models.DeliveryRuleHeaderActionParameters", + "typename": "DeliveryRuleHeaderActionParameters", "headerAction": "Overwrite", "headerName": "X-CDN", "value": "MSFT" @@ -69,7 +69,7 @@ { "name": "RequestMethod", "parameters": { - "@odata.type": "#Microsoft.Azure.Cdn.Models.DeliveryRuleRequestMethodConditionParameters", + "typename": "DeliveryRuleRequestMethodConditionParameters", "operator": "Equal", "matchValues": [ "GET" @@ -82,7 +82,7 @@ { "name": "ModifyResponseHeader", "parameters": { - "@odata.type": "#Microsoft.Azure.Cdn.Models.DeliveryRuleHeaderActionParameters", + "typename": "DeliveryRuleHeaderActionParameters", "headerAction": "Overwrite", "headerName": "X-CDN", "value": "MSFT" From fccbad1aff16610e9773bc34a1b94e4650dd3f05 Mon Sep 17 00:00:00 2001 From: Chenglong Liu Date: Mon, 12 Jul 2021 15:47:03 +0800 Subject: [PATCH 3/4] Update typeName --- .../examples/CustomDomains_EnableCustomHttpsUsingBYOC.json | 2 +- ...stomDomains_EnableCustomHttpsUsingCDNManagedCertificate.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/CustomDomains_EnableCustomHttpsUsingBYOC.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/CustomDomains_EnableCustomHttpsUsingBYOC.json index 48936e97582c..ade14eec68ad 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/CustomDomains_EnableCustomHttpsUsingBYOC.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/CustomDomains_EnableCustomHttpsUsingBYOC.json @@ -11,7 +11,7 @@ "certificateSource": "AzureKeyVault", "protocolType": "ServerNameIndication", "certificateSourceParameters": { - "TypeName": "KeyVaultCertificateSourceParameters", + "typeName": "KeyVaultCertificateSourceParameters", "subscriptionId": "subid", "resourceGroupName": "RG", "vaultName": "kv", diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/CustomDomains_EnableCustomHttpsUsingCDNManagedCertificate.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/CustomDomains_EnableCustomHttpsUsingCDNManagedCertificate.json index e74e6d2383fb..994ede67a5c0 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/CustomDomains_EnableCustomHttpsUsingCDNManagedCertificate.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/CustomDomains_EnableCustomHttpsUsingCDNManagedCertificate.json @@ -11,7 +11,7 @@ "certificateSource": "Cdn", "protocolType": "ServerNameIndication", "certificateSourceParameters": { - "TypeName": "CdnCertificateSourceParameters", + "typeName": "CdnCertificateSourceParameters", "certificateType": "Shared" } } From 0aa8fcb2b52deb95230825585f2fc264332ef17e Mon Sep 17 00:00:00 2001 From: Chenglong Liu Date: Tue, 13 Jul 2021 13:23:51 +0800 Subject: [PATCH 4/4] camel casing typeName --- .../2021-06-01/examples/Endpoints_Create.json | 32 +++++++++---------- .../2021-06-01/examples/Rules_Create.json | 16 +++++----- .../stable/2021-06-01/examples/Rules_Get.json | 4 +-- .../examples/Rules_ListByRuleSet.json | 4 +-- .../2021-06-01/examples/Rules_Update.json | 10 +++--- 5 files changed, 33 insertions(+), 33 deletions(-) diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Endpoints_Create.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Endpoints_Create.json index f9bf46a94bd2..964fde5e3ae4 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Endpoints_Create.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Endpoints_Create.json @@ -40,7 +40,7 @@ "192.168.1.0/24", "10.0.0.0/24" ], - "typename": "DeliveryRuleRemoteAddressConditionParameters" + "typeName": "DeliveryRuleRemoteAddressConditionParameters" } } ], @@ -50,7 +50,7 @@ "parameters": { "cacheBehavior": "Override", "cacheDuration": "10:10:09", - "typename": "DeliveryRuleCacheExpirationActionParameters", + "typeName": "DeliveryRuleCacheExpirationActionParameters", "cacheType": "All" } }, @@ -60,7 +60,7 @@ "headerAction": "Overwrite", "headerName": "Access-Control-Allow-Origin", "value": "*", - "typename": "DeliveryRuleHeaderActionParameters" + "typeName": "DeliveryRuleHeaderActionParameters" } }, { @@ -69,7 +69,7 @@ "headerAction": "Overwrite", "headerName": "Accept-Encoding", "value": "gzip", - "typename": "DeliveryRuleHeaderActionParameters" + "typeName": "DeliveryRuleHeaderActionParameters" } } ] @@ -221,7 +221,7 @@ { "name": "RemoteAddress", "parameters": { - "typename": "DeliveryRuleRemoteAddressConditionParameters", + "typeName": "DeliveryRuleRemoteAddressConditionParameters", "operator": "IPMatch", "negateCondition": true, "matchValues": [ @@ -236,7 +236,7 @@ { "name": "CacheExpiration", "parameters": { - "typename": "DeliveryRuleCacheExpirationActionParameters", + "typeName": "DeliveryRuleCacheExpirationActionParameters", "cacheBehavior": "Override", "cacheDuration": "10:10:09", "cacheType": "All" @@ -245,7 +245,7 @@ { "name": "ModifyResponseHeader", "parameters": { - "typename": "DeliveryRuleHeaderActionParameters", + "typeName": "DeliveryRuleHeaderActionParameters", "headerAction": "Overwrite", "headerName": "Access-Control-Allow-Origin", "value": "*" @@ -254,7 +254,7 @@ { "name": "ModifyRequestHeader", "parameters": { - "typename": "DeliveryRuleHeaderActionParameters", + "typeName": "DeliveryRuleHeaderActionParameters", "headerAction": "Overwrite", "headerName": "Accept-Encoding", "value": "gzip" @@ -357,7 +357,7 @@ { "name": "RemoteAddress", "parameters": { - "typename": "DeliveryRuleRemoteAddressConditionParameters", + "typeName": "DeliveryRuleRemoteAddressConditionParameters", "operator": "IPMatch", "negateCondition": true, "matchValues": [ @@ -372,7 +372,7 @@ { "name": "CacheExpiration", "parameters": { - "typename": "DeliveryRuleCacheExpirationActionParameters", + "typeName": "DeliveryRuleCacheExpirationActionParameters", "cacheBehavior": "Override", "cacheDuration": "10:10:09", "cacheType": "All" @@ -381,7 +381,7 @@ { "name": "ModifyResponseHeader", "parameters": { - "typename": "DeliveryRuleHeaderActionParameters", + "typeName": "DeliveryRuleHeaderActionParameters", "headerAction": "Overwrite", "headerName": "Access-Control-Allow-Origin", "value": "*" @@ -390,7 +390,7 @@ { "name": "ModifyRequestHeader", "parameters": { - "typename": "DeliveryRuleHeaderActionParameters", + "typeName": "DeliveryRuleHeaderActionParameters", "headerAction": "Overwrite", "headerName": "Accept-Encoding", "value": "gzip" @@ -493,7 +493,7 @@ { "name": "RemoteAddress", "parameters": { - "typename": "DeliveryRuleRemoteAddressConditionParameters", + "typeName": "DeliveryRuleRemoteAddressConditionParameters", "operator": "IPMatch", "negateCondition": true, "matchValues": [ @@ -508,7 +508,7 @@ { "name": "CacheExpiration", "parameters": { - "typename": "DeliveryRuleCacheExpirationActionParameters", + "typeName": "DeliveryRuleCacheExpirationActionParameters", "cacheBehavior": "Override", "cacheDuration": "10:10:09", "cacheType": "All" @@ -517,7 +517,7 @@ { "name": "ModifyResponseHeader", "parameters": { - "typename": "DeliveryRuleHeaderActionParameters", + "typeName": "DeliveryRuleHeaderActionParameters", "headerAction": "Overwrite", "headerName": "Access-Control-Allow-Origin", "value": "*" @@ -526,7 +526,7 @@ { "name": "ModifyRequestHeader", "parameters": { - "typename": "DeliveryRuleHeaderActionParameters", + "typeName": "DeliveryRuleHeaderActionParameters", "headerAction": "Overwrite", "headerName": "Accept-Encoding", "value": "gzip" diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Rules_Create.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Rules_Create.json index df23a2862950..08ce135a26b3 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Rules_Create.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Rules_Create.json @@ -13,7 +13,7 @@ { "name": "RequestMethod", "parameters": { - "typename": "DeliveryRuleRequestMethodConditionParameters", + "typeName": "DeliveryRuleRequestMethodConditionParameters", "operator": "Equal", "matchValues": [ "GET" @@ -26,7 +26,7 @@ { "name": "ModifyResponseHeader", "parameters": { - "typename": "DeliveryRuleHeaderActionParameters", + "typeName": "DeliveryRuleHeaderActionParameters", "headerAction": "Overwrite", "headerName": "X-CDN", "value": "MSFT" @@ -48,7 +48,7 @@ { "name": "RequestMethod", "parameters": { - "typename": "DeliveryRuleRequestMethodConditionParameters", + "typeName": "DeliveryRuleRequestMethodConditionParameters", "operator": "Equal", "matchValues": [ "GET" @@ -61,7 +61,7 @@ { "name": "ModifyResponseHeader", "parameters": { - "typename": "DeliveryRuleHeaderActionParameters", + "typeName": "DeliveryRuleHeaderActionParameters", "headerAction": "Overwrite", "headerName": "X-CDN", "value": "MSFT" @@ -82,7 +82,7 @@ { "name": "RequestMethod", "parameters": { - "typename": "DeliveryRuleRequestMethodConditionParameters", + "typeName": "DeliveryRuleRequestMethodConditionParameters", "operator": "Equal", "matchValues": [ "GET" @@ -95,7 +95,7 @@ { "name": "ModifyResponseHeader", "parameters": { - "typename": "DeliveryRuleHeaderActionParameters", + "typeName": "DeliveryRuleHeaderActionParameters", "headerAction": "Overwrite", "headerName": "X-CDN", "value": "MSFT" @@ -116,7 +116,7 @@ { "name": "RequestMethod", "parameters": { - "typename": "DeliveryRuleRequestMethodConditionParameters", + "typeName": "DeliveryRuleRequestMethodConditionParameters", "operator": "Equal", "matchValues": [ "GET" @@ -129,7 +129,7 @@ { "name": "ModifyResponseHeader", "parameters": { - "typename": "DeliveryRuleHeaderActionParameters", + "typeName": "DeliveryRuleHeaderActionParameters", "headerAction": "Overwrite", "headerName": "X-CDN", "value": "MSFT" diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Rules_Get.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Rules_Get.json index 306f109b3448..48026509ca10 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Rules_Get.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Rules_Get.json @@ -19,7 +19,7 @@ { "name": "RequestMethod", "parameters": { - "typename": "DeliveryRuleRequestMethodConditionParameters", + "typeName": "DeliveryRuleRequestMethodConditionParameters", "operator": "Equal", "matchValues": [ "GET" @@ -32,7 +32,7 @@ { "name": "ModifyResponseHeader", "parameters": { - "typename": "DeliveryRuleHeaderActionParameters", + "typeName": "DeliveryRuleHeaderActionParameters", "headerAction": "Overwrite", "headerName": "X-CDN", "value": "MSFT" diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Rules_ListByRuleSet.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Rules_ListByRuleSet.json index 2a0c3ccb303e..4e6993b32ba0 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Rules_ListByRuleSet.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Rules_ListByRuleSet.json @@ -20,7 +20,7 @@ { "name": "RequestMethod", "parameters": { - "typename": "DeliveryRuleRequestMethodConditionParameters", + "typeName": "DeliveryRuleRequestMethodConditionParameters", "operator": "Equal", "matchValues": [ "GET" @@ -33,7 +33,7 @@ { "name": "ModifyResponseHeader", "parameters": { - "typename": "DeliveryRuleHeaderActionParameters", + "typeName": "DeliveryRuleHeaderActionParameters", "headerAction": "Overwrite", "headerName": "X-CDN", "value": "MSFT" diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Rules_Update.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Rules_Update.json index 462cf0b937ea..9b9f829d32d6 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Rules_Update.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Rules_Update.json @@ -13,7 +13,7 @@ { "name": "ModifyResponseHeader", "parameters": { - "typename": "DeliveryRuleHeaderActionParameters", + "typeName": "DeliveryRuleHeaderActionParameters", "headerAction": "Overwrite", "headerName": "X-CDN", "value": "MSFT" @@ -35,7 +35,7 @@ { "name": "RequestMethod", "parameters": { - "typename": "DeliveryRuleRequestMethodConditionParameters", + "typeName": "DeliveryRuleRequestMethodConditionParameters", "operator": "Equal", "matchValues": [ "GET" @@ -48,7 +48,7 @@ { "name": "ModifyResponseHeader", "parameters": { - "typename": "DeliveryRuleHeaderActionParameters", + "typeName": "DeliveryRuleHeaderActionParameters", "headerAction": "Overwrite", "headerName": "X-CDN", "value": "MSFT" @@ -69,7 +69,7 @@ { "name": "RequestMethod", "parameters": { - "typename": "DeliveryRuleRequestMethodConditionParameters", + "typeName": "DeliveryRuleRequestMethodConditionParameters", "operator": "Equal", "matchValues": [ "GET" @@ -82,7 +82,7 @@ { "name": "ModifyResponseHeader", "parameters": { - "typename": "DeliveryRuleHeaderActionParameters", + "typeName": "DeliveryRuleHeaderActionParameters", "headerAction": "Overwrite", "headerName": "X-CDN", "value": "MSFT"