Added support acr in Set-AzAksCluster

Author: wyunchi-ms

src/Aks/Aks.Test/Aks.Test.csproj

@@ -13,7 +13,6 @@
   <ItemGroup>
     <PackageReference Include="YamlDotNet.Signed" Version="5.2.1" />
     <PackageReference Include="Microsoft.Azure.Management.ContainerRegistry" Version="4.0.0" />
-    <PackageReference Include="Microsoft.Azure.ContainerRegistry" Version="1.0.0-preview.1" />
     <PackageReference Include="Microsoft.Azure.Management.ContainerService" Version="1.1.0" />
   </ItemGroup>
 

src/Aks/Aks.Test/ScenarioTests/KubernetesTests.ps1

@@ -38,7 +38,7 @@ function Test-NewAzAksWithAcr
     $resourceGroupName = Get-RandomResourceGroupName
     $kubeClusterName = Get-RandomClusterName
     $acrName = Get-RandomRegistryName
-    $location = 'eastus'
+    $location = Get-ProviderLocation "Microsoft.ContainerService/managedClusters"
     $nodeVmSize = "Standard_D2_v2"
 
     try
@@ -47,8 +47,9 @@ function Test-NewAzAksWithAcr
 
         New-AzContainerRegistry -ResourceGroupName $resourceGroupName -Name $acrName -Sku Standard
 
-        
-        New-AzAksCluster -ResourceGroupName $resourceGroupName -Name $kubeClusterName -NodeVmSize $nodeVmSize -AcrNameToAttach $acrName
+        $cred = $(createTestCredential "e65d50b0-0853-48a9-82d3-77d800f4a9bc" "V8-S-y6Er8jXy-.aM_WT95BF89N~X23lqb")
+
+        New-AzAksCluster -ResourceGroupName $resourceGroupName -Name $kubeClusterName -NodeVmSize $nodeVmSize -ServicePrincipalIdAndSecret $cred -AcrNameToAttach $acrName
         $cluster = Get-AzAksCluster -ResourceGroupName $resourceGroupName -Name $kubeClusterName
         Assert-NotNull $cluster.Fqdn
         Assert-NotNull $cluster.DnsPrefix

src/Aks/Aks.Test/ScenarioTests/TestController.cs

@@ -35,9 +35,6 @@ public TestController()
 
         public static TestController NewInstance => new TestController();
 
-        private const string TenantIdKey = "TenantId";
-        private const string DomainKey = "Domain";
-        private const string SubscriptionIdKey = "SubscriptionId";
         public string UserDomain { get; private set; }
         public GraphRbacManagementClient InternalGraphRbacManagementClient { get; private set; }
 
@@ -137,43 +134,6 @@ private static ContainerServiceClient GetContainerServiceClient(MockContext cont
         }
         private GraphRbacManagementClient GetGraphRbacManagementClient(MockContext context)
         {
-            //var environment = TestEnvironmentFactory.GetTestEnvironment();
-            //string tenantId = null;
-
-            //if (HttpMockServer.Mode == HttpRecorderMode.Record)
-            //{
-            //    tenantId = environment.Tenant;
-            //    UserDomain = String.IsNullOrEmpty(environment.UserName) ? String.Empty : environment.UserName.Split(new[] { "@" }, StringSplitOptions.RemoveEmptyEntries).Last();
-
-            //    HttpMockServer.Variables[TenantIdKey] = tenantId;
-            //    HttpMockServer.Variables[DomainKey] = UserDomain;
-            //}
-            //else if (HttpMockServer.Mode == HttpRecorderMode.Playback)
-            //{
-            //    if (HttpMockServer.Variables.ContainsKey(TenantIdKey))
-            //    {
-            //        tenantId = HttpMockServer.Variables[TenantIdKey];
-            //    }
-            //    if (HttpMockServer.Variables.ContainsKey(DomainKey))
-            //    {
-            //        UserDomain = HttpMockServer.Variables[DomainKey];
-            //    }
-            //    if (HttpMockServer.Variables.ContainsKey(SubscriptionIdKey))
-            //    {
-            //        AzureRmProfileProvider.Instance.Profile.DefaultContext.Subscription.Id = HttpMockServer.Variables[SubscriptionIdKey];
-            //    }
-            //}
-
-            //var client = context.GetGraphServiceClient<GraphRbacManagementClient>(environment);
-            //client.TenantID = tenantId;
-            //if (AzureRmProfileProvider.Instance != null &&
-            //    AzureRmProfileProvider.Instance.Profile != null &&
-            //    AzureRmProfileProvider.Instance.Profile.DefaultContext != null &&
-            //    AzureRmProfileProvider.Instance.Profile.DefaultContext.Tenant != null)
-            //{
-            //    AzureRmProfileProvider.Instance.Profile.DefaultContext.Tenant.Id = client.TenantID;
-            //}
-            //return client;
             return context.GetServiceClient<GraphRbacManagementClient>();
         }
         private static AuthorizationManagementClient GetAuthorizationManagementClient(MockContext context)