Added firewall mgmt pips. Also show peered vnets

graemefoster · graemefoster · commit 107cc7f95b48 · 2025-02-05T12:04:17.000+08:00
diff --git a/.idea/.idea.AzureDiagrams/.idea/projectSettingsUpdater.xml b/.idea/.idea.AzureDiagrams/.idea/projectSettingsUpdater.xml
diff --git a/AzureDiagramGenerator/AzureDiagramGenerator.csproj b/AzureDiagramGenerator/AzureDiagramGenerator.csproj
@@ -12,7 +12,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="Azure.Identity" Version="1.12.0" />
+      <PackageReference Include="Azure.Identity" Version="1.13.2" />
       <PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
     </ItemGroup>
 
diff --git a/AzureDiagramGenerator/DrawIo/AzureResourceDrawer.cs b/AzureDiagramGenerator/DrawIo/AzureResourceDrawer.cs
@@ -72,7 +72,8 @@ private static string DrawSimpleRectangleNode(Node node, string type, string nam
                 parent = ((CustomUserData)node.ClusterParent.UserData).Id;
 
         var text = name;
-        if (images.Length == 0 && !string.IsNullOrEmpty(type)) text += $"&lt;br/&gt;({type})";
+        //if (images.Length == 0 && !string.IsNullOrEmpty(type)) text += $"&lt;br/&gt;({type})";
+        if (!string.IsNullOrEmpty(type)) text += $"&lt;br/&gt;({type})";
 
         var container =
             @$"<mxCell id=""{id}"" value=""{text}"" style=""rounded=0;whiteSpace=wrap;html=1;fillColor={backgroundColour};verticalAlign={textAlignment.ToString().ToLowerInvariant()}"" vertex=""1"" parent=""{parent}"">
diff --git a/AzureDiagramGenerator/DrawIo/AzureResourceNodeBuilder.cs b/AzureDiagramGenerator/DrawIo/AzureResourceNodeBuilder.cs
@@ -52,9 +52,20 @@ public IEnumerable<Edge> CreateEdges(
             else
             {
                 var from = nodes[fromResource]
-                    .Single(x => ((CustomUserData)x.UserData).Id == fromResource.InternalId);
-                var to = nodes[toResource].Single(x => ((CustomUserData)x.UserData).Id == toResource.InternalId);
-                yield return AzureResourceDrawer.CreateSimpleEdge(link.From, link.To, from, to, link.Details,
+                    .Where(x => ((CustomUserData)x.UserData).Id == fromResource.InternalId).ToArray();
+
+                if (from.Count() > 1)
+                {
+                    throw new InvalidOperationException($"Multiple nodes representing {fromResource.Id} were found.");
+                }
+
+                var to = nodes[toResource].Where(x => ((CustomUserData)x.UserData).Id == toResource.InternalId).ToArray();
+                if (to.Count() > 1)
+                {
+                    throw new InvalidOperationException($"Multiple nodes representing {toResource.Id} were found.");
+                }
+
+                yield return AzureResourceDrawer.CreateSimpleEdge(link.From, link.To, from.Single(), to.Single(), link.Details,
                     link.Plane, isLinkVisible, link.IsTwoWay);
             }
         }
diff --git a/AzureDiagrams/AzureDiagrams.csproj b/AzureDiagrams/AzureDiagrams.csproj
@@ -8,8 +8,8 @@
 
     <ItemGroup>
         <PackageReference Include="AutomaticGraphLayout" Version="1.1.12" />
-        <PackageReference Include="Azure.Identity" Version="1.12.0" />
-        <PackageReference Include="Microsoft.Identity.Client" Version="4.62.0" />
+        <PackageReference Include="Azure.Identity" Version="1.13.2" />
+        <PackageReference Include="Microsoft.Identity.Client" Version="4.67.2" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
         <PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
     </ItemGroup>
diff --git a/AzureDiagrams/Resources/ContainerApp.cs b/AzureDiagrams/Resources/ContainerApp.cs
@@ -9,7 +9,7 @@ namespace AzureDiagrams.Resources;
 internal class ContainerApp : AzureResource, ICanBeAccessedViaAHostName
 {
     public string ContainerAppEnvironmentId { get; set; } = default!;
-    public override string Image => "img/lib/azure2/compute/Container_Instances.svg";
+    public override string Image => "img/lib/azure2/other/Worker_Container_App.svg";
 
     public string IngressFqdn { get; private set; } = default!;
 
diff --git a/AzureDiagrams/Resources/ContainerAppEnvironment.cs b/AzureDiagrams/Resources/ContainerAppEnvironment.cs
@@ -4,9 +4,10 @@
 
 namespace AzureDiagrams.Resources;
 
-internal class ContainerAppEnvironment : AzureResource, ICanWriteToLogAnalyticsWorkspaces
+internal class ContainerAppEnvironment : AzureResource, ICanWriteToLogAnalyticsWorkspaces, ICanInjectIntoASubnet
 {
-    public override string Image => "img/lib/mscae/Kubernetes_Services.svg";
+    private string[] _subnets;
+    public override string Image => "img/lib/azure2/other/Container_App_Environments.svg";
     public string? LogAnalyticsCustomerId { get; private set; }
 
     public bool DoYouWriteTo(string customerId)
@@ -21,13 +22,24 @@ public void CreateFlowBackToMe(LogAnalyticsWorkspace workspace)
 
     public override Task Enrich(JObject full, Dictionary<string, JObject?> additionalResources)
     {
-        LogAnalyticsCustomerId = full["properties"]!["appLogsConfiguration"]?["logAnalyticsConfiguration"]
-            ?.Value<string>("customerId");
+        var jToken = full["properties"]!
+            ["appLogsConfiguration"]?
+            ["logAnalyticsConfiguration"];
+
+        jToken = jToken?.Type == JTokenType.Null ? null : jToken;
+        
+        LogAnalyticsCustomerId = jToken?.Value<string>("customerId");
+
+        var subnet = full["properties"]!["vnetConfiguration"]?.Value<string>("infrastructureSubnetId");
+        _subnets = subnet != null ? [subnet] : [];
+        
         return base.Enrich(full, additionalResources);
     }
 
     public void DiscoveredContainerApp(ContainerApp containerApp)
     {
         OwnsResource(containerApp);
     }
+
+    public string[] SubnetIdsIAmInjectedInto => _subnets;
 }
diff --git a/AzureDiagrams/Resources/Firewall.cs b/AzureDiagrams/Resources/Firewall.cs
@@ -1,4 +1,5 @@
 ﻿using System.Collections.Generic;
+using System.Linq;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
 
@@ -7,13 +8,15 @@ namespace AzureDiagrams.Resources;
 public class Firewall : AzureResource, ICanInjectIntoASubnet, ICanExposePublicIPAddresses
 {
     private IpConfigurations _ipConfigurations = default!;
+    private IpConfigurations _mgmtIpConfigurations = default!;
     public override string Image => "img/lib/azure2/networking/Firewalls.svg";
 
     public override Task Enrich(JObject full, Dictionary<string, JObject?> additionalResources)
     {
         _ipConfigurations = new IpConfigurations(full);
+        _mgmtIpConfigurations = new IpConfigurations(full, "managementIpConfiguration");
         return base.Enrich(full, additionalResources);
     }
-    public string[] PublicIpAddresses => _ipConfigurations.PublicIpAddresses;
-    public string[] SubnetIdsIAmInjectedInto => _ipConfigurations.SubnetAttachments;
+    public string[] PublicIpAddresses => _ipConfigurations.PublicIpAddresses.Concat(_mgmtIpConfigurations.PublicIpAddresses).ToArray();
+    public string[] SubnetIdsIAmInjectedInto => _ipConfigurations.SubnetAttachments; //technically there may be another subnet associated - the mgmt one. But I can only really display one on the diagram without overcomplicating things.
 }
diff --git a/AzureDiagrams/Resources/IpConfigurations.cs b/AzureDiagrams/Resources/IpConfigurations.cs
@@ -22,33 +22,39 @@ public static IpConfigurations ForPrivateEndpoint(string ipAddress, string subne
 
     public IpConfigurations(JObject jObject, string propertyName = "ipConfigurations")
     {
-        PublicIpAddresses = jObject["properties"]![propertyName]?
+        var ipConfigurations = jObject["properties"]![propertyName];
+        if (ipConfigurations?.Type == JTokenType.Object)
+        {
+            ipConfigurations = new JArray(ipConfigurations);
+        }
+        
+        PublicIpAddresses = ipConfigurations?
             .Select(x =>
                 x["properties"]!["publicIPAddress"] != null
                     ? x["properties"]!["publicIPAddress"]!.Value<string>("id")!.ToLowerInvariant()
                     : null)
             .Where(x => x != null)
             .Select(x => x!.ToLowerInvariant())
-            .ToArray() ?? Array.Empty<string>();
+            .ToArray() ?? [];
 
-        PrivateIpAddresses = jObject["properties"]![propertyName]?
+        PrivateIpAddresses = ipConfigurations?
             .Select(x => x["properties"]!.Value<string>("privateIPAddress"))
             .Where(x => x != null)
             .Select(x => x!)
-            .ToArray() ?? Array.Empty<string>();
+            .ToArray() ?? [];
 
-        SubnetAttachments = jObject["properties"]![propertyName]?
+        SubnetAttachments = ipConfigurations?
             .Select(x => x["properties"]!["subnet"]?.Value<string>("id")!.ToLowerInvariant())
             .Where(x => x != null)
             .Select(x => x!)
-            .ToArray() ?? Array.Empty<string>();
+            .ToArray() ?? [];
 
-        HostNames = jObject["properties"]![propertyName]?
+        HostNames = ipConfigurations?
             .SelectMany(x =>
                 x["properties"]!["privateLinkConnectionProperties"]?["fqdns"]?.Values<string>() ??
                 Array.Empty<string>())
             .Select(x => x!.ToLowerInvariant())
-            .ToArray() ?? Array.Empty<string>();
+            .ToArray() ?? [];
     }
 
     public string[] PrivateIpAddresses { get; set; }
diff --git a/AzureDiagrams/Resources/LoadBalancer.cs b/AzureDiagrams/Resources/LoadBalancer.cs
@@ -19,12 +19,20 @@ public class LoadBalancer : AzureResource, ICanInjectIntoASubnet, ICanExposePubl
     public override Task Enrich(JObject full, Dictionary<string, JObject?> additionalResources)
     {
         _frontendIpConfigurations = new IpConfigurations(full, "frontendIPConfigurations");
-        _backendNics = full["properties"]!["backendAddressPools"]!.SelectMany(x =>
-                x["properties"]!["loadBalancerBackendAddresses"]?.Select(
-                    lbba => lbba["properties"]!["networkInterfaceIPConfiguration"]?.Value<string>("id")!) ??
-                Array.Empty<string>())
-            .Select(x => string.Join('/', x.Split("/")[0..^2]))
-            .ToArray();
+        _backendNics =
+            full["properties"]!
+                ["backendAddressPools"]!
+                .SelectMany(x =>
+                    x["properties"]!["loadBalancerBackendAddresses"]?
+                        .Select(lbba =>
+                            lbba["properties"]!
+                                ["networkInterfaceIPConfiguration"]?
+                                .Value<string>("id") ?? null) ?? Array.Empty<string>()
+                )
+                .Where(x => x != null)
+                .Select(x => string.Join('/', x.Split("/")[0..^2])
+                )
+                .ToArray();
 
         return base.Enrich(full, additionalResources);
     }
diff --git a/AzureDiagrams/Resources/VNet.cs b/AzureDiagrams/Resources/VNet.cs
@@ -9,6 +9,8 @@ namespace AzureDiagrams.Resources;
 
 public class VNet : AzureResource
 {
+    private string[] _peerings;
+
     public VNet(string id, string name, Subnet[] subnets)
     {
         Id = id;
@@ -38,6 +40,12 @@ public override Task Enrich(JObject full, Dictionary<string, JObject?> additiona
             x["properties"]!["routeTable"]?.Value<string>("id")
         )).ToArray();
 
+        _peerings =
+            full["properties"]!
+                ["virtualNetworkPeerings"]?
+                .Select(x => x["properties"]!["remoteVirtualNetwork"]!.Value<string>("id")!)
+                .ToArray() ?? [];
+
         return Task.CompletedTask;
     }
 
@@ -75,6 +83,17 @@ public override void BuildRelationships(IEnumerable<AzureResource> allResources)
                 InjectResourceInto(udr, x.Name);
             }
         });
+
+        foreach (var peeredVnet in _peerings)
+        {
+            var peeredVnetResource = allResources.SingleOrDefault(x =>
+                string.Equals(x.Id, peeredVnet, StringComparison.InvariantCultureIgnoreCase));
+            if (peeredVnetResource != null)
+            {
+                CreateFlowTo(peeredVnetResource, "peering", Plane.Runtime);
+            }
+        }
+            
         base.BuildRelationships(allResources);
     }
 
diff --git a/AzureDiagramsTests/AzureDiagramsTests.csproj b/AzureDiagramsTests/AzureDiagramsTests.csproj
@@ -9,14 +9,14 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
-        <PackageReference Include="Shouldly" Version="4.2.1" />
-        <PackageReference Include="xunit" Version="2.9.0" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+        <PackageReference Include="Shouldly" Version="4.3.0" />
+        <PackageReference Include="xunit" Version="2.9.3" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="3.0.1">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
-        <PackageReference Include="coverlet.collector" Version="6.0.2">
+        <PackageReference Include="coverlet.collector" Version="6.0.4">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ namespace AzureDiagrams.Resources;`
`9`	`9`	`internal class ContainerApp : AzureResource, ICanBeAccessedViaAHostName`
`10`	`10`	`{`
`11`	`11`	`public string ContainerAppEnvironmentId { get; set; } = default!;`
`12`		`- public override string Image => "img/lib/azure2/compute/Container_Instances.svg";`
	`12`	`+ public override string Image => "img/lib/azure2/other/Worker_Container_App.svg";`
`13`	`13`
`14`	`14`	`public string IngressFqdn { get; private set; } = default!;`
`15`	`15`
Original file line number	Diff line number	Diff line change
`@@ -4,9 +4,10 @@`
`4`	`4`
`5`	`5`	`namespace AzureDiagrams.Resources;`
`6`	`6`
`7`		`-internal class ContainerAppEnvironment : AzureResource, ICanWriteToLogAnalyticsWorkspaces`
	`7`	`+internal class ContainerAppEnvironment : AzureResource, ICanWriteToLogAnalyticsWorkspaces, ICanInjectIntoASubnet`
`8`	`8`	`{`
`9`		`- public override string Image => "img/lib/mscae/Kubernetes_Services.svg";`
	`9`	`+ private string[] _subnets;`
	`10`	`+ public override string Image => "img/lib/azure2/other/Container_App_Environments.svg";`
`10`	`11`	`public string? LogAnalyticsCustomerId { get; private set; }`
`11`	`12`
`12`	`13`	`public bool DoYouWriteTo(string customerId)`
`@@ -21,13 +22,24 @@ public void CreateFlowBackToMe(LogAnalyticsWorkspace workspace)`
`21`	`22`
`22`	`23`	`public override Task Enrich(JObject full, Dictionary<string, JObject?> additionalResources)`
`23`	`24`	`{`
`24`		`- LogAnalyticsCustomerId = full["properties"]!["appLogsConfiguration"]?["logAnalyticsConfiguration"]`
`25`		`- ?.Value<string>("customerId");`
	`25`	`+ var jToken = full["properties"]!`
	`26`	`+ ["appLogsConfiguration"]?`
	`27`	`+ ["logAnalyticsConfiguration"];`
	`28`	`+`
	`29`	`+ jToken = jToken?.Type == JTokenType.Null ? null : jToken;`
	`30`	`+`
	`31`	`+ LogAnalyticsCustomerId = jToken?.Value<string>("customerId");`
	`32`	`+`
	`33`	`+ var subnet = full["properties"]!["vnetConfiguration"]?.Value<string>("infrastructureSubnetId");`
	`34`	`+ _subnets = subnet != null ? [subnet] : [];`
	`35`	`+`
`26`	`36`	`return base.Enrich(full, additionalResources);`
`27`	`37`	`}`
`28`	`38`
`29`	`39`	`public void DiscoveredContainerApp(ContainerApp containerApp)`
`30`	`40`	`{`
`31`	`41`	`OwnsResource(containerApp);`
`32`	`42`	`}`
	`43`	`+`
	`44`	`+ public string[] SubnetIdsIAmInjectedInto => _subnets;`
`33`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`using System.Collections.Generic;`
	`2`	`+using System.Linq;`
`2`	`3`	`using System.Threading.Tasks;`
`3`	`4`	`using Newtonsoft.Json.Linq;`
`4`	`5`
`@@ -7,13 +8,15 @@ namespace AzureDiagrams.Resources;`
`7`	`8`	`public class Firewall : AzureResource, ICanInjectIntoASubnet, ICanExposePublicIPAddresses`
`8`	`9`	`{`
`9`	`10`	`private IpConfigurations _ipConfigurations = default!;`
	`11`	`+ private IpConfigurations _mgmtIpConfigurations = default!;`
`10`	`12`	`public override string Image => "img/lib/azure2/networking/Firewalls.svg";`
`11`	`13`
`12`	`14`	`public override Task Enrich(JObject full, Dictionary<string, JObject?> additionalResources)`
`13`	`15`	`{`
`14`	`16`	`_ipConfigurations = new IpConfigurations(full);`
	`17`	`+ _mgmtIpConfigurations = new IpConfigurations(full, "managementIpConfiguration");`
`15`	`18`	`return base.Enrich(full, additionalResources);`
`16`	`19`	`}`
`17`		`- public string[] PublicIpAddresses => _ipConfigurations.PublicIpAddresses;`
`18`		`- public string[] SubnetIdsIAmInjectedInto => _ipConfigurations.SubnetAttachments;`
	`20`	`+ public string[] PublicIpAddresses => _ipConfigurations.PublicIpAddresses.Concat(_mgmtIpConfigurations.PublicIpAddresses).ToArray();`
	`21`	`+ public string[] SubnetIdsIAmInjectedInto => _ipConfigurations.SubnetAttachments; //technically there may be another subnet associated - the mgmt one. But I can only really display one on the diagram without overcomplicating things.`
`19`	`22`	`}`