Fixed several issues

ykuijs · Jul 3, 2024 · 5b56d32 · 5b56d32
1 parent d1ef16c
commit 5b56d32
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+
+- Added the UsedWorkloads section to the Environments section in the Example Data File
+- Added a dependency to the SCSensitivityLabel resources for SCAutoSensitivityLabelPolicy
+
+### Fixed
+
+- Fixed issue were an array was not correctly created where this was required
+
 ## [0.1.15] - 2024-06-04
 
 ### Changed

diff --git a/source/Dependencies.psd1 b/source/Dependencies.psd1
@@ -1,4 +1,5 @@
 @{
+    SCAutoSensitivityLabelPolicy  = '$ConfigurationData.NonNodeData.SecurityCompliance.SensitivityLabels.Name | ForEach-Object { "[SCSensitivityLabel]SCSensitivityLabel-{0}" -f $_ }'
     SCAutoSensitivityLabelRule    = '$ConfigurationData.NonNodeData.SecurityCompliance.AutoSensitivityLabelPolicies.Name | ForEach-Object { "[SCAutoSensitivityLabelPolicy]SCAutoSensitivityLabelPolicy-{0}" -f $_ }'
     SCCaseHoldRule                = '$ConfigurationData.NonNodeData.SecurityCompliance.CaseHoldPolicies | ForEach-Object { "[SCCaseHoldPolicy]SCCaseHoldPolicy-{0}-{1}" -f $_.Name,$_.Case }'
     SCCaseHoldPolicy              = '$ConfigurationData.NonNodeData.SecurityCompliance.ComplianceCases.Name | ForEach-Object { "[SCComplianceCase]SCComplianceCase-{0}" -f $_ }'

diff --git a/source/Public/New-CompositeResourceModule.ps1 b/source/Public/New-CompositeResourceModule.ps1
@@ -73,6 +73,7 @@ function New-CompositeResourceModule
                             }
                         )
                     }
+                    UsedWorkloads = @{}
                     Tokens = @{
                         ExampleToken = 'String | Optional | Example of a token that can be used anywhere in the config, by specifying {{ExampleToken}}'
                     }
@@ -228,6 +229,8 @@ function New-CompositeResourceModule
                         $configData.NonNodeData.$resourceWorkload = [Ordered]@{}
                     }
 
+                    $configData.NonNodeData.Environment.UsedWorkloads.$resourceWorkload = $true
+
                     # Initialize new composite resource content
                     $configString = [System.Text.StringBuilder]::new()
                     [void]$configString.AppendLine("# ($(Get-Date -f 'yyyy-MM-dd HH:mm:ss')) Generated using Microsoft365DSC v$($m365Module.Version)")
@@ -479,7 +482,7 @@ function New-CompositeResourceModule
                                 if ($propertyDataType -like "*Array")
                                 {
                                     $propertyDataType = $propertyDataType -replace "Array"
-                                    $result = ('{0} | {1} | {2} | {3}' -f $propertyDataType, $state, $property.Description, ($property.ValueMap -join ' / '))
+                                    $result = @(('{0} | {1} | {2} | {3}' -f $propertyDataType, $state, $property.Description, ($property.ValueMap -join ' / ')))
                                 }
                                 else
                                 {