TeamsGroupPolicyAssignment Exported configuration cannot be used beca…

…use of duplicated key value Fixes microsoft#3054
andikrueger · Mar 22, 2023 · dc72827 · dc72827
1 parent 0f22b64
commit dc72827
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Change log for Microsoft365DSC
 
+# Breaking Changes (APRIL 5TH RELEASE)
+
+* TeamsGroupPolicyAssignment change of key and required parameters
+  * [BREAKING CHANGE] Setting GroupId and PolicyType as Key parameters
+    FIXES [#3054](https://github.com/microsoft/Microsoft365DSC/issues/3054)
+
 # UNRELEASED
 
 * AADRoleSetting

diff --git a/...t365DSC/DSCResources/MSFT_TeamsGroupPolicyAssignment/MSFT_TeamsGroupPolicyAssignment.psm1 b/...t365DSC/DSCResources/MSFT_TeamsGroupPolicyAssignment/MSFT_TeamsGroupPolicyAssignment.psm1
@@ -8,11 +8,11 @@ function Get-TargetResource
         [System.String]
         $GroupDisplayName,
 
-        [Parameter()]
+        [Parameter(Mandatory = $true)]
         [System.String]
         $GroupId,
 
-        [Parameter()]
+        [Parameter(Mandatory = $true)]
         [ValidateSet('CallingLineIdentity', 'TeamsAppSetupPolicy', 'TeamsAudioConferencingPolicy', 'TeamsCallingPolicy', 'TeamsCallParkPolicy', 'TeamsChannelsPolicy', 'TeamsComplianceRecordingPolicy', 'TenantDialPlan', 'TeamsMeetingBroadcastPolicy', 'TeamsMeetingPolicy', 'TeamsMessagingPolicy', 'TeamsShiftsPolicy', 'TeamsUpdateManagementPolicy', 'TeamsVerticalPackagePolicy')]
         [System.String]
         $PolicyType,
@@ -21,7 +21,7 @@ function Get-TargetResource
         [System.String]
         $PolicyName,
 
-        [Parameter(Mandatory = $true)]
+        [Parameter()]
         [System.String]
         $Priority,
 
@@ -128,11 +128,11 @@ function Set-TargetResource
         [System.String]
         $GroupDisplayName,
 
-        [Parameter()]
+        [Parameter(Mandatory = $true)]
         [System.String]
         $GroupId,
 
-        [Parameter()]
+        [Parameter(Mandatory = $true)]
         [ValidateSet('CallingLineIdentity', 'TeamsAppSetupPolicy', 'TeamsAudioConferencingPolicy', 'TeamsCallingPolicy', 'TeamsCallParkPolicy', 'TeamsChannelsPolicy', 'TeamsComplianceRecordingPolicy', 'TenantDialPlan', 'TeamsMeetingBroadcastPolicy', 'TeamsMeetingPolicy', 'TeamsMessagingPolicy', 'TeamsShiftsPolicy', 'TeamsUpdateManagementPolicy', 'TeamsVerticalPackagePolicy')]
         [System.String]
         $PolicyType,
@@ -141,7 +141,7 @@ function Set-TargetResource
         [System.String]
         $PolicyName,
 
-        [Parameter(Mandatory = $true)]
+        [Parameter()]
         [System.String]
         $Priority,
 
@@ -271,11 +271,11 @@ function Test-TargetResource
         [System.String]
         $GroupDisplayName,
 
-        [Parameter()]
+        [Parameter(Mandatory = $true)]
         [System.String]
         $GroupId,
 
-        [Parameter()]
+        [Parameter(Mandatory = $true)]
         [ValidateSet('CallingLineIdentity', 'TeamsAppSetupPolicy', 'TeamsAudioConferencingPolicy', 'TeamsCallingPolicy', 'TeamsCallParkPolicy', 'TeamsChannelsPolicy', 'TeamsComplianceRecordingPolicy', 'TenantDialPlan', 'TeamsMeetingBroadcastPolicy', 'TeamsMeetingPolicy', 'TeamsMessagingPolicy', 'TeamsShiftsPolicy', 'TeamsUpdateManagementPolicy', 'TeamsVerticalPackagePolicy')]
         [System.String]
         $PolicyType,
@@ -284,7 +284,7 @@ function Test-TargetResource
         [System.String]
         $PolicyName,
 
-        [Parameter(Mandatory = $true)]
+        [Parameter()]
         [System.String]
         $Priority,
 

diff --git a/...C/DSCResources/MSFT_TeamsGroupPolicyAssignment/MSFT_TeamsGroupPolicyAssignment.schema.mof b/...C/DSCResources/MSFT_TeamsGroupPolicyAssignment/MSFT_TeamsGroupPolicyAssignment.schema.mof
@@ -2,10 +2,10 @@
 class MSFT_TeamsGroupPolicyAssignment : OMI_BaseResource
 {
     [Write, Description("Group Displayname of the group the policys are assigned to")] string GroupDisplayName;
-    [Write, Description("GroupId, alternatively to Group Displayname")] String GroupId;
-    [Write, Description("Teams PolicyType. The type of the policy to be assigned. Possible values:"), ValueMap{"CallingLineIdentity","TeamsAppSetupPolicy","TeamsAudioConferencingPolicy","TeamsCallingPolicy","TeamsCallParkPolicy","TeamsChannelsPolicy","TeamsComplianceRecordingPolicy","TenantDialPlan","TeamsMeetingBroadcastPolicy","TeamsMeetingPolicy","TeamsMessagingPolicy","TeamsShiftsPolicy","TeamsUpdateManagementPolicy","TeamsVerticalPackagePolicy"}, Values{"CallingLineIdentity","TeamsAppSetupPolicy","TeamsAudioConferencingPolicy","TeamsCallingPolicy","TeamsCallParkPolicy","TeamsChannelsPolicy","TeamsComplianceRecordingPolicy","TenantDialPlan","TeamsMeetingBroadcastPolicy","TeamsMeetingPolicy","TeamsMessagingPolicy","TeamsShiftsPolicy","TeamsUpdateManagementPolicy","TeamsVerticalPackagePolicy"}] String PolicyType;
+    [Key, Description("GroupId, alternatively to Group Displayname")] String GroupId;
+    [Key, Description("Teams PolicyType. The type of the policy to be assigned. Possible values:"), ValueMap{"CallingLineIdentity","TeamsAppSetupPolicy","TeamsAudioConferencingPolicy","TeamsCallingPolicy","TeamsCallParkPolicy","TeamsChannelsPolicy","TeamsComplianceRecordingPolicy","TenantDialPlan","TeamsMeetingBroadcastPolicy","TeamsMeetingPolicy","TeamsMessagingPolicy","TeamsShiftsPolicy","TeamsUpdateManagementPolicy","TeamsVerticalPackagePolicy"}, Values{"CallingLineIdentity","TeamsAppSetupPolicy","TeamsAudioConferencingPolicy","TeamsCallingPolicy","TeamsCallParkPolicy","TeamsChannelsPolicy","TeamsComplianceRecordingPolicy","TenantDialPlan","TeamsMeetingBroadcastPolicy","TeamsMeetingPolicy","TeamsMessagingPolicy","TeamsShiftsPolicy","TeamsUpdateManagementPolicy","TeamsVerticalPackagePolicy"}] String PolicyType;
     [Write, Description("Teams PolicyName. The name of the policy to be assigned.")] string PolicyName;
-    [Key, Description("Teams Priority. The rank of the policy assignment, relative to other group policy assignments for the same policy type")] string Priority;
+    [Write, Description("Teams Priority. The rank of the policy assignment, relative to other group policy assignments for the same policy type")] string Priority;
     [Write, Description("Present ensures the group policy assignment exists, absent ensures it is removed."), ValueMap{"Present","Absent"}, Values{"Present","Absent"}] String Ensure;
     [Write, Description("Credentials of the Teams Admin"), EmbeddedInstance("MSFT_Credential")] string Credential;
     [Write, Description("Id of the Azure Active Directory application to authenticate with.")] String ApplicationId;