rename PowerShell and WMI resources

PowerShell · Mar 2, 2024 · 9cf510d · 9cf510d
1 parent ebbbc81
commit 9cf510d
Show file tree

Hide file tree

Showing 23 changed files with 39 additions and 40 deletions.
diff --git a/build.ps1 b/build.ps1
@@ -113,13 +113,12 @@ $projects = @(
     "file_lib",
     "dsc",
     "osinfo",
-    "powershellgroup",
+    "powershell-adapter",
     "process",
     "tools/dsctest",
     "tools/test_group_resource",
     "y2j",
-    "powershellgroup",
-    "wmigroup",
+    "wmi-adapter",
     "resources/brew"
 )
 $pedantic_unclean_projects = @("ntreg")

diff --git a/dsc/examples/powershell.dsc.yaml b/dsc/examples/powershell.dsc.yaml
@@ -2,7 +2,7 @@
 $schema: https://raw.githubusercontent.com/PowerShell/DSC/main/schemas/2023/08/config/document.json
 resources:
 - name: Use class PowerShell resources
-  type: DSC/PowerShellGroup
+  type: Microsoft.DSC/PowerShell
   properties:
     resources:
     - name: OpenSSH service

diff --git a/dsc/tests/dsc_resource_list.tests.ps1 b/dsc/tests/dsc_resource_list.tests.ps1
@@ -13,7 +13,7 @@ Describe 'Tests for listing resources' {
         $resources.type | Should -Contain 'Microsoft/OSInfo'
         ($resources | Where-Object { $_.type -eq 'DSC/Group' }).Kind | Should -BeExactly 'Group'
         ($resources | Where-Object { $_.type -eq 'Microsoft/OSInfo' }).Kind | Should -BeExactly 'Resource'
-        ($resources | Where-Object { $_.type -eq 'DSC/PowerShellGroup' }).Kind | Should -BeExactly 'Adapter'
+        ($resources | Where-Object { $_.type -eq 'Microsoft.DSC/PowerShell' }).Kind | Should -BeExactly 'Adapter'
     }
 
     It 'dsc resource list --tags "<tags>" and --description "<description> work' -TestCases @(

diff --git a/...es/TestPSRepository/TestPSRepository.psm1 → ...es/TestPSRepository/TestPSRepository.psm1 b/...es/TestPSRepository/TestPSRepository.psm1 → ...es/TestPSRepository/TestPSRepository.psm1
diff --git a/...tPSRepository/TestPSRepository.schema.mof → ...tPSRepository/TestPSRepository.schema.mof b/...tPSRepository/TestPSRepository.schema.mof → ...tPSRepository/TestPSRepository.schema.mof
diff --git a/...roup/Tests/PSTestModule/PSTestModule.psd1 → ...pter/Tests/PSTestModule/PSTestModule.psd1 b/...roup/Tests/PSTestModule/PSTestModule.psd1 → ...pter/Tests/PSTestModule/PSTestModule.psd1
diff --git a/...Tests/PSTestModule/TestClassResource.psm1 → ...Tests/PSTestModule/TestClassResource.psm1 b/...Tests/PSTestModule/TestClassResource.psm1 → ...Tests/PSTestModule/TestClassResource.psm1
diff --git a/...llgroup/Tests/class_ps_resources.dsc.yaml → ...adapter/Tests/class_ps_resources.dsc.yaml b/...llgroup/Tests/class_ps_resources.dsc.yaml → ...adapter/Tests/class_ps_resources.dsc.yaml
@@ -1,7 +1,7 @@
 $schema: https://raw.githubusercontent.com/PowerShell/DSC/main/schemas/2023/10/config/document.json
 resources:
 - name: Working with classic DSC resources
-  type: DSC/PowerShellGroup
+  type: Microsoft.DSC/PowerShell
   properties:
     resources:
     - name: Repository Info

diff --git a/...roup/Tests/native_and_powershell.dsc.yaml → ...pter/Tests/native_and_powershell.dsc.yaml b/...roup/Tests/native_and_powershell.dsc.yaml → ...pter/Tests/native_and_powershell.dsc.yaml
@@ -2,7 +2,7 @@
 $schema: https://raw.githubusercontent.com/PowerShell/DSC/main/schemas/2023/10/config/document.json
 resources:
 - name: Get info from classic DSC resources
-  type: DSC/PowerShellGroup
+  type: Microsoft.DSC/PowerShell
   properties:
     resources:
     - name: Get PS Repository Info

diff --git a/...up/Tests/powershellgroup.config.tests.ps1 → ...er/Tests/powershellgroup.config.tests.ps1 b/...up/Tests/powershellgroup.config.tests.ps1 → ...er/Tests/powershellgroup.config.tests.ps1
@@ -1,7 +1,7 @@
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
 
-Describe 'PowerShellGroup resource tests' {
+Describe 'PowerShell adapter resource tests' {
 
     BeforeAll {
         $OldPSModulePath  = $env:PSModulePath
@@ -46,7 +46,7 @@ Describe 'PowerShellGroup resource tests' {
             $schema: https://raw.githubusercontent.com/PowerShell/DSC/main/schemas/2023/10/config/document.json
             resources:
             - name: Working with class-based resources
-              type: DSC/PowerShellGroup
+              type: Microsoft.DSC/PowerShell
               properties:
                 resources:
                 - name: Class-resource Info
@@ -67,13 +67,13 @@ Describe 'PowerShellGroup resource tests' {
         $OldPSModulePath  = $env:PSModulePath
         Copy-Item -Recurse -Force -Path "$PSScriptRoot/PSTestModule" -Destination $TestDrive
         Rename-Item -Path "$PSScriptRoot/PSTestModule" -NewName "_PSTestModule"
-        
+
         try {
             $yaml = @"
                 `$schema: https://raw.githubusercontent.com/PowerShell/DSC/main/schemas/2023/10/config/document.json
                 resources:
                 - name: Working with class-based resources
-                  type: DSC/PowerShellGroup
+                  type: Microsoft.DSC/PowerShell
                   properties:
                     psmodulepath: `$env:PSModulePath;$TestDrive
                     resources:
@@ -101,7 +101,7 @@ Describe 'PowerShellGroup resource tests' {
             `$schema: https://raw.githubusercontent.com/PowerShell/DSC/main/schemas/2023/10/config/document.json
             resources:
             - name: Working with class-based resources
-              type: DSC/PowerShellGroup
+              type: Microsoft.DSC/PowerShell
               properties:
                 resources:
                 - name: Class-resource Info
@@ -126,7 +126,7 @@ Describe 'PowerShellGroup resource tests' {
             `$schema: https://raw.githubusercontent.com/PowerShell/DSC/main/schemas/2023/10/config/document.json
             resources:
             - name: Working with class-based resources
-              type: DSC/PowerShellGroup
+              type: Microsoft.DSC/PowerShell
               properties:
                 resources:
                 - name: Class-resource Info

diff --git a/.../Tests/powershellgroup.resource.tests.ps1 → .../Tests/powershellgroup.resource.tests.ps1 b/.../Tests/powershellgroup.resource.tests.ps1 → .../Tests/powershellgroup.resource.tests.ps1
@@ -1,11 +1,11 @@
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
 
-Describe 'PowerShellGroup resource tests' {
+Describe 'PowerShell adapter resource tests' {
 
     BeforeAll {
         $OldPSModulePath  = $env:PSModulePath
-        $env:PSModulePath += ";" + $PSScriptRoot
+        $env:PSModulePath += [System.IO.Path]::PathSeparator + $PSScriptRoot
     }
     AfterAll {
         $env:PSModulePath = $OldPSModulePath

diff --git a/...rshellgroup/Tests/winps_resource.dsc.yaml → ...ell-adapter/Tests/winps_resource.dsc.yaml b/...rshellgroup/Tests/winps_resource.dsc.yaml → ...ell-adapter/Tests/winps_resource.dsc.yaml
@@ -2,7 +2,7 @@
 $schema: https://raw.githubusercontent.com/PowerShell/DSC/main/schemas/2023/10/config/document.json
 resources:
 - name: Get info from classic DSC resources
-  type: DSC/WindowsPowerShellGroup
+  type: Microsoft.Windows/WindowsPowerShell
   properties:
     resources:
     - name: Get Info

diff --git a/powershell-adapter/copy_files.txt b/powershell-adapter/copy_files.txt
@@ -0,0 +1 @@
+powershell.resource.ps1
diff --git a/...llgroup/powershellgroup.dsc.resource.json → ...hell-adapter/powershell.dsc.resource.json b/...llgroup/powershellgroup.dsc.resource.json → ...hell-adapter/powershell.dsc.resource.json
@@ -1,6 +1,6 @@
 {
     "$schema": "https://raw.githubusercontent.com/PowerShell/DSC/main/schemas/2023/08/bundled/resource/manifest.json",
-    "type": "DSC/PowerShellGroup",
+    "type": "Microsoft.DSC/PowerShell",
     "version": "0.1.0",
     "description": "Resource adapter to classic DSC Powershell resources.",
     "tags": [
@@ -14,7 +14,7 @@
           "-NonInteractive",
           "-NoProfile",
           "-Command",
-          "./powershellgroup.resource.ps1 List"
+          "./powershell.resource.ps1 List"
         ]
         },
       "config": "full"
@@ -26,7 +26,7 @@
         "-NonInteractive",
         "-NoProfile",
         "-Command",
-        "$Input | ./powershellgroup.resource.ps1 Get"
+        "$Input | ./powershell.resource.ps1 Get"
       ],
       "input": "stdin"
       },
@@ -37,7 +37,7 @@
         "-NonInteractive",
         "-NoProfile",
         "-Command",
-        "$Input | ./powershellgroup.resource.ps1 Set"
+        "$Input | ./powershell.resource.ps1 Set"
       ],
       "input": "stdin",
       "implementsPretest": true,
@@ -50,7 +50,7 @@
         "-NonInteractive",
         "-NoProfile",
         "-Command",
-        "$Input | ./powershellgroup.resource.ps1 Test"
+        "$Input | ./powershell.resource.ps1 Test"
       ],
       "input": "stdin",
       "return": "state"
@@ -62,7 +62,7 @@
         "-NonInteractive",
         "-NoProfile",
         "-Command",
-        "$Input | ./powershellgroup.resource.ps1 Export"
+        "$Input | ./powershell.resource.ps1 Export"
       ],
       "input": "stdin",
       "return": "state"
@@ -74,7 +74,7 @@
           "-NonInteractive",
           "-NoProfile",
           "-Command",
-          "$Input | ./powershellgroup.resource.ps1 Validate"
+          "$Input | ./powershell.resource.ps1 Validate"
           ]
       },
     "exitCodes": {

diff --git a/powershellgroup/powershellgroup.resource.ps1 → powershell-adapter/powershell.resource.ps1 b/powershellgroup/powershellgroup.resource.ps1 → powershell-adapter/powershell.resource.ps1
@@ -36,7 +36,7 @@ function RefreshCache
 if (($PSVersionTable.PSVersion.Major -eq 7) -and ($PSVersionTable.PSVersion.Minor -eq 4) `
    -and ($PSVersionTable.PSVersion.PreReleaseLabel.StartsWith("preview")))
 {
-    throw "PowerShell 7.4-previews are not supported by PowerShellGroup resource; please use PS 7.4.0-rc.1 or newer."
+    throw "PowerShell 7.4-previews are not supported by PowerShell adapter resource; please use PS 7.4.0-rc.1 or newer."
 }
 
 $inputobj_pscustomobj = $null
@@ -98,7 +98,7 @@ if ($Operation -eq 'List')
 
         $fullResourceTypeName = "$moduleName/$($r.ResourceType)"
         $script:ResourceCache[$fullResourceTypeName] = $r
-       if ($WinPS) {$requiresString = "DSC/WindowsPowerShellGroup"} else {$requiresString = "DSC/PowerShellGroup"}
+       if ($WinPS) {$requiresString = "Microsoft.Windows/WindowsPowerShell"} else {$requiresString = "Microsoft.DSC/PowerShell"}
 
         $z = [pscustomobject]@{
             type = $fullResourceTypeName;
@@ -396,5 +396,5 @@ elseif ($Operation -eq 'Validate')
 }
 else
 {
-    "ERROR: Unsupported operation requested from powershellgroup.resource.ps1"
+    "ERROR: Unsupported operation requested from powershell.resource.ps1"
 }
diff --git a/...windowspowershellgroup.resource.json_todo → ...pter/windowspowershell.resource.json_todo b/...windowspowershellgroup.resource.json_todo → ...pter/windowspowershell.resource.json_todo
@@ -1,6 +1,6 @@
 {
     "manifestVersion": "1.0",
-    "type": "DSC/WindowsPowerShellGroup",
+    "type": "Microsoft.Windows/WindowsPowerShell",
     "version": "0.1.0",
     "description": "Resource adapter to classic DSC Powershell resources in Windows PowerShell.",
     "adapter": {
@@ -11,7 +11,7 @@
           "-NonInteractive",
           "-NoProfile",
           "-Command",
-          "./powershellgroup.resource.ps1 -WinPS List"
+          "./powershell.resource.ps1 -WinPS List"
         ]
         },
       "config": "full"
@@ -23,7 +23,7 @@
         "-NonInteractive",
         "-NoProfile",
         "-Command",
-        "$Input | ./powershellgroup.resource.ps1 -WinPS Get"
+        "$Input | ./powershell.resource.ps1 -WinPS Get"
       ]
       },
     "set": {
@@ -33,7 +33,7 @@
         "-NonInteractive",
         "-NoProfile",
         "-Command",
-        "$Input | ./powershellgroup.resource.ps1 -WinPS Set"
+        "$Input | ./powershell.resource.ps1 -WinPS Set"
       ],
       "input": "stdin",
       "preTest": true,
@@ -46,7 +46,7 @@
         "-NonInteractive",
         "-NoProfile",
         "-Command",
-        "$Input | ./powershellgroup.resource.ps1 -WinPS Test"
+        "$Input | ./powershell.resource.ps1 -WinPS Test"
       ],
       "input": "stdin",
       "return": "state"

diff --git a/powershellgroup/copy_files.txt b/powershellgroup/copy_files.txt
diff --git a/wmigroup/Tests/test_wmi_config.dsc.yaml → wmi-adapter/Tests/test_wmi_config.dsc.yaml b/wmigroup/Tests/test_wmi_config.dsc.yaml → wmi-adapter/Tests/test_wmi_config.dsc.yaml
@@ -2,7 +2,7 @@
 $schema: https://raw.githubusercontent.com/PowerShell/DSC/main/schemas/2023/10/config/document.json
 resources:
 - name: Get info from WMI
-  type: DSC/WMIGroup
+  type: Microsoft.Windows/WMI
   properties:
     resources:
     - name: Get OS Info

diff --git a/wmigroup/Tests/wmigroup.tests.ps1 → wmi-adapter/Tests/wmigroup.tests.ps1 b/wmigroup/Tests/wmigroup.tests.ps1 → wmi-adapter/Tests/wmigroup.tests.ps1
@@ -1,7 +1,7 @@
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
 
-Describe 'PowerShellGroup resource tests' {
+Describe 'WMI adapter resource tests' {
 
     BeforeAll {
         if ($IsWindows)

diff --git a/wmi-adapter/copy_files.txt b/wmi-adapter/copy_files.txt
@@ -0,0 +1,2 @@
+wmi.resource.ps1
+wmi.dsc.resource.json.optout
diff --git a/wmigroup/wmigroup.dsc.resource.json.optout → wmi-adapter/wmi.dsc.resource.json.optout b/wmigroup/wmigroup.dsc.resource.json.optout → wmi-adapter/wmi.dsc.resource.json.optout
@@ -1,6 +1,6 @@
 {
     "$schema": "https://raw.githubusercontent.com/PowerShell/DSC/main/schemas/2023/08/bundled/resource/manifest.json",
-    "type": "DSC/WMIGroup",
+    "type": "Microsoft.Windows/WMI",
     "version": "0.1.0",
     "description": "Resource adapter to WMI resources.",
     "tags": [
@@ -14,7 +14,7 @@
           "-NonInteractive",
           "-NoProfile",
           "-Command",
-          "./wmigroup.resource.ps1 List"
+          "./wmi.resource.ps1 List"
         ]
         },
       "config": "full"
@@ -26,7 +26,7 @@
         "-NonInteractive",
         "-NoProfile",
         "-Command",
-        "$Input | ./wmigroup.resource.ps1 Get"
+        "$Input | ./wmi.resource.ps1 Get"
       ],
       "input": "stdin"
     },
@@ -37,7 +37,7 @@
           "-NonInteractive",
           "-NoProfile",
           "-Command",
-          "$Input | ./wmigroup.resource.ps1 Validate"
+          "$Input | ./wmi.resource.ps1 Validate"
           ]
       },
     "exitCodes": {

diff --git a/wmigroup/wmigroup.resource.ps1 → wmi-adapter/wmi.resource.ps1 b/wmigroup/wmigroup.resource.ps1 → wmi-adapter/wmi.resource.ps1
diff --git a/wmigroup/copy_files.txt b/wmigroup/copy_files.txt