Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed #152 #155

Merged
merged 1 commit into from
Oct 9, 2023
Merged

Fixed #152 #155

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions cmd/azqr/scan.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ func init() {
scanCmd.PersistentFlags().BoolP("defender", "d", true, "Scan Defender Status")
scanCmd.PersistentFlags().BoolP("advisor", "a", true, "Scan Azure Advisor Recommendations")
scanCmd.PersistentFlags().BoolP("costs", "c", false, "Scan Azure Costs")
scanCmd.PersistentFlags().StringP("output-prefix", "o", "azqr_report", "Output file prefix")
scanCmd.PersistentFlags().StringP("output-name", "o", "", "Output file name")
scanCmd.PersistentFlags().BoolP("mask", "m", true, "Mask the subscription id in the report")
scanCmd.PersistentFlags().BoolP("debug", "", false, "Set log level to debug")

Expand Down Expand Up @@ -114,7 +114,7 @@ var scanCmd = &cobra.Command{
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")
outputFileName, _ := cmd.Flags().GetString("output-name")
defender, _ := cmd.Flags().GetBool("defender")
advisor, _ := cmd.Flags().GetBool("advisor")
cost, _ := cmd.Flags().GetBool("costs")
Expand All @@ -132,12 +132,15 @@ func scan(cmd *cobra.Command, serviceScanners []scanners.IAzureScanner) {
log.Fatal().Msg("Resource Group name can only be used with a Subscription Id")
}

current_time := time.Now()
outputFileStamp := fmt.Sprintf("%d_%02d_%02d_T%02d%02d%02d",
current_time.Year(), current_time.Month(), current_time.Day(),
current_time.Hour(), current_time.Minute(), current_time.Second())
outputFile := outputFileName
if outputFile == "" {
current_time := time.Now()
outputFileStamp := fmt.Sprintf("%d_%02d_%02d_T%02d%02d%02d",
current_time.Year(), current_time.Month(), current_time.Day(),
current_time.Hour(), current_time.Minute(), current_time.Second())

outputFile := fmt.Sprintf("%s_%s", outputFilePrefix, outputFileStamp)
outputFile = fmt.Sprintf("%s_%s", "azqr_report", outputFileStamp)
}

cred, err := azidentity.NewDefaultAzureCredential(nil)
if err != nil {
Expand Down
Loading