From 25c75e75df5d6cd2bbe605ffce7f7bc1cfbd4f46 Mon Sep 17 00:00:00 2001 From: Adamvg Date: Thu, 7 Sep 2023 13:59:57 +0100 Subject: [PATCH 1/4] fix: remove properties not used by graph --- .../MSFT_AADNamedLocationPolicy.psm1 | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADNamedLocationPolicy/MSFT_AADNamedLocationPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADNamedLocationPolicy/MSFT_AADNamedLocationPolicy.psm1 index b09ad605c4..a1b1ccd7c9 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADNamedLocationPolicy/MSFT_AADNamedLocationPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADNamedLocationPolicy/MSFT_AADNamedLocationPolicy.psm1 @@ -248,7 +248,6 @@ function Set-TargetResource $desiredValues = @{ '@odata.type' = $OdataType displayName = $DisplayName - isTrusted = $IsTrusted } if ($OdataType -eq '#microsoft.graph.ipNamedLocation') { @@ -274,7 +273,6 @@ function Set-TargetResource { $desiredValues.Add('includeUnknownCountriesAndRegions', $IncludeUnknownCountriesAndRegions) $desiredValues.Add('countriesAndRegions', $CountriesAndRegions) - $desiredValues.Add('countryLookupMethod', $CountryLookupMethod) } # Named Location should exist but it doesn't @@ -291,8 +289,7 @@ function Set-TargetResource } # Named Location should exist and will be configured to desired state elseif ($Ensure -eq 'Present' -and $CurrentAADNamedLocation.Ensure -eq 'Present') - { - $desiredValues.Add('NamedLocationId', $currentAADNamedLocation.Id) | Out-Null + { $VerboseAttributes = ($desiredValues | Out-String) Write-Verbose -Message "Updating existing AAD Named Location {$Displayname)} with attributes: $VerboseAttributes" From 7fc3131f2167c11b9482c6d756eacfbae4041df3 Mon Sep 17 00:00:00 2001 From: Adamvg Date: Thu, 7 Sep 2023 14:14:09 +0100 Subject: [PATCH 2/4] tidy: schema and property fixes --- .../MSFT_AADNamedLocationPolicy.psm1 | 2 ++ .../MSFT_AADNamedLocationPolicy.schema.mof | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADNamedLocationPolicy/MSFT_AADNamedLocationPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADNamedLocationPolicy/MSFT_AADNamedLocationPolicy.psm1 index a1b1ccd7c9..ea4b65c647 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADNamedLocationPolicy/MSFT_AADNamedLocationPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADNamedLocationPolicy/MSFT_AADNamedLocationPolicy.psm1 @@ -251,6 +251,7 @@ function Set-TargetResource } if ($OdataType -eq '#microsoft.graph.ipNamedLocation') { + $desiredValues.Add('isTrusted', $IsTrusted) $IpRangesValue = @() foreach ($IpRange in $IpRanges) { @@ -273,6 +274,7 @@ function Set-TargetResource { $desiredValues.Add('includeUnknownCountriesAndRegions', $IncludeUnknownCountriesAndRegions) $desiredValues.Add('countriesAndRegions', $CountriesAndRegions) + $desiredValues.Add('countryLookupMethod', $CountryLookupMethod) } # Named Location should exist but it doesn't diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADNamedLocationPolicy/MSFT_AADNamedLocationPolicy.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_AADNamedLocationPolicy/MSFT_AADNamedLocationPolicy.schema.mof index 529ceee96e..285218272e 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADNamedLocationPolicy/MSFT_AADNamedLocationPolicy.schema.mof +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADNamedLocationPolicy/MSFT_AADNamedLocationPolicy.schema.mof @@ -5,7 +5,7 @@ class MSFT_AADNamedLocationPolicy : OMI_BaseResource [Write, Description("Specifies the ID of a Named Location in Azure Active Directory.")] String Id; [Key, Description("Specifies the Display Name of a Named Location in Azure Active Directory")] string DisplayName; [Write, Description("Specifies the IP ranges of the Named Location in Azure Active Directory")] String IpRanges[]; - [Write, Description("Specifies the isTrusted value for the Named Location in Azure Active Directory")] Boolean IsTrusted; + [Write, Description("Specifies the isTrusted value for the Named Location (IP ranges only) in Azure Active Directory")] Boolean IsTrusted; [Write, Description("Specifies the countries and regions for the Named Location in Azure Active Directory")] String CountriesAndRegions[]; [Write, Description("Determines what method is used to decide which country the user is located in. Possible values are clientIpAddress(default) and authenticatorAppGps."), ValueMap{"clientIpAddress","authenticatorAppGps"}, Values{"clientIpAddress","authenticatorAppGps"}] String CountryLookupMethod; [Write, Description("Specifies the includeUnknownCountriesAndRegions value for the Named Location in Azure Active Directory")] Boolean IncludeUnknownCountriesAndRegions; From d32d82ed386c3e1d47072d5cd412f35c4afbad07 Mon Sep 17 00:00:00 2001 From: Adamvg Date: Thu, 7 Sep 2023 14:20:19 +0100 Subject: [PATCH 3/4] fix: add default CountryLookupMethod --- .../MSFT_AADNamedLocationPolicy.psm1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADNamedLocationPolicy/MSFT_AADNamedLocationPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADNamedLocationPolicy/MSFT_AADNamedLocationPolicy.psm1 index ea4b65c647..db7ec61077 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADNamedLocationPolicy/MSFT_AADNamedLocationPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADNamedLocationPolicy/MSFT_AADNamedLocationPolicy.psm1 @@ -193,7 +193,7 @@ function Set-TargetResource [Parameter()] [System.String] [ValidateSet('clientIpAddress','authenticatorAppGps')] - $CountryLookupMethod, + $CountryLookupMethod = 'clientIpAddress', [Parameter()] [System.Boolean] From 733ee7c2e7fb9ac3d9a461c1cacf7d29c250748e Mon Sep 17 00:00:00 2001 From: Adamvg Date: Thu, 7 Sep 2023 14:22:27 +0100 Subject: [PATCH 4/4] tidy: add changelog --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9afd72d5ee..d1416aa1b0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Change log for Microsoft365DSC +# UNRELEASED +* AADNamedLocationPolicy + * Set default value for CountryLookupMethod and removed unwanted properties + FIXES [#3656](https://github.com/microsoft/Microsoft365DSC/issues/3656) + # 1.23.906.1 * AADAuthenticationMethodPolicyAuthenticator