Skip to content

Acr fix #14177

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
merged 4 commits into from
Feb 12, 2021
Merged

Acr fix #14177

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
461bf0c
fix docker push issue: use refresh token to login
VeryEarly Feb 10, 2021
c287267
changelog
VeryEarly Feb 10, 2021
c334e38
OOB release for Az.ContainerReigstry
VeryEarly Feb 10, 2021
e766751
resolve comments
VeryEarly Feb 12, 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
13 changes: 2 additions & 11 deletions src/ContainerRegistry/ContainerRegistry/Az.ContainerRegistry.psd1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# RootModule = ''

# Version number of this module.
ModuleVersion = '2.2.0'
ModuleVersion = '2.2.1'

# Supported PSEditions
CompatiblePSEditions = 'Core', 'Desktop'
Expand Down Expand Up @@ -132,16 +132,7 @@ PrivateData = @{
# IconUri = ''

# ReleaseNotes of this module
ReleaseNotes = '* Added cmdlets to supported repository, manifest, and tag operations:
- ''Get-AzContainerRegistryRepository''
- ''Update-AzContainerRegistryRepository''
- ''Remove-AzContainerRegistryRepository''
- ''Get-AzContainerRegistryManifest''
- ''Update-AzContainerRegistryManifest''
- ''Remove-AzContainerRegistryManifest''
- ''Get-AzContainerRegistryTag''
- ''Update-AzContainerRegistryTag''
- ''Remove-AzContainerRegistryTag'''
ReleaseNotes = 'Fixed authentication for `Connect-AzContainerRegistry`'

# Prerelease string of this module
# Prerelease = ''
Expand Down
3 changes: 3 additions & 0 deletions src/ContainerRegistry/ContainerRegistry/ChangeLog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@
-->
## Upcoming Release

## Version 2.2.1
* Fixed authentication for `Connect-AzContainerRegistry`

## Version 2.2.0
* Added cmdlets to supported repository, manifest, and tag operations:
- `Get-AzContainerRegistryRepository`
Expand Down
2 changes: 1 addition & 1 deletion src/ContainerRegistry/ContainerRegistry/Commands/ConnectAzureContainerRegistry.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public override void ExecuteCmdlet() {
if (ParameterSetName.Equals(WithoutNameAndPasswordParameterSet))
{
this.UserName = new Guid().ToString();
this.Password = this.RegistryDataPlaneClient.Authenticate();
this.Password = this.RegistryDataPlaneClient.GetRefreshToken();
}

string LoginScript = string.Format("'{2}' | docker login {0} -u {1} --password-stdin", this.RegistryDataPlaneClient.GetEndPoint(), this.UserName, this.Password);
Expand Down
4 changes: 2 additions & 2 deletions src/ContainerRegistry/ContainerRegistry/Models/ContainerRegistryDataPlaneClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ private string GetArmAccessToken()
.AccessToken;
}

private string GetRefreshToken()
public string GetRefreshToken()
{
return GetClient()
.RefreshTokens
Expand All @@ -123,7 +123,7 @@ private string GetRefreshToken()
.RefreshTokenProperty;
}

private string GetAccessToken(string scope)
public string GetAccessToken(string scope)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you need to change the scope of this method?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you need to change the scope of this method?

Cli provided a way to expose this access token in cmdlet, though we do not have it right now. It's possible we need it in the future.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please public it when you use it. Don't add too much in one PR.

{
return GetClient()
.AccessTokens
Expand Down
4 changes: 2 additions & 2 deletions src/ContainerRegistry/ContainerRegistry/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
[assembly: ComVisible(false)]
[assembly: CLSCompliant(false)]
[assembly: Guid("FE330703-623A-4C08-9DA7-1C63B4058034")]
[assembly: AssemblyVersion("2.2.0")]
[assembly: AssemblyFileVersion("2.2.0")]
[assembly: AssemblyVersion("2.2.1")]
[assembly: AssemblyFileVersion("2.2.1")]
#if !SIGN
[assembly: InternalsVisibleTo("Microsoft.Azure.PowerShell.Cmdlets.ContainerRegistry.Test")]
#endif
2 changes: 1 addition & 1 deletion tools/Az/Az.psd1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '2.2.5'; },
@{ModuleName = 'Az.CognitiveServices'; RequiredVersion = '1.8.0'; },
@{ModuleName = 'Az.Compute'; RequiredVersion = '4.9.0'; },
@{ModuleName = 'Az.ContainerInstance'; RequiredVersion = '1.0.3'; },
@{ModuleName = 'Az.ContainerRegistry'; RequiredVersion = '2.2.0'; },
@{ModuleName = 'Az.ContainerRegistry'; RequiredVersion = '2.2.1'; },
@{ModuleName = 'Az.CosmosDB'; RequiredVersion = '1.0.0'; },
@{ModuleName = 'Az.DataBoxEdge'; RequiredVersion = '1.1.0'; },
@{ModuleName = 'Az.Databricks'; RequiredVersion = '1.1.0'; },
Expand Down