Merge pull request #116 from SteveL-MSFT/resource-extension

rename from `.resource.json` to `.dsc.resource.json`
PowerShell · Aug 1, 2023 · 66191b0 · 66191b0
2 parents 26856c4 + d2e2e05
commit 66191b0
Show file tree

Hide file tree

Showing 10 changed files with 4 additions and 4 deletions.
diff --git a/build.ps1 b/build.ps1
@@ -132,7 +132,7 @@ foreach ($project in $projects) {
             Copy-Item "$path/$project" $target -ErrorAction Ignore
         }
 
-        Copy-Item "*.resource.json" $target -Force -ErrorAction Ignore
+        Copy-Item "*.dsc.resource.json" $target -Force -ErrorAction Ignore
         Copy-Item "*.resource.ps1" $target -Force -ErrorAction Ignore
         Copy-Item "*.command.json" $target -Force -ErrorAction Ignore
 
@@ -174,7 +174,7 @@ if (!$found) {
 
 if ($Test) {
     $failed = $false
-    
+
     $FullyQualifiedName = @{ModuleName="PSDesiredStateConfiguration";ModuleVersion="2.0.7"}
     if (-not(Get-Module -ListAvailable -FullyQualifiedName $FullyQualifiedName))
     {   "Installing module PSDesiredStateConfiguration 2.0.7"

diff --git a/dsc/assertion.resource.json → dsc/assertion.dsc.resource.json b/dsc/assertion.resource.json → dsc/assertion.dsc.resource.json
diff --git a/dsc/group.resource.json → dsc/group.dsc.resource.json b/dsc/group.resource.json → dsc/group.dsc.resource.json
diff --git a/dsc/parallel.resource.json → dsc/parallel.dsc.resource.json b/dsc/parallel.resource.json → dsc/parallel.dsc.resource.json
diff --git a/dsc_lib/src/discovery/command_discovery.rs b/dsc_lib/src/discovery/command_discovery.rs
@@ -59,7 +59,7 @@ impl ResourceDiscovery for CommandDiscovery {
                     let path = entry.path();
                     if path.is_file() {
                         let file_name = path.file_name().unwrap().to_str().unwrap();
-                        if file_name.ends_with(".resource.json") {
+                        if file_name.to_lowercase().ends_with(".dsc.resource.json") {
                             let resource = import_manifest(&path)?;
                             if resource.manifest.is_some() {
                                 let manifest = serde_json::from_value::<ResourceManifest>(resource.manifest.clone().unwrap())?;

diff --git a/osinfo/osinfo.resource.json → osinfo/osinfo.dsc.resource.json b/osinfo/osinfo.resource.json → osinfo/osinfo.dsc.resource.json
diff --git a/...rshellgroup/powershellgroup.resource.json → ...llgroup/powershellgroup.dsc.resource.json b/...rshellgroup/powershellgroup.resource.json → ...llgroup/powershellgroup.dsc.resource.json
diff --git a/registry/registry.resource.json → registry/registry.dsc.resource.json b/registry/registry.resource.json → registry/registry.dsc.resource.json
diff --git a/test_group_resource/testGroup.resource.json → ...roup_resource/testGroup.dsc.resource.json b/test_group_resource/testGroup.resource.json → ...roup_resource/testGroup.dsc.resource.json
diff --git a/test_group_resource/tests/provider.tests.ps1 b/test_group_resource/tests/provider.tests.ps1
@@ -52,7 +52,7 @@ Describe 'Resource provider tests' {
 '@
         $oldPath = $env:PATH
         try {
-            Set-Content -Path testdrive:/invalid.resource.json -Value $invalid_manifest
+            Set-Content -Path testdrive:/invalid.dsc.resource.json -Value $invalid_manifest
             $env:PATH += [System.IO.Path]::PathSeparator + (Resolve-Path (Resolve-Path $TestDrive -Relative))
 
             $out = dsc resource list *invalid* 2>&1