add minimal tls version for mariadb (#11779)

Azure · Apr 13, 2021 · 349526e · 349526e
1 parent b357720
commit 349526e
Show file tree

Hide file tree

Showing 6 changed files with 84 additions and 0 deletions.
diff --git a/...n/mariadb/resource-manager/Microsoft.DBforMariaDB/preview/2018-06-01-preview/mariadb.json b/...n/mariadb/resource-manager/Microsoft.DBforMariaDB/preview/2018-06-01-preview/mariadb.json
@@ -1507,6 +1507,20 @@
         "modelAsString": false
       }
     },
+    "MinimalTlsVersion": {
+      "type": "string",
+      "description": "Enforce a minimal Tls version for the server.",
+      "enum": [
+        "TLS1_0",
+        "TLS1_1",
+        "TLS1_2",
+        "TLSEnforcementDisabled"
+      ],
+      "x-ms-enum": {
+        "name": "MinimalTlsVersionEnum",
+        "modelAsString": true
+      }
+    },
     "ServerProperties": {
       "properties": {
         "administratorLogin": {
@@ -1521,6 +1535,10 @@
           "$ref": "#/definitions/SslEnforcement",
           "description": "Enable ssl enforcement or not when connect to server."
         },
+        "minimalTlsVersion": {
+          "$ref": "#/definitions/MinimalTlsVersion",
+          "description": "Enforce a minimal Tls version for the server."
+        },
         "userVisibleState": {
           "type": "string",
           "description": "A state of a server that is visible to user.",
@@ -1617,6 +1635,10 @@
           "$ref": "#/definitions/SslEnforcement",
           "description": "Enable ssl enforcement or not when connect to server."
         },
+        "minimalTlsVersion": {
+          "$ref": "#/definitions/MinimalTlsVersion",
+          "description": "Enforce a minimal Tls version for the server."
+        },
         "storageProfile": {
           "$ref": "#/definitions/StorageProfile",
           "description": "Storage profile of a server."
@@ -1868,6 +1890,10 @@
               "$ref": "#/definitions/SslEnforcement",
               "description": "Enable ssl enforcement or not when connect to server."
             },
+            "minimalTlsVersion": {
+              "$ref": "#/definitions/MinimalTlsVersion",
+              "description": "Enforce a minimal Tls version for the server."
+            },
             "replicationRole": {
               "type": "string",
               "description": "The replication role of the server."

diff --git a/...db/resource-manager/Microsoft.DBforMariaDB/preview/2018-06-01-privatepreview/mariadb.json b/...db/resource-manager/Microsoft.DBforMariaDB/preview/2018-06-01-privatepreview/mariadb.json
@@ -1880,6 +1880,20 @@
         "modelAsString": false
       }
     },
+    "MinimalTlsVersion": {
+      "type": "string",
+      "description": "Enforce a minimal Tls version for the server.",
+      "enum": [
+        "TLS1_0",
+        "TLS1_1",
+        "TLS1_2",
+        "TLSEnforcementDisabled"
+      ],
+      "x-ms-enum": {
+        "name": "MinimalTlsVersionEnum",
+        "modelAsString": true
+      }
+    },
     "ServerProperties": {
       "properties": {
         "administratorLogin": {
@@ -1894,6 +1908,10 @@
           "$ref": "#/definitions/SslEnforcement",
           "description": "Enable ssl enforcement or not when connect to server."
         },
+        "minimalTlsVersion": {
+          "$ref": "#/definitions/MinimalTlsVersion",
+          "description": "Enforce a minimal Tls version for the server."
+        },
         "userVisibleState": {
           "type": "string",
           "description": "A state of a server that is visible to user.",
@@ -1989,6 +2007,10 @@
           "$ref": "#/definitions/SslEnforcement",
           "description": "Enable ssl enforcement or not when connect to server."
         },
+        "minimalTlsVersion": {
+          "$ref": "#/definitions/MinimalTlsVersion",
+          "description": "Enforce a minimal Tls version for the server."
+        },
         "storageProfile": {
           "$ref": "#/definitions/StorageProfile",
           "description": "Storage profile of a server."
@@ -2239,6 +2261,10 @@
               "$ref": "#/definitions/SslEnforcement",
               "description": "Enable ssl enforcement or not when connect to server."
             },
+            "minimalTlsVersion": {
+              "$ref": "#/definitions/MinimalTlsVersion",
+              "description": "Enforce a minimal Tls version for the server."
+            },
             "replicationRole": {
               "type": "string",
               "description": "The replication role of the server."

diff --git a/...iadb/resource-manager/Microsoft.DBforMariaDB/stable/2018-06-01/examples/ServerCreate.json b/...iadb/resource-manager/Microsoft.DBforMariaDB/stable/2018-06-01/examples/ServerCreate.json
@@ -10,6 +10,7 @@
         "administratorLogin": "cloudsa",
         "administratorLoginPassword": "<administratorLoginPassword>",
         "sslEnforcement": "Enabled",
+        "minimalTlsVersion": "TLS1_2",
         "storageProfile": {
           "storageMB": 128000,
           "backupRetentionDays": 7,
@@ -46,6 +47,7 @@
           },
           "version": "10.3",
           "sslEnforcement": "Enabled",
+          "minimalTlsVersion": "TLS1_2",
           "userVisibleState": "Ready",
           "fullyQualifiedDomainName": "mariadbtestsvc4.mariadb.database.azure.com",
           "earliestRestoreDate": "2018-03-14T18:02:41.577+00:00"

diff --git a/...mariadb/resource-manager/Microsoft.DBforMariaDB/stable/2018-06-01/examples/ServerGet.json b/...mariadb/resource-manager/Microsoft.DBforMariaDB/stable/2018-06-01/examples/ServerGet.json
@@ -23,6 +23,7 @@
           },
           "version": "10.3",
           "sslEnforcement": "Enabled",
+          "minimalTlsVersion": "TLS1_0",
           "userVisibleState": "Ready",
           "fullyQualifiedDomainName": "mariadbtestsvc4.mariadb.database.azure.com",
           "earliestRestoreDate": "2018-03-14T18:02:41.577+00:00",

diff --git a/...ariadb/resource-manager/Microsoft.DBforMariaDB/stable/2018-06-01/examples/ServerList.json b/...ariadb/resource-manager/Microsoft.DBforMariaDB/stable/2018-06-01/examples/ServerList.json
@@ -23,6 +23,7 @@
               },
               "version": "10.3",
               "sslEnforcement": "Enabled",
+              "minimalTlsVersion": "TLS1_2",
               "userVisibleState": "Ready",
               "fullyQualifiedDomainName": "mariadbtestsvc1.mariadb.database.azure.com",
               "earliestRestoreDate": "2018-02-28T23:56:02.627+00:00",
@@ -50,6 +51,7 @@
               },
               "version": "10.3",
               "sslEnforcement": "Enabled",
+              "minimalTlsVersion": "TLS1_1",
               "userVisibleState": "Ready",
               "fullyQualifiedDomainName": "mariadbtstsvc2.mariadb.database.azure.com",
               "earliestRestoreDate": "2018-02-28T23:56:54.3+00:00",
@@ -92,6 +94,7 @@
               },
               "version": "10.3",
               "sslEnforcement": "Enabled",
+              "minimalTlsVersion": "TLS1_0",
               "userVisibleState": "Ready",
               "fullyQualifiedDomainName": "mariadbtestsvc3.mariadb.database.azure.com",
               "earliestRestoreDate": "2018-02-28T23:59:44.847+00:00",

diff --git a/specification/mariadb/resource-manager/Microsoft.DBforMariaDB/stable/2018-06-01/mariadb.json b/specification/mariadb/resource-manager/Microsoft.DBforMariaDB/stable/2018-06-01/mariadb.json
@@ -1477,6 +1477,20 @@
         "modelAsString": false
       }
     },
+    "MinimalTlsVersion": {
+      "type": "string",
+      "description": "Enforce a minimal Tls version for the server.",
+      "enum": [
+        "TLS1_0",
+        "TLS1_1",
+        "TLS1_2",
+        "TLSEnforcementDisabled"
+      ],
+      "x-ms-enum": {
+        "name": "MinimalTlsVersionEnum",
+        "modelAsString": true
+      }
+    },
     "PublicNetworkAccess": {
       "type": "string",
       "description": "Whether or not public network access is allowed for this server. Value is optional but if passed in, must be 'Enabled' or 'Disabled'",
@@ -1598,6 +1612,10 @@
           "$ref": "#/definitions/SslEnforcement",
           "description": "Enable ssl enforcement or not when connect to server."
         },
+        "minimalTlsVersion": {
+          "$ref": "#/definitions/MinimalTlsVersion",
+          "description": "Enforce a minimal Tls version for the server."
+        },
         "userVisibleState": {
           "type": "string",
           "description": "A state of a server that is visible to user.",
@@ -1706,6 +1724,10 @@
           "$ref": "#/definitions/SslEnforcement",
           "description": "Enable ssl enforcement or not when connect to server."
         },
+        "minimalTlsVersion": {
+          "$ref": "#/definitions/MinimalTlsVersion",
+          "description": "Enforce a minimal Tls version for the server."
+        },
         "publicNetworkAccess": {
           "$ref": "#/definitions/PublicNetworkAccess",
           "description": "Whether or not public network access is allowed for this server. Value is optional but if passed in, must be 'Enabled' or 'Disabled'"
@@ -1928,6 +1950,10 @@
               "$ref": "#/definitions/SslEnforcement",
               "description": "Enable ssl enforcement or not when connect to server."
             },
+            "minimalTlsVersion": {
+              "$ref": "#/definitions/MinimalTlsVersion",
+              "description": "Enforce a minimal Tls version for the server."
+            },
             "publicNetworkAccess": {
               "$ref": "#/definitions/PublicNetworkAccess",
               "description": "Whether or not public network access is allowed for this server. Value is optional but if passed in, must be 'Enabled' or 'Disabled'"