Merge pull request #48 from lassehastrup/users/lha/addedSecuritySetti…

…ngsRuleSet Updated ruleSet to include security settings for 'SubscriptionNotRegistered'
JulianHayward · Nov 1, 2024 · 16d0c1c · 16d0c1c
2 parents 6826d07 + ce9e76e
commit 16d0c1c
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 6 deletions.
diff --git a/pwsh/module/build/AzAPICall.zip b/pwsh/module/build/AzAPICall.zip
diff --git a/pwsh/module/build/AzAPICall/AzAPICall.psd1 b/pwsh/module/build/AzAPICall/AzAPICall.psd1
@@ -12,7 +12,7 @@
     RootModule        = 'AzAPICall.psm1'
 
     # Version number of this module.
-    ModuleVersion     = '1.2.3'
+    ModuleVersion     = '1.2.4'
 
     # Supported PSEditions
     # CompatiblePSEditions = @()

diff --git a/pwsh/module/build/AzAPICall/functions/AzAPICallFunctions.ps1 b/pwsh/module/build/AzAPICall/functions/AzAPICallFunctions.ps1
@@ -721,6 +721,7 @@ function AzAPICallErrorHandler {
         { $_ -like "$($AzApiCallConfiguration['azAPIEndpointUrls'].ARM)/subscriptions/*/providers/Microsoft.Security/pricings*" } { $getARMMDfC = $true }
         { $_ -like "$($AzApiCallConfiguration['azAPIEndpointUrls'].ARM)/subscriptions/*/providers/Microsoft.Security/securescores*" } { $getARMMdFC = $true }
         { $_ -like "$($AzApiCallConfiguration['azAPIEndpointUrls'].ARM)/subscriptions/*/providers/Microsoft.Security/securityContacts*" } { $getARMMdFCSecurityContacts = $true }
+        { $_ -like "$($AzApiCallConfiguration['azAPIEndpointUrls'].ARM)/subscriptions/*/providers/Microsoft.Security/settings*" } { $getARMMdFCSecuritySettings = $true }
         { $_ -like "$($AzApiCallConfiguration['azAPIEndpointUrls'].ARM)*/federatedIdentityCredentials*" } { $getARMManagedIdentityUserAssignedFederatedIdentityCredentials = $true }
         #MicrosoftGraph
         { $_ -like "$($AzApiCallConfiguration['azAPIEndpointUrls'].MicrosoftGraph)/v1.0/applications*" } { $getMicrosoftGraphApplication = $true }
@@ -1341,7 +1342,7 @@ function AzAPICallErrorHandler {
         }
     }
 
-    elseif (($getARMMDfC -or $getARMMdFCSecurityContacts) -and $catchResult.error.code -eq 'Subscription Not Registered') {
+    elseif (($getARMMDfC -or $getARMMdFCSecurityContacts -or $getARMMdFCSecuritySettings) -and $catchResult.error.code -eq 'Subscription Not Registered') {
         Logging -preventWriteOutput $true -logMessage "$defaultErrorInfo - AzAPICall: skipping Subscription - return 'SubscriptionNotRegistered'"
         $response = @{
             action    = 'return' #break or return or returnCollection
@@ -1723,7 +1724,7 @@ function getAzAPICallFunctions {
 function getAzAPICallRuleSet {
     return $function:AzAPICallErrorHandler.ToString()
 }
-function getAzAPICallVersion { return '1.2.3' }
+function getAzAPICallVersion { return '1.2.4' }
 
 function getJWTDetails {
     <#

diff --git a/pwsh/module/dev/AzAPICall/AzAPICall.psd1 b/pwsh/module/dev/AzAPICall/AzAPICall.psd1
@@ -12,7 +12,7 @@
     RootModule        = 'AzAPICall.psm1'
 
     # Version number of this module.
-    ModuleVersion     = '1.2.3'
+    ModuleVersion     = '1.2.4'
 
     # Supported PSEditions
     # CompatiblePSEditions = @()

diff --git a/pwsh/module/dev/AzAPICall/functions/AzAPICallRuleSet.ps1 b/pwsh/module/dev/AzAPICall/functions/AzAPICallRuleSet.ps1
@@ -15,6 +15,7 @@ function AzAPICallErrorHandler {
         { $_ -like "$($AzApiCallConfiguration['azAPIEndpointUrls'].ARM)/subscriptions/*/providers/Microsoft.Security/pricings*" } { $getARMMDfC = $true }
         { $_ -like "$($AzApiCallConfiguration['azAPIEndpointUrls'].ARM)/subscriptions/*/providers/Microsoft.Security/securescores*" } { $getARMMdFC = $true }
         { $_ -like "$($AzApiCallConfiguration['azAPIEndpointUrls'].ARM)/subscriptions/*/providers/Microsoft.Security/securityContacts*" } { $getARMMdFCSecurityContacts = $true }
+        { $_ -like "$($AzApiCallConfiguration['azAPIEndpointUrls'].ARM)/subscriptions/*/providers/Microsoft.Security/settings*" } { $getARMMdFCSecuritySettings = $true }
         { $_ -like "$($AzApiCallConfiguration['azAPIEndpointUrls'].ARM)*/federatedIdentityCredentials*" } { $getARMManagedIdentityUserAssignedFederatedIdentityCredentials = $true }
         #MicrosoftGraph
         { $_ -like "$($AzApiCallConfiguration['azAPIEndpointUrls'].MicrosoftGraph)/v1.0/applications*" } { $getMicrosoftGraphApplication = $true }
@@ -635,7 +636,7 @@ function AzAPICallErrorHandler {
         }
     }
 
-    elseif (($getARMMDfC -or $getARMMdFCSecurityContacts) -and $catchResult.error.code -eq 'Subscription Not Registered') {
+    elseif (($getARMMDfC -or $getARMMdFCSecurityContacts -or $getARMMdFCSecuritySettings) -and $catchResult.error.code -eq 'Subscription Not Registered') {
         Logging -preventWriteOutput $true -logMessage "$defaultErrorInfo - AzAPICall: skipping Subscription - return 'SubscriptionNotRegistered'"
         $response = @{
             action    = 'return' #break or return or returnCollection

diff --git a/pwsh/module/dev/AzAPICall/functions/getAzAPICallVersion.ps1 b/pwsh/module/dev/AzAPICall/functions/getAzAPICallVersion.ps1
@@ -1 +1 @@
-function getAzAPICallVersion { return '1.2.3' }
+function getAzAPICallVersion { return '1.2.4' }
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		function getAzAPICallVersion { return '1.2.3' }
		function getAzAPICallVersion { return '1.2.4' }