Skip to content

Commit 014a16f

Browse files
committed
rename to just manifestPath
1 parent 316c980 commit 014a16f

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

dsc_lib/src/extensions/discover.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@ pub struct DiscoverMethod {
1616
#[derive(Debug, Clone, PartialEq, Deserialize, Serialize, JsonSchema)]
1717
pub struct DiscoverResult {
1818
/// The path to the resource manifest, must be absolute.
19-
#[serde(rename = "resourceManifestPath")]
20-
pub resource_manifest_path: String,
19+
#[serde(rename = "manifestPath")]
20+
pub manifest_path: String,
2121
}

dsc_lib/src/extensions/dscextension.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,10 +105,10 @@ impl DscExtension {
105105
return Err(DscError::Json(err));
106106
}
107107
};
108-
if !Path::new(&discover_result.resource_manifest_path).is_absolute() {
109-
return Err(DscError::Extension(t!("extensions.dscextension.discoverNotAbsolutePath", extension = self.type_name.clone(), path = discover_result.resource_manifest_path.clone()).to_string()));
108+
if !Path::new(&discover_result.manifest_path).is_absolute() {
109+
return Err(DscError::Extension(t!("extensions.dscextension.discoverNotAbsolutePath", extension = self.type_name.clone(), path = discover_result.manifest_path.clone()).to_string()));
110110
}
111-
let manifest_path = Path::new(&discover_result.resource_manifest_path);
111+
let manifest_path = Path::new(&discover_result.manifest_path);
112112
// Currently we don't support extensions discovering other extensions
113113
if let ImportedManifest::Resource(resource) = load_manifest(manifest_path)? {
114114
resources.push(resource);

extensions/test/discover/discover.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ param(
99

1010
Get-ChildItem -Path $PSScriptRoot/resources/*.json | ForEach-Object {
1111
$resource = [pscustomobject]@{
12-
resourceManifestPath = if ($RelativePath) {
12+
manifestPath = if ($RelativePath) {
1313
Resolve-Path -Path $_.FullName -Relative
1414
} else {
1515
$_.FullName

0 commit comments

Comments
 (0)