Skip to content

Commit

Permalink
Merge branch 'Dev' into fix/csv-report
Browse files Browse the repository at this point in the history
  • Loading branch information
Fabien Tschanz committed Jan 16, 2025
2 parents eddf36a + 90942ce commit 45fc59a
Show file tree
Hide file tree
Showing 5 changed files with 85 additions and 1 deletion.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

# UNRELEASED

* FabricAdminTenantSettings
* Added support for the AllowGetOneLakeUDK, AllowMountDfCreation, AllowOneLakeUDK,
ArtifactOrgAppPreview properties.
* Fix values that have a zero length whitespace character.
* M365DSCReport
* Fix missing delimiter when called without the parameter.
FIXES [#5634](https://github.com/microsoft/Microsoft365DSC/issues/5634)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,10 @@ function Get-TargetResource
[Microsoft.Management.Infrastructure.CimInstance]
$AllowFreeTrial,

[Parameter()]
[Microsoft.Management.Infrastructure.CimInstance]
$AllowGetOneLakeUDK,

[Parameter()]
[Microsoft.Management.Infrastructure.CimInstance]
$AllowGuestLookup,
Expand All @@ -69,6 +73,14 @@ function Get-TargetResource
[Microsoft.Management.Infrastructure.CimInstance]
$AllowGuestUserToAccessSharedContent,

[Parameter()]
[Microsoft.Management.Infrastructure.CimInstance]
$AllowMountDfCreation,

[Parameter()]
[Microsoft.Management.Infrastructure.CimInstance]
$AllowOneLakeUDK,

[Parameter()]
[Microsoft.Management.Infrastructure.CimInstance]
$AllowPowerBIASDQOnTenant,
Expand All @@ -93,6 +105,10 @@ function Get-TargetResource
[Microsoft.Management.Infrastructure.CimInstance]
$AppPush,

[Parameter()]
[Microsoft.Management.Infrastructure.CimInstance]
$ArtifactOrgAppPreview,

[Parameter()]
[Microsoft.Management.Infrastructure.CimInstance]
$ArtifactSearchTenant,
Expand Down Expand Up @@ -597,14 +613,18 @@ function Get-TargetResource
AllowExternalDataSharingReceiverSwitch = Get-M365DSCFabricTenantSettingObject -Setting ($instance.tenantSettings | Where-Object -FilterScript { $_.settingName -eq 'AllowExternalDataSharingReceiverSwitch' })
AllowExternalDataSharingSwitch = Get-M365DSCFabricTenantSettingObject -Setting ($instance.tenantSettings | Where-Object -FilterScript { $_.settingName -eq 'AllowExternalDataSharingSwitch' })
AllowFreeTrial = Get-M365DSCFabricTenantSettingObject -Setting ($instance.tenantSettings | Where-Object -FilterScript { $_.settingName -eq 'AllowFreeTrial' })
AllowGetOneLakeUDK = Get-M365DSCFabricTenantSettingObject -Setting ($instance.tenantSettings | Where-Object -FilterScript { $_.settingName -eq 'AllowGetOneLakeUDK' })
AllowGuestLookup = Get-M365DSCFabricTenantSettingObject -Setting ($instance.tenantSettings | Where-Object -FilterScript { $_.settingName -eq 'AllowGuestLookup' })
AllowGuestUserToAccessSharedContent = Get-M365DSCFabricTenantSettingObject -Setting ($instance.tenantSettings | Where-Object -FilterScript { $_.settingName -eq 'AllowGuestUserToAccessSharedContent' })
AllowMountDfCreation = Get-M365DSCFabricTenantSettingObject -Setting ($instance.tenantSettings | Where-Object -FilterScript { $_.settingName -eq 'AllowMountDfCreation' })
AllowOneLakeUDK = Get-M365DSCFabricTenantSettingObject -Setting ($instance.tenantSettings | Where-Object -FilterScript { $_.settingName -eq 'AllowOneLakeUDK' })
AllowPowerBIASDQOnTenant = Get-M365DSCFabricTenantSettingObject -Setting ($instance.tenantSettings | Where-Object -FilterScript { $_.settingName -eq 'AllowPowerBIASDQOnTenant' })
AllowSendAOAIDataToOtherRegions = Get-M365DSCFabricTenantSettingObject -Setting ($instance.tenantSettings | Where-Object -FilterScript { $_.settingName -eq 'AllowSendAOAIDataToOtherRegions' })
AllowSendNLToDaxDataToOtherRegions = Get-M365DSCFabricTenantSettingObject -Setting ($instance.tenantSettings | Where-Object -FilterScript { $_.settingName -eq 'AllowSendNLToDaxDataToOtherRegions' })
AllowServicePrincipalsCreateAndUseProfiles = Get-M365DSCFabricTenantSettingObject -Setting ($instance.tenantSettings | Where-Object -FilterScript { $_.settingName -eq 'AllowServicePrincipalsCreateAndUseProfiles' })
AllowServicePrincipalsUseReadAdminAPIs = Get-M365DSCFabricTenantSettingObject -Setting ($instance.tenantSettings | Where-Object -FilterScript { $_.settingName -eq 'AllowServicePrincipalsUseReadAdminAPIs' })
AppPush = Get-M365DSCFabricTenantSettingObject -Setting ($instance.tenantSettings | Where-Object -FilterScript { $_.settingName -eq 'AppPush' })
ArtifactOrgAppPreview = Get-M365DSCFabricTenantSettingObject -Setting ($instance.tenantSettings | Where-Object -FilterScript { $_.settingName -eq 'ArtifactOrgAppPreview' })
ArtifactSearchTenant = Get-M365DSCFabricTenantSettingObject -Setting ($instance.tenantSettings | Where-Object -FilterScript { $_.settingName -eq 'ArtifactSearchTenant' })
ASCollectQueryTextTelemetryTenantSwitch = Get-M365DSCFabricTenantSettingObject -Setting ($instance.tenantSettings | Where-Object -FilterScript { $_.settingName -eq 'ASCollectQueryTextTelemetryTenantSwitch' })
ASShareableCloudConnectionBindingSecurityModeTenant = Get-M365DSCFabricTenantSettingObject -Setting ($instance.tenantSettings | Where-Object -FilterScript { $_.settingName -eq 'ASShareableCloudConnectionBindingSecurityModeTenant' })
Expand Down Expand Up @@ -796,6 +816,10 @@ function Set-TargetResource
[Microsoft.Management.Infrastructure.CimInstance]
$AllowFreeTrial,

[Parameter()]
[Microsoft.Management.Infrastructure.CimInstance]
$AllowGetOneLakeUDK,

[Parameter()]
[Microsoft.Management.Infrastructure.CimInstance]
$AllowGuestLookup,
Expand All @@ -804,6 +828,14 @@ function Set-TargetResource
[Microsoft.Management.Infrastructure.CimInstance]
$AllowGuestUserToAccessSharedContent,

[Parameter()]
[Microsoft.Management.Infrastructure.CimInstance]
$AllowMountDfCreation,

[Parameter()]
[Microsoft.Management.Infrastructure.CimInstance]
$AllowOneLakeUDK,

[Parameter()]
[Microsoft.Management.Infrastructure.CimInstance]
$AllowPowerBIASDQOnTenant,
Expand All @@ -828,6 +860,10 @@ function Set-TargetResource
[Microsoft.Management.Infrastructure.CimInstance]
$AppPush,

[Parameter()]
[Microsoft.Management.Infrastructure.CimInstance]
$ArtifactOrgAppPreview,

[Parameter()]
[Microsoft.Management.Infrastructure.CimInstance]
$ArtifactSearchTenant,
Expand Down Expand Up @@ -1351,6 +1387,10 @@ function Test-TargetResource
[Microsoft.Management.Infrastructure.CimInstance]
$AllowFreeTrial,

[Parameter()]
[Microsoft.Management.Infrastructure.CimInstance]
$AllowGetOneLakeUDK,

[Parameter()]
[Microsoft.Management.Infrastructure.CimInstance]
$AllowGuestLookup,
Expand All @@ -1359,6 +1399,14 @@ function Test-TargetResource
[Microsoft.Management.Infrastructure.CimInstance]
$AllowGuestUserToAccessSharedContent,

[Parameter()]
[Microsoft.Management.Infrastructure.CimInstance]
$AllowMountDfCreation,

[Parameter()]
[Microsoft.Management.Infrastructure.CimInstance]
$AllowOneLakeUDK,

[Parameter()]
[Microsoft.Management.Infrastructure.CimInstance]
$AllowPowerBIASDQOnTenant,
Expand All @@ -1383,6 +1431,10 @@ function Test-TargetResource
[Microsoft.Management.Infrastructure.CimInstance]
$AppPush,

[Parameter()]
[Microsoft.Management.Infrastructure.CimInstance]
$ArtifactOrgAppPreview,

[Parameter()]
[Microsoft.Management.Infrastructure.CimInstance]
$ArtifactSearchTenant,
Expand Down Expand Up @@ -2104,7 +2156,7 @@ function Get-M365DSCFabricTenantSettingObject
}
if (-not [System.String]::IsNullOrEmpty($Setting.tenantSettingGroup))
{
$values.Add('tenantSettingGroup', $Setting.tenantSettingGroup)
$values.Add('tenantSettingGroup',($Setting.tenantSettingGroup -creplace '\P{IsBasicLatin}'))
}
if ($null -ne $Setting.properties -and $Setting.properties.Length -gt 0)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,15 +45,19 @@ class MSFT_FabricAdminTenantSettings : OMI_BaseResource
[Write, Description("Endorse master data (preview)"), EmbeddedInstance("MSFT_FabricTenantSetting")] string AllowEndorsementMasterDataSwitch;
[Write, Description("Users can accept external data shares (preview)"), EmbeddedInstance("MSFT_FabricTenantSetting")] string AllowExternalDataSharingReceiverSwitch;
[Write, Description("External data sharing (preview)"), EmbeddedInstance("MSFT_FabricTenantSetting")] string AllowExternalDataSharingSwitch;
[Write, Description("Use short-lived user-delegated SAS tokens (preview)."), EmbeddedInstance("MSFT_FabricTenantSetting")] string AllowGetOneLakeUDK;
[Write, Description("Users can try Microsoft Fabric paid features"), EmbeddedInstance("MSFT_FabricTenantSetting")] string AllowFreeTrial;
[Write, Description("Users can see guest users in lists of suggested people"), EmbeddedInstance("MSFT_FabricTenantSetting")] string AllowGuestLookup;
[Write, Description("Guest users can access Microsoft Fabric"), EmbeddedInstance("MSFT_FabricTenantSetting")] string AllowGuestUserToAccessSharedContent;
[Write, Description("Users can create and use ADF Mount items (preview)."), EmbeddedInstance("MSFT_FabricTenantSetting")] string AllowMountDfCreation;
[Write, Description("Authenticate with OneLake user-delegated SAS tokens (preview)."), EmbeddedInstance("MSFT_FabricTenantSetting")] string AllowOneLakeUDK;
[Write, Description("Allow DirectQuery connections to Power BI semantic models"), EmbeddedInstance("MSFT_FabricTenantSetting")] string AllowPowerBIASDQOnTenant;
[Write, Description("Data sent to Azure OpenAI can be processed outside your capacity's geographic region, compliance boundary, or national cloud instance"), EmbeddedInstance("MSFT_FabricTenantSetting")] string AllowSendAOAIDataToOtherRegions;
[Write, Description("Allow user data to leave their geography"), EmbeddedInstance("MSFT_FabricTenantSetting")] string AllowSendNLToDaxDataToOtherRegions;
[Write, Description("Allow service principals to create and use profiles"), EmbeddedInstance("MSFT_FabricTenantSetting")] string AllowServicePrincipalsCreateAndUseProfiles;
[Write, Description("Service principals can access read-only admin APIs"), EmbeddedInstance("MSFT_FabricTenantSetting")] string AllowServicePrincipalsUseReadAdminAPIs;
[Write, Description("Push apps to end users"), EmbeddedInstance("MSFT_FabricTenantSetting")] string AppPush;
[Write, Description("Users can discover and create org apps (preview)."), EmbeddedInstance("MSFT_FabricTenantSetting")] string ArtifactOrgAppPreview;
[Write, Description("Use global search for Power BI"), EmbeddedInstance("MSFT_FabricTenantSetting")] string ArtifactSearchTenant;
[Write, Description("Microsoft can store query text to aid in support investigations"), EmbeddedInstance("MSFT_FabricTenantSetting")] string ASCollectQueryTextTelemetryTenantSwitch;
[Write, Description("Enable granular access control for all data connections"), EmbeddedInstance("MSFT_FabricTenantSetting")] string ASShareableCloudConnectionBindingSecurityModeTenant;
Expand Down
20 changes: 20 additions & 0 deletions Modules/Microsoft365DSC/SchemaDefinition.json
Original file line number Diff line number Diff line change
Expand Up @@ -24028,6 +24028,11 @@
"Name": "AllowExternalDataSharingSwitch",
"Option": "Write"
},
{
"CIMType": "MSFT_FabricTenantSetting",
"Name": "AllowGetOneLakeUDK",
"Option": "Write"
},
{
"CIMType": "MSFT_FabricTenantSetting",
"Name": "AllowFreeTrial",
Expand All @@ -24043,6 +24048,16 @@
"Name": "AllowGuestUserToAccessSharedContent",
"Option": "Write"
},
{
"CIMType": "MSFT_FabricTenantSetting",
"Name": "AllowMountDfCreation",
"Option": "Write"
},
{
"CIMType": "MSFT_FabricTenantSetting",
"Name": "AllowOneLakeUDK",
"Option": "Write"
},
{
"CIMType": "MSFT_FabricTenantSetting",
"Name": "AllowPowerBIASDQOnTenant",
Expand Down Expand Up @@ -24073,6 +24088,11 @@
"Name": "AppPush",
"Option": "Write"
},
{
"CIMType": "MSFT_FabricTenantSetting",
"Name": "ArtifactOrgAppPreview",
"Option": "Write"
},
{
"CIMType": "MSFT_FabricTenantSetting",
"Name": "ArtifactSearchTenant",
Expand Down
4 changes: 4 additions & 0 deletions docs/docs/resources/fabric/FabricAdminTenantSettings.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,19 @@
| **AllowEndorsementMasterDataSwitch** | Write | MSFT_FabricTenantSetting | Endorse master data (preview) | |
| **AllowExternalDataSharingReceiverSwitch** | Write | MSFT_FabricTenantSetting | Users can accept external data shares (preview) | |
| **AllowExternalDataSharingSwitch** | Write | MSFT_FabricTenantSetting | External data sharing (preview) | |
| **AllowGetOneLakeUDK** | Write | MSFT_FabricTenantSetting | Use short-lived user-delegated SAS tokens (preview). | |
| **AllowFreeTrial** | Write | MSFT_FabricTenantSetting | Users can try Microsoft Fabric paid features | |
| **AllowGuestLookup** | Write | MSFT_FabricTenantSetting | Users can see guest users in lists of suggested people | |
| **AllowGuestUserToAccessSharedContent** | Write | MSFT_FabricTenantSetting | Guest users can access Microsoft Fabric | |
| **AllowMountDfCreation** | Write | MSFT_FabricTenantSetting | Users can create and use ADF Mount items (preview). | |
| **AllowOneLakeUDK** | Write | MSFT_FabricTenantSetting | Authenticate with OneLake user-delegated SAS tokens (preview). | |
| **AllowPowerBIASDQOnTenant** | Write | MSFT_FabricTenantSetting | Allow DirectQuery connections to Power BI semantic models | |
| **AllowSendAOAIDataToOtherRegions** | Write | MSFT_FabricTenantSetting | Data sent to Azure OpenAI can be processed outside your capacity's geographic region, compliance boundary, or national cloud instance | |
| **AllowSendNLToDaxDataToOtherRegions** | Write | MSFT_FabricTenantSetting | Allow user data to leave their geography | |
| **AllowServicePrincipalsCreateAndUseProfiles** | Write | MSFT_FabricTenantSetting | Allow service principals to create and use profiles | |
| **AllowServicePrincipalsUseReadAdminAPIs** | Write | MSFT_FabricTenantSetting | Service principals can access read-only admin APIs | |
| **AppPush** | Write | MSFT_FabricTenantSetting | Push apps to end users | |
| **ArtifactOrgAppPreview** | Write | MSFT_FabricTenantSetting | Users can discover and create org apps (preview). | |
| **ArtifactSearchTenant** | Write | MSFT_FabricTenantSetting | Use global search for Power BI | |
| **ASCollectQueryTextTelemetryTenantSwitch** | Write | MSFT_FabricTenantSetting | Microsoft can store query text to aid in support investigations | |
| **ASShareableCloudConnectionBindingSecurityModeTenant** | Write | MSFT_FabricTenantSetting | Enable granular access control for all data connections | |
Expand Down

0 comments on commit 45fc59a

Please sign in to comment.