Merge pull request #901 from azsk/users/ritika-msft/BugFixes

Generate pdf fix for express route and GCS
azsk · Jan 16, 2020 · 0db027a · 0db027a
2 parents 7f5fa35 + cd16b8f
commit 0db027a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/src/AzSK.Framework/Abstracts/CommandBase.ps1 b/src/AzSK.Framework/Abstracts/CommandBase.ps1
@@ -156,8 +156,9 @@ else {
         $GeneratePDFReport = $this.InvocationContext.BoundParameters["GeneratePDF"];
         try {
             if (-not [string]::IsNullOrEmpty($folderpath)) {
+
                 switch ($GeneratePDFReport) {
-                    None {
+					None {
                         # Do nothing
                     }
                     Landscape {

diff --git a/src/AzSK.Framework/Models/Enums.ps1 b/src/AzSK.Framework/Models/Enums.ps1
@@ -92,6 +92,7 @@ enum MonitoringSolutionInstallationOption
 
 enum GeneratePDF
 {
+	None
 	Landscape
 	Portrait
 }

diff --git a/src/AzSK/SVT/SVT.ps1 b/src/AzSK/SVT/SVT.ps1
@@ -161,10 +161,9 @@ function Get-AzSKAzureServicesSecurityStatus
 		$DoNotOpenOutputFolder,
 
 		[GeneratePDF]
-		[ValidateSet("Landscape", "portrait")]
         [Parameter(Mandatory = $false)]
 		[Alias("gpdf","pdf")]
-		$GeneratePDF = [GeneratePDF]::portrait,
+		$GeneratePDF = [GeneratePDF]::None,
 
 		[switch]
 		[Parameter(Mandatory = $false)]
@@ -380,10 +379,9 @@ function Get-AzSKSubscriptionSecurityStatus
 		$DoNotOpenOutputFolder,
 
 		[GeneratePDF]
-		[ValidateSet("Landscape", "portrait")]
         [Parameter(Mandatory = $false)]
 		[Alias("gpdf","pdf")]
-		$GeneratePDF = [GeneratePDF]::portrait,
+		$GeneratePDF = [GeneratePDF]::None,
 
 		[switch]
 		[Parameter(Mandatory = $false)]
@@ -551,6 +549,7 @@ function Get-AzSKExpressRouteNetworkSecurityStatus
         [Parameter(Mandatory = $false, HelpMessage = "Enables users to generate PDF file for reports.")]
 		[Alias("gpdf","pdf")]
 		$GeneratePDF  = [GeneratePDF]::None,
+
 
 		[switch]
         [Parameter(Mandatory = $false, HelpMessage = "Switch to specify whether to generate script to fix the control or not.")]
@@ -588,9 +587,10 @@ function Get-AzSKExpressRouteNetworkSecurityStatus
 
 		}
 	}
-
+	
 	Get-AzSKAzureServicesSecurityStatus -SubscriptionId $SubscriptionId -ResourceGroupNames $erResourceGroups -ResourceName $ResourceName `
 			-ResourceTypeName ([SVTMapping]::ERvNetTypeName) -ControlIds $ControlIds -FilterTags $FilterTags -ExcludeTags $ExcludeTags -DoNotOpenOutputFolder:$DoNotOpenOutputFolder -AttestControls $ControlsToAttest -GeneratePDF $GeneratePDF -GenerateFixScript:$GenerateFixScript -ExcludeControlIds $ExcludeControlIds
+
 }
 
 function Get-AzSKControlsStatus
@@ -750,6 +750,7 @@ function Get-AzSKControlsStatus
 		[Alias("gpdf","pdf")]
 		$GeneratePDF  = [GeneratePDF]::None,
 
+
 		[switch]
 		[Parameter(Mandatory = $false)]
 		[Alias("ubc")]
-Original file line number
+Diff line change
@@ Expand Up / @@ -92,6 +92,7 @@ enum MonitoringSolutionInstallationOption @@
     enum GeneratePDF
     {
+    	None
     	Landscape
     	Portrait
     }
@@ Expand Down @@