Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cdn swagger 2021 06 01 fix #17278

Merged
merged 30 commits into from
Jan 14, 2022
Merged

Cdn swagger 2021 06 01 fix #17278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
1bcc20d
Add blockchain to latest profile
markcowl Aug 22, 2019
7b46097
Add additional types
markcowl Aug 22, 2019
5dbb091
Merge branch 'main' of https://github.com/Azure/azure-rest-api-specs …
Jan 4, 2022
e1600f7
[CDN] Fix incorrect type for compressionSettings and SharedPrivateLin…
Jan 4, 2022
d8ac4f9
Merge pull request #1 from t-bzhan/cdn-swagger-2021-06-01-fix
ChenglongLiu Jan 5, 2022
b2a85ff
Update SecurityPolicy patch operation
Jan 5, 2022
36c88c1
Update SecurityPolicy patch operation
Jan 5, 2022
ff473fa
Update SecurityPolicy patch operation
Jan 5, 2022
85c0a16
Update SecurityPolicy patch operation
Jan 5, 2022
9f1b614
Update SecurityPolicy patch operation
Jan 5, 2022
3b76a49
Update SecurityPolicy patch operation
Jan 5, 2022
aea71be
Update SecurityPolicy patch operation
Jan 5, 2022
ddb3135
Update SecurityPolicy patch operation
Jan 5, 2022
de5976b
Update SecurityPolicy patch operation
Jan 5, 2022
d390ac7
Update SecurityPolicy patch operation
Jan 5, 2022
898caaf
Merge pull request #2 from ChenglongLiu/chenglong/fix
ChenglongLiu Jan 5, 2022
c3d298d
Removing originResponseTimeoutSeconds from endpoint level
Jan 5, 2022
0aaeb49
Merge pull request #3 from ChenglongLiu/users/sinadell/originswaggerfix
sinadell Jan 5, 2022
f79d3b4
Fix the afdendpoint example
Jan 6, 2022
06ffa40
Merge pull request #4 from ChenglongLiu/chenglong/fixTimeoutExample
ChenglongLiu Jan 6, 2022
f82cdc7
Fix the cacheDuration format
Jan 7, 2022
4234b85
Merge pull request #5 from ChenglongLiu/chenglong/fixDurationFormat
ChenglongLiu Jan 7, 2022
d6a4a31
Adding user assigned identity to managed identity
ajbrown821 Jan 7, 2022
749ee52
Merge pull request #7 from ChenglongLiu/dev/ajbrown/user-assigned-enu…
ChenglongLiu Jan 10, 2022
7821c1e
Fix the typo and example
Jan 10, 2022
51493ec
Merge pull request #8 from ChenglongLiu/chenglong/fixbug
ChenglongLiu Jan 10, 2022
de566e6
Fix OBJECT_ADDITIONAL_PROPERTIES
Jan 13, 2022
681eb8a
Merge pull request #9 from ChenglongLiu/chenglong/fixbug2
ChenglongLiu Jan 13, 2022
28a5464
Revert responseBasedAFDOriginErrorDetectionSettings
Jan 14, 2022
cb01cc5
Merge pull request #11 from ChenglongLiu/chenglong/revert
ChenglongLiu Jan 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/afdx.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4779,9 +4779,7 @@
"sharedPrivateLinkResource": {
"description": "The properties of the private link resource for private origin.",
"type": "object",
"items": {
"$ref": "#/definitions/SharedPrivateLinkResourceProperties"
}
"$ref": "#/definitions/SharedPrivateLinkResourceProperties"
},
"enabledState": {
"description": "Whether to enable health probes to be made against backends defined under backendPools. Health probes can only be disabled if there is a single enabled backend in single enabled backend pool.",
Expand Down Expand Up @@ -5065,9 +5063,7 @@
"compressionSettings": {
"description": "compression settings.",
"type": "object",
"items": {
"$ref": "#/definitions/CompressionSettings"
}
"$ref": "#/definitions/CompressionSettings"
},
"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.",
Expand Down
39 changes: 26 additions & 13 deletions specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/afdx.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2856,12 +2856,12 @@
"type": "string"
},
{
"name": "securityPolicyProperties",
"name": "securityPolicyUpdateProperties",
"in": "body",
"description": "Security policy update properties",
"required": true,
"schema": {
"$ref": "#/definitions/SecurityPolicyProperties"
"$ref": "#/definitions/SecurityPolicyUpdateParameters"
}
},
{
Expand Down Expand Up @@ -4228,6 +4228,7 @@
},
"SecurityPolicyProperties": {
"description": "The json object that contains properties required to create a security policy",
"type": "object",
"allOf": [
{
"$ref": "#/definitions/AFDStateProperties"
Expand All @@ -4241,11 +4242,31 @@
},
"parameters": {
"description": "object which contains security policy parameters",
"$ref": "#/definitions/SecurityPolicyParameters"
"$ref": "#/definitions/SecurityPolicyPropertiesParameters"
}
}
},
"SecurityPolicyUpdateParameters": {
"description": "The JSON object containing security policy update parameters.",
"type": "object",
"properties": {
"properties": {
"x-ms-client-flatten": true,
"$ref": "#/definitions/SecurityPolicyUpdateProperties"
}
}
},
"SecurityPolicyParameters": {
"SecurityPolicyUpdateProperties": {
"description": "The json object that contains properties required to update a security policy",
"type": "object",
"properties": {
"parameters": {
"description": "object which contains security policy parameters",
"$ref": "#/definitions/SecurityPolicyPropertiesParameters"
}
}
},
"SecurityPolicyPropertiesParameters": {
"description": "The json object containing security policy parameters",
"discriminator": "type",
"required": [
Expand All @@ -4272,7 +4293,7 @@
"type": "object",
"allOf": [
{
"$ref": "#/definitions/SecurityPolicyParameters"
"$ref": "#/definitions/SecurityPolicyPropertiesParameters"
}
],
"properties": {
Expand Down Expand Up @@ -4414,14 +4435,6 @@
"name": "EnabledState",
"modelAsString": true
}
},
"originResponseTimeoutSeconds": {
"description": "Send and receive timeout on forwarding request to the origin. When timeout is reached, the request fails and returns.",
"type": "integer",
"format": "int32",
"minimum": 16,
"maximum": 240,
"exclusiveMinimum": false
}
}
},
Expand Down
73 changes: 66 additions & 7 deletions specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/cdn.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2458,6 +2458,11 @@
"description": "The pricing tier (defines Azure Front Door Standard or Premium or a CDN provider, feature list and rate) of the profile.",
"$ref": "#/definitions/Sku"
},
"kind": {
"readOnly": true,
"type": "string",
"description": "Kind of the profile. Used by portal to differentiate traditional CDN profile and new AFD profile."
},
"properties": {
"x-ms-client-flatten": true,
"$ref": "#/definitions/ProfileProperties"
Expand Down Expand Up @@ -2499,11 +2504,6 @@
"type": "string",
"description": "The Id of the frontdoor."
},
"kind": {
"readOnly": true,
"type": "string",
"description": "Kind of the profile. Used by portal to differentiate traditional CDN profile and new AFD profile."
},
"originResponseTimeoutSeconds": {
"description": "Send and receive timeout on forwarding request to the origin. When timeout is reached, the request fails and returns.",
"type": "integer",
Expand All @@ -2521,6 +2521,8 @@
"description": "Type of managed service identity.",
"enum": [
"SystemAssigned",
"UserAssigned",
"SystemAssigned, UserAssigned",
"None"
],
"type": "string",
Expand All @@ -2538,6 +2540,29 @@
"description": "Principal Id of managed service identity.",
"type": "string",
"readOnly": true
},
"userAssignedIdentities": {
"description": "The list of user assigned identities associated with the resource. The user identity dictionary key references will be ARM resource ids in the form: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}",
"type": "object",
"additionalProperties": {
"$ref": "#/definitions/userAssignedIdentity"
}
}
}
},
"userAssignedIdentity": {
"description": "User Assigned identity.",
"type": "object",
"properties": {
"principalId": {
"description": "Principal Id of user assigned identity",
"type": "string",
"readOnly": true
},
"clientId": {
"description": "Client Id of user assigned identity",
"type": "string",
"readOnly": true
}
}
},
Expand Down Expand Up @@ -3935,6 +3960,13 @@
"Desktop"
]
}
},
"transforms": {
"description": "List of transforms",
"type": "array",
"items": {
"$ref": "#/definitions/transform"
}
}
}
},
Expand Down Expand Up @@ -3974,6 +4006,13 @@
"items": {
"type": "string"
}
},
"transforms": {
"description": "List of transforms",
"type": "array",
"items": {
"$ref": "#/definitions/transform"
}
}
}
},
Expand Down Expand Up @@ -4021,6 +4060,13 @@
"items": {
"type": "string"
}
},
"transforms": {
"description": "List of transforms",
"type": "array",
"items": {
"$ref": "#/definitions/transform"
}
}
}
},
Expand Down Expand Up @@ -4068,6 +4114,13 @@
"items": {
"type": "string"
}
},
"transforms": {
"description": "List of transforms",
"type": "array",
"items": {
"$ref": "#/definitions/transform"
}
}
}
},
Expand Down Expand Up @@ -4160,6 +4213,13 @@
"items": {
"$ref": "#/definitions/SslProtocol"
}
},
"transforms": {
"description": "List of transforms",
"type": "array",
"items": {
"$ref": "#/definitions/transform"
}
}
}
},
Expand Down Expand Up @@ -4732,8 +4792,7 @@
},
"cacheDuration": {
"description": "The duration for which the content needs to be cached. Allowed format is [d.]hh:mm:ss",
"type": "string",
"format": "duration"
"type": "string"
}
}
},
Expand Down
4 changes: 0 additions & 4 deletions ...on/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/AFDEndpoints_Create.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
"tags": {},
"location": "CentralUs",
"properties": {
"originResponseTimeoutSeconds": 30,
"enabledState": "Enabled"
}
}
Expand All @@ -24,7 +23,6 @@
"location": "CentralUs",
"properties": {
"hostName": "endpoint1.azureedge.net",
"originResponseTimeoutSeconds": 30,
"enabledState": "Enabled",
"provisioningState": "Succeeded",
"deploymentStatus": "NotStarted"
Expand All @@ -40,7 +38,6 @@
"location": "CentralUs",
"properties": {
"hostName": "endpoint1.azureedge.net",
"originResponseTimeoutSeconds": 30,
"enabledState": "Enabled",
"provisioningState": "Creating",
"deploymentStatus": "NotStarted"
Expand All @@ -56,7 +53,6 @@
"location": "CentralUs",
"properties": {
"hostName": "endpoint1.azureedge.net",
"originResponseTimeoutSeconds": 30,
"enabledState": "Enabled",
"provisioningState": "Creating",
"deploymentStatus": "NotStarted"
Expand Down
1 change: 0 additions & 1 deletion ...ation/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/AFDEndpoints_Get.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
"location": "CentralUs",
"properties": {
"hostName": "endpoint1.azureedge.net",
"originResponseTimeoutSeconds": 30,
"enabledState": "Enabled",
"provisioningState": "Succeeded",
"deploymentStatus": "Succeeded"
Expand Down
1 change: 0 additions & 1 deletion ...resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/AFDEndpoints_ListByProfile.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
"location": "CentralUs",
"properties": {
"hostName": "endpoint1.azureedge.net",
"originResponseTimeoutSeconds": 30,
"enabledState": "Enabled",
"provisioningState": "Succeeded",
"deploymentStatus": "Succeeded"
Expand Down
3 changes: 0 additions & 3 deletions ...on/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/AFDEndpoints_Update.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
"endpointUpdateProperties": {
"tags": {},
"properties": {
"originResponseTimeoutSeconds": 30,
"enabledState": "Enabled"
}
}
Expand All @@ -23,7 +22,6 @@
"location": "WestCentralUs",
"properties": {
"hostName": "endpoint1.azureedge.net",
"originResponseTimeoutSeconds": 30,
"enabledState": "Enabled",
"provisioningState": "Succeeded",
"deploymentStatus": "InProgress"
Expand All @@ -42,7 +40,6 @@
"location": "WestCentralUs",
"properties": {
"hostName": "endpoint1.azureedge.net",
"originResponseTimeoutSeconds": 30,
"enabledState": "Enabled",
"provisioningState": "Updating",
"deploymentStatus": "NotStarted"
Expand Down
3 changes: 3 additions & 0 deletions ...cation/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Profiles_Create.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
"sku": {
"name": "Premium_AzureFrontDoor"
},
"kind": "frontdoor",
"properties": {
"provisioningState": "Creating",
"resourceState": "Creating"
Expand All @@ -38,6 +39,7 @@
"sku": {
"name": "Premium_AzureFrontDoor"
},
"kind": "frontdoor",
"properties": {
"provisioningState": "Creating",
"resourceState": "Creating"
Expand All @@ -54,6 +56,7 @@
"sku": {
"name": "Premium_AzureFrontDoor"
},
"kind": "frontdoor",
"properties": {
"provisioningState": "Creating",
"resourceState": "Creating"
Expand Down
1 change: 1 addition & 0 deletions ...ification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Profiles_Get.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
"sku": {
"name": "Premium_AzureFrontDoor"
},
"kind": "frontdoor",
"properties": {
"provisioningState": "Succeeded",
"resourceState": "Active"
Expand Down
2 changes: 2 additions & 0 deletions ...fication/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Profiles_List.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
"sku": {
"name": "Premium_AzureFrontDoor"
},
"kind": "frontdoor",
"properties": {
"provisioningState": "Succeeded",
"resourceState": "Active"
Expand All @@ -30,6 +31,7 @@
"sku": {
"name": "Premium_AzureFrontDoor"
},
"kind": "frontdoor",
"properties": {
"provisioningState": "Succeeded",
"resourceState": "Active"
Expand Down
2 changes: 2 additions & 0 deletions ...source-manager/Microsoft.Cdn/stable/2021-06-01/examples/Profiles_ListByResourceGroup.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
"sku": {
"name": "Premium_AzureFrontDoor"
},
"kind": "frontdoor",
"properties": {
"provisioningState": "Succeeded",
"resourceState": "Active"
Expand All @@ -31,6 +32,7 @@
"sku": {
"name": "Premium_AzureFrontDoor"
},
"kind": "frontdoor",
"properties": {
"provisioningState": "Succeeded",
"resourceState": "Active"
Expand Down
2 changes: 2 additions & 0 deletions ...cation/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Profiles_Update.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
"sku": {
"name": "Premium_AzureFrontDoor"
},
"kind": "frontdoor",
"properties": {
"provisioningState": "Succeeded",
"resourceState": "Active"
Expand All @@ -44,6 +45,7 @@
"sku": {
"name": "Premium_AzureFrontDoor"
},
"kind": "frontdoor",
"properties": {
"provisioningState": "Succeeded",
"resourceState": "Active"
Expand Down
Loading