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

Honor location and environment passed to create new containerapp (even if a CA exists on subscription with the same name) #79

Merged
merged 3 commits into from
Apr 27, 2022
Merged

Honor location and environment passed to create new containerapp (even if a CA exists on subscription with the same name) #79

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3498515
Create new Containerapp if user passes env name even if a CA exists w…
Apr 27, 2022
8f2b1ae
Create a new app if location doesn't match any other app.
Apr 27, 2022
478cf54
Fixed small bug, added better error handling for multiple environment…
Apr 27, 2022
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
23 changes: 12 additions & 11 deletions src/containerapp/azext_containerapp/_up_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -477,17 +477,15 @@ def _get_dockerfile_content(repo, branch, token, source, context_path, dockerfil


def _get_app_env_and_group(
cmd, name, resource_group: "ResourceGroup", env: "ContainerAppEnvironment"
cmd, name, resource_group: "ResourceGroup", env: "ContainerAppEnvironment", location
):
if not resource_group.name and not resource_group.exists:
matched_apps = [
c for c in list_containerapp(cmd) if c["name"].lower() == name.lower()
]
matched_apps = [c for c in list_containerapp(cmd) if c["name"].lower() == name.lower()]
if env.name:
matched_apps = [c for c in matched_apps if parse_resource_id(c["properties"]["managedEnvironmentId"])["name"].lower() == env.name.lower()]
if location:
matched_apps = [c for c in matched_apps if c["location"].lower() == location.lower()]
if len(matched_apps) == 1:
if env.name:
logger.warning(
"User passed custom environment name for an existing containerapp. Using existing environment."
)
resource_group.name = parse_resource_id(matched_apps[0]["id"])[
"resource_group"
]
Expand Down Expand Up @@ -666,7 +664,7 @@ def _set_up_defaults(
app: "ContainerApp",
):
# If no RG passed in and a singular app exists with the same name, get its env and rg
_get_app_env_and_group(cmd, name, resource_group, env)
_get_app_env_and_group(cmd, name, resource_group, env, location)

# If no env passed in (and not creating a new RG), then try getting an env by location / log analytics ID
_get_env_and_group_from_log_analytics(
Expand All @@ -681,8 +679,11 @@ def _set_up_defaults(
env_list = [e for e in list_managed_environments(cmd=cmd) if e["name"] == env.name and e["location"] == location]
if len(env_list) == 1:
resource_group.name = parse_resource_id(env_list[0]["id"])["resource_group"]

# get ACR details from --image, if possible
if len(env_list) > 1:
raise ValidationError(
f"There are multiple environments with name {env.name} on the subscription. "
"Please specify which resource group your Containerapp environment is in."
) # get ACR details from --image, if possible
_get_acr_from_image(cmd, app)


Expand Down