Skip to content

Commit 91cc663

Browse files
SteveL-MSFTSteveL-MSFT
committed
fix resource manifests and tests
1 parent e7683ad commit 91cc663

25 files changed

+205
-132
lines changed

‎archive/registry/registry.dsc.resource.json

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,27 +11,36 @@
1111
"executable": "registry",
1212
"args": [
1313
"config",
14-
"get"
15-
],
16-
"input": "stdin"
14+
"get",
15+
{
16+
"jsonInputArg": "--input",
17+
"mandatory": true
18+
}
19+
]
1720
},
1821
"set": {
1922
"executable": "registry",
2023
"args": [
2124
"config",
22-
"set"
25+
"set",
26+
{
27+
"jsonInputArg": "--input",
28+
"mandatory": true
29+
}
2330
],
24-
"input": "stdin",
2531
"implementsPretest": true,
2632
"return": "state"
2733
},
2834
"test": {
2935
"executable": "registry",
3036
"args": [
3137
"config",
32-
"test"
38+
"test",
39+
{
40+
"jsonInputArg": "--input",
41+
"mandatory": true
42+
}
3343
],
34-
"input": "stdin",
3544
"return": "state"
3645
},
3746
"exitCodes": {

‎dsc/assertion.dsc.resource.json

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,12 @@
1212
"config",
1313
"--as-group",
1414
"test",
15-
"--as-get"
16-
],
17-
"input": "stdin"
15+
"--as-get",
16+
{
17+
"jsonInputArg": "--input",
18+
"mandatory": true
19+
}
20+
]
1821
},
1922
"set": {
2023
"executable": "dsc",
@@ -23,9 +26,12 @@
2326
"pass-through",
2427
"config",
2528
"--as-group",
26-
"test"
29+
"test",
30+
{
31+
"jsonInputArg": "--input",
32+
"mandatory": true
33+
}
2734
],
28-
"input": "stdin",
2935
"implementsPretest": true,
3036
"return": "state"
3137
},
@@ -37,9 +43,12 @@
3743
"config",
3844
"--as-group",
3945
"test",
40-
"--as-config"
46+
"--as-config",
47+
{
48+
"jsonInputArg": "--input",
49+
"mandatory": true
50+
}
4151
],
42-
"input": "stdin",
4352
"return": "state"
4453
},
4554
"exitCodes": {
@@ -58,8 +67,11 @@
5867
"--trace-format",
5968
"pass-through",
6069
"config",
61-
"validate"
62-
],
63-
"input": "stdin"
70+
"validate",
71+
{
72+
"jsonInputArg": "--input",
73+
"mandatory": true
74+
}
75+
]
6476
}
6577
}

‎dsc/group.dsc.resource.json

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,12 @@
1111
"pass-through",
1212
"config",
1313
"--as-group",
14-
"get"
15-
],
16-
"input": "stdin"
14+
"get",
15+
{
16+
"jsonInputArg": "--input",
17+
"mandatory": true
18+
}
19+
]
1720
},
1821
"set": {
1922
"executable": "dsc",
@@ -22,9 +25,12 @@
2225
"pass-through",
2326
"config",
2427
"--as-group",
25-
"set"
28+
"set",
29+
{
30+
"jsonInputArg": "--input",
31+
"mandatory": true
32+
}
2633
],
27-
"input": "stdin",
2834
"implementsPretest": true,
2935
"return": "state"
3036
},
@@ -35,9 +41,12 @@
3541
"pass-through",
3642
"config",
3743
"--as-group",
38-
"test"
44+
"test",
45+
{
46+
"jsonInputArg": "--input",
47+
"mandatory": true
48+
}
3949
],
40-
"input": "stdin",
4150
"return": "state"
4251
},
4352
"exitCodes": {
@@ -56,8 +65,11 @@
5665
"--trace-format",
5766
"pass-through",
5867
"config",
59-
"validate"
60-
],
61-
"input": "stdin"
68+
"validate",
69+
{
70+
"jsonInputArg": "--input",
71+
"mandatory": true
72+
}
73+
]
6274
}
6375
}

‎dsc/include.dsc.resource.json

Lines changed: 23 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,12 @@
1212
"config",
1313
"--as-include",
1414
"--as-group",
15-
"get"
16-
],
17-
"input": "stdin"
15+
"get",
16+
{
17+
"jsonInputArg": "--input",
18+
"mandatory": true
19+
}
20+
]
1821
},
1922
"set": {
2023
"executable": "dsc",
@@ -24,9 +27,12 @@
2427
"config",
2528
"--as-include",
2629
"--as-group",
27-
"set"
30+
"set",
31+
{
32+
"jsonInputArg": "--input",
33+
"mandatory": true
34+
}
2835
],
29-
"input": "stdin",
3036
"implementsPretest": true,
3137
"return": "state"
3238
},
@@ -38,9 +44,12 @@
3844
"config",
3945
"--as-include",
4046
"--as-group",
41-
"test"
42-
],
43-
"input": "stdin"
47+
"test",
48+
{
49+
"jsonInputArg": "--input",
50+
"mandatory": true
51+
}
52+
]
4453
},
4554
"exitCodes": {
4655
"0": "Success",
@@ -58,8 +67,11 @@
5867
"pass-through",
5968
"config",
6069
"--as-include",
61-
"validate"
62-
],
63-
"input": "stdin"
70+
"validate",
71+
{
72+
"jsonInputArg": "--input",
73+
"mandatory": true
74+
}
75+
]
6476
}
6577
}

‎dsc/parallel.dsc.resource.json

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,12 @@
1212
"config",
1313
"--parallel",
1414
"--as-group",
15-
"get"
16-
],
17-
"input": "stdin"
15+
"get",
16+
{
17+
"jsonInputArg": "--input",
18+
"mandatory": true
19+
}
20+
]
1821
},
1922
"set": {
2023
"executable": "dsc",
@@ -24,9 +27,12 @@
2427
"config",
2528
"--parallel",
2629
"--as-group",
27-
"set"
30+
"set",
31+
{
32+
"jsonInputArg": "--input",
33+
"mandatory": true
34+
}
2835
],
29-
"input": "stdin",
3036
"implementsPretest": true,
3137
"return": "state"
3238
},
@@ -38,9 +44,12 @@
3844
"config",
3945
"--parallel",
4046
"--as-group",
41-
"test"
47+
"test",
48+
{
49+
"jsonInputArg": "--input",
50+
"mandatory": true
51+
}
4252
],
43-
"input": "stdin",
4453
"return": "state"
4554
},
4655
"exitCodes": {
@@ -59,8 +68,11 @@
5968
"--trace-format",
6069
"pass-through",
6170
"config",
62-
"validate"
63-
],
64-
"input": "stdin"
71+
"validate",
72+
{
73+
"jsonInputArg": "--input",
74+
"mandatory": true
75+
}
76+
]
6577
}
6678
}

‎dsc/src/args.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ pub struct Args {
3030
pub subcommand: SubCommand,
3131
#[clap(short = 'l', long, help = "Trace level to use", value_enum)]
3232
pub trace_level: Option<TraceLevel>,
33-
#[clap(short = 'f', long, help = "Trace format to use", value_enum)]
33+
#[clap(short = 't', long, help = "Trace format to use", value_enum)]
3434
pub trace_format: Option<TraceFormat>,
3535
}
3636

@@ -67,7 +67,7 @@ pub enum SubCommand {
6767
Schema {
6868
#[clap(name = "type", short, long, help = "The type of DSC schema to get")]
6969
dsc_type: DscType,
70-
#[clap(short = 'f', long, help = "The output format to use")]
70+
#[clap(short = 'o', long, help = "The output format to use")]
7171
format: Option<OutputFormat>,
7272
},
7373
}
@@ -184,9 +184,9 @@ pub enum ResourceSubCommand {
184184
resource: String,
185185
#[clap(short, long, help = "The input to pass to the resource as JSON or YAML", conflicts_with = "file")]
186186
input: Option<String>,
187-
#[clap(short = 'p', long, help = "The path to a JSON or YAML file used as input to the configuration or resource. Use '-' for the file to read from STDIN.", conflicts_with = "input")]
187+
#[clap(short = 'f', long, help = "The path to a JSON or YAML file used as input to the configuration or resource. Use '-' for the file to read from STDIN.", conflicts_with = "input")]
188188
file: Option<String>,
189-
#[clap(short = 'f', long, help = "The output format to use")]
189+
#[clap(short = 'o', long, help = "The output format to use")]
190190
output_format: Option<OutputFormat>,
191191
},
192192
#[clap(name = "delete", about = "Invoke the delete operation to a resource", arg_required_else_help = true)]
@@ -195,7 +195,7 @@ pub enum ResourceSubCommand {
195195
resource: String,
196196
#[clap(short, long, help = "The input to pass to the resource as JSON or YAML", conflicts_with = "file")]
197197
input: Option<String>,
198-
#[clap(short = 'p', long, help = "The path to a JSON or YAML file used as input to the configuration or resource. Use '-' for the file to read from STDIN.", conflicts_with = "input")]
198+
#[clap(short = 'f', long, help = "The path to a JSON or YAML file used as input to the configuration or resource. Use '-' for the file to read from STDIN.", conflicts_with = "input")]
199199
file: Option<String>,
200200
},
201201
#[clap(name = "schema", about = "Get the JSON schema for a resource", arg_required_else_help = true)]

0 commit comments

Comments
 (0)