Azure deployment part3 (#507)

* Updated UI * Updated the logic
samsmithnz · Aug 9, 2023 · cbeb2f1 · cbeb2f1
1 parent abf9b59
commit cbeb2f1
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/RepoGovernance.Core/Models/AzureAppRegistration.cs b/src/RepoGovernance.Core/Models/AzureAppRegistration.cs
@@ -14,9 +14,8 @@ public string ExpirationDateString
                 }
                 else
                 {
-                    return "No Expiration Date Found";
+                    return "No expiration date found";
                 }
-
             }
         }
         public DateTimeOffset? ExpirationDate
@@ -26,7 +25,7 @@ public DateTimeOffset? ExpirationDate
                 DateTimeOffset? minDate = null;
                 foreach (DateTimeOffset? item in ExpirationDates)
                 {
-                    if (item != null && item < minDate)
+                    if (item != null && (minDate == null || item < minDate))
                     {
                         minDate = item;
                     }

diff --git a/src/RepoGovernance.Tests/AzureApiTests.cs b/src/RepoGovernance.Tests/AzureApiTests.cs
@@ -61,6 +61,7 @@ public async Task GetApplicationsItemTest()
             Assert.IsNotNull(result);
             Assert.AreEqual(2, result.AppRegistrations.Count);
             Assert.AreEqual(1, result.AppRegistrations[0].ExpirationDates.Count);
+            Assert.IsNotNull(result.AppRegistrations[0].ExpirationDate);
             Assert.AreEqual(1, result.AppRegistrations[1].ExpirationDates.Count);
         }
 

diff --git a/src/RepoGovernance.Web/Views/Home/Index.cshtml b/src/RepoGovernance.Web/Views/Home/Index.cshtml
@@ -207,8 +207,8 @@
                                 @for (int i = 0; i < item.AzureDeployment.AppRegistrations.Count; i++)
                                 {
                                     <li>
-                                        Secret #@(i + 1)
-                                        <i class="bi bi-info-circle" title='Expiring on @item.AzureDeployment.AppRegistrations[i].ExpirationDateString'></i>
+                                        Service principal #@(i + 1)
+                                        <i class="bi bi-info-circle" title='@item.AzureDeployment.AppRegistrations[i].Name, @item.AzureDeployment.AppRegistrations[i].ExpirationDateString'></i>
                                     </li>
                                 }
                                 @* <li>[Secret 1] status: Current (6 months)</li>