Skip to content

Commit

Permalink
Merge branch 'main' into improvement/adf
Browse files Browse the repository at this point in the history
  • Loading branch information
nachoalonsoportillo authored Jul 24, 2023
2 parents c7bdc02 + bfb6a73 commit 5f86972
Show file tree
Hide file tree
Showing 35 changed files with 274 additions and 279 deletions.
10 changes: 5 additions & 5 deletions cmd/azqr/adx.go → cmd/azqr/dec.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,22 @@ package azqr

import (
"github.com/Azure/azqr/internal/scanners"
"github.com/Azure/azqr/internal/scanners/adx"
"github.com/Azure/azqr/internal/scanners/dec"
"github.com/spf13/cobra"
)

func init() {
scanCmd.AddCommand(adxCmd)
scanCmd.AddCommand(decCmd)
}

var adxCmd = &cobra.Command{
Use: "adx",
var decCmd = &cobra.Command{
Use: "dec",
Short: "Scan Azure Data Explorer",
Long: "Scan Azure Data Explorer",
Args: cobra.NoArgs,
Run: func(cmd *cobra.Command, args []string) {
serviceScanners := []scanners.IAzureScanner{
&adx.DataExplorerScanner{},
&dec.DataExplorerScanner{},
}

scan(cmd, serviceScanners)
Expand Down
4 changes: 2 additions & 2 deletions cmd/azqr/rules.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import (

"github.com/Azure/azqr/internal/scanners"
"github.com/Azure/azqr/internal/scanners/adf"
"github.com/Azure/azqr/internal/scanners/adx"
"github.com/Azure/azqr/internal/scanners/afd"
"github.com/Azure/azqr/internal/scanners/afw"
"github.com/Azure/azqr/internal/scanners/agw"
Expand All @@ -22,6 +21,7 @@ import (
"github.com/Azure/azqr/internal/scanners/cog"
"github.com/Azure/azqr/internal/scanners/cosmos"
"github.com/Azure/azqr/internal/scanners/cr"
"github.com/Azure/azqr/internal/scanners/dec"
"github.com/Azure/azqr/internal/scanners/evgd"
"github.com/Azure/azqr/internal/scanners/evh"
"github.com/Azure/azqr/internal/scanners/kv"
Expand Down Expand Up @@ -52,7 +52,6 @@ var rulesCmd = &cobra.Command{
Run: func(cmd *cobra.Command, args []string) {
serviceScanners := []scanners.IAzureScanner{
&adf.DataFactoryScanner{},
&adx.DataExplorerScanner{},
&afd.FrontDoorScanner{},
&afw.FirewallScanner{},
&agw.ApplicationGatewayScanner{},
Expand All @@ -65,6 +64,7 @@ var rulesCmd = &cobra.Command{
&cog.CognitiveScanner{},
&cosmos.CosmosDBScanner{},
&cr.ContainerRegistryScanner{},
&dec.DataExplorerScanner{},
&evgd.EventGridScanner{},
&evh.EventHubScanner{},
&kv.KeyVaultScanner{},
Expand Down
4 changes: 2 additions & 2 deletions cmd/azqr/scan.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import (

"github.com/Azure/azqr/internal/scanners"
"github.com/Azure/azqr/internal/scanners/adf"
"github.com/Azure/azqr/internal/scanners/adx"
"github.com/Azure/azqr/internal/scanners/afd"
"github.com/Azure/azqr/internal/scanners/afw"
"github.com/Azure/azqr/internal/scanners/agw"
Expand All @@ -25,6 +24,7 @@ import (
"github.com/Azure/azqr/internal/scanners/cog"
"github.com/Azure/azqr/internal/scanners/cosmos"
"github.com/Azure/azqr/internal/scanners/cr"
"github.com/Azure/azqr/internal/scanners/dec"
"github.com/Azure/azqr/internal/scanners/evgd"
"github.com/Azure/azqr/internal/scanners/evh"
"github.com/Azure/azqr/internal/scanners/kv"
Expand Down Expand Up @@ -74,7 +74,6 @@ var scanCmd = &cobra.Command{
Run: func(cmd *cobra.Command, args []string) {
serviceScanners := []scanners.IAzureScanner{
&adf.DataFactoryScanner{},
&adx.DataExplorerScanner{},
&afd.FrontDoorScanner{},
&afw.FirewallScanner{},
&agw.ApplicationGatewayScanner{},
Expand All @@ -87,6 +86,7 @@ var scanCmd = &cobra.Command{
&cog.CognitiveScanner{},
&cosmos.CosmosDBScanner{},
&cr.ContainerRegistryScanner{},
&dec.DataExplorerScanner{},
&evgd.EventGridScanner{},
&evh.EventHubScanner{},
&kv.KeyVaultScanner{},
Expand Down
449 changes: 222 additions & 227 deletions docs/rules/README.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion internal/scanners/afd/rules.go
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ func (a *FrontDoorScanner) GetRules() map[string]scanners.AzureRule {
Severity: scanners.SeverityLow,
Eval: func(target interface{}, scanContext *scanners.ScanContext) (bool, string) {
c := target.(*armcdn.Profile)
return c.Tags == nil || len(c.Tags) == 0, ""
return len(c.Tags) == 0, ""
},
Url: "https://learn.microsoft.com/en-us/azure/azure-resource-manager/management/tag-resources?tabs=json",
},
Expand Down
2 changes: 1 addition & 1 deletion internal/scanners/afw/rules.go
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ func (a *FirewallScanner) GetRules() map[string]scanners.AzureRule {
Severity: scanners.SeverityLow,
Eval: func(target interface{}, scanContext *scanners.ScanContext) (bool, string) {
c := target.(*armnetwork.AzureFirewall)
return c.Tags == nil || len(c.Tags) == 0, ""
return len(c.Tags) == 0, ""
},
Url: "https://learn.microsoft.com/en-us/azure/azure-resource-manager/management/tag-resources?tabs=json",
},
Expand Down
2 changes: 1 addition & 1 deletion internal/scanners/agw/rules.go
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ func (a *ApplicationGatewayScanner) GetRules() map[string]scanners.AzureRule {
Severity: scanners.SeverityLow,
Eval: func(target interface{}, scanContext *scanners.ScanContext) (bool, string) {
c := target.(*armnetwork.ApplicationGateway)
return c.Tags == nil || len(c.Tags) == 0, ""
return len(c.Tags) == 0, ""
},
Url: "https://learn.microsoft.com/en-us/azure/azure-resource-manager/management/tag-resources?tabs=json",
},
Expand Down
2 changes: 1 addition & 1 deletion internal/scanners/aks/rules.go
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ func (a *AKSScanner) GetRules() map[string]scanners.AzureRule {
Severity: scanners.SeverityLow,
Eval: func(target interface{}, scanContext *scanners.ScanContext) (bool, string) {
c := target.(*armcontainerservice.ManagedCluster)
return c.Tags == nil || len(c.Tags) == 0, ""
return len(c.Tags) == 0, ""
},
Url: "https://learn.microsoft.com/en-us/azure/azure-resource-manager/management/tag-resources?tabs=json",
},
Expand Down
2 changes: 1 addition & 1 deletion internal/scanners/apim/rules.go
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ func (a *APIManagementScanner) GetRules() map[string]scanners.AzureRule {
Severity: scanners.SeverityLow,
Eval: func(target interface{}, scanContext *scanners.ScanContext) (bool, string) {
c := target.(*armapimanagement.ServiceResource)
return c.Tags == nil || len(c.Tags) == 0, ""
return len(c.Tags) == 0, ""
},
Url: "https://learn.microsoft.com/en-us/azure/azure-resource-manager/management/tag-resources?tabs=json",
},
Expand Down
2 changes: 1 addition & 1 deletion internal/scanners/appcs/rules.go
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ func (a *AppConfigurationScanner) GetRules() map[string]scanners.AzureRule {
Severity: scanners.SeverityLow,
Eval: func(target interface{}, scanContext *scanners.ScanContext) (bool, string) {
c := target.(*armappconfiguration.ConfigurationStore)
return c.Tags == nil || len(c.Tags) == 0, ""
return len(c.Tags) == 0, ""
},
Url: "https://learn.microsoft.com/en-us/azure/azure-resource-manager/management/tag-resources?tabs=json",
},
Expand Down
2 changes: 1 addition & 1 deletion internal/scanners/appi/rules.go
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ func (a *AppInsightsScanner) GetRules() map[string]scanners.AzureRule {
Severity: scanners.SeverityLow,
Eval: func(target interface{}, scanContext *scanners.ScanContext) (bool, string) {
c := target.(*armapplicationinsights.Component)
return c.Tags == nil || len(c.Tags) == 0, ""
return len(c.Tags) == 0, ""
},
Url: "https://learn.microsoft.com/en-us/azure/azure-resource-manager/management/tag-resources?tabs=json",
},
Expand Down
2 changes: 1 addition & 1 deletion internal/scanners/cae/rules.go
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ func (a *ContainerAppsScanner) GetRules() map[string]scanners.AzureRule {
Severity: scanners.SeverityLow,
Eval: func(target interface{}, scanContext *scanners.ScanContext) (bool, string) {
c := target.(*armappcontainers.ManagedEnvironment)
return c.Tags == nil || len(c.Tags) == 0, ""
return len(c.Tags) == 0, ""
},
Url: "https://learn.microsoft.com/en-us/azure/azure-resource-manager/management/tag-resources?tabs=json",
},
Expand Down
2 changes: 1 addition & 1 deletion internal/scanners/ci/rules.go
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ func (a *ContainerInstanceScanner) GetRules() map[string]scanners.AzureRule {
Severity: scanners.SeverityLow,
Eval: func(target interface{}, scanContext *scanners.ScanContext) (bool, string) {
c := target.(*armcontainerinstance.ContainerGroup)
return c.Tags == nil || len(c.Tags) == 0, ""
return len(c.Tags) == 0, ""
},
Url: "https://learn.microsoft.com/en-us/azure/azure-resource-manager/management/tag-resources?tabs=json",
},
Expand Down
2 changes: 1 addition & 1 deletion internal/scanners/cog/rules.go
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ func (a *CognitiveScanner) GetRules() map[string]scanners.AzureRule {
Severity: scanners.SeverityLow,
Eval: func(target interface{}, scanContext *scanners.ScanContext) (bool, string) {
c := target.(*armcognitiveservices.Account)
return c.Tags == nil || len(c.Tags) == 0, ""
return len(c.Tags) == 0, ""
},
Url: "https://learn.microsoft.com/en-us/azure/azure-resource-manager/management/tag-resources?tabs=json",
},
Expand Down
2 changes: 1 addition & 1 deletion internal/scanners/cosmos/rules.go
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ func (a *CosmosDBScanner) GetRules() map[string]scanners.AzureRule {
Severity: scanners.SeverityLow,
Eval: func(target interface{}, scanContext *scanners.ScanContext) (bool, string) {
c := target.(*armcosmos.DatabaseAccountGetResults)
return c.Tags == nil || len(c.Tags) == 0, ""
return len(c.Tags) == 0, ""
},
Url: "https://learn.microsoft.com/en-us/azure/azure-resource-manager/management/tag-resources?tabs=json",
},
Expand Down
2 changes: 1 addition & 1 deletion internal/scanners/cr/rules.go
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ func (a *ContainerRegistryScanner) GetRules() map[string]scanners.AzureRule {
Severity: scanners.SeverityLow,
Eval: func(target interface{}, scanContext *scanners.ScanContext) (bool, string) {
c := target.(*armcontainerregistry.Registry)
return c.Tags == nil || len(c.Tags) == 0, ""
return len(c.Tags) == 0, ""
},
Url: "https://learn.microsoft.com/en-us/azure/azure-resource-manager/management/tag-resources?tabs=json",
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.

package adx
package dec

import (
"github.com/Azure/azqr/internal/scanners"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.

package adx
package dec

import (
"strings"
Expand All @@ -14,7 +14,7 @@ import (
func (a *DataExplorerScanner) GetRules() map[string]scanners.AzureRule {
return map[string]scanners.AzureRule{
"DiagnosticSettings": {
Id: "adx-001",
Id: "dec-001",
Category: scanners.RulesCategoryReliability,
Subcategory: scanners.RulesSubcategoryReliabilityDiagnosticLogs,
Description: "Azure Data Explorer should have diagnostic settings enabled",
Expand All @@ -27,7 +27,7 @@ func (a *DataExplorerScanner) GetRules() map[string]scanners.AzureRule {
Url: "https://learn.microsoft.com/en-us/azure/data-explorer/using-diagnostic-logs",
},
"SLA": {
Id: "adx-002",
Id: "dec-002",
Category: scanners.RulesCategoryReliability,
Subcategory: scanners.RulesSubcategoryReliabilitySLA,
Description: "Azure Data Explorer SLA",
Expand All @@ -38,7 +38,7 @@ func (a *DataExplorerScanner) GetRules() map[string]scanners.AzureRule {
Url: "https://www.microsoft.com/licensing/docs/view/Service-Level-Agreements-SLA-for-Online-Services",
},
"SKU": {
Id: "adx-003",
Id: "dec-003",
Category: scanners.RulesCategoryReliability,
Subcategory: scanners.RulesSubcategoryReliabilitySKU,
Description: "Azure Data Explorer SKU",
Expand All @@ -50,7 +50,7 @@ func (a *DataExplorerScanner) GetRules() map[string]scanners.AzureRule {
Url: "https://learn.microsoft.com/en-us/azure/data-explorer/manage-cluster-choose-sku",
},
"CAF": {
Id: "adx-004",
Id: "dec-004",
Category: scanners.RulesCategoryOperationalExcellence,
Subcategory: scanners.RulesSubcategoryOperationalExcellenceCAF,
Description: "Azure Data Explorer Name should comply with naming conventions",
Expand All @@ -62,8 +62,8 @@ func (a *DataExplorerScanner) GetRules() map[string]scanners.AzureRule {
},
Url: "https://learn.microsoft.com/en-us/azure/cloud-adoption-framework/ready/azure-best-practices/resource-abbreviations",
},
"adx-007": {
Id: "adx-005",
"dec-007": {
Id: "dec-005",
Category: scanners.RulesCategoryOperationalExcellence,
Subcategory: scanners.RulesSubcategoryOperationalExcellenceTags,
Description: "Azure Data Explorer should have tags",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.

package adx
package dec

import (
"reflect"
Expand Down
2 changes: 1 addition & 1 deletion internal/scanners/evgd/rules.go
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ func (a *EventGridScanner) GetRules() map[string]scanners.AzureRule {
Severity: scanners.SeverityLow,
Eval: func(target interface{}, scanContext *scanners.ScanContext) (bool, string) {
c := target.(*armeventgrid.Domain)
return c.Tags == nil || len(c.Tags) == 0, ""
return len(c.Tags) == 0, ""
},
Url: "https://learn.microsoft.com/en-us/azure/azure-resource-manager/management/tag-resources?tabs=json",
},
Expand Down
2 changes: 1 addition & 1 deletion internal/scanners/evh/rules.go
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ func (a *EventHubScanner) GetRules() map[string]scanners.AzureRule {
Severity: scanners.SeverityLow,
Eval: func(target interface{}, scanContext *scanners.ScanContext) (bool, string) {
c := target.(*armeventhub.EHNamespace)
return c.Tags == nil || len(c.Tags) == 0, ""
return len(c.Tags) == 0, ""
},
Url: "https://learn.microsoft.com/en-us/azure/azure-resource-manager/management/tag-resources?tabs=json",
},
Expand Down
2 changes: 1 addition & 1 deletion internal/scanners/kv/rules.go
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ func (a *KeyVaultScanner) GetRules() map[string]scanners.AzureRule {
Severity: scanners.SeverityLow,
Eval: func(target interface{}, scanContext *scanners.ScanContext) (bool, string) {
c := target.(*armkeyvault.Vault)
return c.Tags == nil || len(c.Tags) == 0, ""
return len(c.Tags) == 0, ""
},
Url: "https://learn.microsoft.com/en-us/azure/azure-resource-manager/management/tag-resources?tabs=json",
},
Expand Down
2 changes: 1 addition & 1 deletion internal/scanners/lb/rules.go
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ func (a *LoadBalancerScanner) GetRules() map[string]scanners.AzureRule {
Severity: scanners.SeverityLow,
Eval: func(target interface{}, scanContext *scanners.ScanContext) (bool, string) {
c := target.(*armnetwork.LoadBalancer)
return c.Tags == nil || len(c.Tags) == 0, ""
return len(c.Tags) == 0, ""
},
Url: "https://learn.microsoft.com/en-us/azure/azure-resource-manager/management/tag-resources?tabs=json",
},
Expand Down
4 changes: 2 additions & 2 deletions internal/scanners/mysql/rules.go
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ func (a *MySQLScanner) GetRules() map[string]scanners.AzureRule {
Severity: scanners.SeverityLow,
Eval: func(target interface{}, scanContext *scanners.ScanContext) (bool, string) {
c := target.(*armmysql.Server)
return c.Tags == nil || len(c.Tags) == 0, ""
return len(c.Tags) == 0, ""
},
Url: "https://learn.microsoft.com/en-us/azure/azure-resource-manager/management/tag-resources?tabs=json",
},
Expand Down Expand Up @@ -197,7 +197,7 @@ func (a *MySQLFlexibleScanner) GetRules() map[string]scanners.AzureRule {
Severity: scanners.SeverityLow,
Eval: func(target interface{}, scanContext *scanners.ScanContext) (bool, string) {
c := target.(*armmysqlflexibleservers.Server)
return c.Tags == nil || len(c.Tags) == 0, ""
return len(c.Tags) == 0, ""
},
Url: "https://learn.microsoft.com/en-us/azure/azure-resource-manager/management/tag-resources?tabs=json",
},
Expand Down
6 changes: 3 additions & 3 deletions internal/scanners/plan/rules.go
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ func (a *AppServiceScanner) GetRules() map[string]scanners.AzureRule {
Severity: scanners.SeverityLow,
Eval: func(target interface{}, scanContext *scanners.ScanContext) (bool, string) {
c := target.(*armappservice.Plan)
return c.Tags == nil || len(c.Tags) == 0, ""
return len(c.Tags) == 0, ""
},
Url: "https://learn.microsoft.com/en-us/azure/azure-resource-manager/management/tag-resources?tabs=json",
},
Expand Down Expand Up @@ -158,7 +158,7 @@ func (a *AppServiceScanner) GetAppRules() map[string]scanners.AzureRule {
Severity: scanners.SeverityLow,
Eval: func(target interface{}, scanContext *scanners.ScanContext) (bool, string) {
c := target.(*armappservice.Site)
return c.Tags == nil || len(c.Tags) == 0, ""
return len(c.Tags) == 0, ""
},
Url: "https://learn.microsoft.com/en-us/azure/azure-resource-manager/management/tag-resources?tabs=json",
},
Expand Down Expand Up @@ -228,7 +228,7 @@ func (a *AppServiceScanner) GetFunctionRules() map[string]scanners.AzureRule {
Severity: scanners.SeverityLow,
Eval: func(target interface{}, scanContext *scanners.ScanContext) (bool, string) {
c := target.(*armappservice.Site)
return c.Tags == nil || len(c.Tags) == 0, ""
return len(c.Tags) == 0, ""
},
Url: "https://learn.microsoft.com/en-us/azure/azure-resource-manager/management/tag-resources?tabs=json",
},
Expand Down
4 changes: 2 additions & 2 deletions internal/scanners/psql/rules.go
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ func (a *PostgreScanner) GetRules() map[string]scanners.AzureRule {
Severity: scanners.SeverityLow,
Eval: func(target interface{}, scanContext *scanners.ScanContext) (bool, string) {
c := target.(*armpostgresql.Server)
return c.Tags == nil || len(c.Tags) == 0, ""
return len(c.Tags) == 0, ""
},
Url: "https://learn.microsoft.com/en-us/azure/azure-resource-manager/management/tag-resources?tabs=json",
},
Expand Down Expand Up @@ -211,7 +211,7 @@ func (a *PostgreFlexibleScanner) GetRules() map[string]scanners.AzureRule {
Severity: scanners.SeverityLow,
Eval: func(target interface{}, scanContext *scanners.ScanContext) (bool, string) {
c := target.(*armpostgresqlflexibleservers.Server)
return c.Tags == nil || len(c.Tags) == 0, ""
return len(c.Tags) == 0, ""
},
Url: "https://learn.microsoft.com/en-us/azure/azure-resource-manager/management/tag-resources?tabs=json",
},
Expand Down
2 changes: 1 addition & 1 deletion internal/scanners/redis/rules.go
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ func (a *RedisScanner) GetRules() map[string]scanners.AzureRule {
Severity: scanners.SeverityLow,
Eval: func(target interface{}, scanContext *scanners.ScanContext) (bool, string) {
c := target.(*armredis.ResourceInfo)
return c.Tags == nil || len(c.Tags) == 0, ""
return len(c.Tags) == 0, ""
},
Url: "https://learn.microsoft.com/en-us/azure/azure-resource-manager/management/tag-resources?tabs=json",
},
Expand Down
2 changes: 1 addition & 1 deletion internal/scanners/sb/rules.go
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ func (a *ServiceBusScanner) GetRules() map[string]scanners.AzureRule {
Severity: scanners.SeverityLow,
Eval: func(target interface{}, scanContext *scanners.ScanContext) (bool, string) {
c := target.(*armservicebus.SBNamespace)
return c.Tags == nil || len(c.Tags) == 0, ""
return len(c.Tags) == 0, ""
},
Url: "https://learn.microsoft.com/en-us/azure/azure-resource-manager/management/tag-resources?tabs=json",
},
Expand Down
2 changes: 1 addition & 1 deletion internal/scanners/sigr/rules.go
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ func (a *SignalRScanner) GetRules() map[string]scanners.AzureRule {
Severity: scanners.SeverityLow,
Eval: func(target interface{}, scanContext *scanners.ScanContext) (bool, string) {
c := target.(*armsignalr.ResourceInfo)
return c.Tags == nil || len(c.Tags) == 0, ""
return len(c.Tags) == 0, ""
},
Url: "https://learn.microsoft.com/en-us/azure/azure-resource-manager/management/tag-resources?tabs=json",
},
Expand Down
Loading

0 comments on commit 5f86972

Please sign in to comment.