Skip to content

fix hostname location parameter & add hostname tests with ASD #112

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
StrawnSC merged 6 commits into from
May 22, 2022
Merged

fix hostname location parameter & add hostname tests with ASD #112

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
87099c6
adding hostname tests with ASD
lil131 May 20, 2022
8f31760
fix location & add more test cases
lil131 May 20, 2022
b7f37a1
minor changes
lil131 May 20, 2022
699d2fc
rm redundant whitespaces
lil131 May 20, 2022
2ba057f
mark custom domain test as live_only
lil131 May 20, 2022
cf297ae
rm yaml files
lil131 May 21, 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
Prev Previous commit
Next Next commit
fix location & add more test cases
  • Loading branch information
@lil131
lil131 committed May 20, 2022
commit 8f3176003fb8ba777503af7b8671325ca05518c2
1 change: 1 addition & 0 deletions src/containerapp/azext_containerapp/_params.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,6 +287,7 @@ def load_arguments(self, _):

with self.argument_context('containerapp hostname list') as c:
c.argument('name', id_part=None)
c.argument('location', configured_default='location')

with self.argument_context('containerapp hostname delete') as c:
c.argument('hostname', help='The custom domain name.')
6 changes: 4 additions & 2 deletions src/containerapp/azext_containerapp/_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1270,8 +1270,10 @@ def patch_new_custom_domain(cmd, resource_group_name, name, new_custom_domains):
def get_custom_domains(cmd, resource_group_name, name, location=None, environment=None):
try:
app = ContainerAppClient.show(cmd=cmd, resource_group_name=resource_group_name, name=name)
if location and (app["location"] != location):
raise ResourceNotFoundError('Container app {} is not in location {}.'.format(name, location))
if location:
_ensure_location_allowed(cmd, location, "Microsoft.App", "containerApps")
if _normalize_location(cmd, app["location"]) != _normalize_location(cmd, location):
raise ResourceNotFoundError('Container app {} is not in location {}.'.format(name, location))
if environment and (_get_name(environment) != _get_name(app["properties"]["managedEnvironmentId"])):
raise ResourceNotFoundError('Container app {} is not under environment {}.'.format(name, environment))
if "ingress" in app["properties"]["configuration"] and "customDomains" in app["properties"]["configuration"]["ingress"]:
Expand Down
Loading