Skip to content

Adding PublicNetworkAccess, InfrastructureEncryption, ResourceIdentity as Server Create/Update property for PostgreSQL/MySQL/MariaDB #8709

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

Merged
lirenhe merged 5 commits into from
Mar 18, 2020
Merged

Adding PublicNetworkAccess, InfrastructureEncryption, ResourceIdentity as Server Create/Update property for PostgreSQL/MySQL/MariaDB #8709

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7e29d96
Adding PublicNetworkAccess, InfrastructureEncryption as Server Create…
Mar 13, 2020
8be4b91
proper spacing
Mar 16, 2020
a67667b
Merge branch 'master' of https://github.com/Azure/azure-rest-api-specs
Mar 16, 2020
f853745
Adding resource identity
Mar 17, 2020
0f6e9e7
Removing resource identity for mariadb
Mar 17, 2020
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
32 changes: 22 additions & 10 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 @@ -1320,6 +1320,18 @@
"modelAsString": false
}
},
"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'",
"enum": [
"Enabled",
"Disabled"
],
"x-ms-enum": {
"name": "PublicNetworkAccessEnum",
"modelAsString": true
}
},
"ServerPrivateEndpointConnection": {
"description": "A private endpoint connection under a server",
"type": "object",
Expand Down Expand Up @@ -1498,16 +1510,8 @@
"description": "The maximum number of replicas that a master server can have."
},
"publicNetworkAccess": {
"type": "string",
"description": "Whether or not public endpoint access is allowed for this server. Value is optional but if passed in, must be 'Enabled' or 'Disabled'",
"enum": [
"Enabled",
"Disabled"
],
"x-ms-enum": {
"name": "PublicNetworkAccessEnum",
"modelAsString": true
}
"$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'"
},
"privateEndpointConnections": {
"description": "List of private endpoint connections on a server",
Expand Down Expand Up @@ -1572,6 +1576,10 @@
"$ref": "#/definitions/SslEnforcement",
"description": "Enable ssl enforcement or not when connect to 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'"
},
"storageProfile": {
"$ref": "#/definitions/StorageProfile",
"description": "Storage profile of a server."
Expand Down Expand Up @@ -1786,6 +1794,10 @@
"$ref": "#/definitions/SslEnforcement",
"description": "Enable ssl enforcement or not when connect to 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'"
},
"replicationRole": {
"type": "string",
"description": "The replication role of the server."
Expand Down
68 changes: 48 additions & 20 deletions specification/mysql/resource-manager/Microsoft.DBforMySQL/stable/2017-12-01/mysql.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1522,6 +1522,30 @@
"modelAsString": true
}
},
"InfrastructureEncryption": {
"type": "string",
"description": "Status showing whether the server enabled infrastructure encryption.",
"enum": [
"Enabled",
"Disabled"
],
"x-ms-enum": {
"name": "InfrastructureEncryption",
"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'",
"enum": [
"Enabled",
"Disabled"
],
"x-ms-enum": {
"name": "PublicNetworkAccessEnum",
"modelAsString": true
}
},
"ServerPrivateEndpointConnection": {
"description": "A private endpoint connection under a server",
"type": "object",
Expand Down Expand Up @@ -1665,16 +1689,8 @@
"readOnly": true
},
"infrastructureEncryption": {
"type": "string",
"description": "Status showing whether the server enabled infrastructure encryption.",
"enum": [
"Enabled",
"Disabled"
],
"x-ms-enum": {
"name": "InfrastructureEncryption",
"modelAsString": true
}
"$ref": "#/definitions/InfrastructureEncryption",
"description": "Status showing whether the server enabled infrastructure encryption."
},
"userVisibleState": {
"type": "string",
Expand Down Expand Up @@ -1718,16 +1734,8 @@
"description": "The maximum number of replicas that a master server can have."
},
"publicNetworkAccess": {
"type": "string",
"description": "Whether or not public endpoint access is allowed for this server. Value is optional but if passed in, must be 'Enabled' or 'Disabled'",
"enum": [
"Enabled",
"Disabled"
],
"x-ms-enum": {
"name": "PublicNetworkAccessEnum",
"modelAsString": true
}
"$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'"
},
"privateEndpointConnections": {
"description": "List of private endpoint connections on a server",
Expand Down Expand Up @@ -1796,6 +1804,14 @@
"$ref": "#/definitions/MinimalTlsVersion",
"description": "Enforce a minimal Tls version for the server."
},
"infrastructureEncryption": {
"$ref": "#/definitions/InfrastructureEncryption",
"description": "Status showing whether the server enabled infrastructure encryption."
},
"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'"
},
"storageProfile": {
"$ref": "#/definitions/StorageProfile",
"description": "Storage profile of a server."
Expand Down Expand Up @@ -1991,6 +2007,10 @@
},
"ServerForCreate": {
"properties": {
"identity": {
"$ref": "#/definitions/ResourceIdentity",
"description": "The Azure Active Directory identity of the server."
},
"sku": {
"$ref": "#/definitions/Sku",
"description": "The SKU (pricing tier) of the server."
Expand Down Expand Up @@ -2020,6 +2040,10 @@
},
"ServerUpdateParameters": {
"properties": {
"identity": {
"$ref": "#/definitions/ResourceIdentity",
"description": "The Azure Active Directory identity of the server."
},
"sku": {
"$ref": "#/definitions/Sku",
"description": "The SKU (pricing tier) of the server."
Expand Down Expand Up @@ -2047,6 +2071,10 @@
"$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'"
},
"replicationRole": {
"type": "string",
"description": "The replication role of the server."
Expand Down
68 changes: 48 additions & 20 deletions ...n/postgresql/resource-manager/Microsoft.DBforPostgreSQL/stable/2017-12-01/postgresql.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1525,6 +1525,30 @@
"modelAsString": true
}
},
"InfrastructureEncryption": {
"type": "string",
"description": "Status showing whether the server enabled infrastructure encryption.",
"enum": [
"Enabled",
"Disabled"
],
"x-ms-enum": {
"name": "InfrastructureEncryption",
"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'",
"enum": [
"Enabled",
"Disabled"
],
"x-ms-enum": {
"name": "PublicNetworkAccessEnum",
"modelAsString": true
}
},
"ServerPrivateEndpointConnection": {
"description": "A private endpoint connection under a server",
"type": "object",
Expand Down Expand Up @@ -1668,16 +1692,8 @@
"readOnly": true
},
"infrastructureEncryption": {
"type": "string",
"description": "Status showing whether the server enabled infrastructure encryption.",
"enum": [
"Enabled",
"Disabled"
],
"x-ms-enum": {
"name": "InfrastructureEncryption",
"modelAsString": true
}
"$ref": "#/definitions/InfrastructureEncryption",
"description": "Status showing whether the server enabled infrastructure encryption."
},
"userVisibleState": {
"type": "string",
Expand Down Expand Up @@ -1721,16 +1737,8 @@
"description": "The maximum number of replicas that a master server can have."
},
"publicNetworkAccess": {
"type": "string",
"description": "Whether or not public endpoint access is allowed for this server. Value is optional but if passed in, must be 'Enabled' or 'Disabled'",
"enum": [
"Enabled",
"Disabled"
],
"x-ms-enum": {
"name": "PublicNetworkAccessEnum",
"modelAsString": true
}
"$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'"
},
"privateEndpointConnections": {
"description": "List of private endpoint connections on a server",
Expand Down Expand Up @@ -1799,6 +1807,14 @@
"$ref": "#/definitions/MinimalTlsVersion",
"description": "Enforce a minimal Tls version for the server."
},
"infrastructureEncryption": {
"$ref": "#/definitions/InfrastructureEncryption",
"description": "Status showing whether the server enabled infrastructure encryption."
},
"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'"
},
"storageProfile": {
"$ref": "#/definitions/StorageProfile",
"description": "Storage profile of a server."
Expand Down Expand Up @@ -1994,6 +2010,10 @@
},
"ServerForCreate": {
"properties": {
"identity": {
"$ref": "#/definitions/ResourceIdentity",
"description": "The Azure Active Directory identity of the server."
},
"sku": {
"$ref": "#/definitions/Sku",
"description": "The SKU (pricing tier) of the server."
Expand Down Expand Up @@ -2023,6 +2043,10 @@
},
"ServerUpdateParameters": {
"properties": {
"identity": {
"$ref": "#/definitions/ResourceIdentity",
"description": "The Azure Active Directory identity of the server."
},
"sku": {
"$ref": "#/definitions/Sku",
"description": "The SKU (pricing tier) of the server."
Expand Down Expand Up @@ -2050,6 +2074,10 @@
"$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'"
},
"replicationRole": {
"type": "string",
"description": "The replication role of the server."
Expand Down