From 31137f64b407bbc1e7441aefaa2a801f543d738a Mon Sep 17 00:00:00 2001
From: Steve Lee <slee@microsoft.com>
Date: Sat, 2 Mar 2024 12:53:22 -0800
Subject: [PATCH 1/2] rename group resources to conform to namespace standard
---
dsc/assertion.dsc.resource.json | 2 +-
dsc/examples/assertion.dsc.yaml | 4 ++--
dsc/examples/brew.dsc.yaml | 4 ++--
dsc/examples/brew_uninstall.dsc.yaml | 4 ++--
dsc/examples/groups.dsc.yaml | 8 ++++----
dsc/examples/parallel.dsc.yaml | 4 ++--
dsc/group.dsc.resource.json | 2 +-
dsc/parallel.dsc.resource.json | 2 +-
dsc/tests/dsc_group.tests.ps1 | 6 +++---
dsc/tests/dsc_resource_list.tests.ps1 | 6 +++---
10 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/dsc/assertion.dsc.resource.json b/dsc/assertion.dsc.resource.json
index 1449585b..b478d52f 100644
--- 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.",
"get": {
diff --git a/dsc/examples/assertion.dsc.yaml b/dsc/examples/assertion.dsc.yaml
index 25f868dd..0f50de32 100644
--- 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
index 4c9860db..6d5db1de 100644
--- 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
index 461c559c..86f9f6e1 100644
--- 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
index 734cfbe8..0cb7b0d9 100644
--- 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
index 56c73644..332f5e5b 100644
--- 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
index 6e3fcfca..da88cc7a 100644
--- 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.",
"get": {
diff --git a/dsc/parallel.dsc.resource.json b/dsc/parallel.dsc.resource.json
index 6f644eba..c082ea1d 100644
--- 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.",
"get": {
diff --git a/dsc/tests/dsc_group.tests.ps1 b/dsc/tests/dsc_group.tests.ps1
index 66b2259d..a64b0c11 100644
--- a/dsc/tests/dsc_group.tests.ps1
+++ b/dsc/tests/dsc_group.tests.ps1
@@ -8,7 +8,7 @@ Describe 'Group resource tests' {
$out | Should -BeExactly @'
results:
- name: First Group
- type: DSC/Group
+ type: Microsoft.DSC/Group
result:
- name: First
type: Test/Echo
@@ -16,7 +16,7 @@ results:
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
index 3d3d9cc9..9087d65d 100644
--- a/dsc/tests/dsc_resource_list.tests.ps1
+++ b/dsc/tests/dsc_resource_list.tests.ps1
@@ -7,9 +7,9 @@ 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'
}
From b951dd5c2f5e91e2cfc12171e9aeec455a2e6a61 Mon Sep 17 00:00:00 2001
From: "Steve Lee (POWERSHELL HE/HIM) (from Dev Box)"
<slee@ntdev.microsoft.com>
Date: Sat, 2 Mar 2024 17:09:01 -0800
Subject: [PATCH 2/2] fix test from bad merge
---
dsc/tests/dsc_resource_list.tests.ps1 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dsc/tests/dsc_resource_list.tests.ps1 b/dsc/tests/dsc_resource_list.tests.ps1
index 25b0cca6..2eebdf80 100644
--- a/dsc/tests/dsc_resource_list.tests.ps1
+++ b/dsc/tests/dsc_resource_list.tests.ps1
@@ -11,7 +11,7 @@ Describe 'Tests for listing resources' {
$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'
}