Merge pull request Azure#7 from rsharm7/port-stable

Port stable changes to preview
aviyerMSFT · Feb 14, 2023 · 407c5c9 · 407c5c9
2 parents 59cd7b5 + 4888a40
commit 407c5c9
Show file tree

Hide file tree

Showing 9 changed files with 42 additions and 4 deletions.
diff --git a/...cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2022-11-15-preview/cosmos-db.json b/...cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2022-11-15-preview/cosmos-db.json
@@ -8437,6 +8437,11 @@
         "enableBurstCapacity": {
           "description": "Flag to indicate enabling/disabling of Burst Capacity Preview feature on the account",
           "type": "boolean"
+        },
+        "minimalTlsVersion": {
+          "description": "Indicates the minimum allowed Tls version. The default is Tls 1.0, except for Cassandra and Mongo API's, which only work with Tls 1.2.",
+          "type": "string",
+          "$ref": "#/definitions/MinimalTlsVersion"
         }
       }
     },
@@ -8595,6 +8600,11 @@
         "enableBurstCapacity": {
           "description": "Flag to indicate enabling/disabling of Burst Capacity Preview feature on the account",
           "type": "boolean"
+        },
+        "minimalTlsVersion": {
+          "description": "Indicates the minimum allowed Tls version. The default is Tls 1.0, except for Cassandra and Mongo API's, which only work with Tls 1.2.",
+          "type": "string",
+          "$ref": "#/definitions/MinimalTlsVersion"
         }
       },
       "required": [
@@ -8777,6 +8787,11 @@
         "enableBurstCapacity": {
           "description": "Flag to indicate enabling/disabling of Burst Capacity Preview feature on the account",
           "type": "boolean"
+        },
+        "minimalTlsVersion": {
+          "description": "Indicates the minimum allowed Tls version. The default is Tls 1.0, except for Cassandra and Mongo API's, which only work with Tls 1.2.",
+          "type": "string",
+          "$ref": "#/definitions/MinimalTlsVersion"
         }
       }
     },
@@ -11697,6 +11712,19 @@
         "name": "ContinuousTier",
         "modelAsString": true
       }
+    },
+    "MinimalTlsVersion": {
+      "description": "Indicates the minimum allowed Tls version. The default is Tls 1.0, except for Cassandra and Mongo API's, which only work with Tls 1.2.",
+      "type": "string",
+      "enum": [
+        "Tls",
+        "Tls11",
+        "Tls12"
+      ],
+      "x-ms-enum": {
+        "name": "MinimalTlsVersion",
+        "modelAsString": true
+      }
     }
   },
   "parameters": {

diff --git a/...soft.DocumentDB/preview/2022-11-15-preview/examples/CosmosDBDatabaseAccountCreateMax.json b/...soft.DocumentDB/preview/2022-11-15-preview/examples/CosmosDBDatabaseAccountCreateMax.json
@@ -81,7 +81,8 @@
           "totalThroughputLimit": 2000
         },
         "enableMaterializedViews": false,
-        "enableBurstCapacity": true
+        "enableBurstCapacity": true,
+        "minimalTlsVersion": "Tls12"
       }
     }
   },
@@ -216,6 +217,7 @@
           },
           "enableMaterializedViews": false,
           "enableBurstCapacity": true,
+          "minimalTlsVersion": "Tls12",
           "keysMetadata": {
             "primaryMasterKey": {
               "generationTime": "2022-02-25T20:30:11Z"

diff --git a/...soft.DocumentDB/preview/2022-11-15-preview/examples/CosmosDBDatabaseAccountCreateMin.json b/...soft.DocumentDB/preview/2022-11-15-preview/examples/CosmosDBDatabaseAccountCreateMin.json
@@ -90,6 +90,7 @@
             }
           },
           "enableMaterializedViews": false,
+          "minimalTlsVersion": "Tls",
           "keysMetadata": {
             "primaryMasterKey": {
               "generationTime": "2022-02-25T20:30:11Z"

diff --git a/.../Microsoft.DocumentDB/preview/2022-11-15-preview/examples/CosmosDBDatabaseAccountGet.json b/.../Microsoft.DocumentDB/preview/2022-11-15-preview/examples/CosmosDBDatabaseAccountGet.json
@@ -102,6 +102,7 @@
           "networkAclBypassResourceIds": [],
           "enablePartitionMerge": true,
           "enableBurstCapacity": true,
+          "minimalTlsVersion": "Tls",
           "diagnosticLogSettings": {
             "enableFullTextQuery": "False"
           },

diff --git a/...Microsoft.DocumentDB/preview/2022-11-15-preview/examples/CosmosDBDatabaseAccountList.json b/...Microsoft.DocumentDB/preview/2022-11-15-preview/examples/CosmosDBDatabaseAccountList.json
@@ -95,6 +95,7 @@
               "networkAclBypassResourceIds": [],
               "enablePartitionMerge": true,
               "enableBurstCapacity": true,
+              "minimalTlsVersion": "Tls",
               "enableMaterializedViews": false,
               "keysMetadata": {
                 "primaryMasterKey": {

diff --git a/...entDB/preview/2022-11-15-preview/examples/CosmosDBDatabaseAccountListByResourceGroup.json b/...entDB/preview/2022-11-15-preview/examples/CosmosDBDatabaseAccountListByResourceGroup.json
@@ -76,6 +76,7 @@
               "networkAclBypass": "None",
               "networkAclBypassResourceIds": [],
               "enableMaterializedViews": false,
+              "minimalTlsVersion": "Tls",
               "keysMetadata": {
                 "primaryMasterKey": {
                   "generationTime": "2022-02-25T20:30:11Z"

diff --git a/...icrosoft.DocumentDB/preview/2022-11-15-preview/examples/CosmosDBDatabaseAccountPatch.json b/...icrosoft.DocumentDB/preview/2022-11-15-preview/examples/CosmosDBDatabaseAccountPatch.json
@@ -61,7 +61,8 @@
           "enableFullTextQuery": "True"
         },
         "enablePartitionMerge": true,
-        "enableBurstCapacity": true
+        "enableBurstCapacity": true,
+        "minimalTlsVersion": "Tls"
       }
     }
   },
@@ -190,6 +191,7 @@
           },
           "enableMaterializedViews": false,
           "enableBurstCapacity": true,
+          "minimalTlsVersion": "Tls",
           "keysMetadata": {
             "primaryMasterKey": {
               "generationTime": "2022-02-25T20:30:11Z"

diff --git a/...entDB/preview/2022-11-15-preview/examples/CosmosDBRestoreDatabaseAccountCreateUpdate.json b/...entDB/preview/2022-11-15-preview/examples/CosmosDBRestoreDatabaseAccountCreateUpdate.json
@@ -57,7 +57,8 @@
           "serverVersion": "3.2"
         },
         "enableAnalyticalStorage": true,
-        "enableMaterializedViews": false
+        "enableMaterializedViews": false,
+        "minimalTlsVersion": "Tls"
       }
     }
   },
@@ -125,6 +126,7 @@
           "enableFreeTier": false,
           "apiProperties": {},
           "enableAnalyticalStorage": false,
+          "minimalTlsVersion": "Tls",
           "analyticalStorageConfiguration": null,
           "networkAclBypass": "None",
           "networkAclBypassResourceIds": [],

diff --git a/...db/resource-manager/Microsoft.DocumentDB/preview/2022-11-15-preview/managedCassandra.json b/...db/resource-manager/Microsoft.DocumentDB/preview/2022-11-15-preview/managedCassandra.json
@@ -1017,7 +1017,7 @@
             "hoursBetweenBackups": {
               "type": "integer",
               "format": "int32",
-              "description": "Number of hours to wait between taking a backup of the cluster."
+              "description": "Number of hours to wait between taking a backup of the cluster. To disable backups, set this property to 0."
             },
             "deallocated": {
               "type": "boolean",