Hub: implement issuance of hub managed instance ids

Author: webprofusion-chrisc

src/Certify.Core/Management/CertifyManager/CertifyManager.ManagedCertificates.cs

@@ -18,14 +18,6 @@ namespace Certify.Management
 {
     public partial class CertifyManager
     {
-        public string InstanceId
-        {
-            get
-            {
-                return CoreAppSettings.Current.InstanceId;
-            }
-        }
-
         /// <summary>
         /// Get managed certificate details by ID
         /// </summary>
@@ -36,7 +28,7 @@ public async Task<ManagedCertificate> GetManagedCertificate(string id)
             var item = await _itemManager.GetById(id);
             if (item != null)
             {
-                item.InstanceId = InstanceId;
+                item.InstanceId = _serverConfig.HubAssignedInstanceId;
                 item.DateRetrieved = DateTime.UtcNow;
             }
 
@@ -61,7 +53,7 @@ public async Task<List<ManagedCertificate>> GetManagedCertificates(ManagedCertif
                 }
             }
 
-            list.ForEach(i => { i.InstanceId = InstanceId; i.DateRetrieved = DateTime.UtcNow; });
+            list.ForEach(i => { i.InstanceId = _serverConfig.HubAssignedInstanceId; i.DateRetrieved = DateTime.UtcNow; });
 
             return list;
         }
@@ -120,7 +112,7 @@ public async Task<ManagedCertificateSearchResult> GetManagedCertificateResults(M
 
             var list = await _itemManager.Find(filter);
 
-            list.ForEach(i => { i.InstanceId = InstanceId; i.DateRetrieved = DateTime.UtcNow; });
+            list.ForEach(i => { i.InstanceId = _serverConfig.HubAssignedInstanceId; i.DateRetrieved = DateTime.UtcNow; });
 
             result.Results = list;
 
@@ -132,7 +124,7 @@ public async Task<ManagedCertificateSearchResult> GetManagedCertificateResults(M
                 if (external != null)
                 {
                     list.AddRange(await external);
-                    list.ForEach(i => i.InstanceId = InstanceId);
+                    list.ForEach(i => i.InstanceId = _serverConfig.HubAssignedInstanceId);
                     result.Results = list;
                 }
             }
@@ -152,7 +144,7 @@ public async Task<ManagedCertificateSearchResult> GetManagedCertificateResults(M
             var ms = await _itemManager.Find(filter);
 
             var summary = new StatusSummary();
-            summary.InstanceId = InstanceId;
+            summary.InstanceId = _serverConfig.HubAssignedInstanceId;
             summary.Total = ms.Count;
             summary.Healthy = ms.Count(c => c.Health == ManagedCertificateHealth.OK);
             summary.Error = ms.Count(c => c.Health == ManagedCertificateHealth.Error);
@@ -181,7 +173,7 @@ public async Task<ManagedCertificate> UpdateManagedCertificate(ManagedCertificat
             // store managed cert in database store
             managedCert = await _itemManager.Update(managedCert);
 
-            managedCert.InstanceId = InstanceId;
+            managedCert.InstanceId = _serverConfig.HubAssignedInstanceId;
 
             // report request state to status hub clients
 
@@ -276,7 +268,7 @@ private async Task ReportManagedCertificateStatus(ManagedCertificate managedCert
 
             var report = new Models.Shared.RenewalStatusReport
             {
-                InstanceId = this.InstanceId,
+                InstanceId = CoreAppSettings.Current.InstanceId,
                 MachineName = Environment.MachineName,
                 PrimaryContactEmail = (await GetAccountDetails(managedCertificate, allowFailover: false))?.Email,
                 ManagedSite = reportedCert,

src/Certify.Core/Management/CertifyManager/CertifyManager.ManagedInstances.cs

@@ -0,0 +1,49 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Certify.Models.Config;
+using Certify.Models.Hub;
+
+namespace Certify.Management
+{
+    public partial class CertifyManager
+    {
+        public async Task<ActionResult<ManagedInstanceInfo>> AddHubManagedInstance(ManagedInstanceInfo item)
+        {
+            item.Id = Guid.NewGuid().ToString();
+            item.InstanceId = item.Id;
+            await _configStore.Add(nameof(ManagedInstanceInfo), item);
+            return new ActionResult<ManagedInstanceInfo>("Added", true, item);
+        }
+
+        public async Task<ActionResult> UpdateHubManagedInstance(ManagedInstanceInfo item)
+        {
+            await _configStore.Update(nameof(ManagedInstanceInfo), item);
+            return new ActionResult("Updated", true);
+        }
+
+        public async Task<ManagedInstanceInfo> GetHubManagedInstance(string id)
+        {
+            var item = await _configStore.Get<ManagedInstanceInfo>(nameof(ManagedInstanceInfo), id);
+            return item;
+        }
+
+        public async Task<ICollection<ManagedInstanceInfo>> GetHubManagedInstances()
+        {
+            return await _configStore.GetItems<ManagedInstanceInfo>(nameof(ManagedInstanceInfo));
+        }
+
+        public async Task<ActionResult> RemoveHubManagedInstance(string id)
+        {
+            var deleted = await _configStore.Delete<ManagedInstanceInfo>(nameof(ManagedInstanceInfo), id);
+            if (deleted)
+            {
+                return new ActionResult("Deleted", true);
+            }
+            else
+            {
+                return new ActionResult("Not found", false);
+            }
+        }
+    }
+}