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

[SRP] Add CORS to common types #7562

Merged
merged 1 commit into from
Oct 21, 2019
Merged

[SRP] Add CORS to common types #7562

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
68 changes: 1 addition & 67 deletions specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/blob.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1130,7 +1130,7 @@
"properties": {
"properties": {
"cors": {
"$ref": "#/definitions/CorsRules",
"$ref": "./common.json#/definitions/CorsRules",
"description": "Specifies CORS rules for the Blob service. You can include up to five CorsRule elements in the request. If no CorsRule elements are included in the request body, all CORS rules will be deleted, and CORS will be disabled for the Blob service."
},
"defaultServiceVersion": {
Expand Down Expand Up @@ -1198,72 +1198,6 @@
},
"description": "The blob service properties for soft delete."
},
"CorsRules": {
"properties": {
"corsRules": {
"type": "array",
"items": {
"description": "Specifies a CORS rule for the Blob service. ",
"$ref": "#/definitions/CorsRule"
},
"description": "The List of CORS rules. You can include up to five CorsRule elements in the request. "
}
},
"description": "Sets the CORS rules. You can include up to five CorsRule elements in the request. "
},
"CorsRule": {
"properties": {
"allowedOrigins": {
"type": "array",
"items": {
"type": "string"
},
"description": "Required if CorsRule element is present. A list of origin domains that will be allowed via CORS, or \"*\" to allow all domains"
},
"allowedMethods": {
"type": "array",
"items": {
"type": "string",
"enum": [
"DELETE",
"GET",
"HEAD",
"MERGE",
"POST",
"OPTIONS",
"PUT"
]
},
"description": "Required if CorsRule element is present. A list of HTTP methods that are allowed to be executed by the origin."
},
"maxAgeInSeconds": {
"type": "integer",
"description": "Required if CorsRule element is present. The number of seconds that the client/browser should cache a preflight response."
},
"exposedHeaders": {
"type": "array",
"items": {
"type": "string"
},
"description": "Required if CorsRule element is present. A list of response headers to expose to CORS clients."
},
"allowedHeaders": {
"type": "array",
"items": {
"type": "string"
},
"description": "Required if CorsRule element is present. A list of headers allowed to be part of the cross-origin request."
}
},
"required": [
"allowedOrigins",
"allowedMethods",
"maxAgeInSeconds",
"exposedHeaders",
"allowedHeaders"
],
"description": "Specifies a CORS rule for the Blob service."
},
"LeaseContainerRequest": {
"properties": {
"action": {
Expand Down
76 changes: 76 additions & 0 deletions specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/common.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
{
"swagger": "2.0",
"info": {
"title": "Storage",
"description": "Storage Resource Provider API Common Types",
"version": "2019-06-01"
},
"definitions": {
"CorsRules": {
"properties": {
"corsRules": {
"type": "array",
"items": {
"description": "Specifies a CORS rule for the Blob service. ",
"$ref": "#/definitions/CorsRule"
},
"description": "The List of CORS rules. You can include up to five CorsRule elements in the request. "
}
},
"description": "Sets the CORS rules. You can include up to five CorsRule elements in the request. "
},
"CorsRule": {
"properties": {
"allowedOrigins": {
"type": "array",
"items": {
"type": "string"
},
"description": "Required if CorsRule element is present. A list of origin domains that will be allowed via CORS, or \"*\" to allow all domains"
},
"allowedMethods": {
"type": "array",
"items": {
"type": "string",
"enum": [
"DELETE",
"GET",
"HEAD",
"MERGE",
"POST",
"OPTIONS",
"PUT"
]
},
"description": "Required if CorsRule element is present. A list of HTTP methods that are allowed to be executed by the origin."
},
"maxAgeInSeconds": {
"type": "integer",
"description": "Required if CorsRule element is present. The number of seconds that the client/browser should cache a preflight response."
},
"exposedHeaders": {
"type": "array",
"items": {
"type": "string"
},
"description": "Required if CorsRule element is present. A list of response headers to expose to CORS clients."
},
"allowedHeaders": {
"type": "array",
"items": {
"type": "string"
},
"description": "Required if CorsRule element is present. A list of headers allowed to be part of the cross-origin request."
}
},
"required": [
"allowedOrigins",
"allowedMethods",
"maxAgeInSeconds",
"exposedHeaders",
"allowedHeaders"
],
"description": "Specifies a CORS rule for the Blob service."
}
}
}
2 changes: 1 addition & 1 deletion specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/file.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,7 +436,7 @@
"properties": {
"properties": {
"cors": {
"$ref": "../../../../../storage/resource-manager/Microsoft.Storage/stable/2019-06-01/blob.json#/definitions/CorsRules",
"$ref": "./common.json#/definitions/CorsRules",
"description": "Specifies CORS rules for the File service. You can include up to five CorsRule elements in the request. If no CorsRule elements are included in the request body, all CORS rules will be deleted, and CORS will be disabled for the File service."
}
},
Expand Down