Skip to content

Commit 349526e

Browse files
ThomasDaiThomasDai
authored
add minimal tls version for mariadb (Azure#11779)
1 parent b357720 commit 349526e

File tree

6 files changed

+84
-0
lines changed

6 files changed

+84
-0
lines changed

‎specification/mariadb/resource-manager/Microsoft.DBforMariaDB/preview/2018-06-01-preview/mariadb.json‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1507,6 +1507,20 @@
15071507
"modelAsString": false
15081508
}
15091509
},
1510+
"MinimalTlsVersion": {
1511+
"type": "string",
1512+
"description": "Enforce a minimal Tls version for the server.",
1513+
"enum": [
1514+
"TLS1_0",
1515+
"TLS1_1",
1516+
"TLS1_2",
1517+
"TLSEnforcementDisabled"
1518+
],
1519+
"x-ms-enum": {
1520+
"name": "MinimalTlsVersionEnum",
1521+
"modelAsString": true
1522+
}
1523+
},
15101524
"ServerProperties": {
15111525
"properties": {
15121526
"administratorLogin": {
@@ -1521,6 +1535,10 @@
15211535
"$ref": "#/definitions/SslEnforcement",
15221536
"description": "Enable ssl enforcement or not when connect to server."
15231537
},
1538+
"minimalTlsVersion": {
1539+
"$ref": "#/definitions/MinimalTlsVersion",
1540+
"description": "Enforce a minimal Tls version for the server."
1541+
},
15241542
"userVisibleState": {
15251543
"type": "string",
15261544
"description": "A state of a server that is visible to user.",
@@ -1617,6 +1635,10 @@
16171635
"$ref": "#/definitions/SslEnforcement",
16181636
"description": "Enable ssl enforcement or not when connect to server."
16191637
},
1638+
"minimalTlsVersion": {
1639+
"$ref": "#/definitions/MinimalTlsVersion",
1640+
"description": "Enforce a minimal Tls version for the server."
1641+
},
16201642
"storageProfile": {
16211643
"$ref": "#/definitions/StorageProfile",
16221644
"description": "Storage profile of a server."
@@ -1868,6 +1890,10 @@
18681890
"$ref": "#/definitions/SslEnforcement",
18691891
"description": "Enable ssl enforcement or not when connect to server."
18701892
},
1893+
"minimalTlsVersion": {
1894+
"$ref": "#/definitions/MinimalTlsVersion",
1895+
"description": "Enforce a minimal Tls version for the server."
1896+
},
18711897
"replicationRole": {
18721898
"type": "string",
18731899
"description": "The replication role of the server."

‎specification/mariadb/resource-manager/Microsoft.DBforMariaDB/preview/2018-06-01-privatepreview/mariadb.json‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1880,6 +1880,20 @@
18801880
"modelAsString": false
18811881
}
18821882
},
1883+
"MinimalTlsVersion": {
1884+
"type": "string",
1885+
"description": "Enforce a minimal Tls version for the server.",
1886+
"enum": [
1887+
"TLS1_0",
1888+
"TLS1_1",
1889+
"TLS1_2",
1890+
"TLSEnforcementDisabled"
1891+
],
1892+
"x-ms-enum": {
1893+
"name": "MinimalTlsVersionEnum",
1894+
"modelAsString": true
1895+
}
1896+
},
18831897
"ServerProperties": {
18841898
"properties": {
18851899
"administratorLogin": {
@@ -1894,6 +1908,10 @@
18941908
"$ref": "#/definitions/SslEnforcement",
18951909
"description": "Enable ssl enforcement or not when connect to server."
18961910
},
1911+
"minimalTlsVersion": {
1912+
"$ref": "#/definitions/MinimalTlsVersion",
1913+
"description": "Enforce a minimal Tls version for the server."
1914+
},
18971915
"userVisibleState": {
18981916
"type": "string",
18991917
"description": "A state of a server that is visible to user.",
@@ -1989,6 +2007,10 @@
19892007
"$ref": "#/definitions/SslEnforcement",
19902008
"description": "Enable ssl enforcement or not when connect to server."
19912009
},
2010+
"minimalTlsVersion": {
2011+
"$ref": "#/definitions/MinimalTlsVersion",
2012+
"description": "Enforce a minimal Tls version for the server."
2013+
},
19922014
"storageProfile": {
19932015
"$ref": "#/definitions/StorageProfile",
19942016
"description": "Storage profile of a server."
@@ -2239,6 +2261,10 @@
22392261
"$ref": "#/definitions/SslEnforcement",
22402262
"description": "Enable ssl enforcement or not when connect to server."
22412263
},
2264+
"minimalTlsVersion": {
2265+
"$ref": "#/definitions/MinimalTlsVersion",
2266+
"description": "Enforce a minimal Tls version for the server."
2267+
},
22422268
"replicationRole": {
22432269
"type": "string",
22442270
"description": "The replication role of the server."

‎specification/mariadb/resource-manager/Microsoft.DBforMariaDB/stable/2018-06-01/examples/ServerCreate.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
"administratorLogin": "cloudsa",
1111
"administratorLoginPassword": "<administratorLoginPassword>",
1212
"sslEnforcement": "Enabled",
13+
"minimalTlsVersion": "TLS1_2",
1314
"storageProfile": {
1415
"storageMB": 128000,
1516
"backupRetentionDays": 7,
@@ -46,6 +47,7 @@
4647
},
4748
"version": "10.3",
4849
"sslEnforcement": "Enabled",
50+
"minimalTlsVersion": "TLS1_2",
4951
"userVisibleState": "Ready",
5052
"fullyQualifiedDomainName": "mariadbtestsvc4.mariadb.database.azure.com",
5153
"earliestRestoreDate": "2018-03-14T18:02:41.577+00:00"

‎specification/mariadb/resource-manager/Microsoft.DBforMariaDB/stable/2018-06-01/examples/ServerGet.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
},
2424
"version": "10.3",
2525
"sslEnforcement": "Enabled",
26+
"minimalTlsVersion": "TLS1_0",
2627
"userVisibleState": "Ready",
2728
"fullyQualifiedDomainName": "mariadbtestsvc4.mariadb.database.azure.com",
2829
"earliestRestoreDate": "2018-03-14T18:02:41.577+00:00",

‎specification/mariadb/resource-manager/Microsoft.DBforMariaDB/stable/2018-06-01/examples/ServerList.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
},
2424
"version": "10.3",
2525
"sslEnforcement": "Enabled",
26+
"minimalTlsVersion": "TLS1_2",
2627
"userVisibleState": "Ready",
2728
"fullyQualifiedDomainName": "mariadbtestsvc1.mariadb.database.azure.com",
2829
"earliestRestoreDate": "2018-02-28T23:56:02.627+00:00",
@@ -50,6 +51,7 @@
5051
},
5152
"version": "10.3",
5253
"sslEnforcement": "Enabled",
54+
"minimalTlsVersion": "TLS1_1",
5355
"userVisibleState": "Ready",
5456
"fullyQualifiedDomainName": "mariadbtstsvc2.mariadb.database.azure.com",
5557
"earliestRestoreDate": "2018-02-28T23:56:54.3+00:00",
@@ -92,6 +94,7 @@
9294
},
9395
"version": "10.3",
9496
"sslEnforcement": "Enabled",
97+
"minimalTlsVersion": "TLS1_0",
9598
"userVisibleState": "Ready",
9699
"fullyQualifiedDomainName": "mariadbtestsvc3.mariadb.database.azure.com",
97100
"earliestRestoreDate": "2018-02-28T23:59:44.847+00:00",

‎specification/mariadb/resource-manager/Microsoft.DBforMariaDB/stable/2018-06-01/mariadb.json‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1477,6 +1477,20 @@
14771477
"modelAsString": false
14781478
}
14791479
},
1480+
"MinimalTlsVersion": {
1481+
"type": "string",
1482+
"description": "Enforce a minimal Tls version for the server.",
1483+
"enum": [
1484+
"TLS1_0",
1485+
"TLS1_1",
1486+
"TLS1_2",
1487+
"TLSEnforcementDisabled"
1488+
],
1489+
"x-ms-enum": {
1490+
"name": "MinimalTlsVersionEnum",
1491+
"modelAsString": true
1492+
}
1493+
},
14801494
"PublicNetworkAccess": {
14811495
"type": "string",
14821496
"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 @@
15981612
"$ref": "#/definitions/SslEnforcement",
15991613
"description": "Enable ssl enforcement or not when connect to server."
16001614
},
1615+
"minimalTlsVersion": {
1616+
"$ref": "#/definitions/MinimalTlsVersion",
1617+
"description": "Enforce a minimal Tls version for the server."
1618+
},
16011619
"userVisibleState": {
16021620
"type": "string",
16031621
"description": "A state of a server that is visible to user.",
@@ -1706,6 +1724,10 @@
17061724
"$ref": "#/definitions/SslEnforcement",
17071725
"description": "Enable ssl enforcement or not when connect to server."
17081726
},
1727+
"minimalTlsVersion": {
1728+
"$ref": "#/definitions/MinimalTlsVersion",
1729+
"description": "Enforce a minimal Tls version for the server."
1730+
},
17091731
"publicNetworkAccess": {
17101732
"$ref": "#/definitions/PublicNetworkAccess",
17111733
"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 @@
19281950
"$ref": "#/definitions/SslEnforcement",
19291951
"description": "Enable ssl enforcement or not when connect to server."
19301952
},
1953+
"minimalTlsVersion": {
1954+
"$ref": "#/definitions/MinimalTlsVersion",
1955+
"description": "Enforce a minimal Tls version for the server."
1956+
},
19311957
"publicNetworkAccess": {
19321958
"$ref": "#/definitions/PublicNetworkAccess",
19331959
"description": "Whether or not public network access is allowed for this server. Value is optional but if passed in, must be 'Enabled' or 'Disabled'"

0 commit comments

Comments
 (0)