Skip to content

[ACR] add --allow-trusted-services support #16530

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
fengzhou-msft merged 5 commits into from
Jan 14, 2021
Merged

[ACR] add --allow-trusted-services support #16530

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
60c704b
[ACR] add --allow-trusted-services support
Jan 14, 2021
faeadd7
Update help text and remove unnecessary model import.
Jan 14, 2021
aab18ca
update help text should not mention defaults.
Jan 14, 2021
95be721
consolidate allow suffixes for network rules
Jan 14, 2021
771f96d
add linter exclusion, style fix.
Jan 14, 2021
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
update help text should not mention defaults.
  • Loading branch information
Tosin Adewale committed Jan 14, 2021
commit aab18ca46d61f332ae4d145cf65dbc80f322778a
6 changes: 4 additions & 2 deletions src/azure-cli/azure/cli/command_modules/acr/_params.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,10 @@ def load_arguments(self, _): # pylint: disable=too-many-statements
with self.argument_context(scope, arg_group='Network Rule') as c:
c.argument('default_action', arg_type=get_enum_type(DefaultAction),
help='Default action to apply when no rule matches. Only applicable to Premium SKU.')
c.argument('public_network_enabled', get_three_state_flag(), help="Allow public network access for the container registry. The Default is to allow public access.")
c.argument('allow_trusted_services', get_three_state_flag(), is_preview=True, help="Allow trusted Azure Services to access network restricted registries. For more information, please visit https://aka.ms/acr/trusted-services. The default is to allow.")
suffix = " The Default is to allow public access." if "create" in scope else ""
c.argument('public_network_enabled', get_three_state_flag(), help="Allow public network access for the container registry.{suffix}".format(suffix=suffix))
suffix = " The default is to allow." if "create" in scope else ""
c.argument('allow_trusted_services', get_three_state_flag(), is_preview=True, help="Allow trusted Azure Services to access network restricted registries. For more information, please visit https://aka.ms/acr/trusted-services.{suffix}".format(suffix=suffix))

with self.argument_context('acr create', arg_group="Customer managed key") as c:
c.argument('identity', help="Use assigned managed identity resource id or name if in the same resource group")
Expand Down