Skip to content

[Service Connector] az webapp/containerapp/spring connection create/update cosmos-postgresql: Support Azure Cosmos DB for PostgreSQL Cluster as target service #27987

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

Draft
wchigit wants to merge 5 commits into
base: dev
Choose a base branch
from
Draft

[Service Connector] az webapp/containerapp/spring connection create/update cosmos-postgresql: Support Azure Cosmos DB for PostgreSQL Cluster as target service #27987

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
3aee195
add cosmospostgresql resource type
wchigit Nov 28, 2023
9878f64
Merge branch 'dev' of https://github.com/wchigit/azure-cli into cosmo…
wchigit Dec 6, 2023
ec727e6
update test
wchigit Dec 8, 2023
92c09cc
Merge branch 'dev' of https://github.com/wchigit/azure-cli into cosmo…
wchigit Dec 13, 2023
6b76ebf
add cluster argument
wchigit Dec 13, 2023
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
36 changes: 35 additions & 1 deletion src/azure-cli/azure/cli/command_modules/serviceconnector/_resource_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ class RESOURCE(Enum):
CosmosMongo = 'cosmos-mongo'
CosmosSql = 'cosmos-sql'
CosmosTable = 'cosmos-table'
CosmosPostgreSql = 'cosmos-postgresql'
StorageBlob = 'storage-blob'
StorageQueue = 'storage-queue'
StorageFile = 'storage-file'
Expand Down Expand Up @@ -130,6 +131,7 @@ class CLIENT_TYPE(Enum):
RESOURCE.CosmosMongo: '/subscriptions/{subscription}/resourceGroups/{target_resource_group}/providers/Microsoft.DocumentDB/databaseAccounts/{account}/mongodbDatabases/{database}',
RESOURCE.CosmosSql: '/subscriptions/{subscription}/resourceGroups/{target_resource_group}/providers/Microsoft.DocumentDB/databaseAccounts/{account}/sqlDatabases/{database}',
RESOURCE.CosmosTable: '/subscriptions/{subscription}/resourceGroups/{target_resource_group}/providers/Microsoft.DocumentDB/databaseAccounts/{account}/tables/{table}',
RESOURCE.CosmosPostgreSql: '/subscriptions/{subscription}/resourceGroups/{target_resource_group}/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/{cluster}/databases/{database}',

RESOURCE.StorageBlob: '/subscriptions/{subscription}/resourceGroups/{target_resource_group}/providers/Microsoft.Storage/storageAccounts/{account}/blobServices/default',
RESOURCE.StorageQueue: '/subscriptions/{subscription}/resourceGroups/{target_resource_group}/providers/Microsoft.Storage/storageAccounts/{account}/queueServices/default',
Expand Down Expand Up @@ -502,6 +504,23 @@ class CLIENT_TYPE(Enum):
'placeholder': 'MyTable'
}
},
RESOURCE.CosmosPostgreSql: {
'target_resource_group': {
'options': ['--target-resource-group', '--tg'],
'help': 'The resource group which contains the cosmos database account',
'placeholder': 'CosmosRG'
},
'cluster': {
'options': ['--cluster'],
'help': 'Name of the cluster of cosmos db for postgresql',
'placeholder': 'MyCluster'
},
'database': {
'options': ['--database'],
'help': 'Name of the database',
'placeholder': 'MyDB'
}
},
RESOURCE.StorageBlob: {
'target_resource_group': {
'options': ['--target-resource-group', '--tg'],
Expand Down Expand Up @@ -652,6 +671,7 @@ class CLIENT_TYPE(Enum):
RESOURCE.CosmosGremlin,
RESOURCE.CosmosMongo,
RESOURCE.CosmosTable,
RESOURCE.CosmosPostgreSql,
RESOURCE.Redis,
RESOURCE.Postgres,
RESOURCE.Mysql,
Expand Down Expand Up @@ -732,6 +752,7 @@ class CLIENT_TYPE(Enum):
RESOURCE.CosmosMongo: [AUTH_TYPE.SecretAuto, AUTH_TYPE.UserAccount, AUTH_TYPE.ServicePrincipalSecret],
RESOURCE.CosmosTable: [AUTH_TYPE.SecretAuto, AUTH_TYPE.UserAccount, AUTH_TYPE.ServicePrincipalSecret],
RESOURCE.CosmosSql: [AUTH_TYPE.SecretAuto, AUTH_TYPE.UserAccount, AUTH_TYPE.ServicePrincipalSecret],
RESOURCE.CosmosPostgreSql: [AUTH_TYPE.Secret],

RESOURCE.StorageBlob: [AUTH_TYPE.SecretAuto, AUTH_TYPE.UserAccount, AUTH_TYPE.ServicePrincipalSecret],
RESOURCE.StorageQueue: [AUTH_TYPE.SecretAuto, AUTH_TYPE.UserAccount, AUTH_TYPE.ServicePrincipalSecret],
Expand Down Expand Up @@ -760,6 +781,7 @@ class CLIENT_TYPE(Enum):
RESOURCE.CosmosMongo: [AUTH_TYPE.SystemIdentity, AUTH_TYPE.SecretAuto, AUTH_TYPE.UserIdentity, AUTH_TYPE.ServicePrincipalSecret],
RESOURCE.CosmosTable: [AUTH_TYPE.SystemIdentity, AUTH_TYPE.SecretAuto, AUTH_TYPE.UserIdentity, AUTH_TYPE.ServicePrincipalSecret],
RESOURCE.CosmosSql: [AUTH_TYPE.SystemIdentity, AUTH_TYPE.SecretAuto, AUTH_TYPE.UserIdentity, AUTH_TYPE.ServicePrincipalSecret],
RESOURCE.CosmosPostgreSql: [AUTH_TYPE.Secret],

RESOURCE.StorageBlob: [AUTH_TYPE.SystemIdentity, AUTH_TYPE.SecretAuto, AUTH_TYPE.UserIdentity, AUTH_TYPE.ServicePrincipalSecret],
RESOURCE.StorageQueue: [AUTH_TYPE.SystemIdentity, AUTH_TYPE.SecretAuto, AUTH_TYPE.UserIdentity, AUTH_TYPE.ServicePrincipalSecret],
Expand Down Expand Up @@ -788,6 +810,7 @@ class CLIENT_TYPE(Enum):
RESOURCE.CosmosMongo: [AUTH_TYPE.SystemIdentity, AUTH_TYPE.SecretAuto, AUTH_TYPE.UserIdentity, AUTH_TYPE.ServicePrincipalSecret],
RESOURCE.CosmosTable: [AUTH_TYPE.SystemIdentity, AUTH_TYPE.SecretAuto, AUTH_TYPE.UserIdentity, AUTH_TYPE.ServicePrincipalSecret],
RESOURCE.CosmosSql: [AUTH_TYPE.SystemIdentity, AUTH_TYPE.SecretAuto, AUTH_TYPE.UserIdentity, AUTH_TYPE.ServicePrincipalSecret],
RESOURCE.CosmosPostgreSql: [AUTH_TYPE.Secret],

RESOURCE.StorageBlob: [AUTH_TYPE.SystemIdentity, AUTH_TYPE.SecretAuto, AUTH_TYPE.UserIdentity, AUTH_TYPE.ServicePrincipalSecret],
RESOURCE.StorageQueue: [AUTH_TYPE.SystemIdentity, AUTH_TYPE.SecretAuto, AUTH_TYPE.UserIdentity, AUTH_TYPE.ServicePrincipalSecret],
Expand Down Expand Up @@ -844,6 +867,7 @@ class CLIENT_TYPE(Enum):
RESOURCE.CosmosMongo: [AUTH_TYPE.SystemIdentity, AUTH_TYPE.SecretAuto, AUTH_TYPE.UserIdentity, AUTH_TYPE.ServicePrincipalSecret],
RESOURCE.CosmosTable: [AUTH_TYPE.SystemIdentity, AUTH_TYPE.SecretAuto, AUTH_TYPE.UserIdentity, AUTH_TYPE.ServicePrincipalSecret],
RESOURCE.CosmosSql: [AUTH_TYPE.SystemIdentity, AUTH_TYPE.SecretAuto, AUTH_TYPE.UserIdentity, AUTH_TYPE.ServicePrincipalSecret],
RESOURCE.CosmosPostgreSql: [AUTH_TYPE.Secret],

RESOURCE.StorageBlob: [AUTH_TYPE.SystemIdentity, AUTH_TYPE.SecretAuto, AUTH_TYPE.UserIdentity, AUTH_TYPE.ServicePrincipalSecret],
RESOURCE.StorageQueue: [AUTH_TYPE.SystemIdentity, AUTH_TYPE.SecretAuto, AUTH_TYPE.UserIdentity, AUTH_TYPE.ServicePrincipalSecret],
Expand Down Expand Up @@ -998,7 +1022,7 @@ class CLIENT_TYPE(Enum):
CLIENT_TYPE.SpringBoot,
CLIENT_TYPE.Blank
],
RESOURCE.StorageBlob: [
RESOURCE.CosmosPostgreSql: [
CLIENT_TYPE.Dotnet,
CLIENT_TYPE.DotnetInternal,
CLIENT_TYPE.Java,
Expand All @@ -1007,6 +1031,16 @@ class CLIENT_TYPE(Enum):
CLIENT_TYPE.SpringBoot,
CLIENT_TYPE.Blank
],
RESOURCE.StorageBlob: [
CLIENT_TYPE.Dotnet,
CLIENT_TYPE.DotnetInternal,
CLIENT_TYPE.Java,
CLIENT_TYPE.Python,
CLIENT_TYPE.Nodejs,
CLIENT_TYPE.Ruby,
CLIENT_TYPE.Php,
CLIENT_TYPE.Blank
],
RESOURCE.StorageQueue: [
CLIENT_TYPE.Dotnet,
CLIENT_TYPE.DotnetInternal,
Expand Down
1 change: 1 addition & 0 deletions src/azure-cli/azure/cli/command_modules/serviceconnector/custom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -497,6 +497,7 @@ def local_connection_create(cmd, client, # pylint: disable=too-many-locals,too-
namespace=None, # Resource.EventHub
webpubsub=None, # Resource.WebPubSub
signalr=None, # Resource.SignalR
cluster=None, # Resource.CosmosPostgresql
):
auth_info = get_local_conn_auth_info(secret_auth_info, secret_auth_info_auto,
user_account_auth_info, service_principal_auth_info_secret)
Expand Down
Loading
Loading