Merge pull request Azure#4788 from spaoliello/preview

Don't NullRef during Get-AzureDeployment when the cloud service has extended configuration

Author: cormacpayne

src/ServiceManagement/Common/Commands.ScenarioTest/Commands.ScenarioTest.csproj

@@ -224,6 +224,12 @@
     <None Include="Resources\DiagnosticsExtension\Files\diagnostics.wadcfgx">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="Resources\ServiceManagement\Files\dSMSTest.cscfg">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="Resources\ServiceManagement\Files\dSMSTest.cspkg">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="Resources\SqlIaaSExtension\SqlIaaSExtensionTests.ps1">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
@@ -302,6 +308,9 @@
     <None Include="SessionRecords\Microsoft.WindowsAzure.Commands.ScenarioTest.ServiceManagementTests\RunAzurePlatformVMImageNegativeTest.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="SessionRecords\Microsoft.WindowsAzure.Commands.ScenarioTest.ServiceManagementTests\RunDSMSHostedServiceTest.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="SessionRecords\Microsoft.WindowsAzure.Commands.ScenarioTest.ServiceManagementTests\RunEnableAndDisableDataCollectionTests.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>

src/ServiceManagement/Common/Commands.ScenarioTest/Resources/ServiceManagement/Files/dSMSTest.cscfg

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  **********************************************************************************************
+
+  This file was generated by a tool from the project file: ServiceConfiguration.Cloud.cscfg
+
+  Changes to this file may cause incorrect behavior and will be lost if the file is regenerated.
+
+  **********************************************************************************************
+-->
+<ServiceConfiguration serviceName="AzureCloudService1" xmlns="http://schemas.microsoft.com/ServiceHosting/2008/10/ServiceConfiguration" osFamily="5" osVersion="*" schemaVersion="2015-04.2.6">
+  <Role name="WorkerRole1">
+    <Instances count="1" />
+    <ConfigurationSettings>
+      <Setting name="Microsoft.WindowsAzure.Plugins.Diagnostics.ConnectionString" value="UseDevelopmentStorage=true" />
+      <Setting name="DummySetting" value="Foo" />
+    </ConfigurationSettings>
+    <Certificates>
+      <Certificate name="ThumbprintCert" thumbprint="{{PLACEHOLDER}}" thumbprintAlgorithm="sha1" />
+      <Certificate name="dSMSCert" sourceLocation="/genevacustomers/monitoring/prod/warmpath/test/auxweb/certificates/chained/portaldogfoodmdscert.pfx" />
+    </Certificates>
+  </Role>
+</ServiceConfiguration>

src/ServiceManagement/Common/Commands.ScenarioTest/Resources/ServiceManagement/Files/dSMSTest.cspkg

@@ -296,6 +296,73 @@ function Run-AutoGeneratedVirtualMachineCmdletTests
     }
 }
 
+# Run dSMS Hosted Service test
+function Run-DSMSHostedServiceTest
+{
+	# Setup
+    $svcName = 'pstest' + (Get-CloudServiceName);
+	$location = Get-DefaultLocation;
+
+    $storageName = 'pstest' + (getAssetName);
+    New-AzureStorageAccount -StorageAccountName $storageName -Location $location;
+
+    # Associate the new storage account with the current subscription
+    Set-CurrentStorageAccountName $storageName;
+
+	$testMode = Get-ComputeTestMode;
+    if ($testMode.ToLower() -ne 'playback')
+    {
+        $cspkg = '.\Resources\ServiceManagement\Files\dSMSTest.cspkg';
+    }
+    else
+    {
+        $cspkg = "https://${storageName}.blob.azure.windows.net/blob/dSMSTest.cspkg";
+    }
+    $cscfg = "$TestOutputRoot\Resources\ServiceManagement\Files\dSMSTest.cscfg";
+	$cscfgChanged = "$TestOutputRoot\Resources\ServiceManagement\Files\dSMSTest-changed.cscfg";
+	
+	# Create a temporary self-signed cert
+	$cert = New-SelfSignedCertificate -DnsName "example.local" -CertStoreLocation "Cert:\CurrentUser\My";
+	$certPath = "Cert:\CurrentUser\My\$($cert.Thumbprint)"
+	# Update the cscfg to use the new cert
+	(Get-Content $cscfg) | ForEach-Object {$_ -replace "\{\{PLACEHOLDER\}\}", $cert.Thumbprint} | Set-Content $cscfgChanged;
+
+    try
+    {
+		# Create Hosted Service
+		$result = New-AzureService -ServiceName $svcName -Location $location -Label $svcName -Description $svcName;
+
+		# Upload the certificate
+		Add-AzureCertificate -ServiceName $svcName -CertToDeploy $cert;
+
+        # Deploy to staging
+        $result = New-AzureDeployment -ServiceName $svcName -Package $cspkg -Configuration $cscfgChanged -Label $svcName -Slot Staging;
+
+		# Get Deployment
+		$deploy = Get-AzureDeployment -ServiceName $svcName -Slot Staging;
+
+		# Make a change
+		$newConfig = $deploy.Configuration -replace 'Setting name="DummySetting" value="Foo"', 'Setting name="DummySetting" value="Bar"';
+		$newConfig | Set-Content $cscfgChanged;
+
+		# Update configuration
+		$result = Set-AzureDeployment -Config -ServiceName $svcName -Configuration $cscfgChanged -Slot Staging;
+    }
+    finally
+    {
+        # Cleanup
+        Cleanup-CloudService $svcName;
+		Cleanup-Storage $storageName;
+		if (Test-Path $cscfgChanged)
+		{
+			Remove-Item $cscfgChanged;
+		}
+		if (Test-Path $certPath)
+		{
+			Remove-Item $certPath
+		}
+    }
+}
 
 # Run New-AzureComputeArgumentList Cmdlet Tests Using Method Names
 function Run-NewAzureComputeArgumentListTests

src/ServiceManagement/Common/Commands.ScenarioTest/Resources/ServiceManagement/ServiceManagementTests.ps1

@@ -79,6 +79,15 @@ public void RunAutoGeneratedVirtualMachineCmdletTests()
             this.RunPowerShellTest("Run-AutoGeneratedVirtualMachineCmdletTests");
         }
 
+        [Fact]
+        [Trait(Category.Service, Category.ServiceManagement)]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        [Trait(Category.AcceptanceType, Category.BVT)]
+        public void RunDSMSHostedServiceTest()
+        {
+            this.RunPowerShellTest("Run-DSMSHostedServiceTest");
+        }
+
         [Fact]
         [Trait(Category.Service, Category.ServiceManagement)]
         [Trait(Category.AcceptanceType, Category.CheckIn)]

src/ServiceManagement/Common/Commands.ScenarioTest/ServiceManagement/ScenarioTests.cs

@@ -19,5 +19,7 @@ public class CertificateConfiguration
         public string Thumbprint { get; set; }
 
         public string ThumbprintAlgorithm { get; set; }
+
+        public string SourceLocation { get; set; }
     }
 }

src/ServiceManagement/Common/Commands.ScenarioTest/SessionRecords/Microsoft.WindowsAzure.Commands.ScenarioTest.ServiceManagementTests/RunDSMSHostedServiceTest.json

@@ -45,8 +45,9 @@ public RoleConfiguration(XElement data)
                 {
                     var certificate = new CertificateConfiguration
                     {
-                        Thumbprint = setting.Attribute("thumbprint").Value,
-                        ThumbprintAlgorithm = setting.Attribute("thumbprintAlgorithm").Value
+                        Thumbprint = setting.Attribute("thumbprint") == null ? null : setting.Attribute("thumbprint").Value,
+                        ThumbprintAlgorithm = setting.Attribute("thumbprintAlgorithm") == null ? null : setting.Attribute("thumbprintAlgorithm").Value,
+                        SourceLocation = setting.Attribute("sourceLocation") == null ? null : setting.Attribute("sourceLocation").Value,
                     };
 
                     this.Certificates.Add(setting.Attribute("name").Value, certificate);
@@ -104,8 +105,18 @@ internal XElement Serialize()
             {
                 XElement certificateElement = new XElement(this.ns + "Certificate");
                 certificateElement.SetAttributeValue("name", certificate.Key);
-                certificateElement.SetAttributeValue("thumbprint", certificate.Value.Thumbprint);
-                certificateElement.SetAttributeValue("thumbprintAlgorithm", certificate.Value.ThumbprintAlgorithm);
+                if (certificate.Value.Thumbprint != null)
+                {
+                    certificateElement.SetAttributeValue("thumbprint", certificate.Value.Thumbprint);
+                }
+                if (certificate.Value.ThumbprintAlgorithm != null)
+                {
+                    certificateElement.SetAttributeValue("thumbprintAlgorithm", certificate.Value.ThumbprintAlgorithm);
+                }
+                if (certificate.Value.SourceLocation != null)
+                {
+                    certificateElement.SetAttributeValue("sourceLocation", certificate.Value.SourceLocation);
+                }
                 certificatesElement.Add(certificateElement);
             }