From a59809da62510731d6a4bd45f40d7e059422eab1 Mon Sep 17 00:00:00 2001 From: Sena Gungor Date: Mon, 13 May 2024 19:47:53 +0300 Subject: [PATCH] Update Cosmos DB for PostgreSQL - 2023-03-02-preview version with missing properties (#28280) * Add CMK related properties * Fix lintdiff errors * Fix lintdiff error * Use common type for user assigned identities * Add description for primary key uri * Update UserAssignedIdentities definition from v3 to v5 * Add & update examples * Fix lintdiff error --------- Co-authored-by: madhura <56606095+madhura-np@users.noreply.github.com> --- .../examples/ClusterAddNode.json | 14 ++ .../examples/ClusterCreateBurstablev1.json | 12 ++ .../examples/ClusterCreateBurstablev2.json | 12 ++ .../ClusterCreateCustomDatabaseName.json | 154 +++++++++++++ .../examples/ClusterCreateMultiNode.json | 12 ++ .../examples/ClusterCreatePITR.json | 12 ++ .../examples/ClusterCreateReadReplica.json | 12 ++ .../examples/ClusterCreateSingleNode.json | 12 ++ .../examples/ClusterCreateWithAAD.json | 200 +++++++++++++++++ .../examples/ClusterCreateWithCMK.json | 204 ++++++++++++++++++ .../examples/ClusterGet.json | 6 + .../examples/ClusterList.json | 12 ++ .../examples/ClusterListByResourceGroup.json | 12 ++ .../examples/ClusterScaleCompute.json | 12 ++ .../examples/ClusterScaleStorage.json | 12 ++ .../examples/ClusterUpdate.json | 12 ++ .../ClusterUpdateMaintenanceWindow.json | 12 ++ .../2023-03-02-preview/postgresqlhsc.json | 94 +++++++- 18 files changed, 815 insertions(+), 1 deletion(-) create mode 100644 specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2023-03-02-preview/examples/ClusterCreateCustomDatabaseName.json create mode 100644 specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2023-03-02-preview/examples/ClusterCreateWithAAD.json create mode 100644 specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2023-03-02-preview/examples/ClusterCreateWithCMK.json diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2023-03-02-preview/examples/ClusterAddNode.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2023-03-02-preview/examples/ClusterAddNode.json index ceb7d5e514c6..3f7e1b3924e0 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2023-03-02-preview/examples/ClusterAddNode.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2023-03-02-preview/examples/ClusterAddNode.json @@ -27,6 +27,7 @@ "properties": { "provisioningState": "Provisioning", "state": "Provisioning", + "aadAuthEnabled": "disabled", "postgresqlVersion": "15", "citusVersion": "11.1", "maintenanceWindow": { @@ -38,14 +39,20 @@ "preferredPrimaryZone": "1", "nodeCount": 2, "enableShardsOnCoordinator": false, + "enableGeoBackup": false, "coordinatorServerEdition": "GeneralPurpose", "coordinatorStorageQuotaInMb": 524288, "coordinatorVCores": 4, "coordinatorEnablePublicIpAccess": true, + "dataEncryption": { + "type": "SystemManaged" + }, + "databaseName": "citus", "nodeServerEdition": "MemoryOptimized", "nodeStorageQuotaInMb": 524288, "nodeVCores": 8, "nodeEnablePublicIpAccess": false, + "passwordEnabled": "enabled", "serverNames": [ { "name": "testcluster-c", @@ -90,6 +97,7 @@ "provisioningState": "Provisioning", "state": "Provisioning", "postgresqlVersion": "15", + "aadAuthEnabled": "disabled", "citusVersion": "11.1", "maintenanceWindow": { "customWindow": "Disabled", @@ -100,14 +108,20 @@ "preferredPrimaryZone": "1", "nodeCount": 2, "enableShardsOnCoordinator": false, + "enableGeoBackup": false, "coordinatorServerEdition": "GeneralPurpose", "coordinatorStorageQuotaInMb": 524288, "coordinatorVCores": 4, "coordinatorEnablePublicIpAccess": true, + "dataEncryption": { + "type": "SystemManaged" + }, + "databaseName": "citus", "nodeServerEdition": "MemoryOptimized", "nodeStorageQuotaInMb": 524288, "nodeVCores": 8, "nodeEnablePublicIpAccess": false, + "passwordEnabled": "enabled", "serverNames": [ { "name": "testcluster-c", diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2023-03-02-preview/examples/ClusterCreateBurstablev1.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2023-03-02-preview/examples/ClusterCreateBurstablev1.json index a5c6ba6a2e57..8bb304413199 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2023-03-02-preview/examples/ClusterCreateBurstablev1.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2023-03-02-preview/examples/ClusterCreateBurstablev1.json @@ -53,7 +53,12 @@ "startHour": 0, "startMinute": 0 }, + "aadAuthEnabled": "disabled", "administratorLogin": "citus", + "dataEncryption": { + "type": "SystemManaged" + }, + "passwordEnabled": "enabled", "preferredPrimaryZone": "1", "nodeCount": 0, "enableShardsOnCoordinator": true, @@ -61,6 +66,7 @@ "coordinatorStorageQuotaInMb": 131072, "coordinatorVCores": 1, "coordinatorEnablePublicIpAccess": true, + "databaseName": "citus", "nodeEnablePublicIpAccess": false, "nodeServerEdition": "MemoryOptimized", "nodeStorageQuotaInMb": 131072, @@ -111,7 +117,12 @@ "startHour": 0, "startMinute": 0 }, + "aadAuthEnabled": "disabled", "administratorLogin": "citus", + "dataEncryption": { + "type": "SystemManaged" + }, + "passwordEnabled": "enabled", "preferredPrimaryZone": "1", "nodeCount": 0, "enableShardsOnCoordinator": true, @@ -119,6 +130,7 @@ "coordinatorStorageQuotaInMb": 131072, "coordinatorVCores": 1, "coordinatorEnablePublicIpAccess": true, + "databaseName": "citus", "nodeEnablePublicIpAccess": false, "nodeServerEdition": "MemoryOptimized", "nodeStorageQuotaInMb": 131072, diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2023-03-02-preview/examples/ClusterCreateBurstablev2.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2023-03-02-preview/examples/ClusterCreateBurstablev2.json index f6551318aeb9..5cf98175b314 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2023-03-02-preview/examples/ClusterCreateBurstablev2.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2023-03-02-preview/examples/ClusterCreateBurstablev2.json @@ -53,7 +53,12 @@ "startHour": 0, "startMinute": 0 }, + "aadAuthEnabled": "disabled", "administratorLogin": "citus", + "dataEncryption": { + "type": "SystemManaged" + }, + "passwordEnabled": "enabled", "preferredPrimaryZone": "1", "nodeCount": 0, "enableShardsOnCoordinator": true, @@ -61,6 +66,7 @@ "coordinatorStorageQuotaInMb": 131072, "coordinatorVCores": 2, "coordinatorEnablePublicIpAccess": true, + "databaseName": "citus", "nodeEnablePublicIpAccess": false, "nodeServerEdition": "MemoryOptimized", "nodeStorageQuotaInMb": 131072, @@ -111,7 +117,12 @@ "startHour": 0, "startMinute": 0 }, + "aadAuthEnabled": "disabled", "administratorLogin": "citus", + "dataEncryption": { + "type": "SystemManaged" + }, + "passwordEnabled": "enabled", "preferredPrimaryZone": "1", "nodeCount": 0, "enableShardsOnCoordinator": true, @@ -119,6 +130,7 @@ "coordinatorStorageQuotaInMb": 131072, "coordinatorVCores": 2, "coordinatorEnablePublicIpAccess": true, + "databaseName": "citus", "nodeEnablePublicIpAccess": false, "nodeServerEdition": "MemoryOptimized", "nodeStorageQuotaInMb": 131072, diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2023-03-02-preview/examples/ClusterCreateCustomDatabaseName.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2023-03-02-preview/examples/ClusterCreateCustomDatabaseName.json new file mode 100644 index 000000000000..ef3d1bb2819f --- /dev/null +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2023-03-02-preview/examples/ClusterCreateCustomDatabaseName.json @@ -0,0 +1,154 @@ +{ + "parameters": { + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", + "resourceGroupName": "TestGroup", + "clusterName": "testcluster-custom-db-name", + "api-version": "2023-03-02-preview", + "parameters": { + "location": "westus", + "properties": { + "administratorLoginPassword": "password", + "postgresqlVersion": "15", + "citusVersion": "11.3", + "enableHa": true, + "enableShardsOnCoordinator": true, + "coordinatorServerEdition": "GeneralPurpose", + "coordinatorStorageQuotaInMb": 131072, + "coordinatorVCores": 8, + "coordinatorEnablePublicIpAccess": true, + "nodeCount": 0, + "preferredPrimaryZone": "1", + "databaseName": "testdbname" + }, + "tags": { + "owner": "JohnDoe" + } + } + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestResourceGroup/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/testcluster-custom-db-name", + "name": "testcluster-custom-db-name", + "type": "Microsoft.DBforPostgreSQL/serverGroupsv2", + "tags": { + "owner": "JohnDoe" + }, + "location": "westus", + "systemData": { + "createdBy": "user1", + "createdByType": "User", + "createdAt": "2022-01-01T17:18:19.1234567Z", + "lastModifiedBy": "user2", + "lastModifiedByType": "User", + "lastModifiedAt": "2022-01-02T17:18:19.1234567Z" + }, + "properties": { + "provisioningState": "Provisioning", + "state": "Provisioning", + "postgresqlVersion": "15", + "aadAuthEnabled": "disabled", + "citusVersion": "11.3", + "maintenanceWindow": { + "customWindow": "Disabled", + "dayOfWeek": 0, + "startHour": 0, + "startMinute": 0 + }, + "administratorLogin": "citus", + "dataEncryption": { + "type": "SystemManaged" + }, + "passwordEnabled": "enabled", + "preferredPrimaryZone": "1", + "nodeCount": 0, + "enableShardsOnCoordinator": true, + "coordinatorServerEdition": "GeneralPurpose", + "coordinatorStorageQuotaInMb": 131072, + "coordinatorVCores": 8, + "coordinatorEnablePublicIpAccess": true, + "databaseName": "testdbname", + "nodeEnablePublicIpAccess": false, + "nodeServerEdition": "MemoryOptimized", + "nodeStorageQuotaInMb": 131072, + "nodeVCores": 8, + "serverNames": [ + { + "name": "testcluster-singlenode-c", + "fullyQualifiedDomainName": "c.testcluster-singlenode.postgres.database.azure.com" + } + ], + "sourceResourceId": null, + "enableHa": true, + "readReplicas": [], + "earliestRestoreTime": null, + "privateEndpointConnections": [] + } + } + }, + "201": { + "headers": { + "Azure-AsyncOperation": "https://management.azure.com/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/providers/Microsoft.DBforPostgreSQL/locations/westus/azureAsyncOperation/e276a03a-1770-4549-86f5-0edffae8997c?api-version=2023-03-02-preview", + "Location": "https://management.azure.com/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/providers/Microsoft.DBforPostgreSQL/locations/westus/operationResults/e276a03a-1770-4549-86f5-0edffae8997c?api-version=2023-03-02-preview" + }, + "body": { + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestResourceGroup/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/testcluster-singlenode", + "name": "testcluster-singlenode", + "type": "Microsoft.DBforPostgreSQL/serverGroupsv2", + "tags": { + "owner": "JohnDoe" + }, + "location": "westus", + "systemData": { + "createdBy": "user1", + "createdByType": "User", + "createdAt": "2022-01-01T17:18:19.1234567Z", + "lastModifiedBy": "user2", + "lastModifiedByType": "User", + "lastModifiedAt": "2022-01-02T17:18:19.1234567Z" + }, + "properties": { + "provisioningState": "Provisioning", + "state": "Provisioning", + "postgresqlVersion": "15", + "aadAuthEnabled": "disabled", + "citusVersion": "11.3", + "maintenanceWindow": { + "customWindow": "Disabled", + "dayOfWeek": 0, + "startHour": 0, + "startMinute": 0 + }, + "administratorLogin": "citus", + "dataEncryption": { + "type": "SystemManaged" + }, + "preferredPrimaryZone": "1", + "nodeCount": 0, + "enableShardsOnCoordinator": true, + "coordinatorServerEdition": "GeneralPurpose", + "coordinatorStorageQuotaInMb": 131072, + "coordinatorVCores": 8, + "coordinatorEnablePublicIpAccess": true, + "databaseName": "testdbname", + "nodeEnablePublicIpAccess": false, + "nodeServerEdition": "MemoryOptimized", + "nodeStorageQuotaInMb": 131072, + "nodeVCores": 8, + "passwordEnabled": "enabled", + "serverNames": [ + { + "name": "testcluster-singlenode-c", + "fullyQualifiedDomainName": "c.testcluster-singlenode.postgres.database.azure.com" + } + ], + "sourceResourceId": null, + "enableHa": true, + "readReplicas": [], + "earliestRestoreTime": null, + "privateEndpointConnections": [] + } + } + } + } +} diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2023-03-02-preview/examples/ClusterCreateMultiNode.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2023-03-02-preview/examples/ClusterCreateMultiNode.json index 1484fbbc9107..c0685db8f0b3 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2023-03-02-preview/examples/ClusterCreateMultiNode.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2023-03-02-preview/examples/ClusterCreateMultiNode.json @@ -53,7 +53,12 @@ "startHour": 0, "startMinute": 0 }, + "aadAuthEnabled": "disabled", "administratorLogin": "citus", + "dataEncryption": { + "type": "SystemManaged" + }, + "passwordEnabled": "enabled", "preferredPrimaryZone": "1", "nodeCount": 3, "enableShardsOnCoordinator": false, @@ -61,6 +66,7 @@ "coordinatorStorageQuotaInMb": 524288, "coordinatorVCores": 4, "coordinatorEnablePublicIpAccess": true, + "databaseName": "citus", "nodeServerEdition": "MemoryOptimized", "nodeStorageQuotaInMb": 524288, "nodeVCores": 8, @@ -121,7 +127,12 @@ "startHour": 0, "startMinute": 0 }, + "aadAuthEnabled": "disabled", "administratorLogin": "citus", + "dataEncryption": { + "type": "SystemManaged" + }, + "passwordEnabled": "enabled", "preferredPrimaryZone": "1", "nodeCount": 3, "enableShardsOnCoordinator": false, @@ -129,6 +140,7 @@ "coordinatorStorageQuotaInMb": 524288, "coordinatorVCores": 4, "coordinatorEnablePublicIpAccess": true, + "databaseName": "citus", "nodeServerEdition": "MemoryOptimized", "nodeStorageQuotaInMb": 524288, "nodeVCores": 8, diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2023-03-02-preview/examples/ClusterCreatePITR.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2023-03-02-preview/examples/ClusterCreatePITR.json index 66d4bc5e31d2..637e68964531 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2023-03-02-preview/examples/ClusterCreatePITR.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2023-03-02-preview/examples/ClusterCreatePITR.json @@ -38,7 +38,12 @@ "startHour": 0, "startMinute": 0 }, + "aadAuthEnabled": "disabled", "administratorLogin": "citus", + "dataEncryption": { + "type": "SystemManaged" + }, + "passwordEnabled": "enabled", "preferredPrimaryZone": "1", "nodeCount": 1, "enableShardsOnCoordinator": false, @@ -46,6 +51,7 @@ "coordinatorStorageQuotaInMb": 524288, "coordinatorVCores": 4, "coordinatorEnablePublicIpAccess": true, + "databaseName": "citus", "nodeServerEdition": "MemoryOptimized", "nodeStorageQuotaInMb": 524288, "nodeVCores": 8, @@ -97,7 +103,12 @@ "startHour": 0, "startMinute": 0 }, + "aadAuthEnabled": "disabled", "administratorLogin": "citus", + "dataEncryption": { + "type": "SystemManaged" + }, + "passwordEnabled": "enabled", "preferredPrimaryZone": "1", "nodeCount": 1, "enableShardsOnCoordinator": false, @@ -105,6 +116,7 @@ "coordinatorStorageQuotaInMb": 524288, "coordinatorVCores": 4, "coordinatorEnablePublicIpAccess": true, + "databaseName": "citus", "nodeServerEdition": "MemoryOptimized", "nodeStorageQuotaInMb": 524288, "nodeVCores": 8, diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2023-03-02-preview/examples/ClusterCreateReadReplica.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2023-03-02-preview/examples/ClusterCreateReadReplica.json index ceb1cc986ea4..0148be4e066e 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2023-03-02-preview/examples/ClusterCreateReadReplica.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2023-03-02-preview/examples/ClusterCreateReadReplica.json @@ -37,7 +37,12 @@ "startHour": 0, "startMinute": 0 }, + "aadAuthEnabled": "disabled", "administratorLogin": "citus", + "dataEncryption": { + "type": "SystemManaged" + }, + "passwordEnabled": "enabled", "preferredPrimaryZone": "1", "nodeCount": 1, "enableShardsOnCoordinator": false, @@ -45,6 +50,7 @@ "coordinatorStorageQuotaInMb": 524288, "coordinatorVCores": 4, "coordinatorEnablePublicIpAccess": true, + "databaseName": "citus", "nodeServerEdition": "MemoryOptimized", "nodeStorageQuotaInMb": 524288, "nodeVCores": 8, @@ -96,7 +102,12 @@ "startHour": 0, "startMinute": 0 }, + "aadAuthEnabled": "disabled", "administratorLogin": "citus", + "dataEncryption": { + "type": "SystemManaged" + }, + "passwordEnabled": "enabled", "preferredPrimaryZone": "1", "nodeCount": 1, "enableShardsOnCoordinator": false, @@ -104,6 +115,7 @@ "coordinatorStorageQuotaInMb": 524288, "coordinatorVCores": 4, "coordinatorEnablePublicIpAccess": true, + "databaseName": "citus", "nodeServerEdition": "MemoryOptimized", "nodeStorageQuotaInMb": 524288, "nodeVCores": 8, diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2023-03-02-preview/examples/ClusterCreateSingleNode.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2023-03-02-preview/examples/ClusterCreateSingleNode.json index 2d70a5993682..dfabef6528a8 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2023-03-02-preview/examples/ClusterCreateSingleNode.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2023-03-02-preview/examples/ClusterCreateSingleNode.json @@ -53,7 +53,12 @@ "startHour": 0, "startMinute": 0 }, + "aadAuthEnabled": "disabled", "administratorLogin": "citus", + "dataEncryption": { + "type": "SystemManaged" + }, + "passwordEnabled": "enabled", "preferredPrimaryZone": "1", "nodeCount": 0, "enableShardsOnCoordinator": true, @@ -61,6 +66,7 @@ "coordinatorStorageQuotaInMb": 131072, "coordinatorVCores": 8, "coordinatorEnablePublicIpAccess": true, + "databaseName": "citus", "nodeEnablePublicIpAccess": false, "nodeServerEdition": "MemoryOptimized", "nodeStorageQuotaInMb": 131072, @@ -111,7 +117,12 @@ "startHour": 0, "startMinute": 0 }, + "aadAuthEnabled": "disabled", "administratorLogin": "citus", + "dataEncryption": { + "type": "SystemManaged" + }, + "passwordEnabled": "enabled", "preferredPrimaryZone": "1", "nodeCount": 0, "enableShardsOnCoordinator": true, @@ -119,6 +130,7 @@ "coordinatorStorageQuotaInMb": 131072, "coordinatorVCores": 8, "coordinatorEnablePublicIpAccess": true, + "databaseName": "citus", "nodeEnablePublicIpAccess": false, "nodeServerEdition": "MemoryOptimized", "nodeStorageQuotaInMb": 131072, diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2023-03-02-preview/examples/ClusterCreateWithAAD.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2023-03-02-preview/examples/ClusterCreateWithAAD.json new file mode 100644 index 000000000000..1d4e20128663 --- /dev/null +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2023-03-02-preview/examples/ClusterCreateWithAAD.json @@ -0,0 +1,200 @@ +{ + "parameters": { + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", + "resourceGroupName": "TestGroup", + "clusterName": "testcluster-cmk", + "api-version": "2023-03-02-preview", + "parameters": { + "location": "westus", + "identity": { + "type": "UserAssigned", + "userAssignedIdentities": { + "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.ManagedIdentity/userAssignedIdentities/test-usermanagedidentity": {} + } + }, + "properties": { + "administratorLoginPassword": "password", + "dataEncryption": { + "primaryKeyUri": "https://test-kv.vault.azure.net/keys/test-key1/fffffffffffffffffffffffffffffff", + "primaryUserAssignedIdentityId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.ManagedIdentity/userAssignedIdentities/test-usermanagedidentity", + "type": "AzureKeyVault" + }, + "postgresqlVersion": "15", + "citusVersion": "12.1", + "enableHa": false, + "enableShardsOnCoordinator": false, + "coordinatorServerEdition": "GeneralPurpose", + "coordinatorStorageQuotaInMb": 524288, + "coordinatorVCores": 4, + "coordinatorEnablePublicIpAccess": true, + "databaseName": "citus", + "nodeServerEdition": "MemoryOptimized", + "nodeCount": 3, + "nodeStorageQuotaInMb": 524288, + "nodeVCores": 8, + "nodeEnablePublicIpAccess": false, + "preferredPrimaryZone": "1" + }, + "tags": {} + } + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/testcluster-multinode", + "name": "testcluster-multinode", + "type": "Microsoft.DBforPostgreSQL/serverGroupsv2", + "tags": {}, + "location": "westus", + "systemData": { + "createdBy": "user1", + "createdByType": "User", + "createdAt": "2022-01-01T17:18:19.1234567Z", + "lastModifiedBy": "user2", + "lastModifiedByType": "User", + "lastModifiedAt": "2022-01-02T17:18:19.1234567Z" + }, + "identity": { + "userAssignedIdentities": { + "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.ManagedIdentity/userAssignedIdentities/test-usermanagedidentity": { + "principalId": "0a4e0c6e-7751-4078-ae1f-a477306c11e9", + "clientId": "72f988bf-86f1-41af-91ab-2d7cd011db47" + } + }, + "type": "UserAssigned" + }, + "properties": { + "provisioningState": "Provisioning", + "state": "Provisioning", + "postgresqlVersion": "15", + "aadAuthEnabled": "enabled", + "citusVersion": "12.1", + "maintenanceWindow": { + "customWindow": "Disabled", + "dayOfWeek": 0, + "startHour": 0, + "startMinute": 0 + }, + "administratorLogin": "citus", + "passwordEnabled": "disabled", + "preferredPrimaryZone": "1", + "nodeCount": 3, + "enableShardsOnCoordinator": false, + "coordinatorServerEdition": "GeneralPurpose", + "coordinatorStorageQuotaInMb": 524288, + "coordinatorVCores": 4, + "coordinatorEnablePublicIpAccess": true, + "databaseName": "citus", + "dataEncryption": { + "type": "SystemManaged" + }, + "nodeServerEdition": "MemoryOptimized", + "nodeStorageQuotaInMb": 524288, + "nodeVCores": 8, + "nodeEnablePublicIpAccess": false, + "serverNames": [ + { + "name": "testcluster-multinode-c", + "fullyQualifiedDomainName": "c.testcluster-multinode.postgres.database.azure.com" + }, + { + "name": "testcluster-multinode-w0", + "fullyQualifiedDomainName": "w0.testcluster-multinode.postgres.database.azure.com" + }, + { + "name": "testcluster-multinode-w2", + "fullyQualifiedDomainName": "w0.testcluster-multinode.postgres.database.azure.com" + }, + { + "name": "testcluster-multinode-w3", + "fullyQualifiedDomainName": "w0.testcluster-multinode.postgres.database.azure.com" + } + ], + "authConfig": { + "activeDirectoryAuth": "{serverGroupProperties.ActiveDirectoryAuth}", + "passwordAuth": "{serverGroupProperties.PasswordAuth}" + }, + "sourceResourceId": null, + "enableHa": true, + "readReplicas": [], + "earliestRestoreTime": null, + "privateEndpointConnections": [] + } + } + }, + "201": { + "headers": { + "Azure-AsyncOperation": "https://management.azure.com/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/providers/Microsoft.DBforPostgreSQL/locations/westus/azureAsyncOperation/e276a03a-1770-4549-86f5-0edffae8997c?api-version=2023-03-02-preview", + "Location": "https://management.azure.com/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/providers/Microsoft.DBforPostgreSQL/locations/westus/operationResults/e276a03a-1770-4549-86f5-0edffae8997c?api-version=2023-03-02-preview" + }, + "body": { + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestResourceGroup/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/testcluster-multinode", + "name": "testcluster-multinode", + "type": "Microsoft.DBforPostgreSQL/serverGroupsv2", + "tags": {}, + "location": "westus", + "systemData": { + "createdBy": "user1", + "createdByType": "User", + "createdAt": "2022-01-01T17:18:19.1234567Z", + "lastModifiedBy": "user2", + "lastModifiedByType": "User", + "lastModifiedAt": "2022-01-02T17:18:19.1234567Z" + }, + "properties": { + "provisioningState": "Provisioning", + "state": "Provisioning", + "postgresqlVersion": "15", + "aadAuthEnabled": "disabled", + "citusVersion": "11.1", + "maintenanceWindow": { + "customWindow": "Disabled", + "dayOfWeek": 0, + "startHour": 0, + "startMinute": 0 + }, + "administratorLogin": "citus", + "dataEncryption": { + "type": "SystemManaged" + }, + "passwordEnabled": "disabled", + "preferredPrimaryZone": "1", + "nodeCount": 3, + "enableShardsOnCoordinator": false, + "coordinatorServerEdition": "GeneralPurpose", + "coordinatorStorageQuotaInMb": 524288, + "coordinatorVCores": 4, + "coordinatorEnablePublicIpAccess": true, + "databaseName": "citus", + "nodeServerEdition": "MemoryOptimized", + "nodeStorageQuotaInMb": 524288, + "nodeVCores": 8, + "nodeEnablePublicIpAccess": false, + "serverNames": [ + { + "name": "testcluster-multinode-c", + "fullyQualifiedDomainName": "c.testcluster-multinode.postgres.database.azure.com" + }, + { + "name": "testcluster-multinode-w0", + "fullyQualifiedDomainName": "w0.testcluster-multinode.postgres.database.azure.com" + }, + { + "name": "testcluster-multinode-w2", + "fullyQualifiedDomainName": "w0.testcluster-multinode.postgres.database.azure.com" + }, + { + "name": "testcluster-multinode-w3", + "fullyQualifiedDomainName": "w0.testcluster-multinode.postgres.database.azure.com" + } + ], + "sourceResourceId": null, + "enableHa": true, + "readReplicas": [], + "earliestRestoreTime": null, + "privateEndpointConnections": [] + } + } + } + } +} diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2023-03-02-preview/examples/ClusterCreateWithCMK.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2023-03-02-preview/examples/ClusterCreateWithCMK.json new file mode 100644 index 000000000000..7c2a28336756 --- /dev/null +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2023-03-02-preview/examples/ClusterCreateWithCMK.json @@ -0,0 +1,204 @@ +{ + "parameters": { + "subscriptionId": "ffffffff-ffff-ffff-ffff-ffffffffffff", + "resourceGroupName": "TestGroup", + "clusterName": "testcluster-cmk", + "api-version": "2023-03-02-preview", + "parameters": { + "location": "westus", + "identity": { + "type": "UserAssigned", + "userAssignedIdentities": { + "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.ManagedIdentity/userAssignedIdentities/test-usermanagedidentity": {} + } + }, + "properties": { + "administratorLoginPassword": "password", + "dataEncryption": { + "primaryKeyUri": "https://test-kv.vault.azure.net/keys/test-key1/fffffffffffffffffffffffffffffff", + "primaryUserAssignedIdentityId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.ManagedIdentity/userAssignedIdentities/test-usermanagedidentity", + "type": "AzureKeyVault" + }, + "postgresqlVersion": "15", + "citusVersion": "12.1", + "enableHa": false, + "enableShardsOnCoordinator": false, + "coordinatorServerEdition": "GeneralPurpose", + "coordinatorStorageQuotaInMb": 524288, + "coordinatorVCores": 4, + "coordinatorEnablePublicIpAccess": true, + "databaseName": "citus", + "nodeServerEdition": "MemoryOptimized", + "nodeCount": 3, + "nodeStorageQuotaInMb": 524288, + "nodeVCores": 8, + "nodeEnablePublicIpAccess": false, + "preferredPrimaryZone": "1" + }, + "tags": {} + } + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/testcluster-multinode", + "name": "testcluster-multinode", + "type": "Microsoft.DBforPostgreSQL/serverGroupsv2", + "tags": {}, + "location": "westus", + "systemData": { + "createdBy": "user1", + "createdByType": "User", + "createdAt": "2022-01-01T17:18:19.1234567Z", + "lastModifiedBy": "user2", + "lastModifiedByType": "User", + "lastModifiedAt": "2022-01-02T17:18:19.1234567Z" + }, + "identity": { + "userAssignedIdentities": { + "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.ManagedIdentity/userAssignedIdentities/test-usermanagedidentity": { + "principalId": "0a4e0c6e-7751-4078-ae1f-a477306c11e9", + "clientId": "72f988bf-86f1-41af-91ab-2d7cd011db47" + } + }, + "type": "UserAssigned" + }, + "properties": { + "provisioningState": "Provisioning", + "state": "Provisioning", + "postgresqlVersion": "15", + "aadAuthEnabled": "disabled", + "citusVersion": "12.1", + "maintenanceWindow": { + "customWindow": "Disabled", + "dayOfWeek": 0, + "startHour": 0, + "startMinute": 0 + }, + "administratorLogin": "citus", + "preferredPrimaryZone": "1", + "nodeCount": 3, + "enableShardsOnCoordinator": false, + "coordinatorServerEdition": "GeneralPurpose", + "coordinatorStorageQuotaInMb": 524288, + "coordinatorVCores": 4, + "coordinatorEnablePublicIpAccess": true, + "databaseName": "citus", + "dataEncryption": { + "type": "AzureKeyVault", + "primaryKeyUri": "https://test-kv.vault.azure.net/keys/test-key1/fffffffffffffffffffffffffffffff", + "primaryUserAssignedIdentityId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.ManagedIdentity/userAssignedIdentities/test-usermanagedidentity" + }, + "nodeServerEdition": "MemoryOptimized", + "nodeStorageQuotaInMb": 524288, + "nodeVCores": 8, + "nodeEnablePublicIpAccess": false, + "passwordEnabled": "enabled", + "serverNames": [ + { + "name": "testcluster-multinode-c", + "fullyQualifiedDomainName": "c.testcluster-multinode.postgres.database.azure.com" + }, + { + "name": "testcluster-multinode-w0", + "fullyQualifiedDomainName": "w0.testcluster-multinode.postgres.database.azure.com" + }, + { + "name": "testcluster-multinode-w2", + "fullyQualifiedDomainName": "w0.testcluster-multinode.postgres.database.azure.com" + }, + { + "name": "testcluster-multinode-w3", + "fullyQualifiedDomainName": "w0.testcluster-multinode.postgres.database.azure.com" + } + ], + "authConfig": { + "activeDirectoryAuth": "{serverGroupProperties.ActiveDirectoryAuth}", + "passwordAuth": "{serverGroupProperties.PasswordAuth}" + }, + "sourceResourceId": null, + "enableHa": true, + "readReplicas": [], + "earliestRestoreTime": null, + "privateEndpointConnections": [] + } + } + }, + "201": { + "headers": { + "Azure-AsyncOperation": "https://management.azure.com/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/providers/Microsoft.DBforPostgreSQL/locations/westus/azureAsyncOperation/e276a03a-1770-4549-86f5-0edffae8997c?api-version=2023-03-02-preview", + "Location": "https://management.azure.com/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/providers/Microsoft.DBforPostgreSQL/locations/westus/operationResults/e276a03a-1770-4549-86f5-0edffae8997c?api-version=2023-03-02-preview" + }, + "body": { + "id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestResourceGroup/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/testcluster-multinode", + "name": "testcluster-multinode", + "type": "Microsoft.DBforPostgreSQL/serverGroupsv2", + "tags": {}, + "location": "westus", + "systemData": { + "createdBy": "user1", + "createdByType": "User", + "createdAt": "2022-01-01T17:18:19.1234567Z", + "lastModifiedBy": "user2", + "lastModifiedByType": "User", + "lastModifiedAt": "2022-01-02T17:18:19.1234567Z" + }, + "properties": { + "provisioningState": "Provisioning", + "state": "Provisioning", + "postgresqlVersion": "15", + "citusVersion": "11.1", + "maintenanceWindow": { + "customWindow": "Disabled", + "dayOfWeek": 0, + "startHour": 0, + "startMinute": 0 + }, + "aadAuthEnabled": "disabled", + "administratorLogin": "citus", + "dataEncryption": { + "type": "AzureKeyVault", + "primaryKeyUri": "https://test-kv.vault.azure.net/keys/test-key1/fffffffffffffffffffffffffffffff", + "primaryUserAssignedIdentityId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.ManagedIdentity/userAssignedIdentities/test-usermanagedidentity" + }, + "preferredPrimaryZone": "1", + "nodeCount": 3, + "enableShardsOnCoordinator": false, + "coordinatorServerEdition": "GeneralPurpose", + "coordinatorStorageQuotaInMb": 524288, + "coordinatorVCores": 4, + "coordinatorEnablePublicIpAccess": true, + "databaseName": "citus", + "nodeServerEdition": "MemoryOptimized", + "nodeStorageQuotaInMb": 524288, + "nodeVCores": 8, + "nodeEnablePublicIpAccess": false, + "passwordEnabled": "enabled", + "serverNames": [ + { + "name": "testcluster-multinode-c", + "fullyQualifiedDomainName": "c.testcluster-multinode.postgres.database.azure.com" + }, + { + "name": "testcluster-multinode-w0", + "fullyQualifiedDomainName": "w0.testcluster-multinode.postgres.database.azure.com" + }, + { + "name": "testcluster-multinode-w2", + "fullyQualifiedDomainName": "w0.testcluster-multinode.postgres.database.azure.com" + }, + { + "name": "testcluster-multinode-w3", + "fullyQualifiedDomainName": "w0.testcluster-multinode.postgres.database.azure.com" + } + ], + "sourceResourceId": null, + "enableHa": true, + "readReplicas": [], + "earliestRestoreTime": null, + "privateEndpointConnections": [] + } + } + } + } +} diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2023-03-02-preview/examples/ClusterGet.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2023-03-02-preview/examples/ClusterGet.json index 6e246ff0629a..4b2c95f6019e 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2023-03-02-preview/examples/ClusterGet.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2023-03-02-preview/examples/ClusterGet.json @@ -36,7 +36,12 @@ "startMinute": 0, "customWindow": "Disabled" }, + "aadAuthEnabled": "disabled", "administratorLogin": "citus", + "dataEncryption": { + "type": "SystemManaged" + }, + "passwordEnabled": "enabled", "preferredPrimaryZone": "1", "enableHa": false, "enableShardsOnCoordinator": false, @@ -44,6 +49,7 @@ "coordinatorStorageQuotaInMb": 2097152, "coordinatorVCores": 4, "coordinatorEnablePublicIpAccess": true, + "databaseName": "citus", "nodeServerEdition": "MemoryOptimized", "nodeCount": 2, "nodeStorageQuotaInMb": 2097152, diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2023-03-02-preview/examples/ClusterList.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2023-03-02-preview/examples/ClusterList.json index 0953ce5c7ab2..7d55e0df19e6 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2023-03-02-preview/examples/ClusterList.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2023-03-02-preview/examples/ClusterList.json @@ -35,7 +35,12 @@ "startMinute": 0, "customWindow": "Disabled" }, + "aadAuthEnabled": "disabled", "administratorLogin": "citus", + "dataEncryption": { + "type": "SystemManaged" + }, + "passwordEnabled": "enabled", "preferredPrimaryZone": "1", "enableHa": false, "enableShardsOnCoordinator": false, @@ -43,6 +48,7 @@ "coordinatorStorageQuotaInMb": 2097152, "coordinatorVCores": 4, "coordinatorEnablePublicIpAccess": true, + "databaseName": "citus", "nodeServerEdition": "MemoryOptimized", "nodeCount": 2, "nodeStorageQuotaInMb": 2097152, @@ -98,7 +104,12 @@ "startMinute": 0, "customWindow": "Disabled" }, + "aadAuthEnabled": "disabled", "administratorLogin": "citus", + "dataEncryption": { + "type": "SystemManaged" + }, + "passwordEnabled": "enabled", "preferredPrimaryZone": "1", "enableHa": true, "enableShardsOnCoordinator": false, @@ -106,6 +117,7 @@ "coordinatorStorageQuotaInMb": 524288, "coordinatorVCores": 4, "coordinatorEnablePublicIpAccess": true, + "databaseName": "citus", "nodeServerEdition": "MemoryOptimized", "nodeCount": 1, "nodeStorageQuotaInMb": 524288, diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2023-03-02-preview/examples/ClusterListByResourceGroup.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2023-03-02-preview/examples/ClusterListByResourceGroup.json index baa32ef34fa8..5c9552e6b74f 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2023-03-02-preview/examples/ClusterListByResourceGroup.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2023-03-02-preview/examples/ClusterListByResourceGroup.json @@ -36,7 +36,12 @@ "startMinute": 0, "customWindow": "Disabled" }, + "aadAuthEnabled": "disabled", "administratorLogin": "citus", + "dataEncryption": { + "type": "SystemManaged" + }, + "passwordEnabled": "enabled", "preferredPrimaryZone": "1", "enableHa": false, "enableShardsOnCoordinator": false, @@ -44,6 +49,7 @@ "coordinatorStorageQuotaInMb": 2097152, "coordinatorVCores": 4, "coordinatorEnablePublicIpAccess": true, + "databaseName": "citus", "nodeServerEdition": "MemoryOptimized", "nodeCount": 3, "nodeStorageQuotaInMb": 2097152, @@ -103,7 +109,12 @@ "startMinute": 0, "customWindow": "Disabled" }, + "aadAuthEnabled": "disabled", "administratorLogin": "citus", + "dataEncryption": { + "type": "SystemManaged" + }, + "passwordEnabled": "enabled", "preferredPrimaryZone": "1", "enableHa": true, "enableShardsOnCoordinator": false, @@ -111,6 +122,7 @@ "coordinatorStorageQuotaInMb": 524288, "coordinatorVCores": 4, "coordinatorEnablePublicIpAccess": true, + "databaseName": "citus", "nodeServerEdition": "MemoryOptimized", "nodeCount": 2, "nodeStorageQuotaInMb": 524288, diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2023-03-02-preview/examples/ClusterScaleCompute.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2023-03-02-preview/examples/ClusterScaleCompute.json index e7e5187ad060..daf4d2b9ab93 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2023-03-02-preview/examples/ClusterScaleCompute.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2023-03-02-preview/examples/ClusterScaleCompute.json @@ -35,7 +35,12 @@ "startMinute": 0, "customWindow": "Disabled" }, + "aadAuthEnabled": "disabled", "administratorLogin": "citus", + "dataEncryption": { + "type": "SystemManaged" + }, + "passwordEnabled": "enabled", "preferredPrimaryZone": "1", "enableHa": false, "enableShardsOnCoordinator": false, @@ -43,6 +48,7 @@ "coordinatorStorageQuotaInMb": 2097152, "coordinatorVCores": 16, "coordinatorEnablePublicIpAccess": true, + "databaseName": "citus", "nodeServerEdition": "MemoryOptimized", "nodeCount": 3, "nodeStorageQuotaInMb": 2097152, @@ -102,7 +108,12 @@ "startMinute": 0, "customWindow": "Disabled" }, + "aadAuthEnabled": "disabled", "administratorLogin": "citus", + "dataEncryption": { + "type": "SystemManaged" + }, + "passwordEnabled": "enabled", "preferredPrimaryZone": "1", "enableHa": false, "enableShardsOnCoordinator": false, @@ -110,6 +121,7 @@ "coordinatorStorageQuotaInMb": 2097152, "coordinatorVCores": 16, "coordinatorEnablePublicIpAccess": true, + "databaseName": "citus", "nodeServerEdition": "MemoryOptimized", "nodeCount": 3, "nodeStorageQuotaInMb": 2097152, diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2023-03-02-preview/examples/ClusterScaleStorage.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2023-03-02-preview/examples/ClusterScaleStorage.json index 9fe42061fdd2..26b86999e5e2 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2023-03-02-preview/examples/ClusterScaleStorage.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2023-03-02-preview/examples/ClusterScaleStorage.json @@ -35,7 +35,12 @@ "startMinute": 0, "customWindow": "Disabled" }, + "aadAuthEnabled": "disabled", "administratorLogin": "citus", + "dataEncryption": { + "type": "SystemManaged" + }, + "passwordEnabled": "enabled", "preferredPrimaryZone": "1", "enableHa": false, "enableShardsOnCoordinator": false, @@ -43,6 +48,7 @@ "coordinatorStorageQuotaInMb": 2097152, "coordinatorVCores": 16, "coordinatorEnablePublicIpAccess": true, + "databaseName": "citus", "nodeServerEdition": "MemoryOptimized", "nodeCount": 3, "nodeStorageQuotaInMb": 2097152, @@ -102,7 +108,12 @@ "startMinute": 0, "customWindow": "Disabled" }, + "aadAuthEnabled": "disabled", "administratorLogin": "citus", + "dataEncryption": { + "type": "SystemManaged" + }, + "passwordEnabled": "enabled", "preferredPrimaryZone": "1", "enableHa": false, "enableShardsOnCoordinator": false, @@ -110,6 +121,7 @@ "coordinatorStorageQuotaInMb": 2097152, "coordinatorVCores": 16, "coordinatorEnablePublicIpAccess": true, + "databaseName": "citus", "nodeServerEdition": "MemoryOptimized", "nodeCount": 3, "nodeStorageQuotaInMb": 2097152, diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2023-03-02-preview/examples/ClusterUpdate.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2023-03-02-preview/examples/ClusterUpdate.json index bfa0d737d693..ea6709168359 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2023-03-02-preview/examples/ClusterUpdate.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2023-03-02-preview/examples/ClusterUpdate.json @@ -44,7 +44,12 @@ "startMinute": 0, "customWindow": "Disabled" }, + "aadAuthEnabled": "disabled", "administratorLogin": "citus", + "dataEncryption": { + "type": "SystemManaged" + }, + "passwordEnabled": "enabled", "preferredPrimaryZone": "1", "enableHa": false, "enableShardsOnCoordinator": false, @@ -52,6 +57,7 @@ "coordinatorStorageQuotaInMb": 2097152, "coordinatorVCores": 16, "coordinatorEnablePublicIpAccess": true, + "databaseName": "citus", "nodeServerEdition": "MemoryOptimized", "nodeCount": 4, "nodeStorageQuotaInMb": 2097152, @@ -123,7 +129,12 @@ "startMinute": 0, "customWindow": "Disabled" }, + "aadAuthEnabled": "disabled", "administratorLogin": "citus", + "dataEncryption": { + "type": "SystemManaged" + }, + "passwordEnabled": "enabled", "preferredPrimaryZone": "1", "enableHa": false, "enableShardsOnCoordinator": false, @@ -131,6 +142,7 @@ "coordinatorStorageQuotaInMb": 2097152, "coordinatorVCores": 16, "coordinatorEnablePublicIpAccess": true, + "databaseName": "citus", "nodeServerEdition": "MemoryOptimized", "nodeCount": 4, "nodeStorageQuotaInMb": 2097152, diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2023-03-02-preview/examples/ClusterUpdateMaintenanceWindow.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2023-03-02-preview/examples/ClusterUpdateMaintenanceWindow.json index 82891913088e..be82a5e2a414 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2023-03-02-preview/examples/ClusterUpdateMaintenanceWindow.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2023-03-02-preview/examples/ClusterUpdateMaintenanceWindow.json @@ -40,7 +40,12 @@ "startMinute": 0, "customWindow": "Enabled" }, + "aadAuthEnabled": "disabled", "administratorLogin": "citus", + "dataEncryption": { + "type": "SystemManaged" + }, + "passwordEnabled": "enabled", "preferredPrimaryZone": "1", "enableHa": false, "enableShardsOnCoordinator": false, @@ -48,6 +53,7 @@ "coordinatorStorageQuotaInMb": 2097152, "coordinatorVCores": 16, "coordinatorEnablePublicIpAccess": true, + "databaseName": "citus", "nodeServerEdition": "MemoryOptimized", "nodeCount": 2, "nodeStorageQuotaInMb": 2097152, @@ -103,7 +109,12 @@ "startMinute": 0, "customWindow": "Enabled" }, + "aadAuthEnabled": "disabled", "administratorLogin": "citus", + "dataEncryption": { + "type": "SystemManaged" + }, + "passwordEnabled": "enabled", "preferredPrimaryZone": "1", "enableHa": false, "enableShardsOnCoordinator": false, @@ -111,6 +122,7 @@ "coordinatorStorageQuotaInMb": 2097152, "coordinatorVCores": 16, "coordinatorEnablePublicIpAccess": true, + "databaseName": "citus", "nodeServerEdition": "MemoryOptimized", "nodeCount": 2, "nodeStorageQuotaInMb": 2097152, diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2023-03-02-preview/postgresqlhsc.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2023-03-02-preview/postgresqlhsc.json index 37c2cb81d875..dc0687aa331f 100644 --- a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2023-03-02-preview/postgresqlhsc.json +++ b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2023-03-02-preview/postgresqlhsc.json @@ -144,6 +144,15 @@ }, "Create a new cluster as a read replica": { "$ref": "./examples/ClusterCreateReadReplica.json" + }, + "Create a new cluster with custom database name": { + "$ref": "./examples/ClusterCreateCustomDatabaseName.json" + }, + "Create a new cluster with Customer Managed Key - CMK data encryption.": { + "$ref": "./examples/ClusterCreateWithCMK.json" + }, + "Create a new cluster with Azure Active Directory Authentication": { + "$ref": "./examples/ClusterCreateWithAAD.json" } }, "parameters": [ @@ -2013,6 +2022,10 @@ "x-ms-client-flatten": true, "description": "Properties of the cluster." }, + "identity": { + "$ref": "#/definitions/IdentityProperties", + "description": "Describes the identity of the cluster." + }, "tags": { "type": "object", "additionalProperties": { @@ -2130,6 +2143,10 @@ "$ref": "#/definitions/ClusterProperties", "x-ms-client-flatten": true, "description": "Properties of the cluster." + }, + "identity": { + "$ref": "#/definitions/IdentityProperties", + "description": "Describes the identity of the cluster." } }, "allOf": [ @@ -2142,6 +2159,19 @@ "description": "Properties of the cluster.", "type": "object", "properties": { + "aadAuthEnabled": { + "type": "string", + "readOnly": true, + "enum": [ + "enabled", + "disabled" + ], + "x-ms-enum": { + "name": "AadEnabledEnum", + "modelAsString": true + }, + "description": "Indicates whether the cluster was created using AAD authentication." + }, "administratorLogin": { "type": "string", "description": "The administrator's login name of the servers in the cluster.", @@ -2157,6 +2187,10 @@ ], "description": "The password of the administrator login. Required for creation." }, + "dataEncryption": { + "$ref": "#/definitions/DataEncryption", + "description": "The data encryption properties of a cluster." + }, "provisioningState": { "type": "string", "description": "Provisioning state of the cluster", @@ -2252,6 +2286,19 @@ "type": "string", "description": "The Azure region of source cluster for read replica clusters." }, + "passwordEnabled": { + "type": "string", + "readOnly": true, + "enum": [ + "enabled", + "disabled" + ], + "x-ms-enum": { + "name": "PasswordEnabledEnum", + "modelAsString": true + }, + "description": "Indicates whether the cluster was created with a password or using AAD authentication." + }, "pointInTimeUTC": { "type": "string", "format": "date-time", @@ -2322,6 +2369,31 @@ } } }, + "DataEncryption": { + "type": "object", + "description": "The data encryption properties of a cluster.", + "properties": { + "primaryKeyUri": { + "type": "string", + "description": "URI for the key in keyvault for data encryption of the primary server." + }, + "primaryUserAssignedIdentityId": { + "type": "string", + "description": "Resource Id for the User assigned identity to be used for data encryption of the primary server." + }, + "type": { + "type": "string", + "enum": [ + "AzureKeyVault", + "SystemAssigned" + ], + "x-ms-enum": { + "name": "DataEncryptionType", + "modelAsString": true + } + } + } + }, "MaintenanceWindow": { "type": "object", "description": "Schedule settings for regular cluster updates.", @@ -2610,6 +2682,26 @@ } } }, + "IdentityProperties": { + "type": "object", + "description": "Describes the identity of the cluster.", + "properties": { + "type": { + "type": "string", + "enum": [ + "UserAssigned", + "SystemAssigned" + ], + "x-ms-enum": { + "name": "IdentityType", + "modelAsString": true + } + }, + "userAssignedIdentities": { + "$ref": "../../../../../common-types/resource-management/v5/managedidentity.json#/definitions/UserAssignedIdentities" + } + } + }, "RoleProperties": { "properties": { "roleType": { @@ -2936,7 +3028,7 @@ "properties": { "enableGeoBackup": { "type": "boolean", - "description": "Cluster name to verify." + "description": "Boolean property to enable geo-redundant replica promotion." } } }