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

Jump to bottom

Add minimal TLS version support for the MariaDB service #11779

Merged
merged 1 commit into from
Apr 13, 2021
Merged

Add minimal TLS version support for the MariaDB service #11779

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
26 changes: 26 additions & 0 deletions ...n/mariadb/resource-manager/Microsoft.DBforMariaDB/preview/2018-06-01-preview/mariadb.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1320,6 +1320,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": {
Expand All @@ -1334,6 +1348,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.",
Expand Down Expand Up @@ -1429,6 +1447,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."
Expand Down Expand Up @@ -1679,6 +1701,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."
Expand Down
26 changes: 26 additions & 0 deletions ...db/resource-manager/Microsoft.DBforMariaDB/preview/2018-06-01-privatepreview/mariadb.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand All @@ -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.",
Expand Down Expand Up @@ -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."
Expand Down Expand Up @@ -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."
Expand Down
2 changes: 2 additions & 0 deletions ...iadb/resource-manager/Microsoft.DBforMariaDB/stable/2018-06-01/examples/ServerCreate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"administratorLogin": "cloudsa",
"administratorLoginPassword": "pass$w0rd",
"sslEnforcement": "Enabled",
"minimalTlsVersion": "TLS1_2",
"storageProfile": {
"storageMB": 128000,
"backupRetentionDays": 7,
Expand Down Expand Up @@ -46,6 +47,7 @@
},
"version": "5.7",
"sslEnforcement": "Enabled",
"minimalTlsVersion": "TLS1_2",
"userVisibleState": "Ready",
"fullyQualifiedDomainName": "mariadbtestsvc4.mariadb.database.azure.com",
"earliestRestoreDate": "2018-03-14T18:02:41.577+00:00"
Expand Down
1 change: 1 addition & 0 deletions ...mariadb/resource-manager/Microsoft.DBforMariaDB/stable/2018-06-01/examples/ServerGet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
},
"version": "5.7",
"sslEnforcement": "Enabled",
"minimalTlsVersion": "TLS1_0",
"userVisibleState": "Ready",
"fullyQualifiedDomainName": "mariadbtestsvc4.mariadb.database.azure.com",
"earliestRestoreDate": "2018-03-14T18:02:41.577+00:00",
Expand Down
3 changes: 3 additions & 0 deletions ...ariadb/resource-manager/Microsoft.DBforMariaDB/stable/2018-06-01/examples/ServerList.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
},
"version": "5.7",
"sslEnforcement": "Enabled",
"minimalTlsVersion": "TLS1_2",
"userVisibleState": "Ready",
"fullyQualifiedDomainName": "mariadbtestsvc1.mariadb.database.azure.com",
"earliestRestoreDate": "2018-02-28T23:56:02.627+00:00",
Expand Down Expand Up @@ -50,6 +51,7 @@
},
"version": "5.7",
"sslEnforcement": "Enabled",
"minimalTlsVersion": "TLS1_1",
"userVisibleState": "Ready",
"fullyQualifiedDomainName": "mariadbtstsvc2.mariadb.database.azure.com",
"earliestRestoreDate": "2018-02-28T23:56:54.3+00:00",
Expand Down Expand Up @@ -92,6 +94,7 @@
},
"version": "5.7",
"sslEnforcement": "Enabled",
"minimalTlsVersion": "TLS1_0",
"userVisibleState": "Ready",
"fullyQualifiedDomainName": "mariadbtestsvc3.mariadb.database.azure.com",
"earliestRestoreDate": "2018-02-28T23:59:44.847+00:00",
Expand Down
26 changes: 26 additions & 0 deletions specification/mariadb/resource-manager/Microsoft.DBforMariaDB/stable/2018-06-01/mariadb.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1332,6 +1332,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'",
Expand Down Expand Up @@ -1453,6 +1467,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.",
Expand Down Expand Up @@ -1561,6 +1579,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'"
Expand Down Expand Up @@ -1782,6 +1804,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'"
Expand Down