Acr fix (#14177) (#14189)

* fix docker push issue: use refresh token to login * changelog * OOB release for Az.ContainerReigstry * resolve comments
Azure · Feb 13, 2021 · 1decdb5 · 1decdb5
1 parent 6a5d296
commit 1decdb5
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 16 deletions.
diff --git a/src/ContainerRegistry/ContainerRegistry/Az.ContainerRegistry.psd1 b/src/ContainerRegistry/ContainerRegistry/Az.ContainerRegistry.psd1
@@ -12,7 +12,7 @@
 # RootModule = ''
 
 # Version number of this module.
-ModuleVersion = '2.2.0'
+ModuleVersion = '2.2.1'
 
 # Supported PSEditions
 CompatiblePSEditions = 'Core', 'Desktop'
@@ -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 = ''

diff --git a/src/ContainerRegistry/ContainerRegistry/ChangeLog.md b/src/ContainerRegistry/ContainerRegistry/ChangeLog.md
@@ -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`

diff --git a/src/ContainerRegistry/ContainerRegistry/Commands/ConnectAzureContainerRegistry.cs b/src/ContainerRegistry/ContainerRegistry/Commands/ConnectAzureContainerRegistry.cs
@@ -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);

diff --git a/src/ContainerRegistry/ContainerRegistry/Models/ContainerRegistryDataPlaneClient.cs b/src/ContainerRegistry/ContainerRegistry/Models/ContainerRegistryDataPlaneClient.cs
@@ -113,7 +113,7 @@ private string GetArmAccessToken()
                    .AccessToken;
         }
 
-        private string GetRefreshToken()
+        public string GetRefreshToken()
         {
             return GetClient()
                     .RefreshTokens

diff --git a/src/ContainerRegistry/ContainerRegistry/Properties/AssemblyInfo.cs b/src/ContainerRegistry/ContainerRegistry/Properties/AssemblyInfo.cs
@@ -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
diff --git a/tools/Az/Az.psd1 b/tools/Az/Az.psd1
@@ -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'; },