Merge pull request #7597 from a-santamaria/preview

Fix bug adding certificate to linux vmss, flatten exception and fix service fabric durability upgrade issue

Author: MiYanni

src/ResourceManager/ServiceFabric/Commands.ServiceFabric/ChangeLog.md

@@ -18,6 +18,13 @@
         - Additional information about change #1
 -->
 ## Current Release
+* Fix add certificate to Linux Vmss.
+
+* Fix `Add-AzureRmServiceFabricClusterCertificate`
+    - Using correct thumbprint from new certificate (Azure/service-fabric-issues#932).
+    - Display exception correctly (Azure/service-fabric-issues#1054).
+
+* Fix `Update-AzureRmServiceFabricDurability` to update cluster configuration before starting Vmss CreateOrUpdate operation.
 
 ## Version 0.3.12
 * Fixed issue with default resource groups not being set.

src/ResourceManager/ServiceFabric/Commands.ServiceFabric/Commands/ServiceFabricClusterCertificateCmdlet.cs

@@ -415,6 +415,14 @@ internal Task AddCertToVmssTask(VirtualMachineScaleSet vmss, CertificateInformat
         {
             var secretGroup = vmss.VirtualMachineProfile.OsProfile.Secrets.SingleOrDefault(
                 s => s.SourceVault.Id.Equals(certInformation.KeyVault.Id, StringComparison.OrdinalIgnoreCase));
+
+
+            string configStore = null;
+            if (vmss.VirtualMachineProfile.OsProfile.WindowsConfiguration != null)
+            {
+                configStore = Constants.DefaultCertificateStore;
+            }
+
             if (secretGroup == null)
             {
                 vmss.VirtualMachineProfile.OsProfile.Secrets.Add(
@@ -428,7 +436,7 @@ internal Task AddCertToVmssTask(VirtualMachineScaleSet vmss, CertificateInformat
                         {
                           new VaultCertificate()
                           {
-                          CertificateStore = Constants.DefaultCertificateStore,
+                          CertificateStore = configStore,
                           CertificateUrl = certInformation.SecretUrl
                           }
                         }
@@ -449,7 +457,7 @@ internal Task AddCertToVmssTask(VirtualMachineScaleSet vmss, CertificateInformat
                         secretGroup.VaultCertificates.Add(
                             new VaultCertificate()
                             {
-                                CertificateStore = Constants.DefaultCertificateStore,
+                                CertificateStore = configStore,
                                 CertificateUrl = certInformation.SecretUrl
                             });
                     }
@@ -460,7 +468,7 @@ internal Task AddCertToVmssTask(VirtualMachineScaleSet vmss, CertificateInformat
                     {
                         new VaultCertificate()
                         {
-                            CertificateStore = Constants.DefaultCertificateStore,
+                            CertificateStore = configStore,
                             CertificateUrl = certInformation.SecretUrl
                         }
                    };
@@ -586,7 +594,16 @@ private string GetThumbprintFromSecret(string secretUrl)
                 throw new PSArgumentException("secretUrl");
             }
 
-            var secretBundle = this.KeyVaultClient.GetSecretAsync(secretUrl).Result;
+            SecretBundle secretBundle;
+            try
+            {
+                secretBundle = this.KeyVaultClient.GetSecretAsync(secretUrl).Result;
+            }
+            catch (Exception ex)
+            {
+                throw GetInnerException(ex);
+            }
+
             var secretValue = secretBundle.Value;
             try
             {
@@ -615,7 +632,11 @@ private string GetThumbprintFromSecret(string secretUrl)
                                 jsonBlob.Password,
                                 X509KeyStorageFlags.Exportable);
 
-                            return certCollection[0].Thumbprint;
+                            var lastCert = certCollection.Count > 0 ? certCollection[certCollection.Count - 1] : null;
+                            if (lastCert?.Thumbprint != null)
+                            {
+                                return lastCert.Thumbprint;
+                            }
                         }
                     }
                 }

src/ResourceManager/ServiceFabric/Commands.ServiceFabric/Commands/ServiceFabricClusterCmdlet.cs

@@ -93,18 +93,7 @@ protected PSCluster SendPutRequest(Cluster clusterResource, bool runOnSameThread
             catch (Exception e)
             {
                 PrintSdkExceptionDetail(e);
-
-                if (e.InnerException != null)
-                {
-                    while (e.InnerException != null)
-                    {
-                        e = e.InnerException;
-                    }
-
-                    throw;
-                }
-
-                throw;
+                throw GetInnerException(e);
             }
 
             return new PSCluster(cluster);
@@ -163,18 +152,7 @@ protected PSCluster SendPatchRequest(ClusterUpdateParameters request, bool runOn
             catch (Exception e)
             {
                 PrintSdkExceptionDetail(e);
-
-                if (e.InnerException != null)
-                {
-                    while (e.InnerException != null)
-                    {
-                        e = e.InnerException;
-                    }
-
-                    throw;
-                }
-
-                throw;
+                throw GetInnerException(e);
             }
 
             return new PSCluster(cluster);
@@ -193,17 +171,7 @@ protected Cluster GetCurrentCluster()
             }
             catch (Exception e)
             {
-                if (e.InnerException != null)
-                {
-                    while (e.InnerException != null)
-                    {
-                        e = e.InnerException;
-                    }
-
-                    throw;
-                }
-
-                throw;
+                throw GetInnerException(e);
             }
         }
 
@@ -349,5 +317,15 @@ protected void WriteClusterAndVmssVerboseWhenUpdate(List<Task> allTasks, bool pr
             exceptions.ForEach(PrintSdkExceptionDetail);
             task.Wait();
         }
+
+        protected Exception GetInnerException(Exception exception)
+        {
+            while (exception.InnerException != null)
+            {
+                exception = exception.InnerException;
+            }
+
+            return exception;
+        }
     }
 }

src/ResourceManager/ServiceFabric/Commands.ServiceFabric/Commands/UpdateAzureRmServiceFabricDurability.cs

@@ -125,11 +125,10 @@ public override void ExecuteCmdlet()
                     NodeTypes = cluster.NodeTypes
                 };
 
-                var patchTask = PatchAsync(patchArg);
+                var psCluster = SendPatchRequest(patchArg);
 
-                WriteClusterAndVmssVerboseWhenUpdate(new List<Task>() { vmssTask, patchTask }, true, this.NodeType);
+                WriteClusterAndVmssVerboseWhenUpdate(new List<Task>() { vmssTask }, false, this.NodeType);
 
-                var psCluster = new PSCluster(patchTask.Result);
                 WriteObject(psCluster, true);
             }
         }