feat: Improve Profiles support

Author: GeekMasher

ql/lib/codeql/bicep/frameworks/Microsoft/AKS.qll

@@ -98,6 +98,15 @@ module AKS {
       result = this.getProperties().getAzureMonitorProfile()
     }
 
+    /**
+     *  Returns OS profiles for the cluster.
+     */
+    OsProfiles::OsProfile getOsProfile() {
+      result = this.getProperties().getLinuxProfile()
+      or
+      result = this.getProperties().getWindowsProfile()
+    }
+
     override string toString() { result = "ManagedContainerResource" }
   }
 
@@ -191,7 +200,7 @@ module AKS {
       /**
        * Gets the network profile for the cluster.
        */
-      Network::NetworkProfile getNetworkProfile() { result = this.getProperty("networkProfile") }
+      NetworkingProfiles::NetworkProfile getNetworkProfile() { result = this.getProperty("networkProfile") }
 
       /**
        * Gets the API server access profile for the cluster.
@@ -248,7 +257,7 @@ module AKS {
       /**
        * Gets the storage profile for the cluster.
        */
-      StorageProfile getStorageProfile() { result = this.getProperty("storageProfile") }
+      StorageProfiles::StorageProfile getStorageProfile() { result = this.getProperty("storageProfile") }
 
       /**
        * Gets the workload auto scaler profile for the cluster.
@@ -260,12 +269,12 @@ module AKS {
       /**
        * Gets the Windows profile for the cluster.
        */
-      Profiles::WindowsProfile getWindowsProfile() { result = this.getProperty("windowsProfile") }
+      OsProfiles::WindowsProfile getWindowsProfile() { result = this.getProperty("windowsProfile") }
 
       /**
        * Gets the Linux profile for the cluster.
        */
-      Profiles::LinuxProfile getLinuxProfile() { result = this.getProperty("linuxProfile") }
+      OsProfiles::LinuxProfile getLinuxProfile() { result = this.getProperty("linuxProfile") }
 
       /**
        * Gets the HTTP proxy configuration for the cluster.
@@ -561,7 +570,7 @@ module AKS {
       /**
        * Gets the network profile.
        */
-      Expr getNetworkProfile() { result = this.getProperty("networkProfile") }
+      NetworkingProfiles::NetworkProfile getNetworkProfile() { result = this.getProperty("networkProfile") }
 
       /**
        * Gets the security profile.
@@ -700,7 +709,7 @@ module AKS {
        */
       predicate hasCount() { exists(this.getCount()) }
 
-      string getToString() { result = "AgentPoolProfile" }
+      string toString() { result = "AgentPoolProfile" }
     }
 
     /**
@@ -1033,40 +1042,6 @@ module AKS {
       string toString() { result = "ServiceMeshProfile" }
     }
 
-    /**
-     * Represents the storage profile for a managed AKS cluster.
-     */
-    class StorageProfile extends Object {
-      private Properties properties;
-
-      /**
-       * Constructs a StorageProfile object for the given properties.
-       */
-      StorageProfile() { this = properties.getProperty("storageProfile") }
-
-      /**
-       * Gets the blob CSI driver property.
-       */
-      Expr getBlobCSIDriver() { result = this.getProperty("blobCSIDriver") }
-
-      /**
-       * Gets the disk CSI driver property.
-       */
-      Expr getDiskCSIDriver() { result = this.getProperty("diskCSIDriver") }
-
-      /**
-       * Gets the file CSI driver property.
-       */
-      Expr getFileCSIDriver() { result = this.getProperty("fileCSIDriver") }
-
-      /**
-       * Gets the snapshot controller property.
-       */
-      Expr getSnapshotController() { result = this.getProperty("snapshotController") }
-
-      string toString() { result = "StorageProfile" }
-    }
-
     /**
      * Represents the workload auto scaler profile for a managed AKS cluster.
      */

ql/lib/codeql/bicep/frameworks/Microsoft/Compute.qll

@@ -75,12 +75,12 @@ module Compute {
       /**
        * Returns the network profile object for the virtual machine.
        */
-      NetworkProfile getNetworkProfile() { result = this.getProperty("networkProfile") }
+      NetworkingProfiles::NetworkProfile getNetworkProfile() { result = this.getProperty("networkProfile") }
 
       /**
        * Returns the OS profile object for the virtual machine.
        */
-      Compute::Profiles::OsProfile getOsProfile() { result = this.getProperty("osProfile") }
+      OsProfiles::OsProfile getOsProfile() { result = this.getProperty("osProfile") }
 
       override string toString() {
         result = "VirtualMachinesProperties[" + virtualMachines.getName() + "]"
@@ -108,171 +108,5 @@ module Compute {
        */
       Expr getVmSize() { result = this.getProperty("vmSize") }
     }
-
-    /**
-     * Represents a network profile for the Microsoft.Compute/virtualMachines type.
-     */
-    class NetworkProfile extends Object {
-      private Properties properties;
-
-      /**
-       * Constructs a NetworkProfile object for the given properties.
-       */
-      NetworkProfile() { this = properties.getProperty("networkProfile") }
-
-      /**
-       * Returns a string representation of the network profile.
-       */
-      string toString() { result = "NetworkProfile" }
-
-      /**
-       * Returns the network interfaces for the virtual machine.
-       */
-      Network::NetworkInterfaces getNetworkInterfaces() {
-        result = resolveResource(this.getNetworkInterfacesObject())
-      }
-
-      /**
-       * Returns the networkInterfaces property as an object array.
-       */
-      private Object getNetworkInterfacesObject() {
-        result = this.getProperty("networkInterfaces").(Array).getElements()
-      }
-    }
-
-    /**
-     * Represents the storage profile for the Microsoft.Compute/virtualMachines type.
-     */
-    class StorageProfile extends Object {
-      private Properties properties;
-
-      /**
-       * Constructs a StorageProfile object for the given properties.
-       */
-      StorageProfile() { this = properties.getProperty("storageProfile") }
-
-      /**
-       * Returns the image reference for the storage profile.
-       */
-      ImageReference getImageReference() { result = this.getProperty("imageReference") }
-    }
-
-    /**
-     * Represents an image reference for the Microsoft.Compute/virtualMachines type.
-     * See: https://learn.microsoft.com/en-us/azure/templates/microsoft.compute/virtualmachines?pivots=deployment-language-bicep#imagereference
-     */
-    class ImageReference extends Object {
-      private StorageProfile storageProfile;
-
-      /**
-       * Constructs an ImageReference object for the given storage profile.
-       */
-      ImageReference() { this = storageProfile.getProperty("imageReference") }
-
-      /**
-       * Returns the publisher property of the image reference.
-       */
-      Expr getPublisher() { result = this.getProperty("publisher") }
-
-      /**
-       * Returns the offer property of the image reference.
-       */
-      Expr getOffer() { result = this.getProperty("offer") }
-
-      /**
-       * Returns the sku property of the image reference.
-       */
-      Expr getSku() { result = this.getProperty("sku") }
-
-      /**
-       * Returns the version property of the image reference.
-       */
-      Expr getVersion() { result = this.getProperty("version") }
-    }
-  }
-
-  module Profiles {
-    /**
-     * Represents the OS profile for the Microsoft.Compute/virtualMachines type.
-     */
-    class OsProfile extends Object {
-      private ResourceProperties properties;
-      private string profileType;
-      /**
-       * Constructs an OsProfile object for the given properties.
-       */
-      OsProfile() {
-        this = properties.getProperty("osProfile") and profileType = "general"
-        or 
-        this = properties.getProperty("linuxProfile") and profileType = "linux"
-        or
-        this = properties.getProperty("windowsProfile") and profileType = "windows"
-      }
-
-      /**
-       * Returns the computerName property of the OS profile.
-       */
-      Expr getComputerName() { result = this.getProperty("computerName") }
-
-      string osType() {
-        result = profileType
-      }
-
-      /**
-       * Returns the adminUsername property of the OS profile.
-       */
-      Expr getAdminUsername() { result = this.getProperty("adminUsername") }
-
-      /**
-       * Returns the adminPassword property of the OS profile.
-       */
-      Expr getAdminPassword() { result = this.getProperty("adminPassword") }
-
-      SshConfig getSshConfig() {
-        result = this.getProperty("ssh")
-      }
-
-      string toString() {
-        result = "OsProfile[" + profileType + "]"
-      }
-    }
-
-    class SshConfig extends Object {
-      private OsProfile osProfile;
-      
-      /**
-       * Constructs an SshConfig object for the given OS profile.
-       */
-      SshConfig() { this = osProfile.getProperty("ssh") }
-
-      /**
-       * Returns the publicKeys property of the SSH configuration.
-       */
-      SshPublicKey getPublicKeys() { result = this.getProperty("publicKeys").(Array).getElements() }
-
-      /**
-       * Returns a string representation of the SSH configuration.
-       */
-      string toString() { result = "SshConfig" }
-    }
-
-    class SshPublicKey extends Object {
-      private SshConfig sshConfig;
-
-      /**
-       * Constructs an SshConfigPublicKey object for the given SSH configuration.
-       */
-      SshPublicKey() { this = sshConfig.getProperty("publicKeys").(Array).getElements() }
-
-      /**
-       * Returns the keyData property of the SSH public key.
-       */
-      Expr getKeyData() { result = this.getProperty("keyData") }
-
-      /**
-       * Returns a string representation of the SSH public key.
-       */
-      string toString() { result = "SshConfigPublicKey" }
-    }
   }
 }