Feedback incorporated

ykuijs · Nov 29, 2024 · ad38f9d · ad38f9d
1 parent ef77bc8
commit ad38f9d
Show file tree

Hide file tree

Showing 10 changed files with 192 additions and 88 deletions.
diff --git a/...osoft365DSC/DSCResources/MSFT_TeamsProtectionPolicy/MSFT_TeamsProtectionPolicy.schema.mof b/...osoft365DSC/DSCResources/MSFT_TeamsProtectionPolicy/MSFT_TeamsProtectionPolicy.schema.mof
@@ -6,7 +6,7 @@ class MSFT_TeamsProtectionPolicy : OMI_BaseResource
     [Write, Description("The AdminDisplayName parameter specifies a description for the policy.")] String AdminDisplayName;
     [Write, Description("The HighConfidencePhishQuarantineTag parameter specifies the quarantine policy that's used for messages that are quarantined as high confidence phishing by ZAP for Teams."), ValueMap{"AdminOnlyAccessPolicy","DefaultFullAccessPolicy","DefaultFullAccessWithNotificationPolicy"}, Values{"AdminOnlyAccessPolicy","DefaultFullAccessPolicy","DefaultFullAccessWithNotificationPolicy"}] String HighConfidencePhishQuarantineTag;
     [Write, Description("The MalwareQuarantineTag parameter specifies the quarantine policy that's used for messages that are quarantined as malware by ZAP for Teams."), ValueMap{"AdminOnlyAccessPolicy","DefaultFullAccessPolicy","DefaultFullAccessWithNotificationPolicy"}, Values{"AdminOnlyAccessPolicy","DefaultFullAccessPolicy","DefaultFullAccessWithNotificationPolicy"}] String MalwareQuarantineTag;
-    [Write, Description("he ZapEnabled parameter specifies whether to enable zero-hour auto purge (ZAP) for malware and high confidence phishing messages in Teams messages.")] Boolean ZapEnabled;
+    [Write, Description("The ZapEnabled parameter specifies whether to enable zero-hour auto purge (ZAP) for malware and high confidence phishing messages in Teams messages.")] Boolean ZapEnabled;
     [Write, Description("Credentials of the Exchange Global Admin"), EmbeddedInstance("MSFT_Credential")] string Credential;
     [Write, Description("Id of the Azure Active Directory application to authenticate with.")] String ApplicationId;
     [Write, Description("Id of the Azure Active Directory tenant used for authentication.")] String TenantId;

diff --git a/Modules/Microsoft365DSC/Examples/Resources/SCCaseHoldPolicy/1-AddingNewCaseHoldPolicy.ps1 b/Modules/Microsoft365DSC/Examples/Resources/SCCaseHoldPolicy/1-AddingNewCaseHoldPolicy.ps1
@@ -5,25 +5,36 @@ It is not meant to use as a production baseline.
 
 Configuration Example
 {
-    param(
-        [Parameter(Mandatory = $true)]
-        [PSCredential]
-        $Credscredential
+    param
+    (
+        [Parameter()]
+        [System.String]
+        $ApplicationId,
+
+        [Parameter()]
+        [System.String]
+        $TenantId,
+
+        [Parameter()]
+        [System.String]
+        $CertificateThumbprint
     )
     Import-DscResource -ModuleName Microsoft365DSC
 
     node localhost
     {
         SCCaseHoldPolicy 'CaseHoldPolicy'
         {
-            Case                 = "Test Case"
-            ExchangeLocation     = "[email protected]"
-            Name                 = "Demo Hold"
-            PublicFolderLocation = "All"
-            Comment              = "This is a demo"
-            Enabled              = $True
-            Ensure               = "Present"
-            Credential           = $Credscredential
+            Case                  = 'Test Case'
+            ExchangeLocation      = '[email protected]'
+            Name                  = 'Demo Hold'
+            PublicFolderLocation  = 'All'
+            Comment               = 'This is a demo'
+            Enabled               = $True
+            Ensure                = 'Present'
+            ApplicationId         = $ApplicationId
+            TenantId              = $TenantId
+            CertificateThumbprint = $CertificateThumbprint
         }
     }
 }
diff --git a/...oft365DSC/Examples/Resources/SCSupervisoryReviewRule/1-AddingNewSupervisoryReviewRule.ps1 b/...oft365DSC/Examples/Resources/SCSupervisoryReviewRule/1-AddingNewSupervisoryReviewRule.ps1
@@ -5,23 +5,35 @@ It is not meant to use as a production baseline.
 
 Configuration Example
 {
-    param(
-        [Parameter(Mandatory = $true)]
-        [PSCredential]
-        $Credscredential
+    param
+    (
+        [Parameter()]
+        [System.String]
+        $ApplicationId,
+
+        [Parameter()]
+        [System.String]
+        $TenantId,
+
+        [Parameter()]
+        [System.String]
+        $CertificateThumbprint
     )
+
     Import-DscResource -ModuleName Microsoft365DSC
 
     Node localhost
     {
         SCSupervisoryReviewRule 'SupervisoryReviewRule'
         {
-            Name         = "DemoRule"
-            Condition    = "(NOT(Reviewee:US Compliance))"
-            SamplingRate = 100
-            Policy       = 'TestPolicy'
-            Ensure       = "Present"
-            Credential   = $Credscredential
+            Name                  = 'DemoRule'
+            Condition             = '(NOT(Reviewee:US Compliance))'
+            SamplingRate          = 100
+            Policy                = 'TestPolicy'
+            Ensure                = 'Present'
+            ApplicationId         = $ApplicationId
+            TenantId              = $TenantId
+            CertificateThumbprint = $CertificateThumbprint
         }
     }
 }
diff --git a/.../Resources/SCUnifiedAuditLogRetentionPolicy/1-CreateNewUnifiedAuditLogRetentionPolicy.ps1 b/.../Resources/SCUnifiedAuditLogRetentionPolicy/1-CreateNewUnifiedAuditLogRetentionPolicy.ps1
@@ -5,22 +5,35 @@ It is not meant to use as a production baseline.
 
 Configuration Example
 {
-    param(
-        [Parameter(Mandatory = $true)]
-        [PSCredential]
-        $Credentials
+    param
+    (
+        [Parameter()]
+        [System.String]
+        $ApplicationId,
+
+        [Parameter()]
+        [System.String]
+        $TenantId,
+
+        [Parameter()]
+        [System.String]
+        $CertificateThumbprint
     )
+
     Import-DscResource -ModuleName Microsoft365DSC
 
     node localhost
     {
         SCUnifiedAuditLogRetentionPolicy 'Example'
         {
-            Credential           = $Credentials;
-            Ensure               = "Present";
-            Name                 = "Test Policy";
-            Priority             = 1;
-            RetentionDuration    = "SevenDays";
+            Credential            = $Credentials
+            Ensure                = 'Present'
+            Name                  = 'Test Policy'
+            Priority              = 1
+            RetentionDuration     = 'SevenDays'
+            ApplicationId         = $ApplicationId
+            TenantId              = $TenantId
+            CertificateThumbprint = $CertificateThumbprint
         }
     }
 }
diff --git a/.../Microsoft365DSC/Examples/Resources/TeamsCallHoldPolicy/1-TeamsCallHoldPolicy-Example.ps1 b/.../Microsoft365DSC/Examples/Resources/TeamsCallHoldPolicy/1-TeamsCallHoldPolicy-Example.ps1
@@ -5,20 +5,31 @@ It is not meant to use as a production baseline.
 
 Configuration Example
 {
-    param(
-        [Parameter(Mandatory = $true)]
-        [PSCredential]
-        $Credscredential
+    param
+    (
+        [Parameter()]
+        [System.String]
+        $ApplicationId,
+
+        [Parameter()]
+        [System.String]
+        $TenantId,
+
+        [Parameter()]
+        [System.String]
+        $CertificateThumbprint
     )
     Import-DscResource -ModuleName Microsoft365DSC
 
     node localhost
     {
         TeamsCallHoldPolicy 'Example'
         {
-            Credential           = $Credscredential;
-            Ensure               = "Present";
-            Identity             = "Global";
+            Identity              = 'Global'
+            Ensure                = 'Present'
+            ApplicationId         = $ApplicationId
+            TenantId              = $TenantId
+            CertificateThumbprint = $CertificateThumbprint
         }
     }
 }
diff --git a/Modules/Microsoft365DSC/Examples/Resources/TeamsChannel/1-CreateTeamsChannel.ps1 b/Modules/Microsoft365DSC/Examples/Resources/TeamsChannel/1-CreateTeamsChannel.ps1
@@ -5,23 +5,35 @@ It is not meant to use as a production baseline.
 
 Configuration Example
 {
-    param(
-        [Parameter(Mandatory = $true)]
-        [PSCredential]
-        $Credscredential
+    param
+    (
+        [Parameter()]
+        [System.String]
+        $ApplicationId,
+
+        [Parameter()]
+        [System.String]
+        $TenantId,
+
+        [Parameter()]
+        [System.String]
+        $CertificateThumbprint
     )
+
     Import-DscResource -ModuleName Microsoft365DSC
 
     node localhost
     {
         TeamsChannel 'ConfigureChannel'
         {
-            TeamName           = "SuperSecretTeam"
-            DisplayName        = "SP2013 Review teams group"
-            NewDisplayName     = "SP2016 Review teams group"
-            Description        = "SP2016 Code reviews for SPFX"
-            Ensure             = "Present"
-            Credential         = $Credscredential
+            TeamName              = 'SuperSecretTeam'
+            DisplayName           = 'SP2013 Review teams group'
+            NewDisplayName        = 'SP2016 Review teams group'
+            Description           = 'SP2016 Code reviews for SPFX'
+            Ensure                = 'Present'
+            ApplicationId         = $ApplicationId
+            TenantId              = $TenantId
+            CertificateThumbprint = $CertificateThumbprint
         }
     }
 }
diff --git a/Modules/Microsoft365DSC/Examples/Resources/TeamsChannelsPolicy/1-AddNewChannelsPolicy.ps1 b/Modules/Microsoft365DSC/Examples/Resources/TeamsChannelsPolicy/1-AddNewChannelsPolicy.ps1
@@ -6,9 +6,17 @@ Configuration Example
 {
     param
     (
-        [Parameter(Mandatory = $true)]
-        [PSCredential]
-        $Credscredential
+        [Parameter()]
+        [System.String]
+        $ApplicationId,
+
+        [Parameter()]
+        [System.String]
+        $TenantId,
+
+        [Parameter()]
+        [System.String]
+        $CertificateThumbprint
     )
 
     Import-DscResource -ModuleName Microsoft365DSC
@@ -26,7 +34,9 @@ Configuration Example
             AllowSharedChannelCreation                    = $True
             AllowUserToParticipateInExternalSharedChannel = $True
             Ensure                                        = 'Present'
-            Credential                                    = $Credscredential
+            ApplicationId                                 = $ApplicationId
+            TenantId                                      = $TenantId
+            CertificateThumbprint                         = $CertificateThumbprint
         }
     }
 }
diff --git a/Modules/Microsoft365DSC/Examples/Resources/TeamsProtectionPolicy/2-Update.ps1 b/Modules/Microsoft365DSC/Examples/Resources/TeamsProtectionPolicy/2-Update.ps1
@@ -5,23 +5,35 @@ It is not meant to use as a production baseline.
 
 Configuration Example
 {
-    param(
-        [Parameter(Mandatory = $true)]
-        [PSCredential]
-        $credsCredential
+    param
+    (
+        [Parameter()]
+        [System.String]
+        $ApplicationId,
+
+        [Parameter()]
+        [System.String]
+        $TenantId,
+
+        [Parameter()]
+        [System.String]
+        $CertificateThumbprint
     )
+
     Import-DscResource -ModuleName Microsoft365DSC
 
     node localhost
     {
-        TeamsProtectionPolicy "TeamsProtectionPolicy"
+        TeamsProtectionPolicy 'TeamsProtectionPolicy'
         {
-            IsSingleInstance                 = "Yes"
-            AdminDisplayName                 = "Contoso Administrator"
-            HighConfidencePhishQuarantineTag = "DefaultFullAccessPolicy"
-            MalwareQuarantineTag             = "AdminOnlyAccessPolicy"
+            IsSingleInstance                 = 'Yes'
+            AdminDisplayName                 = 'Contoso Administrator'
+            HighConfidencePhishQuarantineTag = 'DefaultFullAccessPolicy'
+            MalwareQuarantineTag             = 'AdminOnlyAccessPolicy'
             ZapEnabled                       = $true
-            Credential                       = $credsCredential
+            ApplicationId                    = $ApplicationId
+            TenantId                         = $TenantId
+            CertificateThumbprint            = $CertificateThumbprint
         }
     }
 }
diff --git a/Modules/Microsoft365DSC/Examples/Resources/TeamsShiftsPolicy/1-TeamsShiftsPolicy-Example.ps1 b/Modules/Microsoft365DSC/Examples/Resources/TeamsShiftsPolicy/1-TeamsShiftsPolicy-Example.ps1
@@ -5,27 +5,38 @@ It is not meant to use as a production baseline.
 
 Configuration Example
 {
-    param(
-        [Parameter(Mandatory = $true)]
-        [PSCredential]
-        $Credscredential
+    param
+    (
+        [Parameter()]
+        [System.String]
+        $ApplicationId,
+
+        [Parameter()]
+        [System.String]
+        $TenantId,
+
+        [Parameter()]
+        [System.String]
+        $CertificateThumbprint
     )
     Import-DscResource -ModuleName Microsoft365DSC
 
     node localhost
     {
         TeamsShiftsPolicy 'Example'
         {
-            AccessGracePeriodMinutes       = 15;
-            AccessType                     = "UnrestrictedAccess_TeamsApp";
-            Credential                     = $Credscredential;
-            EnableScheduleOwnerPermissions = $False;
-            EnableShiftPresence            = $False;
-            Ensure                         = "Present";
-            Identity                       = "Global";
-            ShiftNoticeFrequency           = "Never";
-            ShiftNoticeMessageCustom       = "";
-            ShiftNoticeMessageType         = "DefaultMessage";
+            Identity                       = 'Global'
+            AccessGracePeriodMinutes       = 15
+            AccessType                     = 'UnrestrictedAccess_TeamsApp'
+            EnableScheduleOwnerPermissions = $False
+            EnableShiftPresence            = $False
+            Ensure                         = 'Present'
+            ShiftNoticeFrequency           = 'Never'
+            ShiftNoticeMessageCustom       = ''
+            ShiftNoticeMessageType         = 'DefaultMessage'
+            ApplicationId                  = $ApplicationId
+            TenantId                       = $TenantId
+            CertificateThumbprint          = $CertificateThumbprint
         }
     }
 }