added flags for defender and advisor

Azure · Mar 27, 2023 · 1299c89 · 1299c89
1 parent 981c8fd
commit 1299c89
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 21 deletions.
diff --git a/cmd/azqr/root.go b/cmd/azqr/root.go
@@ -40,6 +40,8 @@ const (
 func init() {
 	rootCmd.PersistentFlags().StringP("subscription-id", "s", "", "Azure Subscription Id")
 	rootCmd.PersistentFlags().StringP("resource-group", "g", "", "Azure Resource Group (Use with --subscription-id)")
+	rootCmd.PersistentFlags().BoolP("defender", "d", true, "Scan Defender Status")
+	rootCmd.PersistentFlags().BoolP("advisor", "a", true, "Scan Azure Advisor Recommendations")
 	rootCmd.PersistentFlags().StringP("output-prefix", "o", "azqr_report", "Output file prefix")
 	rootCmd.PersistentFlags().BoolP("mask", "m", true, "Mask the subscription id in the report")
 	rootCmd.PersistentFlags().IntP("concurrency", "p", defaultConcurrency, fmt.Sprintf("Parallel processes. Default to %d. A < 0 value will use the maxmimum concurrency.", defaultConcurrency))

diff --git a/cmd/azqr/scan.go b/cmd/azqr/scan.go
@@ -20,6 +20,8 @@ func scan(cmd *cobra.Command, serviceScanners []scanners.IAzureScanner) {
 	subscriptionID, _ := cmd.Flags().GetString("subscription-id")
 	resourceGroupName, _ := cmd.Flags().GetString("resource-group")
 	outputFilePrefix, _ := cmd.Flags().GetString("output-prefix")
+	defender, _ := cmd.Flags().GetBool("defender")
+	advisor, _ := cmd.Flags().GetBool("advisor")
 	mask, _ := cmd.Flags().GetBool("mask")
 	concurrency, _ := cmd.Flags().GetInt("concurrency")
 
@@ -53,9 +55,9 @@ func scan(cmd *cobra.Command, serviceScanners []scanners.IAzureScanner) {
 		}
 	}
 
-	var all []scanners.AzureServiceResult
+	var ruleResults []scanners.AzureServiceResult
 	var defenderResults []scanners.DefenderResult
-	var scannerResults []scanners.AdvisorResult
+	var advisorResults []scanners.AdvisorResult
 
 	ctx, cancel := context.WithCancel(ctx)
 	defer cancel()
@@ -127,38 +129,42 @@ func scan(cmd *cobra.Command, serviceScanners []scanners.IAzureScanner) {
 				cancel()
 				log.Fatal(err)
 			}
-			all = append(all, *res...)
+			ruleResults = append(ruleResults, *res...)
 		}
 
-		err = defenderScanner.Init(config)
-		if err != nil {
-			log.Fatal(err)
-		}
+		if defender {
+			err = defenderScanner.Init(config)
+			if err != nil {
+				log.Fatal(err)
+			}
 
-		res, err := defenderScanner.ListConfiguration()
-		if err != nil {
-			log.Fatal(err)
+			res, err := defenderScanner.ListConfiguration()
+			if err != nil {
+				log.Fatal(err)
+			}
+			defenderResults = append(defenderResults, res...)
 		}
-		defenderResults = append(defenderResults, res...)
 
-		err = advisorScanner.Init(config)
-		if err != nil {
-			log.Fatal(err)
-		}
+		if advisor {
+			err = advisorScanner.Init(config)
+			if err != nil {
+				log.Fatal(err)
+			}
 
-		rec, err := advisorScanner.ListRecommendations()
-		if err != nil {
-			log.Fatal(err)
+			rec, err := advisorScanner.ListRecommendations()
+			if err != nil {
+				log.Fatal(err)
+			}
+			advisorResults = append(advisorResults, rec...)
 		}
-		scannerResults = append(scannerResults, rec...)
 	}
 
 	reportData := renderers.ReportData{
 		OutputFileName: outputFile,
 		Mask:           mask,
-		MainData:       all,
+		MainData:       ruleResults,
 		DefenderData:   defenderResults,
-		AdvisorData:    scannerResults,
+		AdvisorData:    advisorResults,
 	}
 
 	renderers.CreateExcelReport(reportData)