Merge pull request #6 from sayedimac/mgmt

Mgmt

Author: sayedimac

Controllers/ResourceGroupsController.cs

@@ -1,15 +1,18 @@
 using Microsoft.AspNetCore.Mvc;
 using System.Text.Json;
 using AzureIntegration.Services;
+using Microsoft.VisualBasic;
+using System.Runtime.CompilerServices;
+
 
 namespace AzureIntegration.Controllers
 {
 
     public class ResourceGroupsController : Controller
-
     {
         private readonly IHttpClientFactory _httpClientFactory;
         private readonly IConfiguration _configuration;
+
         public ResourceGroupsController(IHttpClientFactory httpClientFactory, IConfiguration configuration)
         {
             _httpClientFactory = httpClientFactory ?? throw new ArgumentNullException(nameof(httpClientFactory));
@@ -37,9 +40,9 @@ public async Task<IActionResult> Index()
         private async Task<List<ResourceGroup>> GetResourceGroupsAsync()
         {
             var httpClient = _httpClientFactory.CreateClient("AzureServices");
-
+            var subscriptionId = _configuration["SubscriptionId"];
             var httpResponseMessage = await httpClient.GetAsync(
-            $"resourcegroups?api-version=2021-04-01");
+            $"subscriptions/{subscriptionId}/resourcegroups?api-version=2021-04-01");
 
 
             var jsonDocument = JsonDocument.Parse(httpResponseMessage.Content.ReadAsStringAsync().Result);
@@ -67,9 +70,10 @@ private async Task<List<AzureResource>> GetResourcesAsync(string name)
         {
 
             var httpClient = _httpClientFactory.CreateClient("AzureServices");
+            var subscriptionId = _configuration["SubscriptionId"];
 
             var httpResponseMessage = await httpClient.GetAsync(
-            $"resourceGroups/{name}/resources?api-version=2021-04-01");
+            $"subscriptions/{subscriptionId}/resourceGroups/{name}/resources?api-version=2021-04-01");
 
             var jsonDocument = JsonDocument.Parse(httpResponseMessage.Content.ReadAsStringAsync().Result);
 
@@ -93,7 +97,7 @@ private async Task<List<AzureManagementGroup>> GetAzureManagementGroups()
             var httpClient = _httpClientFactory.CreateClient("AzureServices");
 
             var httpResponseMessage = await httpClient.GetAsync(
-            $"managementgroups?api-version=2021-04-01");
+            $"providers/Microsoft.Management/managementGroups?api-version=2020-05-01");
 
             var jsonDocument = JsonDocument.Parse(httpResponseMessage.Content.ReadAsStringAsync().Result);
 
@@ -103,7 +107,8 @@ private async Task<List<AzureManagementGroup>> GetAzureManagementGroups()
             {
                 foreach (var managementGroup in managementGroupsElement.EnumerateArray())
                 {
-                    var name = managementGroup.GetProperty("name").GetString();
+                    var name = managementGroup.GetProperty("properties").GetProperty("displayName").GetString();
+                    //var name = managementGroup. .GetProperty("displayName").GetString();
                     var id = managementGroup.GetProperty("id").GetString();
                     var type = managementGroup.GetProperty("type").GetString();
                     azureManagementGroups.Add(new AzureManagementGroup
@@ -117,6 +122,7 @@ private async Task<List<AzureManagementGroup>> GetAzureManagementGroups()
             }
             return azureManagementGroups;
         }
+
     }
 }
 

Program.cs

@@ -1,6 +1,6 @@
 using Microsoft.Identity.Client;
 using System.Net.Http.Headers; // Add this line
-
+using AzureIntegration.Services;
 var builder = WebApplication.CreateBuilder(args);
 
 IConfiguration _configuration = new ConfigurationBuilder()
@@ -26,7 +26,7 @@
 
 builder.Services.AddHttpClient("AzureServices", httpClient =>
 {
-    httpClient.BaseAddress = new Uri($"https://management.azure.com/subscriptions/{subscriptionId}/");
+    httpClient.BaseAddress = new Uri($"https://management.azure.com/");
     httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", authResult.Result.AccessToken);
 });
 
@@ -40,6 +40,7 @@
 // Register the HTTP client
 builder.Services.AddHttpClient();
 
+builder.Services.AddSingleton(new Subscription(subscriptionId));
 // Register the configuration
 builder.Services.AddSingleton<IConfiguration>(builder.Configuration);
 builder.Services.AddDistributedMemoryCache();

Services/ResourceGroupsClasses.cs

@@ -30,4 +30,19 @@ public string? Url
             }
         }
     }
+    public class Subscription
+    {
+        public string SubscriptionId { get; set; }
+        public Subscription(string subscriptionId)
+        {
+            SubscriptionId = subscriptionId;
+        }
+        public string GetSubscriptionId
+        {
+            get
+            {
+                return SubscriptionId;
+            }
+        }
+    }
 }

Views/ResourceGroups/Details.cshtml

@@ -5,6 +5,6 @@
 <ul>
     @foreach (var resource in Model)
     {
-        <li><img src="@resource.Url" /> @resource.Name </li>
+        <li><img src="@resource.Url" /> @resource.Name - @resource.Type </li>
     }
 </ul>

Views/ResourceGroups/Index.cshtml

@@ -7,7 +7,7 @@
     foreach (var resourceGroup in Model)
     {
             <li><a href="@Url.Action("Details", "ResourceGroups", new { name = resourceGroup.Name })">
-                    @resourceGroup.Name </a>  (@resourceGroup.Location)
+                    @resourceGroup.Name </a> - @resourceGroup.Location
             </li>
     }
 }

Views/ResourceGroups/ManagementGroups.cshtml

@@ -5,6 +5,6 @@
 <ul>
     @foreach (var group in Model)
     {
-        <li>@group.Name (@group.Type / @group.Id)</li>
+        <li>@group.Name - @group.Type</li>
     }
 </ul>

Views/Shared/_Layout.cshtml

@@ -31,7 +31,11 @@
                         </li>
                         <li class="nav-item">
                             <a class="nav-link text-dark" asp-area="" asp-controller="ResourceGroups"
-                                asp-action="">Azure Resource Groups</a>
+                                asp-action="ManagementGroups">Management Groups</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link text-dark" asp-area="" asp-controller="ResourceGroups"
+                                asp-action="">Resource Groups</a>
                         </li>
                     </ul>
                 </div>