Skip to content

[Service Connector] az webapp/continerapp/spring connection create/update containerapp: Add ACA as target service #28061

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 2 commits into
base: dev
Choose a base branch
from
Draft

[Service Connector] az webapp/continerapp/spring connection create/update containerapp: Add ACA as target service #28061

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
36a789a
support aca as target
wchigit Dec 19, 2023
b61cf55
add experimental tag
wchigit Dec 19, 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: 36 additions & 0 deletions 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 @@ -49,6 +49,7 @@ class RESOURCE(Enum):
SignalR = 'signalr'
WebPubSub = 'webpubsub'
ConfluentKafka = 'confluent-cloud'
ContainerAppAsTarget = 'containerapp'

@classmethod
def value_of(cls, value):
Expand Down Expand Up @@ -143,6 +144,8 @@ class CLIENT_TYPE(Enum):
RESOURCE.SignalR: '/subscriptions/{subscription}/resourceGroups/{target_resource_group}/providers/Microsoft.SignalRService/SignalR/{signalr}',
RESOURCE.WebPubSub: '/subscriptions/{subscription}/resourceGroups/{target_resource_group}/providers/Microsoft.SignalRService/WebPubSub/{webpubsub}',
RESOURCE.ConfluentKafka: '#', # special target resource, no arm resource id

RESOURCE.ContainerAppAsTarget: '/subscriptions/{subscription}/resourceGroups/{target_resource_group}/providers/Microsoft.App/containerApps/{target_app_name}'
}


Expand Down Expand Up @@ -621,6 +624,18 @@ class CLIENT_TYPE(Enum):
'help': 'Name of the webpubsub service',
'placeholder': 'MyWebPubSub'
}
},
RESOURCE.ContainerAppAsTarget: {
'target_resource_group': {
'options': ['--target-resource-group', '--tg'],
'help': 'The resource group which contains the container app as target resource',
'placeholder': 'ContainerAppAsTargetRG'
},
'target_app_name': {
'options': ['--target-app-name'],
'help': 'Name of the container app as target resource',
'placeholder': 'MyContainerAppAsTarget'
}
}
}

Expand Down Expand Up @@ -773,6 +788,8 @@ class CLIENT_TYPE(Enum):
RESOURCE.SignalR: [AUTH_TYPE.SystemIdentity, AUTH_TYPE.SecretAuto, AUTH_TYPE.UserIdentity, AUTH_TYPE.ServicePrincipalSecret],
RESOURCE.WebPubSub: [AUTH_TYPE.SystemIdentity, AUTH_TYPE.SecretAuto, AUTH_TYPE.UserIdentity, AUTH_TYPE.ServicePrincipalSecret],
RESOURCE.ConfluentKafka: [AUTH_TYPE.Secret],

RESOURCE.ContainerAppAsTarget: [AUTH_TYPE.SecretAuto]
},
RESOURCE.SpringCloud: {
RESOURCE.Postgres: [AUTH_TYPE.Secret, AUTH_TYPE.SystemIdentity],
Expand Down Expand Up @@ -801,6 +818,8 @@ class CLIENT_TYPE(Enum):
RESOURCE.SignalR: [AUTH_TYPE.SystemIdentity, AUTH_TYPE.SecretAuto, AUTH_TYPE.UserIdentity, AUTH_TYPE.ServicePrincipalSecret],
RESOURCE.WebPubSub: [AUTH_TYPE.SystemIdentity, AUTH_TYPE.SecretAuto, AUTH_TYPE.UserIdentity, AUTH_TYPE.ServicePrincipalSecret],
RESOURCE.ConfluentKafka: [AUTH_TYPE.Secret],

RESOURCE.ContainerAppAsTarget: [AUTH_TYPE.SecretAuto],
},
RESOURCE.KubernetesCluster: {
RESOURCE.Postgres: [AUTH_TYPE.Secret],
Expand Down Expand Up @@ -829,6 +848,8 @@ class CLIENT_TYPE(Enum):
RESOURCE.SignalR: [AUTH_TYPE.SecretAuto, AUTH_TYPE.ServicePrincipalSecret],
RESOURCE.WebPubSub: [AUTH_TYPE.SecretAuto, AUTH_TYPE.ServicePrincipalSecret],
RESOURCE.ConfluentKafka: [AUTH_TYPE.Secret],

RESOURCE.ContainerAppAsTarget: [AUTH_TYPE.SecretAuto],
},
RESOURCE.ContainerApp: {
RESOURCE.Postgres: [AUTH_TYPE.Secret, AUTH_TYPE.SystemIdentity],
Expand Down Expand Up @@ -857,6 +878,8 @@ class CLIENT_TYPE(Enum):
RESOURCE.SignalR: [AUTH_TYPE.SystemIdentity, AUTH_TYPE.SecretAuto, AUTH_TYPE.UserIdentity, AUTH_TYPE.ServicePrincipalSecret],
RESOURCE.WebPubSub: [AUTH_TYPE.SystemIdentity, AUTH_TYPE.SecretAuto, AUTH_TYPE.UserIdentity, AUTH_TYPE.ServicePrincipalSecret],
RESOURCE.ConfluentKafka: [AUTH_TYPE.Secret],

RESOURCE.ContainerAppAsTarget: [AUTH_TYPE.SecretAuto],
},
}
SUPPORTED_AUTH_TYPE[RESOURCE.SpringCloudDeprecated] = SUPPORTED_AUTH_TYPE[RESOURCE.SpringCloud]
Expand Down Expand Up @@ -1094,6 +1117,19 @@ class CLIENT_TYPE(Enum):
CLIENT_TYPE.Go,
CLIENT_TYPE.SpringBoot,
CLIENT_TYPE.Blank
],
RESOURCE.ContainerAppAsTarget: [
CLIENT_TYPE.Dotnet,
CLIENT_TYPE.DotnetInternal,
CLIENT_TYPE.Java,
CLIENT_TYPE.Python,
CLIENT_TYPE.Nodejs,
CLIENT_TYPE.Go,
CLIENT_TYPE.Php,
CLIENT_TYPE.Ruby,
CLIENT_TYPE.Django,
CLIENT_TYPE.SpringBoot,
CLIENT_TYPE.Blank
]
}
}
Expand Down
6 changes: 6 additions & 0 deletions src/azure-cli/azure/cli/command_modules/serviceconnector/commands.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,9 @@ def load_command_table(self, _): # pylint: disable=too-many-statements
if target in TARGET_RESOURCES_DEPRECATED:
ig.custom_command(target.value, 'connection_create', deprecate_info=self.deprecate(hide=False),
supports_no_wait=True, transform=transform_linker_properties)
elif target == RESOURCE.ContainerAppAsTarget:
ig.custom_command(target.value, 'connection_create', is_experimental=True,
supports_no_wait=True, transform=transform_linker_properties)
else:
ig.custom_command(target.value, 'connection_create',
supports_no_wait=True, transform=transform_linker_properties)
Expand All @@ -74,6 +77,9 @@ def load_command_table(self, _): # pylint: disable=too-many-statements
if target in TARGET_RESOURCES_DEPRECATED:
ig.custom_command(target.value, 'connection_update', deprecate_info=self.deprecate(hide=False),
supports_no_wait=True, transform=transform_linker_properties)
elif target == RESOURCE.ContainerAppAsTarget:
ig.custom_command(target.value, 'connection_update', is_experimental=True,
supports_no_wait=True, transform=transform_linker_properties)
else:
ig.custom_command(target.value, 'connection_update',
supports_no_wait=True, transform=transform_linker_properties)
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 @@ -306,6 +306,7 @@ def connection_create(cmd, client, # pylint: disable=too-many-locals,too-many-s
namespace=None, # Resource.EventHub
webpubsub=None, # Resource.WebPubSub
signalr=None, # Resource.SignalR
target_app_name=None, # Resource.ContainerAppAsTarget
):

auth_info = get_cloud_conn_auth_info(secret_auth_info, secret_auth_info_auto, user_identity_auth_info,
Expand Down
Loading
Loading