Taking in site object, emitting the file path, calling upload certificate and get ACIk in parallel,

Author: devsriMS

src/ServiceManagement/RecoveryServices/Commands.RecoveryServices/Service/GetVaultCredentialsFile.cs

@@ -58,18 +58,31 @@ public class GetVaultCredentialsFile : RecoveryServicesCmdletBase
         public string Location { get; set; }
 
         /// <summary>
-        /// Gets or sets Job Object.
+        /// Gets or sets vault Object.
         /// </summary>
         [Parameter(ParameterSetName = ASRParameterSets.ByObject, Mandatory = true, ValueFromPipeline = true)]
         [ValidateNotNullOrEmpty]
         public ASRVault Vault { get; set; }
 
         /// <summary>
-        /// Gets or sets the path where the credential file is to be generated
+        /// Gets or sets the site name
         /// </summary>
         [Parameter(ParameterSetName = ASRParameterSets.ByParam, Mandatory = false, HelpMessage = "The site name if the vault credentials to be downloaded for a Hyper-V sites.")]
         public string SiteName { get; set; }
 
+        /// <summary>
+        /// Gets or sets the site id
+        /// </summary>
+        [Parameter(ParameterSetName = ASRParameterSets.ByParam, Mandatory = false, HelpMessage = "The site name if the vault credentials to be downloaded for a Hyper-V sites.")]
+        public string SiteId { get; set; }
+
+        /// <summary>
+        /// Gets or sets site object
+        /// </summary>
+        [Parameter(ParameterSetName = ASRParameterSets.ByObject, Mandatory = false, ValueFromPipeline = true)]
+        [ValidateNotNullOrEmpty]
+        public Site Site { get; set; }
+
         /// <summary>
         /// Gets or sets the path where the credential file is to be generated
         /// </summary>
@@ -90,6 +103,12 @@ public override void ExecuteCmdlet()
                     case ASRParameterSets.ByObject:
                         this.Name = this.Vault.Name;
                         this.Location = this.Vault.Location;
+                        if (this.Site != null)
+                        {
+                            this.SiteName = this.Site.Name;
+                            this.SiteId = this.Site.ID;
+                        }
+
                         this.GetByParams();
                         break;
                     case ASRParameterSets.ByParam:
@@ -107,7 +126,7 @@ public override void ExecuteCmdlet()
         /// <summary>
         /// Method to execute the command
         /// </summary>
-        private async void GetByParams()
+        private void GetByParams()
         {
             AzureSubscription subscription = AzureSession.CurrentContext.Subscription;
 
@@ -124,15 +143,22 @@ private async void GetByParams()
             });
 
             // Upload certificate
-            UploadCertificateResponse acsDetails = await this.UpdateVaultCertificate(cert);
+            UploadCertificateResponse acsDetails;
+            Task<UploadCertificateResponse> uploadCertificate = this.UpdateVaultCertificate(cert);
 
             // Get Channel Integrity key
-            string channelIntegrityKey = await this.GetChannelIntegrityKey();
+            string channelIntegrityKey;
+            Task<string> getChannelIntegrityKey = this.GetChannelIntegrityKey();
+
+            uploadCertificate.Wait();
+            getChannelIntegrityKey.Wait();
+
+            acsDetails = uploadCertificate.Result;
+            channelIntegrityKey = getChannelIntegrityKey.Result;
 
             // Generate file.
             ASRVaultCreds vaultCreds = this.GenerateCredential(
                 subscription.Id.ToString(),
-                this.Name,
                 cert,
                 acsDetails,
                 channelIntegrityKey,
@@ -142,7 +168,10 @@ private async void GetByParams()
             string fileName = this.GenerateFileName();
 
             // write the content to a file.
-            Utilities.WriteToFile<ASRVaultCreds>(vaultCreds, filePath, fileName);
+            string outputPath = Utilities.WriteToFile<ASRVaultCreds>(vaultCreds, filePath, fileName);
+
+            // print the path to the user.
+            this.WriteObject(outputPath, true);
         }
 
         /// <summary>
@@ -231,25 +260,26 @@ private ResourceExtendedInfo CreateVaultExtendedInformatino()
         /// Method to generate the credential file content
         /// </summary>
         /// <param name="subscriptionId">subscription id</param>
-        /// <param name="resourceName">resource name</param>
         /// <param name="managementCert">management cert</param>
         /// <param name="acsDetails">ACS details</param>
         /// <param name="channelIntegrityKey">Integrity key</param>
         /// <param name="cloudServiceName">cloud service name</param>
         /// <returns>vault credential object</returns>
-        private ASRVaultCreds GenerateCredential(string subscriptionId, string resourceName, X509Certificate2 managementCert, UploadCertificateResponse acsDetails, string channelIntegrityKey, string cloudServiceName)
+        private ASRVaultCreds GenerateCredential(string subscriptionId, X509Certificate2 managementCert, UploadCertificateResponse acsDetails, string channelIntegrityKey, string cloudServiceName)
         {
             string serializedCertifivate = Convert.ToBase64String(managementCert.Export(X509ContentType.Pfx));
 
             AcsNamespace acsNamespace = new AcsNamespace(acsDetails);
 
             ASRVaultCreds vaultCreds = new ASRVaultCreds(
                                             subscriptionId,
-                                            resourceName,
+                                            this.Name,
                                             serializedCertifivate,
                                             acsNamespace,
                                             channelIntegrityKey,
-                                            cloudServiceName);
+                                            cloudServiceName,
+                                            this.SiteId,
+                                            this.SiteName);
 
             return vaultCreds;
         }

src/ServiceManagement/RecoveryServices/Commands.RecoveryServices/lib/PSContracts.cs

@@ -494,18 +494,25 @@ public ASRVaultCreds()
         /// <param name="acsNamespace">authenticating service  namespace</param>
         /// <param name="channelIntegrityKey">Agent Channel Integrity Key</param>
         /// <param name="cloudServiceName">cloud service name</param>
+        /// <param name="siteId">custom site Id</param>
+        /// <param name="siteName">custom site name</param>
         public ASRVaultCreds(
             string subscriptionId,
             string resourceName,
             string managementCert,
             AcsNamespace acsNamespace,
             string channelIntegrityKey,
-            string cloudServiceName)
+            string cloudServiceName,
+            string siteId,
+            string siteName)
             : base(subscriptionId, resourceName, managementCert, acsNamespace)
         {
             this.ChannelIntegrityKey = channelIntegrityKey;
             this.CloudServiceName = cloudServiceName;
             this.Version = Constants.VaultCredentialVersion;
+
+            this.SiteId = siteId != null ? siteId : string.Empty;
+            this.SiteName = siteName != null ? siteName : string.Empty;
         }
 
         #endregion
@@ -528,6 +535,18 @@ public ASRVaultCreds(
         /// </summary>
         [DataMember(Order = 2)]
         public string Version { get; set; }
+
+        /// <summary>
+        /// Gets or sets the site Id
+        /// </summary>
+        [DataMember(Order = 3)]
+        public string SiteId { get; set; }
+
+        /// <summary>
+        /// Gets or sets the site name
+        /// </summary>
+        [DataMember(Order = 4)]
+        public string SiteName { get; set; }
         #endregion
     }
 

src/ServiceManagement/RecoveryServices/Commands.RecoveryServices/lib/Utilities.cs

@@ -82,14 +82,17 @@ public static T Deserialize<T>(string xml)
         /// <param name="fileContent">content to be written to the file</param>
         /// <param name="filePath">the path where the file is to be created</param>
         /// <param name="fileName">name of the file to be created</param>
-        public static void WriteToFile<T>(T fileContent, string filePath, string fileName)
+        /// <returns>file path with file name as string</returns>
+        public static string WriteToFile<T>(T fileContent, string filePath, string fileName)
         {
             string fullFileName = Path.Combine(filePath, fileName);
-            using (System.IO.StreamWriter file = new System.IO.StreamWriter(@fullFileName, true))
+            using (System.IO.StreamWriter file = new System.IO.StreamWriter(@fullFileName, false))
             {
                 string contentToWrite = Serialize<T>(fileContent);
                 file.WriteLine(contentToWrite);
             }
+
+            return fullFileName;
         }
 
         /// <summary>