removed unused code

internal/scanners/advisor.go

@@ -21,7 +21,7 @@ type AdvisorScanner struct {
 }
 
 // GetProperties - Returns the properties of the AdvisorResult
-func (d *AdvisorResult) GetProperties() []string {
+func (a AdvisorResult) GetProperties() []string {
 	return []string{
 		"SubscriptionID",
 		"Name",
@@ -35,16 +35,16 @@ func (d *AdvisorResult) GetProperties() []string {
 }
 
 // ToMap - Returns the properties of the AdvisorResult as a map
-func (r AdvisorResult) ToMap(mask bool) map[string]string {
+func (a AdvisorResult) ToMap(mask bool) map[string]string {
 	return map[string]string{
-		"SubscriptionID":     MaskSubscriptionID(r.SubscriptionID, mask),
-		"Name":               r.Name,
-		"Type":               r.Type,
-		"Category":           r.Category,
-		"Description":        r.Description,
-		"Potential Benefits": r.PotentialBenefits,
-		"Risk":               r.Risk,
-		"Learn":              r.LearnMoreLink,
+		"SubscriptionID":     MaskSubscriptionID(a.SubscriptionID, mask),
+		"Name":               a.Name,
+		"Type":               a.Type,
+		"Category":           a.Category,
+		"Description":        a.Description,
+		"Potential Benefits": a.PotentialBenefits,
+		"Risk":               a.Risk,
+		"Learn":              a.LearnMoreLink,
 	}
 }
 

internal/scanners/afd/afd.go

@@ -12,20 +12,16 @@ import (
 
 // FrontDoorScanner - Scanner for Front Door
 type FrontDoorScanner struct {
-	config   *scanners.ScannerConfig
-	client   *armcdn.ProfilesClient
-	listFunc func(resourceGroupName string) ([]*armcdn.Profile, error)
+	config *scanners.ScannerConfig
+	client *armcdn.ProfilesClient
 }
 
 // Init - Initializes the FrontDoor Scanner
 func (a *FrontDoorScanner) Init(config *scanners.ScannerConfig) error {
 	a.config = config
 	var err error
 	a.client, err = armcdn.NewProfilesClient(config.SubscriptionID, a.config.Cred, a.config.ClientOptions)
-	if err != nil {
-		return err
-	}
-	return nil
+	return err
 }
 
 // Scan - Scans all Front Doors in a Resource Group
@@ -56,19 +52,15 @@ func (a *FrontDoorScanner) Scan(resourceGroupName string, scanContext *scanners.
 }
 
 func (a *FrontDoorScanner) list(resourceGroupName string) ([]*armcdn.Profile, error) {
-	if a.listFunc == nil {
-		pager := a.client.NewListByResourceGroupPager(resourceGroupName, nil)
+	pager := a.client.NewListByResourceGroupPager(resourceGroupName, nil)
 
-		services := make([]*armcdn.Profile, 0)
-		for pager.More() {
-			resp, err := pager.NextPage(a.config.Ctx)
-			if err != nil {
-				return nil, err
-			}
-			services = append(services, resp.Value...)
+	services := make([]*armcdn.Profile, 0)
+	for pager.More() {
+		resp, err := pager.NextPage(a.config.Ctx)
+		if err != nil {
+			return nil, err
 		}
-		return services, nil
+		services = append(services, resp.Value...)
 	}
-
-	return a.listFunc(resourceGroupName)
+	return services, nil
 }

internal/scanners/afw/afw.go

@@ -12,20 +12,16 @@ import (
 
 // FirewallScanner - Scanner for Azure Firewall
 type FirewallScanner struct {
-	config   *scanners.ScannerConfig
-	client   *armnetwork.AzureFirewallsClient
-	listFunc func(resourceGroupName string) ([]*armnetwork.AzureFirewall, error)
+	config *scanners.ScannerConfig
+	client *armnetwork.AzureFirewallsClient
 }
 
 // Init - Initializes the Azure Firewall
 func (a *FirewallScanner) Init(config *scanners.ScannerConfig) error {
 	a.config = config
 	var err error
 	a.client, err = armnetwork.NewAzureFirewallsClient(config.SubscriptionID, a.config.Cred, a.config.ClientOptions)
-	if err != nil {
-		return err
-	}
-	return nil
+	return err
 }
 
 // Scan - Scans all Azure Firewall in a Resource Group
@@ -56,19 +52,15 @@ func (a *FirewallScanner) Scan(resourceGroupName string, scanContext *scanners.S
 }
 
 func (a *FirewallScanner) list(resourceGroupName string) ([]*armnetwork.AzureFirewall, error) {
-	if a.listFunc == nil {
-		pager := a.client.NewListPager(resourceGroupName, nil)
+	pager := a.client.NewListPager(resourceGroupName, nil)
 
-		services := make([]*armnetwork.AzureFirewall, 0)
-		for pager.More() {
-			resp, err := pager.NextPage(a.config.Ctx)
-			if err != nil {
-				return nil, err
-			}
-			services = append(services, resp.Value...)
+	services := make([]*armnetwork.AzureFirewall, 0)
+	for pager.More() {
+		resp, err := pager.NextPage(a.config.Ctx)
+		if err != nil {
+			return nil, err
 		}
-		return services, nil
+		services = append(services, resp.Value...)
 	}
-
-	return a.listFunc(resourceGroupName)
+	return services, nil
 }

internal/scanners/agw/agw.go

@@ -12,20 +12,16 @@ import (
 
 // ApplicationGatewayScanner - Scanner for Application Gateways
 type ApplicationGatewayScanner struct {
-	config           *scanners.ScannerConfig
-	gatewaysClient   *armnetwork.ApplicationGatewaysClient
-	listGatewaysFunc func(resourceGroupName string) ([]*armnetwork.ApplicationGateway, error)
+	config         *scanners.ScannerConfig
+	gatewaysClient *armnetwork.ApplicationGatewaysClient
 }
 
 // Init - Initializes the ApplicationGatewayAnalyzer
 func (a *ApplicationGatewayScanner) Init(config *scanners.ScannerConfig) error {
 	a.config = config
 	var err error
 	a.gatewaysClient, err = armnetwork.NewApplicationGatewaysClient(config.SubscriptionID, a.config.Cred, a.config.ClientOptions)
-	if err != nil {
-		return err
-	}
-	return nil
+	return err
 }
 
 // Scan - Scans all Application Gateways in a Resource Group
@@ -56,18 +52,14 @@ func (a *ApplicationGatewayScanner) Scan(resourceGroupName string, scanContext *
 }
 
 func (a *ApplicationGatewayScanner) listGateways(resourceGroupName string) ([]*armnetwork.ApplicationGateway, error) {
-	if a.listGatewaysFunc == nil {
-		pager := a.gatewaysClient.NewListPager(resourceGroupName, nil)
-		results := []*armnetwork.ApplicationGateway{}
-		for pager.More() {
-			resp, err := pager.NextPage(a.config.Ctx)
-			if err != nil {
-				return nil, err
-			}
-			results = append(results, resp.Value...)
+	pager := a.gatewaysClient.NewListPager(resourceGroupName, nil)
+	results := []*armnetwork.ApplicationGateway{}
+	for pager.More() {
+		resp, err := pager.NextPage(a.config.Ctx)
+		if err != nil {
+			return nil, err
 		}
-		return results, nil
+		results = append(results, resp.Value...)
 	}
-
-	return a.listGatewaysFunc(resourceGroupName)
+	return results, nil
 }

internal/scanners/agw/rules.go

@@ -18,7 +18,7 @@ func (a *ApplicationGatewayScanner) GetRules() map[string]scanners.AzureRule {
 			Category:    scanners.RulesCategoryReliability,
 			Subcategory: scanners.RulesSubcategoryReliabilityScaling,
 			Description: "Application Gateway: Ensure autoscaling is used with a minimum of 2 instances",
-			Severity:    scanners.SeverityCritical,
+			Severity:    scanners.SeverityHigh,
 			Eval: func(target interface{}, scanContext *scanners.ScanContext) (bool, string) {
 				g := target.(*armnetwork.ApplicationGateway)
 				autoscale := g.Properties.AutoscaleConfiguration != nil && g.Properties.AutoscaleConfiguration.MinCapacity != nil && *g.Properties.AutoscaleConfiguration.MinCapacity >= 2

internal/scanners/aks/aks.go

@@ -12,20 +12,16 @@ import (
 
 // AKSScanner - Scanner for AKS Clusters
 type AKSScanner struct {
-	config           *scanners.ScannerConfig
-	clustersClient   *armcontainerservice.ManagedClustersClient
-	listClustersFunc func(resourceGroupName string) ([]*armcontainerservice.ManagedCluster, error)
+	config         *scanners.ScannerConfig
+	clustersClient *armcontainerservice.ManagedClustersClient
 }
 
 // Init - Initializes the AKSScanner
 func (a *AKSScanner) Init(config *scanners.ScannerConfig) error {
 	a.config = config
 	var err error
 	a.clustersClient, err = armcontainerservice.NewManagedClustersClient(config.SubscriptionID, config.Cred, config.ClientOptions)
-	if err != nil {
-		return err
-	}
-	return nil
+	return err
 }
 
 // Scan - Scans all AKS Clusters in a Resource Group
@@ -58,19 +54,15 @@ func (a *AKSScanner) Scan(resourceGroupName string, scanContext *scanners.ScanCo
 }
 
 func (a *AKSScanner) listClusters(resourceGroupName string) ([]*armcontainerservice.ManagedCluster, error) {
-	if a.listClustersFunc == nil {
-		pager := a.clustersClient.NewListByResourceGroupPager(resourceGroupName, nil)
+	pager := a.clustersClient.NewListByResourceGroupPager(resourceGroupName, nil)
 
-		clusters := make([]*armcontainerservice.ManagedCluster, 0)
-		for pager.More() {
-			resp, err := pager.NextPage(a.config.Ctx)
-			if err != nil {
-				return nil, err
-			}
-			clusters = append(clusters, resp.Value...)
+	clusters := make([]*armcontainerservice.ManagedCluster, 0)
+	for pager.More() {
+		resp, err := pager.NextPage(a.config.Ctx)
+		if err != nil {
+			return nil, err
 		}
-		return clusters, nil
+		clusters = append(clusters, resp.Value...)
 	}
-
-	return a.listClustersFunc(resourceGroupName)
+	return clusters, nil
 }

internal/scanners/apim/apim.go

@@ -12,20 +12,16 @@ import (
 
 // APIManagementScanner - Scanner for API Management Services
 type APIManagementScanner struct {
-	config           *scanners.ScannerConfig
-	serviceClient    *armapimanagement.ServiceClient
-	listServicesFunc func(resourceGroupName string) ([]*armapimanagement.ServiceResource, error)
+	config        *scanners.ScannerConfig
+	serviceClient *armapimanagement.ServiceClient
 }
 
 // Init - Initializes the APIManagementScanner
 func (a *APIManagementScanner) Init(config *scanners.ScannerConfig) error {
 	a.config = config
 	var err error
 	a.serviceClient, err = armapimanagement.NewServiceClient(config.SubscriptionID, config.Cred, config.ClientOptions)
-	if err != nil {
-		return err
-	}
-	return nil
+	return err
 }
 
 // Scan -Scans all API Management Services in a Resource Group
@@ -56,19 +52,15 @@ func (a *APIManagementScanner) Scan(resourceGroupName string, scanContext *scann
 }
 
 func (a *APIManagementScanner) listServices(resourceGroupName string) ([]*armapimanagement.ServiceResource, error) {
-	if a.listServicesFunc == nil {
-		pager := a.serviceClient.NewListByResourceGroupPager(resourceGroupName, nil)
+	pager := a.serviceClient.NewListByResourceGroupPager(resourceGroupName, nil)
 
-		services := make([]*armapimanagement.ServiceResource, 0)
-		for pager.More() {
-			resp, err := pager.NextPage(a.config.Ctx)
-			if err != nil {
-				return nil, err
-			}
-			services = append(services, resp.Value...)
+	services := make([]*armapimanagement.ServiceResource, 0)
+	for pager.More() {
+		resp, err := pager.NextPage(a.config.Ctx)
+		if err != nil {
+			return nil, err
 		}
-		return services, nil
+		services = append(services, resp.Value...)
 	}
-
-	return a.listServicesFunc(resourceGroupName)
+	return services, nil
 }

internal/scanners/appcs/appcs.go

@@ -12,20 +12,16 @@ import (
 
 // AppConfigurationScanner - Scanner for Container Apps
 type AppConfigurationScanner struct {
-	config   *scanners.ScannerConfig
-	client   *armappconfiguration.ConfigurationStoresClient
-	listFunc func(resourceGroupName string) ([]*armappconfiguration.ConfigurationStore, error)
+	config *scanners.ScannerConfig
+	client *armappconfiguration.ConfigurationStoresClient
 }
 
 // Init - Initializes the AppConfigurationScanner
 func (a *AppConfigurationScanner) Init(config *scanners.ScannerConfig) error {
 	a.config = config
 	var err error
 	a.client, err = armappconfiguration.NewConfigurationStoresClient(config.SubscriptionID, config.Cred, config.ClientOptions)
-	if err != nil {
-		return err
-	}
-	return nil
+	return err
 }
 
 // Scan - Scans all App Configurations in a Resource Group
@@ -56,18 +52,14 @@ func (a *AppConfigurationScanner) Scan(resourceGroupName string, scanContext *sc
 }
 
 func (a *AppConfigurationScanner) list(resourceGroupName string) ([]*armappconfiguration.ConfigurationStore, error) {
-	if a.listFunc == nil {
-		pager := a.client.NewListByResourceGroupPager(resourceGroupName, nil)
-		apps := make([]*armappconfiguration.ConfigurationStore, 0)
-		for pager.More() {
-			resp, err := pager.NextPage(a.config.Ctx)
-			if err != nil {
-				return nil, err
-			}
-			apps = append(apps, resp.Value...)
+	pager := a.client.NewListByResourceGroupPager(resourceGroupName, nil)
+	apps := make([]*armappconfiguration.ConfigurationStore, 0)
+	for pager.More() {
+		resp, err := pager.NextPage(a.config.Ctx)
+		if err != nil {
+			return nil, err
 		}
-		return apps, nil
+		apps = append(apps, resp.Value...)
 	}
-
-	return a.listFunc(resourceGroupName)
+	return apps, nil
 }

internal/scanners/appi/appi.go

@@ -21,10 +21,7 @@ func (a *AppInsightsScanner) Init(config *scanners.ScannerConfig) error {
 	a.config = config
 	var err error
 	a.client, err = armapplicationinsights.NewComponentsClient(config.SubscriptionID, a.config.Cred, a.config.ClientOptions)
-	if err != nil {
-		return err
-	}
-	return nil
+	return err
 }
 
 // Scan - Scans all Application Insights in a Resource Group