Merge pull request #5689 from yolo3301/fix_reg

Fix for #5506

Author: Maddie Clayton

src/ResourceManager/ContainerInstance/ChangeLog.md

@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Current Release
+* Fix parameter sets issue for container registry and azure file volume mount
 * Fix issue with Default Resource Group in CloudShell
 
 ## Version 0.2.3

src/ResourceManager/ContainerInstance/Commands.ContainerInstance.Test/ScenarioTests/ContainerInstanceTests.ps1

@@ -99,18 +99,22 @@ function Test-AzureRmContainerGroupWithVolumeMount
     $resourceGroupName = Get-RandomResourceGroupName
     $containerGroupName = Get-RandomContainerGroupName
     $location = Get-ProviderLocation "Microsoft.ContainerInstance/ContainerGroups"
-    $image = "alpine"
+    $image = "acc.azurecr.io/alpine"
     $shareName = "acipstestshare"
     $accountName = "acipstest"
     $accountKey = "password"
     $secureAccountKey = ConvertTo-SecureString $accountKey -AsPlainText -Force
     $accountCredential = New-Object System.Management.Automation.PSCredential ($accountName, $secureAccountKey)
+    $registryUsername = "acc"
+    $registryPassword = "password"
+    $secureRegistryPassword = ConvertTo-SecureString $registryPassword -AsPlainText -Force
+    $registryCredential = New-Object System.Management.Automation.PSCredential ($registryUsername, $secureRegistryPassword)
     $mountPath = "/mnt/azfile"
 
     try
     {
         New-AzureRmResourceGroup -Name $resourceGroupName -Location $location
-        $containerGroupCreated = New-AzureRmContainerGroup -ResourceGroupName $resourceGroupName -Name $containerGroupName -Image $image -RestartPolicy "Never" -Command "ls $mountPath" -AzureFileVolumeShareName $shareName -AzureFileVolumeAccountCredential $accountCredential -AzureFileVolumeMountPath $mountPath
+        $containerGroupCreated = New-AzureRmContainerGroup -ResourceGroupName $resourceGroupName -Name $containerGroupName -Image $image -RegistryCredential $registryCredential -RestartPolicy "Never" -Command "ls $mountPath" -AzureFileVolumeShareName $shareName -AzureFileVolumeAccountCredential $accountCredential -AzureFileVolumeMountPath $mountPath
 
         Assert-NotNull $containerGroupCreated.Volumes
         Assert-NotNull $containerGroupCreated.Volumes[0].AzureFile

src/ResourceManager/ContainerInstance/Commands.ContainerInstance.Test/SessionRecords/Microsoft.Azure.Commands.ContainerInstance.Test.ScenarioTests.ContainerInstanceTests/TestCreateContainerGroupWithVolume.json

@@ -352,7 +352,7 @@
       "RequestUri": "/subscriptions/ae43b1e3-c35d-4c8c-bc0d-f148b4c52b78/resourceGroups/ps9107/providers/Microsoft.ContainerInstance/containerGroups/ps2492?api-version=2018-02-01-preview",
       "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvYWU0M2IxZTMtYzM1ZC00YzhjLWJjMGQtZjE0OGI0YzUyYjc4L3Jlc291cmNlR3JvdXBzL3BzOTEwNy9wcm92aWRlcnMvTWljcm9zb2Z0LkNvbnRhaW5lckluc3RhbmNlL2NvbnRhaW5lckdyb3Vwcy9wczI0OTI/YXBpLXZlcnNpb249MjAxOC0wMi0wMS1wcmV2aWV3",
       "RequestMethod": "PUT",
-      "RequestBody": "{\r\n  \"properties\": {\r\n    \"containers\": [\r\n      {\r\n        \"name\": \"ps2492\",\r\n        \"properties\": {\r\n          \"image\": \"alpine\",\r\n          \"command\": [\r\n            \"ls\",\r\n            \"/mnt/azfile\"\r\n          ],\r\n          \"environmentVariables\": [],\r\n          \"resources\": {\r\n            \"requests\": {\r\n              \"memoryInGB\": 1.5,\r\n              \"cpu\": 1.0\r\n            }\r\n          },\r\n          \"volumeMounts\": [\r\n            {\r\n              \"name\": \"azurefile\",\r\n              \"mountPath\": \"/mnt/azfile\"\r\n            }\r\n          ]\r\n        }\r\n      }\r\n    ],\r\n    \"restartPolicy\": \"Never\",\r\n    \"osType\": \"Linux\",\r\n    \"volumes\": [\r\n      {\r\n        \"name\": \"azurefile\",\r\n        \"azureFile\": {\r\n          \"shareName\": \"acipstestshare\",\r\n          \"storageAccountName\": \"acipstest\",\r\n          \"storageAccountKey\": \"ELFwG1AfwHJbr2kC0N/k8P+kz+t/UHoYMKtQnhr5B/M2sZ+65PqSyQP+aiY9A7j0VSa6e2ZId/3r2zOL+Cb8rw==\"\r\n        }\r\n      }\r\n    ]\r\n  },\r\n  \"location\": \"westus\"\r\n}",
+      "RequestBody": "{\r\n  \"properties\": {\r\n    \"containers\": [\r\n      {\r\n        \"name\": \"ps2492\",\r\n        \"properties\": {\r\n          \"image\": \"acc.azurecr.io/alpine\",\r\n          \"command\": [\r\n            \"ls\",\r\n            \"/mnt/azfile\"\r\n          ],\r\n          \"environmentVariables\": [],\r\n          \"resources\": {\r\n            \"requests\": {\r\n              \"memoryInGB\": 1.5,\r\n              \"cpu\": 1.0\r\n            }\r\n          },\r\n          \"volumeMounts\": [\r\n            {\r\n              \"name\": \"azurefile\",\r\n              \"mountPath\": \"/mnt/azfile\"\r\n            }\r\n          ]\r\n        }\r\n      }\r\n    ],\r\n    \"restartPolicy\": \"Never\",\r\n    \"osType\": \"Linux\",\r\n    \"imageRegistryCredentials\": [\r\n      {\r\n        \"server\": \"acc.azurecr.io\",\r\n        \"username\": \"acc\",\r\n        \"password\": \"password\",\r\n        }\r\n      ],\r\n    \"volumes\": [\r\n      {\r\n        \"name\": \"azurefile\",\r\n        \"azureFile\": {\r\n          \"shareName\": \"acipstestshare\",\r\n          \"storageAccountName\": \"acipstest\",\r\n          \"storageAccountKey\": \"ELFwG1AfwHJbr2kC0N/k8P+kz+t/UHoYMKtQnhr5B/M2sZ+65PqSyQP+aiY9A7j0VSa6e2ZId/3r2zOL+Cb8rw==\"\r\n        }\r\n      }\r\n    ]\r\n  },\r\n  \"location\": \"westus\"\r\n}",
       "RequestHeaders": {
         "Content-Type": [
           "application/json; charset=utf-8"
@@ -373,7 +373,7 @@
           "Microsoft.Azure.Management.ContainerInstance.ContainerInstanceManagementClient/0.0.0.0"
         ]
       },
-      "ResponseBody": "{\r\n  \"properties\": {\r\n    \"provisioningState\": \"Creating\",\r\n    \"containers\": [\r\n      {\r\n        \"name\": \"ps2492\",\r\n        \"properties\": {\r\n          \"image\": \"alpine\",\r\n          \"command\": [\r\n            \"ls\",\r\n            \"/mnt/azfile\"\r\n          ],\r\n          \"ports\": [],\r\n          \"environmentVariables\": [],\r\n          \"resources\": {\r\n            \"requests\": {\r\n              \"memoryInGB\": 1.5,\r\n              \"cpu\": 1.0\r\n            }\r\n          },\r\n          \"volumeMounts\": [\r\n            {\r\n              \"name\": \"azurefile\",\r\n              \"mountPath\": \"/mnt/azfile\"\r\n            }\r\n          ]\r\n        }\r\n      }\r\n    ],\r\n    \"restartPolicy\": \"Never\",\r\n    \"osType\": \"Linux\",\r\n    \"volumes\": [\r\n      {\r\n        \"name\": \"azurefile\",\r\n        \"azureFile\": {\r\n          \"shareName\": \"acipstestshare\",\r\n          \"storageAccountName\": \"acipstest\"\r\n        }\r\n      }\r\n    ],\r\n    \"instanceView\": {\r\n      \"events\": [],\r\n      \"state\": \"Pending\"\r\n    }\r\n  },\r\n  \"id\": \"/subscriptions/ae43b1e3-c35d-4c8c-bc0d-f148b4c52b78/resourceGroups/ps9107/providers/Microsoft.ContainerInstance/containerGroups/ps2492\",\r\n  \"name\": \"ps2492\",\r\n  \"type\": \"Microsoft.ContainerInstance/containerGroups\",\r\n  \"location\": \"westus\"\r\n}",
+      "ResponseBody": "{\r\n  \"properties\": {\r\n    \"provisioningState\": \"Creating\",\r\n    \"containers\": [\r\n      {\r\n        \"name\": \"ps2492\",\r\n        \"properties\": {\r\n          \"image\": \"acc.azurecr.io/alpine\",\r\n          \"command\": [\r\n            \"ls\",\r\n            \"/mnt/azfile\"\r\n          ],\r\n          \"ports\": [],\r\n          \"environmentVariables\": [],\r\n          \"resources\": {\r\n            \"requests\": {\r\n              \"memoryInGB\": 1.5,\r\n              \"cpu\": 1.0\r\n            }\r\n          },\r\n          \"volumeMounts\": [\r\n            {\r\n              \"name\": \"azurefile\",\r\n              \"mountPath\": \"/mnt/azfile\"\r\n            }\r\n          ]\r\n        }\r\n      }\r\n    ],\r\n    \"restartPolicy\": \"Never\",\r\n    \"osType\": \"Linux\",\r\n    \"imageRegistryCredentials\": [\r\n      {\r\n        \"server\": \"acc.azurecr.io\",\r\n        \"username\": \"acc\",\r\n        \"password\": \"\",\r\n        }\r\n      ],\r\n    \"volumes\": [\r\n      {\r\n        \"name\": \"azurefile\",\r\n        \"azureFile\": {\r\n          \"shareName\": \"acipstestshare\",\r\n          \"storageAccountName\": \"acipstest\"\r\n        }\r\n      }\r\n    ],\r\n    \"instanceView\": {\r\n      \"events\": [],\r\n      \"state\": \"Pending\"\r\n    }\r\n  },\r\n  \"id\": \"/subscriptions/ae43b1e3-c35d-4c8c-bc0d-f148b4c52b78/resourceGroups/ps9107/providers/Microsoft.ContainerInstance/containerGroups/ps2492\",\r\n  \"name\": \"ps2492\",\r\n  \"type\": \"Microsoft.ContainerInstance/containerGroups\",\r\n  \"location\": \"westus\"\r\n}",
       "ResponseHeaders": {
         "Content-Length": [
           "726"
@@ -436,7 +436,7 @@
           "Microsoft.Azure.Management.ContainerInstance.ContainerInstanceManagementClient/0.0.0.0"
         ]
       },
-      "ResponseBody": "{\r\n  \"properties\": {\r\n    \"provisioningState\": \"Creating\",\r\n    \"containers\": [\r\n      {\r\n        \"name\": \"ps2492\",\r\n        \"properties\": {\r\n          \"image\": \"alpine\",\r\n          \"command\": [\r\n            \"ls\",\r\n            \"/mnt/azfile\"\r\n          ],\r\n          \"ports\": [],\r\n          \"environmentVariables\": [],\r\n          \"resources\": {\r\n            \"requests\": {\r\n              \"memoryInGB\": 1.5,\r\n              \"cpu\": 1.0\r\n            }\r\n          },\r\n          \"volumeMounts\": [\r\n            {\r\n              \"name\": \"azurefile\",\r\n              \"mountPath\": \"/mnt/azfile\"\r\n            }\r\n          ]\r\n        }\r\n      }\r\n    ],\r\n    \"restartPolicy\": \"Never\",\r\n    \"osType\": \"Linux\",\r\n    \"volumes\": [\r\n      {\r\n        \"name\": \"azurefile\",\r\n        \"azureFile\": {\r\n          \"shareName\": \"acipstestshare\",\r\n          \"storageAccountName\": \"acipstest\"\r\n        }\r\n      }\r\n    ],\r\n    \"instanceView\": {\r\n      \"events\": [],\r\n      \"state\": \"Pending\"\r\n    }\r\n  },\r\n  \"id\": \"/subscriptions/ae43b1e3-c35d-4c8c-bc0d-f148b4c52b78/resourceGroups/ps9107/providers/Microsoft.ContainerInstance/containerGroups/ps2492\",\r\n  \"name\": \"ps2492\",\r\n  \"type\": \"Microsoft.ContainerInstance/containerGroups\",\r\n  \"location\": \"westus\"\r\n}",
+      "ResponseBody": "{\r\n  \"properties\": {\r\n    \"provisioningState\": \"Creating\",\r\n    \"containers\": [\r\n      {\r\n        \"name\": \"ps2492\",\r\n        \"properties\": {\r\n          \"image\": \"acc.azurecr.io/alpine\",\r\n          \"command\": [\r\n            \"ls\",\r\n            \"/mnt/azfile\"\r\n          ],\r\n          \"ports\": [],\r\n          \"environmentVariables\": [],\r\n          \"resources\": {\r\n            \"requests\": {\r\n              \"memoryInGB\": 1.5,\r\n              \"cpu\": 1.0\r\n            }\r\n          },\r\n          \"volumeMounts\": [\r\n            {\r\n              \"name\": \"azurefile\",\r\n              \"mountPath\": \"/mnt/azfile\"\r\n            }\r\n          ]\r\n        }\r\n      }\r\n    ],\r\n    \"restartPolicy\": \"Never\",\r\n    \"osType\": \"Linux\",\r\n    \"imageRegistryCredentials\": [\r\n      {\r\n        \"server\": \"acc.azurecr.io\",\r\n        \"username\": \"acc\",\r\n        \"password\": \"\",\r\n        }\r\n      ],\r\n    \"volumes\": [\r\n      {\r\n        \"name\": \"azurefile\",\r\n        \"azureFile\": {\r\n          \"shareName\": \"acipstestshare\",\r\n          \"storageAccountName\": \"acipstest\"\r\n        }\r\n      }\r\n    ],\r\n    \"instanceView\": {\r\n      \"events\": [],\r\n      \"state\": \"Pending\"\r\n    }\r\n  },\r\n  \"id\": \"/subscriptions/ae43b1e3-c35d-4c8c-bc0d-f148b4c52b78/resourceGroups/ps9107/providers/Microsoft.ContainerInstance/containerGroups/ps2492\",\r\n  \"name\": \"ps2492\",\r\n  \"type\": \"Microsoft.ContainerInstance/containerGroups\",\r\n  \"location\": \"westus\"\r\n}",
       "ResponseHeaders": {
         "Content-Length": [
           "726"

src/ResourceManager/ContainerInstance/Commands.ContainerInstance/Commands/NewAzureContainerGroupCommand.cs

@@ -32,7 +32,6 @@ namespace Microsoft.Azure.Commands.ContainerInstance
     public class NewAzureContainerGroupCommand : ContainerInstanceCmdletBase
     {
         protected const string CreateContainerGroupBaseParamSet = "CreateContainerGroupBaseParamSet";
-        protected const string CreateContainerGroupWithRegistryParamSet = "CreateContainerGroupWithRegistryParamSet";
         protected const string CreateContainerGroupWithAzureFileVolumeParamSet = "CreateContainerGroupWithAzureFileMountParamSet";
 
         [Parameter(
@@ -60,8 +59,7 @@ public class NewAzureContainerGroupCommand : ContainerInstanceCmdletBase
         public string Image { get; set; }
 
         [Parameter(
-            Mandatory = true,
-            ParameterSetName = CreateContainerGroupWithRegistryParamSet,
+            Mandatory = false,
             HelpMessage = "The custom container registry credential.")]
         [ValidateNotNullOrEmpty]
         public PSCredential RegistryCredential { get; set; }
@@ -165,7 +163,6 @@ public class NewAzureContainerGroupCommand : ContainerInstanceCmdletBase
 
         [Parameter(
             Mandatory = false,
-            ParameterSetName = CreateContainerGroupWithRegistryParamSet,
             HelpMessage = "The custom container registry login server.")]
         [ValidateNotNullOrEmpty]
         [Alias("RegistryServer")]

src/ResourceManager/ContainerInstance/Commands.ContainerInstance/Models/ContainerGroupCreationParameters.cs

@@ -161,11 +161,12 @@ public class ContainerGroupCreationParameters
         /// </summary>
         public void Validate()
         {
-            if (string.IsNullOrEmpty(this.Location))
-            {
-                throw new ArgumentException("Please specify Location");
-            }
+            ValidateRegistryParameters();
+            ValidateAzureFileVolumeParameters();
+        }
 
+        private void ValidateRegistryParameters()
+        {
             if (!string.IsNullOrEmpty(this.RegistryServer))
             {
                 if (string.IsNullOrEmpty(this.RegistryUsername) || string.IsNullOrEmpty(this.RegistryPassword))
@@ -189,7 +190,10 @@ public void Validate()
 
                 this.RegistryServer = acrServer;
             }
+        }
 
+        private void ValidateAzureFileVolumeParameters()
+        {
             if (!string.IsNullOrWhiteSpace(this.AzureFileVolumeMountPath) && this.AzureFileVolumeMountPath.Contains(":"))
             {
                 throw new ArgumentException("Azure File volume mount path must not contain ':'");

src/ResourceManager/ContainerInstance/Commands.ContainerInstance/help/AzureRM.ContainerInstance.md

@@ -1,4 +1,4 @@
----
+---
 Module Name: AzureRM.ContainerInstance
 Module Guid: 
 Download Help Link: 

src/ResourceManager/ContainerInstance/Commands.ContainerInstance/help/New-AzureRmContainerGroup.md

@@ -14,16 +14,8 @@ Creates a container group.
 
 ### CreateContainerGroupBaseParamSet (Default)
 ```
-New-AzureRmContainerGroup [-ResourceGroupName] <String> [-Name] <String> [-Image] <String> [-Location <String>]
- [-OsType <String>] [-RestartPolicy <String>] [-Cpu <Int32>] [-MemoryInGB <Double>] [-IpAddressType <String>]
- [-DnsNameLabel <String>] [-Port <Int32[]>] [-Command <String>] [-EnvironmentVariable <Hashtable>]
- [-Tag <Hashtable>] [-DefaultProfile <IAzureContextContainer>] [-WhatIf] [-Confirm] [<CommonParameters>]
-```
-
-### CreateContainerGroupWithRegistryParamSet
-```
 New-AzureRmContainerGroup [-ResourceGroupName] <String> [-Name] <String> [-Image] <String>
- -RegistryCredential <PSCredential> [-Location <String>] [-OsType <String>] [-RestartPolicy <String>]
+ [-RegistryCredential <PSCredential>] [-Location <String>] [-OsType <String>] [-RestartPolicy <String>]
  [-Cpu <Int32>] [-MemoryInGB <Double>] [-IpAddressType <String>] [-DnsNameLabel <String>] [-Port <Int32[]>]
  [-Command <String>] [-EnvironmentVariable <Hashtable>] [-RegistryServerDomain <String>] [-Tag <Hashtable>]
  [-DefaultProfile <IAzureContextContainer>] [-WhatIf] [-Confirm] [<CommonParameters>]
@@ -32,11 +24,12 @@ New-AzureRmContainerGroup [-ResourceGroupName] <String> [-Name] <String> [-Image
 ### CreateContainerGroupWithAzureFileMountParamSet
 ```
 New-AzureRmContainerGroup [-ResourceGroupName] <String> [-Name] <String> [-Image] <String>
- -AzureFileVolumeShareName <String> -AzureFileVolumeAccountCredential <PSCredential>
- -AzureFileVolumeMountPath <String> [-Location <String>] [-OsType <String>] [-RestartPolicy <String>]
- [-Cpu <Int32>] [-MemoryInGB <Double>] [-IpAddressType <String>] [-DnsNameLabel <String>] [-Port <Int32[]>]
- [-Command <String>] [-EnvironmentVariable <Hashtable>] [-Tag <Hashtable>]
- [-DefaultProfile <IAzureContextContainer>] [-WhatIf] [-Confirm] [<CommonParameters>]
+ [-RegistryCredential <PSCredential>] -AzureFileVolumeShareName <String>
+ -AzureFileVolumeAccountCredential <PSCredential> -AzureFileVolumeMountPath <String> [-Location <String>]
+ [-OsType <String>] [-RestartPolicy <String>] [-Cpu <Int32>] [-MemoryInGB <Double>] [-IpAddressType <String>]
+ [-DnsNameLabel <String>] [-Port <Int32[]>] [-Command <String>] [-EnvironmentVariable <Hashtable>]
+ [-RegistryServerDomain <String>] [-Tag <Hashtable>] [-DefaultProfile <IAzureContextContainer>] [-WhatIf]
+ [-Confirm] [<CommonParameters>]
 ```
 
 ## DESCRIPTION
@@ -432,10 +425,10 @@ The custom container registry credential.
 
 ```yaml
 Type: PSCredential
-Parameter Sets: CreateContainerGroupWithRegistryParamSet
+Parameter Sets: (All)
 Aliases:
 
-Required: True
+Required: False
 Position: Named
 Default value: None
 Accept pipeline input: False
@@ -447,7 +440,7 @@ The custom container registry login server.
 
 ```yaml
 Type: String
-Parameter Sets: CreateContainerGroupWithRegistryParamSet
+Parameter Sets: (All)
 Aliases: RegistryServer
 
 Required: False