Skip to content

Commit 3914c2e

Browse files
committed
remove used types and fix test
1 parent 2a3ad9d commit 3914c2e

4 files changed

Lines changed: 1 addition & 44 deletions

File tree

dsc/tests/dsc_export.tests.ps1

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ resources:
163163
$out.resources[1].properties.hello | Should -BeExactly 'world'
164164
}
165165

166-
It 'Export can surface _kind, _securityContext, and _name from a resource' {
166+
It 'Export can surface _securityContext and _name from a resource' {
167167
$yaml = @'
168168
$schema: https://raw.githubusercontent.com/PowerShell/DSC/main/schemas/2023/08/config/document.json
169169
resources:
@@ -176,9 +176,7 @@ resources:
176176
$LASTEXITCODE | Should -Be 0
177177
$out.resources.count | Should -Be 1
178178
$out.resources[0].name | Should -BeExactly 'TestName'
179-
$out.resources[0].kind | Should -BeExactly 'TestKind'
180179
$out.resources[0].metadata.'Microsoft.DSC'.securityContext | Should -BeExactly 'elevated'
181-
$out.resources[0].properties.psobject.properties.name | Should -Not -Contain '_kind'
182180
$out.resources[0].properties.psobject.properties.name | Should -Not -Contain '_securityContext'
183181
$out.resources[0].properties.psobject.properties.name | Should -Not -Contain '_name'
184182
}

lib/dsc-lib/src/configure/config_doc.rs

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -427,44 +427,6 @@ pub struct Copy {
427427
pub batch_size: Option<IntOrExpression>,
428428
}
429429

430-
#[derive(Debug, Clone, PartialEq, Deserialize, Serialize, JsonSchema)]
431-
#[serde(deny_unknown_fields)]
432-
pub struct Plan {
433-
pub name: String,
434-
#[serde(skip_serializing_if = "Option::is_none", rename = "promotionCode")]
435-
pub promotion_code: Option<String>,
436-
#[serde(skip_serializing_if = "Option::is_none")]
437-
pub publisher: Option<String>,
438-
#[serde(skip_serializing_if = "Option::is_none")]
439-
pub product: Option<String>,
440-
#[serde(skip_serializing_if = "Option::is_none")]
441-
pub version: Option<String>,
442-
}
443-
444-
#[derive(Debug, Clone, PartialEq, Deserialize, Serialize, JsonSchema)]
445-
#[serde(deny_unknown_fields)]
446-
pub struct Identity {
447-
#[serde(skip_serializing_if = "Option::is_none")]
448-
pub r#type: Option<String>,
449-
#[serde(skip_serializing_if = "Option::is_none", rename = "userAssignedIdentities")]
450-
pub user_assigned_identities: Option<Map<String, Value>>,
451-
}
452-
453-
#[derive(Debug, Clone, PartialEq, Deserialize, Serialize, JsonSchema)]
454-
#[serde(deny_unknown_fields)]
455-
pub struct Sku {
456-
#[serde(skip_serializing_if = "Option::is_none")]
457-
pub name: Option<String>,
458-
#[serde(skip_serializing_if = "Option::is_none")]
459-
pub tier: Option<String>,
460-
#[serde(skip_serializing_if = "Option::is_none")]
461-
pub size: Option<String>,
462-
#[serde(skip_serializing_if = "Option::is_none")]
463-
pub family: Option<String>,
464-
#[serde(skip_serializing_if = "Option::is_none")]
465-
pub capacity: Option<i32>,
466-
}
467-
468430
#[derive(Debug, Clone, PartialEq, Deserialize, Serialize, JsonSchema, DscRepoSchema)]
469431
#[serde(deny_unknown_fields, rename_all = "camelCase")]
470432
#[dsc_repo_schema(base_name = "document.resource", folder_path = "config")]

tools/dsctest/src/export.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ pub struct Export {
1010
/// Number of instances to return
1111
pub count: u64,
1212
#[serde(skip_serializing_if = "Option::is_none")]
13-
pub _kind: Option<String>,
14-
#[serde(skip_serializing_if = "Option::is_none")]
1513
pub _name: Option<String>,
1614
#[serde(rename = "_securityContext", skip_serializing_if = "Option::is_none")]
1715
pub _security_context: Option<String>,

tools/dsctest/src/main.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,6 @@ fn main() {
125125
for i in 0..export.count {
126126
let instance = Export {
127127
count: i,
128-
_kind: Some("TestKind".to_string()),
129128
_name: Some("TestName".to_string()),
130129
_security_context: Some("elevated".to_string()),
131130
};

0 commit comments

Comments
 (0)