Merge pull request #9444 from ikanni/ikanni/FixGitIssues

Fixed issues #5862 #4684 #7048

Author: cormacpayne

src/Automation/Automation.Test/ScenarioTests/ConnectionTests.cs

@@ -33,5 +33,15 @@ public void TestE2EConnections()
         {
             TestRunner.RunTestScript("Test-E2EConnections");
         }
+
+        [Fact]
+        [Trait(Category.Service, Category.Automation)]
+        [Trait(Category.RunType, Category.LiveOnly)]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        [Trait(Category.AcceptanceType, Category.BVT)]
+        public void TestSetConnectionFieldValue()
+        {
+            TestRunner.RunTestScript("Test-SetConnectionFieldValue");
+        }
     }
 }

src/Automation/Automation.Test/ScenarioTests/ConnectionTests.ps1

@@ -50,6 +50,71 @@ function Test-E2EConnections
     Assert-AreEqual $thumbprint.ToString() $getConnectionAssetCreated.FieldDefinitionValues.Item("CertificateThumbprint")
     Assert-AreEqual $subscriptionId.ToString() $getConnectionAssetCreated.FieldDefinitionValues.Item("SubscriptionId")
 
+    Remove-AzAutomationConnection -Name $connectionAssetName `
+                                       -ResourceGroupName $resourceGroupName `
+                                       -AutomationAccountName $automationAccountName `
+                                       -Force
+
+    $output = Get-AzAutomationConnection -ResourceGroupName $resourceGroupName `
+                                              -AutomationAccountName $automationAccountName `
+                                              -Name $connectionAssetName -ErrorAction SilentlyContinue
+
+    Assert-True {$output -eq $null}
+}
+
+<#
+.SYNOPSIS
+Tests create new automation AzureServicePrincipal connection and update the ApplicationId.
+#>
+function Test-SetConnectionFieldValue
+{
+    $resourceGroupName = "to-delete-01"
+    $automationAccountName = "fbs-aa-01"
+    $output = Get-AzAutomationAccount -ResourceGroupName $resourceGroupName -AutomationAccountName $automationAccountName -ErrorAction SilentlyContinue
+    $connectionAssetName = "CreateNewAzureServicePrincipalConnection"
+    $connectionTypeName = "AzureServicePrincipal"
+    $applicationId = "applicationIdString"
+    $tenantId = "tenantIdString"
+    $tenantIdChanged = "ContosoCertificate2"
+    $thumbprint  = "thumbprintIdString"
+    $subscriptionId  = "subscriptionIdString"
+    $connectionFieldValues = @{"ApplicationId" = $applicationId; `
+                               "TenantId" = $tenantId; `
+                               "CertificateThumbprint" = $thumbprint; `
+                               "SubscriptionId" = $subscriptionId}
+
+    $connectionAssetCreated = New-AzAutomationConnection -ResourceGroupName $resourceGroupName `
+                                                              -AutomationAccountName $automationAccountName `
+                                                              -Name $connectionAssetName `
+                                                              -ConnectionTypeName $connectionTypeName `
+                                                              -ConnectionFieldValues $connectionFieldValues
+
+    $getConnectionAssetCreated = Get-AzAutomationConnection -ResourceGroupName $resourceGroupName `
+                                                                 -AutomationAccountName $automationAccountName `
+                                                                 -Name $connectionAssetName
+
+    Assert-AreEqual $connectionAssetName  $getConnectionAssetCreated.Name
+    Assert-NotNull $getConnectionAssetCreated.FieldDefinitionValues
+    Assert-AreEqual $applicationId.ToString() $getConnectionAssetCreated.FieldDefinitionValues.Item("ApplicationId")
+    Assert-AreEqual $tenantId.ToString() $getConnectionAssetCreated.FieldDefinitionValues.Item("TenantId")
+    Assert-AreEqual $thumbprint.ToString() $getConnectionAssetCreated.FieldDefinitionValues.Item("CertificateThumbprint")
+    Assert-AreEqual $subscriptionId.ToString() $getConnectionAssetCreated.FieldDefinitionValues.Item("SubscriptionId")
+
+	$newApplicationId = "UpdatedApplicationIdString"
+    Set-AzAutomationConnectionFieldValue -Name $connectionAssetName `
+                                       -ResourceGroupName $resourceGroupName `
+                                       -AutomationAccountName $automationAccountName `
+									   -ConnectionFieldName ApplicationId `
+									   -Value $newApplicationId
+
+    $getConnectionAssetUpdated = Get-AzAutomationConnection -ResourceGroupName $resourceGroupName `
+                                              -AutomationAccountName $automationAccountName `
+                                              -Name $connectionAssetName
+
+    Assert-AreEqual $connectionAssetName  $getConnectionAssetUpdated.Name
+    Assert-NotNull $getConnectionAssetUpdated.FieldDefinitionValues
+    Assert-AreEqual $newApplicationId.ToString() $getConnectionAssetUpdated.FieldDefinitionValues.Item("ApplicationId")
+
     Remove-AzAutomationConnection -Name $connectionAssetName `
                                        -ResourceGroupName $resourceGroupName `
                                        -AutomationAccountName $automationAccountName `