Add cors rule in request/response for Cosmos DB (Azure#10204)

innosam · Aug 17, 2020 · 859abc5 · 859abc5
1 parent 14faf68
commit 859abc5
Show file tree

Hide file tree

Showing 14 changed files with 140 additions and 4 deletions.
diff --git a/...cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2020-06-01-preview/cosmos-db.json b/...cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2020-06-01-preview/cosmos-db.json
@@ -5207,6 +5207,38 @@
         "defaultConsistencyLevel"
       ]
     },
+    "CorsPolicy": {
+      "type": "object",
+      "description": "The CORS policy for the Cosmos DB database account.",
+      "properties": {
+        "allowedOrigins": {
+          "description": "The origin domains that are permitted to make a request against the service via CORS.",
+          "type": "string"
+        },
+        "allowedMethods": {
+          "description": "The methods (HTTP request verbs) that the origin domain may use for a CORS request.",
+          "type": "string"
+        },
+        "allowedHeaders": {
+          "description": "The request headers that the origin domain may specify on the CORS request.",
+          "type": "string"
+        },
+        "exposedHeaders": {
+          "description": "The response headers that may be sent in the response to the CORS request and exposed by the browser to the request issuer.",
+          "type": "string"
+        },
+        "maxAgeInSeconds": {
+          "description": "The maximum amount time that a browser should cache the preflight OPTIONS request.",
+          "type": "integer",
+          "minimum": 1,
+          "maximum": 2147483647,
+          "format": "int64"
+        }
+      },
+      "required": [
+        "allowedOrigins"
+      ]
+    },
     "DatabaseAccountGetProperties": {
       "description": "Properties for the database account.",
       "type": "object",
@@ -5351,6 +5383,13 @@
           "description": "The object representing the policy for taking backups on an account.",
           "type": "object",
           "$ref": "#/definitions/BackupPolicy"
+        },
+        "cors": {
+          "type": "array",
+          "description": "The CORS policy for the Cosmos DB database account.",
+          "items": {
+            "$ref": "#/definitions/CorsPolicy"
+          }
         }
       }
     },
@@ -5447,6 +5486,13 @@
           "description": "The object representing the policy for taking backups on an account.",
           "type": "object",
           "$ref": "#/definitions/BackupPolicy"
+        },
+        "cors": {
+          "type": "array",
+          "description": "The CORS policy for the Cosmos DB database account.",
+          "items": {
+            "$ref": "#/definitions/CorsPolicy"
+          }
         }
       },
       "required": [
@@ -5593,6 +5639,13 @@
           "description": "The object representing the policy for taking backups on an account.",
           "type": "object",
           "$ref": "#/definitions/BackupPolicy"
+        },
+        "cors": {
+          "type": "array",
+          "description": "The CORS policy for the Cosmos DB database account.",
+          "items": {
+            "$ref": "#/definitions/CorsPolicy"
+          }
         }
       }
     },

diff --git a/...soft.DocumentDB/preview/2020-06-01-preview/examples/CosmosDBDatabaseAccountCreateMax.json b/...soft.DocumentDB/preview/2020-06-01-preview/examples/CosmosDBDatabaseAccountCreateMax.json
@@ -55,7 +55,12 @@
             "backupIntervalInMinutes": 240,
             "backupRetentionIntervalInHours": 720
           }
-        }
+        },
+        "cors": [
+          {
+            "allowedOrigins": "https://test"
+          }
+        ]
       }
     }
   },
@@ -158,7 +163,12 @@
               "backupIntervalInMinutes": 240,
               "backupRetentionIntervalInHours": 720
             }
-          }
+          },
+          "cors": [
+            {
+              "allowedOrigins": "https://test"
+            }
+          ]
         },
         "systemData": {
           "createdAt": "2020-06-12T22:05:09Z"

diff --git a/...soft.DocumentDB/preview/2020-06-01-preview/examples/CosmosDBDatabaseAccountCreateMin.json b/...soft.DocumentDB/preview/2020-06-01-preview/examples/CosmosDBDatabaseAccountCreateMin.json
@@ -72,6 +72,7 @@
               "failoverPriority": 0
             }
           ],
+          "cors": [],
           "enableFreeTier": false,
           "apiProperties": {},
           "enableAnalyticalStorage": false,

diff --git a/.../Microsoft.DocumentDB/preview/2020-06-01-preview/examples/CosmosDBDatabaseAccountGet.json b/.../Microsoft.DocumentDB/preview/2020-06-01-preview/examples/CosmosDBDatabaseAccountGet.json
@@ -75,6 +75,7 @@
               }
             }
           ],
+          "cors": [],
           "enableFreeTier": false,
           "apiProperties": {},
           "enableAnalyticalStorage": true,

diff --git a/...Microsoft.DocumentDB/preview/2020-06-01-preview/examples/CosmosDBDatabaseAccountList.json b/...Microsoft.DocumentDB/preview/2020-06-01-preview/examples/CosmosDBDatabaseAccountList.json
@@ -73,6 +73,7 @@
                   }
                 }
               ],
+              "cors": [],
               "enableFreeTier": false,
               "apiProperties": {},
               "enableAnalyticalStorage": true,

diff --git a/...entDB/preview/2020-06-01-preview/examples/CosmosDBDatabaseAccountListByResourceGroup.json b/...entDB/preview/2020-06-01-preview/examples/CosmosDBDatabaseAccountListByResourceGroup.json
@@ -60,6 +60,7 @@
                   "failoverPriority": 0
                 }
               ],
+              "cors": [],
               "enableFreeTier": false,
               "instanceId": "d9b26648-2f53-4541-b3d8-3044f4f9810d",
               "createMode": "Default",

diff --git a/...icrosoft.DocumentDB/preview/2020-06-01-preview/examples/CosmosDBDatabaseAccountPatch.json b/...icrosoft.DocumentDB/preview/2020-06-01-preview/examples/CosmosDBDatabaseAccountPatch.json
@@ -106,6 +106,7 @@
               "failoverPriority": 0
             }
           ],
+          "cors": [],
           "virtualNetworkRules": [
             {
               "id": "/subscriptions/subId/resourceGroups/rg/providers/Microsoft.Network/virtualNetworks/vnet1/subnets/subnet1",

diff --git a/...fication/cosmos-db/resource-manager/Microsoft.DocumentDB/stable/2020-04-01/cosmos-db.json b/...fication/cosmos-db/resource-manager/Microsoft.DocumentDB/stable/2020-04-01/cosmos-db.json
@@ -5818,6 +5818,38 @@
         "defaultConsistencyLevel"
       ]
     },
+    "CorsPolicy": {
+      "type": "object",
+      "description": "The CORS policy for the Cosmos DB database account.",
+      "properties": {
+        "allowedOrigins": {
+          "description": "The origin domains that are permitted to make a request against the service via CORS.",
+          "type": "string"
+        },
+        "allowedMethods": {
+          "description": "The methods (HTTP request verbs) that the origin domain may use for a CORS request.",
+          "type": "string"
+        },
+        "allowedHeaders": {
+          "description": "The request headers that the origin domain may specify on the CORS request.",
+          "type": "string"
+        },
+        "exposedHeaders": {
+          "description": "The response headers that may be sent in the response to the CORS request and exposed by the browser to the request issuer.",
+          "type": "string"
+        },
+        "maxAgeInSeconds": {
+          "description": "The maximum amount time that a browser should cache the preflight OPTIONS request.",
+          "type": "integer",
+          "minimum": 1,
+          "maximum": 2147483647,
+          "format": "int64"
+        }
+      },
+      "required": [
+        "allowedOrigins"
+      ]
+    },
     "DatabaseAccountGetProperties": {
       "description": "Properties for the database account.",
       "type": "object",
@@ -5941,6 +5973,13 @@
         "enableAnalyticalStorage": {
           "description": "Flag to indicate whether to enable storage analytics.",
           "type": "boolean"
+        },
+        "cors": {
+          "type": "array",
+          "description": "The CORS policy for the Cosmos DB database account.",
+          "items": {
+            "$ref": "#/definitions/CorsPolicy"
+          }
         }
       }
     },
@@ -6025,6 +6064,13 @@
         "enableAnalyticalStorage": {
           "description": "Flag to indicate whether to enable storage analytics.",
           "type": "boolean"
+        },
+        "cors": {
+          "type": "array",
+          "description": "The CORS policy for the Cosmos DB database account.",
+          "items": {
+            "$ref": "#/definitions/CorsPolicy"
+          }
         }
       },
       "required": [
@@ -6141,6 +6187,13 @@
         "enableAnalyticalStorage": {
           "description": "Flag to indicate whether to enable storage analytics.",
           "type": "boolean"
+        },
+        "cors": {
+          "type": "array",
+          "description": "The CORS policy for the Cosmos DB database account.",
+          "items": {
+            "$ref": "#/definitions/CorsPolicy"
+          }
         }
       }
     },

diff --git a/...ger/Microsoft.DocumentDB/stable/2020-04-01/examples/CosmosDBDatabaseAccountCreateMax.json b/...ger/Microsoft.DocumentDB/stable/2020-04-01/examples/CosmosDBDatabaseAccountCreateMax.json
@@ -47,7 +47,12 @@
         "apiProperties": {
           "serverVersion": "3.2"
         },
-        "enableAnalyticalStorage": true
+        "enableAnalyticalStorage": true,
+        "cors": [
+          {
+            "allowedOrigins": "https://test"
+          }
+        ]
       }
     }
   },
@@ -141,7 +146,12 @@
           "apiProperties": {
             "serverVersion": "3.2"
           },
-          "enableAnalyticalStorage": true
+          "enableAnalyticalStorage": true,
+          "cors": [
+            {
+              "allowedOrigins": "https://test"
+            }
+          ]
         }
       }
     }

diff --git a/...ger/Microsoft.DocumentDB/stable/2020-04-01/examples/CosmosDBDatabaseAccountCreateMin.json b/...ger/Microsoft.DocumentDB/stable/2020-04-01/examples/CosmosDBDatabaseAccountCreateMin.json
@@ -71,6 +71,7 @@
               "failoverPriority": 0
             }
           ],
+          "cors": [],
           "enableFreeTier": false,
           "apiProperties": {},
           "enableAnalyticalStorage": false

diff --git a/...e-manager/Microsoft.DocumentDB/stable/2020-04-01/examples/CosmosDBDatabaseAccountGet.json b/...e-manager/Microsoft.DocumentDB/stable/2020-04-01/examples/CosmosDBDatabaseAccountGet.json
@@ -75,6 +75,7 @@
               }
             }
           ],
+          "cors": [],
           "enableFreeTier": false,
           "apiProperties": {},
           "enableAnalyticalStorage": true

diff --git a/...-manager/Microsoft.DocumentDB/stable/2020-04-01/examples/CosmosDBDatabaseAccountList.json b/...-manager/Microsoft.DocumentDB/stable/2020-04-01/examples/CosmosDBDatabaseAccountList.json
@@ -73,6 +73,7 @@
                   }
                 }
               ],
+              "cors": [],
               "enableFreeTier": false,
               "apiProperties": {},
               "enableAnalyticalStorage": true

diff --git a/...oft.DocumentDB/stable/2020-04-01/examples/CosmosDBDatabaseAccountListByResourceGroup.json b/...oft.DocumentDB/stable/2020-04-01/examples/CosmosDBDatabaseAccountListByResourceGroup.json
@@ -60,6 +60,7 @@
                   "failoverPriority": 0
                 }
               ],
+              "cors": [],
               "enableFreeTier": false
             }
           }

diff --git a/...manager/Microsoft.DocumentDB/stable/2020-04-01/examples/CosmosDBDatabaseAccountPatch.json b/...manager/Microsoft.DocumentDB/stable/2020-04-01/examples/CosmosDBDatabaseAccountPatch.json
@@ -119,6 +119,7 @@
               }
             }
           ],
+          "cors": [],
           "enableFreeTier": false,
           "apiProperties": {},
           "enableAnalyticalStorage": true
-Original file line number
+Diff line change
@@ Expand Up / @@ -60,6 +60,7 @@ @@
                       "failoverPriority": 0
                     }
                   ],
+                  "cors": [],
                   "enableFreeTier": false
                 }
               }
@@ Expand Down @@