Merge pull request #341 from SteveL-MSFT/group-names

rename group resources to conform to namespace standard
PowerShell · Mar 5, 2024 · 3119292 · 3119292
2 parents 10a765b + b951dd5
commit 3119292
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 22 deletions.
diff --git a/dsc/assertion.dsc.resource.json b/dsc/assertion.dsc.resource.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://raw.githubusercontent.com/PowerShell/DSC/main/schemas/2023/08/bundled/resource/manifest.json",
-  "type": "DSC/AssertionGroup",
+  "type": "Microsoft.DSC/Assertion",
   "version": "0.1.0",
   "description": "`test` will be invoked for all resources in the supplied configuration.",
   "kind": "Group",

diff --git a/dsc/examples/assertion.dsc.yaml b/dsc/examples/assertion.dsc.yaml
@@ -7,9 +7,9 @@ resources:
     keyPath: HKCU\example
     _ensure: Present
   dependsOn:
-  - "[resourceId('DSC/AssertionGroup','my assertions')]"
+  - "[resourceId('Microsoft.DSC/Assertion','my assertions')]"
 - name: my assertions
-  type: DSC/AssertionGroup
+  type: Microsoft.DSC/Assertion
   properties:
     $schema: https://raw.githubusercontent.com/PowerShell/DSC/main/schemas/2023/08/config/document.json
     resources:

diff --git a/dsc/examples/brew.dsc.yaml b/dsc/examples/brew.dsc.yaml
@@ -2,7 +2,7 @@
 $schema: https://raw.githubusercontent.com/PowerShell/DSC/main/schemas/2023/08/config/document.json
 resources:
 - name: assertions
-  type: DSC/AssertionGroup
+  type: Microsoft.DSC/Assertion
   properties:
     $schema: https://raw.githubusercontent.com/PowerShell/DSC/main/schemas/2023/08/config/document.json
     resources:
@@ -16,4 +16,4 @@ resources:
     packageName: gitui
     _exist: true
   dependsOn:
-  - "[resourceId('DSC/AssertionGroup','assertions')]"
+  - "[resourceId('Microsoft.DSC/Assertion','assertions')]"
diff --git a/dsc/examples/brew_uninstall.dsc.yaml b/dsc/examples/brew_uninstall.dsc.yaml
@@ -2,7 +2,7 @@
 $schema: https://raw.githubusercontent.com/PowerShell/DSC/main/schemas/2023/08/config/document.json
 resources:
 - name: assertions
-  type: DSC/AssertionGroup
+  type: Microsoft.DSC/Assertion
   properties:
     $schema: https://raw.githubusercontent.com/PowerShell/DSC/main/schemas/2023/08/config/document.json
     resources:
@@ -16,4 +16,4 @@ resources:
     packageName: gitui
     _exist: false
   dependsOn:
-  - "[resourceId('DSC/AssertionGroup','assertions')]"
+  - "[resourceId('Microsoft.DSC/Assertion','assertions')]"
diff --git a/dsc/examples/groups.dsc.yaml b/dsc/examples/groups.dsc.yaml
@@ -2,7 +2,7 @@
 $schema: https://raw.githubusercontent.com/PowerShell/DSC/main/schemas/2023/08/config/document.json
 resources:
 - name: Last Group
-  type: DSC/Group
+  type: Microsoft.DSC/Group
   properties:
     $schema: https://raw.githubusercontent.com/PowerShell/DSC/main/schemas/2023/08/config/document.json
     resources:
@@ -11,9 +11,9 @@ resources:
       properties:
         output: Last
   dependsOn:
-  - "[resourceId('DSC/Group','First Group')]"
+  - "[resourceId('Microsoft.DSC/Group','First Group')]"
 - name: First Group
-  type: DSC/Group
+  type: Microsoft.DSC/Group
   properties:
     $schema: https://raw.githubusercontent.com/PowerShell/DSC/main/schemas/2023/08/config/document.json
     resources:
@@ -22,7 +22,7 @@ resources:
       properties:
         output: First
     - name: Nested Group
-      type: DSC/Group
+      type: Microsoft.DSC/Group
       properties:
         $schema: https://raw.githubusercontent.com/PowerShell/DSC/main/schemas/2023/08/config/document.json
         resources:

diff --git a/dsc/examples/parallel.dsc.yaml b/dsc/examples/parallel.dsc.yaml
@@ -21,7 +21,7 @@ resources:
         keyPath: HKLM\Software\Microsoft\Windows NT\CurrentVersion
         valueName: SystemRoot
 - name: myGroup
-  type: DSC/Group # each resource in this group would run in sequence
+  type: Microsoft.DSC/Group # each resource in this group would run in sequence
   properties:
     resources:
     - name: current user registry
@@ -35,7 +35,7 @@ resources:
         keyPath: HKCU\example2
         _ensure: present
     - name: mygroup
-      type: DSC/Group
+      type: Microsoft.DSC/Group
       properties:
         resources:
         - name: myreg

diff --git a/dsc/group.dsc.resource.json b/dsc/group.dsc.resource.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://raw.githubusercontent.com/PowerShell/DSC/main/schemas/2023/08/bundled/resource/manifest.json",
-  "type": "DSC/Group",
+  "type": "Microsoft.DSC/Group",
   "version": "0.1.0",
   "description": "All resources in the supplied configuration is treated as a group.",
   "kind": "Group",

diff --git a/dsc/parallel.dsc.resource.json b/dsc/parallel.dsc.resource.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://raw.githubusercontent.com/PowerShell/DSC/main/schemas/2023/08/bundled/resource/manifest.json",
-  "type": "DSC/ParallelGroup",
+  "type": "Microsoft.DSC/Parallel",
   "version": "0.1.0",
   "description": "All resources in the supplied configuration run concurrently.",
   "kind": "Group",

diff --git a/dsc/tests/dsc_group.tests.ps1 b/dsc/tests/dsc_group.tests.ps1
@@ -8,15 +8,15 @@ Describe 'Group resource tests' {
         $out | Should -BeExactly @'
 results:
 - name: First Group
-  type: DSC/Group
+  type: Microsoft.DSC/Group
   result:
   - name: First
     type: Test/Echo
     result:
       actualState:
         output: First
   - name: Nested Group
-    type: DSC/Group
+    type: Microsoft.DSC/Group
     result:
     - name: Nested First
       type: Test/Echo
@@ -29,7 +29,7 @@ results:
         actualState:
           output: Nested Second
 - name: Last Group
-  type: DSC/Group
+  type: Microsoft.DSC/Group
   result:
   - name: Last
     type: Test/Echo

diff --git a/dsc/tests/dsc_resource_list.tests.ps1 b/dsc/tests/dsc_resource_list.tests.ps1
@@ -7,11 +7,11 @@ Describe 'Tests for listing resources' {
         $LASTEXITCODE | Should -Be 0
         $resources | Should -Not -BeNullOrEmpty
         $resources.Count | Should -BeGreaterThan 0
-        $resources.type | Should -Contain 'DSC/AssertionGroup'
-        $resources.type | Should -Contain 'DSC/Group'
-        $resources.type | Should -Contain 'DSC/ParallelGroup'
+        $resources.type | Should -Contain 'Microsoft.DSC/Assertion'
+        $resources.type | Should -Contain 'Microsoft.DSC/Group'
+        $resources.type | Should -Contain 'Microsoft.DSC/Parallel'
         $resources.type | Should -Contain 'Microsoft/OSInfo'
-        ($resources | Where-Object { $_.type -eq 'DSC/Group' }).Kind | Should -BeExactly 'Group'
+        ($resources | Where-Object { $_.type -eq 'Microsoft.DSC/Group' }).Kind | Should -BeExactly 'Group'
         ($resources | Where-Object { $_.type -eq 'Microsoft/OSInfo' }).Kind | Should -BeExactly 'Resource'
         ($resources | Where-Object { $_.type -eq 'Microsoft.DSC/PowerShell' }).Kind | Should -BeExactly 'Adapter'
     }