Skip to content

[ACR] az acr connected-registry install: deprecate ACR_SYNC_TOKEN_USERNAME from the output #16561

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 2 commits into from
Jan 26, 2021
Merged

[ACR] az acr connected-registry install: deprecate ACR_SYNC_TOKEN_USERNAME from the output #16561

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
1c25b0b
connected registry install change token_username to token_name
rosanch Jan 15, 2021
737f605
help fix
rosanch Jan 19, 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
4 changes: 2 additions & 2 deletions src/azure-cli/azure/cli/command_modules/acr/_help.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1224,15 +1224,15 @@
- name: Create a connected registry in registry mode with access to repos app/hello-world and service/mycomponent. It'll create a sync token and scope-map with the right repo permissions.
text: |
az acr connected-registry create --registry mycloudregistry --name myconnectedregistry \\
--repository "app/hello-world service/mycomponent"
--repository "app/hello-world" "service/mycomponent"
- name: Create a mirror connected registry with only read permissions and pass the sync token
text: |
az acr connected-registry create --registry mycloudregistry --name mymirroracr \\
--mode mirror --parent myconnectedregistry --sync-token mySyncTokenName
- name: Create a mirror connected registry with client tokens, that syncs every day at midninght and sync window of 4 hours.
text: |
az acr connected-registry create -r mycloudregistry -n mymirroracr -p myconnectedregistry \\
--repository app/mycomponent -m mirror -s "0 12 * * *" -w PT4H \\
--repository "app/mycomponent" -m mirror -s "0 12 * * *" -w PT4H \\
--client-tokens myTokenName1 myTokenName2
"""

Expand Down
3 changes: 3 additions & 0 deletions src/azure-cli/azure/cli/command_modules/acr/connected_registry.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,9 +430,12 @@ def _get_install_info(cmd,
sync_username = sync_token_name
sync_password = "<sync token password>"

logger.warning("Value 'ACR_SYNC_TOKEN_USERNAME' has been deprecated and will be removed in a future release."
" Use 'ACR_SYNC_TOKEN_NAME' instead.")
return {
"ACR_REGISTRY_NAME": connected_registry_name,
"ACR_REGISTRY_LOGIN_SERVER": connected_registry_login_server,
"ACR_SYNC_TOKEN_NAME": sync_username,
"ACR_SYNC_TOKEN_USERNAME": sync_username,
"ACR_SYNC_TOKEN_PASSWORD": sync_password,
"ACR_PARENT_GATEWAY_ENDPOINT": parent_gateway_endpoint,
Expand Down