Skip to content

Commit 8716780

Browse files
authored
Merge pull request #838 from Gijsreyn/update-docs
Update Test/Echo docs and new format() reference doc
2 parents 48c7687 + f3382b7 commit 8716780

File tree

22 files changed

+281
-150
lines changed

22 files changed

+281
-150
lines changed

.github/ISSUE_TEMPLATE/Bug_Report.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ body:
3838
$schema: https://aka.ms/dsc/schemas/v3/bundled/config/document.json
3939
resources:
4040
- name: repro
41-
type: Test/Echo
41+
type: Microsoft.DSC.Debug/Echo
4242
properties:
4343
output: expected value
4444
```
@@ -59,7 +59,7 @@ body:
5959
6060
results:
6161
- name: repro
62-
type: Test/Echo
62+
type: Microsoft.DSC.Debug/Echo
6363
result:
6464
actualState:
6565
output: expected value
@@ -77,7 +77,7 @@ body:
7777
7878
results:
7979
- name: repro
80-
type: Test/Echo
80+
type: Microsoft.DSC.Debug/Echo
8181
result:
8282
actualState:
8383
output: other value

.vscode/docs.code-snippets

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,19 +45,19 @@
4545
"\\$schema: https://aka.ms/dsc/schemas/v3/bundled/config/document.json",
4646
"resources:",
4747
"- name: ${7:descriptive resource name}",
48-
" type: Test/Echo",
48+
" type: Microsoft.DSC.Debug/Echo",
4949
" properties:",
5050
" output: \"[${1:name}(${8:example input})]\"",
5151
"```",
5252
"",
5353
"```bash",
54-
"dsc config get --document ${1:name}.example.1.dsc.config.yaml",
54+
"dsc config get --file ${1:name}.example.1.dsc.config.yaml",
5555
"```",
5656
"",
5757
"```yaml",
5858
"results:",
5959
"- name: ${7:descriptive resource name}",
60-
" type: Test/Echo",
60+
" type: Microsoft.DSC.Debug/Echo",
6161
" result:",
6262
" actualState:",
6363
" output: ${9:example output}",
@@ -104,19 +104,19 @@
104104
"\\$schema: https://aka.ms/dsc/schemas/v3/bundled/config/document.json",
105105
"resources:",
106106
"- name: ${4:descriptive resource name}",
107-
" type: Test/Echo",
107+
" type: Microsoft.DSC.Debug/Echo",
108108
" properties:",
109109
" output: \"[$TM_FILENAME_BASE(${5:example input})]\"",
110110
"```",
111111
"",
112112
"```bash",
113-
"dsc config get --document ${TM_FILENAME_BASE}.example.$1.dsc.config.yaml",
113+
"dsc config get --file ${TM_FILENAME_BASE}.example.$1.dsc.config.yaml",
114114
"```",
115115
"",
116116
"```yaml",
117117
"results:",
118118
"- name: $4",
119-
" type: Test/Echo",
119+
" type: Microsoft.DSC.Debug/Echo",
120120
" result:",
121121
" actualState:",
122122
" output: ${6:example output}",

docs/reference/cli/config/set.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,22 +80,22 @@ cat ./example.dsc.config.yaml | dsc config set --file -
8080

8181
<a id="example-2"></a>
8282

83-
The command uses the **path** option to enforce the configuration defined in the
83+
The command uses the **file** option to enforce the configuration defined in the
8484
`example.dsc.config.yaml` file.
8585

8686
```sh
87-
dsc config set --path ./example.dsc.config.yaml
87+
dsc config set --file ./example.dsc.config.yaml
8888
```
8989

9090
### Example 3 - Passing a configuration document as a variable
9191

9292
<a id="example-3"></a>
9393

94-
The command uses the **document** option to enforce the configuration stored in the `$desired`
94+
The command uses the **input** option to enforce the configuration stored in the `$desired`
9595
variable.
9696

9797
```sh
98-
dsc config set --document $desired
98+
dsc config set --input $desired
9999
```
100100

101101
## Options

docs/reference/cli/config/test.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ dsc config test [Options] --file <FILE>
2222
### Configuration document from option string
2323

2424
```sh
25-
dsc config test [Options] --document <INPUT>
25+
dsc config test [Options] --input <INPUT>
2626
```
2727

2828
### Configuration document from stdin

docs/reference/schemas/config/functions/add.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,19 +33,19 @@ This example document shows how you can use the `add()` function to return the s
3333
$schema: https://aka.ms/dsc/schemas/v3/bundled/config/document.json
3434
resources:
3535
- name: Sum of 3 and 5
36-
type: Test/Echo
36+
type: Microsoft.DSC.Debug/Echo
3737
properties:
3838
output: "[add(3, 5)]"
3939
```
4040
4141
```bash
42-
dsc config get --document add.example.1.dsc.config.yaml
42+
dsc config get --file add.example.1.dsc.config.yaml
4343
```
4444

4545
```yaml
4646
results:
4747
- name: Sum of 3 and 5
48-
type: Test/Echo
48+
type: Microsoft.DSC.Debug/Echo
4949
result:
5050
actualState:
5151
output: 8
@@ -63,19 +63,19 @@ configuration functions that return integer values.
6363
$schema: https://aka.ms/dsc/schemas/v3/bundled/config/document.json
6464
resources:
6565
- name: Add nested function outputs
66-
type: Test/Echo
66+
type: Microsoft.DSC.Debug/Echo
6767
properties:
6868
output: "[add(mul(2,3), div(6,3))]"
6969
```
7070

7171
```bash
72-
dsc config get --document add.example.2.dsc.config.yaml
72+
dsc config get --file add.example.2.dsc.config.yaml
7373
```
7474

7575
```yaml
7676
results:
7777
- name: Add nested function outputs
78-
type: Test/Echo
78+
type: Microsoft.DSC.Debug/Echo
7979
result:
8080
actualState:
8181
output: 8

docs/reference/schemas/config/functions/base64.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,19 +34,19 @@ The configuration converts a basic string value with the `base64()` function.
3434
$schema: https://aka.ms/dsc/schemas/v3/bundled/config/document.json
3535
resources:
3636
- name: Echo 'abc' in base64
37-
type: Test/Echo
37+
type: Microsoft.DSC.Debug/Echo
3838
properties:
3939
output: "[base64('abc')]"
4040
```
4141
4242
```bash
43-
dsc --input-file base64.example.1.dsc.config.yaml config get
43+
dsc --file base64.example.1.dsc.config.yaml config get
4444
```
4545

4646
```yaml
4747
results:
4848
- name: Echo 'abc' in base64
49-
type: Test/Echo
49+
type: Microsoft.DSC.Debug/Echo
5050
result:
5151
actualState:
5252
output: YWJj
@@ -64,19 +64,19 @@ strings `a`, `b`, and `c` into `abc` before returning the base64 representation.
6464
$schema: https://aka.ms/dsc/schemas/v3/bundled/config/document.json
6565
resources:
6666
- name: Echo concatenated 'a', 'b', 'c' in base64
67-
type: Test/Echo
67+
type: Microsoft.DSC.Debug/Echo
6868
properties:
6969
output: "[base64(concat('a', 'b', 'c'))]"
7070
```
7171

7272
```bash
73-
dsc --input-file base64.example.2.dsc.config.yaml config get
73+
dsc --file base64.example.2.dsc.config.yaml config get
7474
```
7575

7676
```yaml
7777
results:
7878
- name: Echo concatenated 'a', 'b', 'c' in base64
79-
type: Test/Echo
79+
type: Microsoft.DSC.Debug/Echo
8080
result:
8181
actualState:
8282
output: YWJj

docs/reference/schemas/config/functions/concat.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,19 +38,19 @@ The configuration uses the `concat()` function to join the strings `abc` and `de
3838
$schema: https://aka.ms/dsc/schemas/v3/bundled/config/document.json
3939
resources:
4040
- name: Echo 'abcdef'
41-
type: Test/Echo
41+
type: Microsoft.DSC.Debug/Echo
4242
properties:
4343
output: "[concat('abc', 'def')]"
4444
```
4545
4646
```bash
47-
dsc --input-file concat.example.1.dsc.config.yaml config get
47+
dsc config get --file concat.example.1.dsc.config.yaml
4848
```
4949

5050
```yaml
5151
results:
5252
- name: Echo 'abcdef'
53-
type: Test/Echo
53+
type: Microsoft.DSC.Debug/Echo
5454
result:
5555
actualState:
5656
output: abcdef
@@ -67,7 +67,7 @@ The configuration uses the `concat()` function to return a combined array of str
6767
$schema: https://aka.ms/dsc/schemas/v3/bundled/config/document.json
6868
resources:
6969
- name: Echo ['a', 'b', 'c', 'd', 'e', 'f']
70-
type: Test/Echo
70+
type: Microsoft.DSC.Debug/Echo
7171
properties:
7272
output: >-
7373
[concat(
@@ -77,13 +77,13 @@ resources:
7777
```
7878

7979
```bash
80-
dsc config get --document concat.example.2.dsc.config.yaml
80+
dsc config get --file concat.example.2.dsc.config.yaml
8181
```
8282

8383
```yaml
8484
results:
8585
- name: Echo ['a', 'b', 'c', 'd', 'e', 'f']
86-
type: Test/Echo
86+
type: Microsoft.DSC.Debug/Echo
8787
result:
8888
actualState:
8989
output:

docs/reference/schemas/config/functions/createArray.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,19 +36,19 @@ example synopsis
3636
$schema: https://aka.ms/dsc/schemas/v3/bundled/config/document.json
3737
resources:
3838
- name: Echo array of integers
39-
type: Test/Echo
39+
type: Microsoft.DSC.Debug/Echo
4040
properties:
4141
output: "[createArray(1, 3, 5)]"
4242
```
4343
4444
```bash
45-
dsc config get --document createArray.example.1.dsc.config.yaml config get
45+
dsc config get --file createArray.example.1.dsc.config.yaml config get
4646
```
4747

4848
```yaml
4949
results:
5050
- name: Echo array of integers
51-
type: Test/Echo
51+
type: Microsoft.DSC.Debug/Echo
5252
result:
5353
actualState:
5454
output:
@@ -69,19 +69,19 @@ sub-array contains only integers. The second sub-array contains only strings.
6969
$schema: https://aka.ms/dsc/schemas/v3/bundled/config/document.json
7070
resources:
7171
- name: Create array of arrays
72-
type: Test/Echo
72+
type: Microsoft.DSC.Debug/Echo
7373
properties:
7474
output: "[createArray(createArray(1,3,5), createArray('a', 'b', 'c'))]"
7575
```
7676
7777
```bash
78-
dsc config get --document createArray.example.2.dsc.config.yaml
78+
dsc config get --file createArray.example.2.dsc.config.yaml
7979
```
8080

8181
```yaml
8282
results:
8383
- name: Create array of arrays
84-
type: Test/Echo
84+
type: Microsoft.DSC.Debug/Echo
8585
result:
8686
actualState:
8787
output:
@@ -105,7 +105,7 @@ strings. It uses YAML's folded multiline string syntax to make the function more
105105
$schema: https://aka.ms/dsc/schemas/v3/bundled/config/document.json
106106
resources:
107107
- name: Echo flattened array
108-
type: Test/Echo
108+
type: Microsoft.DSC.Debug/Echo
109109
properties:
110110
output: >-
111111
[concat(
@@ -115,13 +115,13 @@ resources:
115115
```
116116
117117
```bash
118-
dsc config get --document createArray.example.3.dsc.config.yaml
118+
dsc config get --file createArray.example.3.dsc.config.yaml
119119
```
120120

121121
```yaml
122122
results:
123123
- name: Echo flattened array
124-
type: Test/Echo
124+
type: Microsoft.DSC.Debug/Echo
125125
result:
126126
actualState:
127127
output:

docs/reference/schemas/config/functions/div.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,19 +35,19 @@ integers.
3535
$schema: https://aka.ms/dsc/schemas/v3/bundled/config/document.json
3636
resources:
3737
- name: Dividing integers
38-
type: Test/Echo
38+
type: Microsoft.DSC.Debug/Echo
3939
properties:
4040
output: "[div(6,3)]"
4141
```
4242
4343
```bash
44-
dsc config get --document div.example.1.dsc.config.yaml config get
44+
dsc config get --file div.example.1.dsc.config.yaml config get
4545
```
4646

4747
```yaml
4848
results:
4949
- name: Dividing integers
50-
type: Test/Echo
50+
type: Microsoft.DSC.Debug/Echo
5151
result:
5252
actualState:
5353
output: 2
@@ -66,19 +66,19 @@ full integer value without the remainder. It doesn't round the result up to 3.
6666
$schema: https://aka.ms/dsc/schemas/v3/bundled/config/document.json
6767
resources:
6868
- name: Dividing nested functions
69-
type: Test/Echo
69+
type: Microsoft.DSC.Debug/Echo
7070
properties:
7171
output: "[div(mul(7,2), add(4,1))]"
7272
```
7373

7474
```bash
75-
dsc config get --document div.example.2.dsc.config.yaml
75+
dsc config get --file div.example.2.dsc.config.yaml
7676
```
7777

7878
```yaml
7979
results:
8080
- name: Dividing nested functions
81-
type: Test/Echo
81+
type: Microsoft.DSC.Debug/Echo
8282
result:
8383
actualState:
8484
output: 2

docs/reference/schemas/config/functions/envvar.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,14 @@ commands, DSC automatically creates the `DSC_CONFIG_ROOT` environment variable a
3131
the parent folder of the specified configuration document. For more information, see
3232
[dsc config command reference][01].
3333

34-
This configuration echoes that folder with the `Test/Echo` resource.
34+
This configuration echoes that folder with the `Microsoft.DSC.Debug/Echo` resource.
3535

3636
```yaml
3737
# ./examples/envvar.example.1.dsc.config.yaml
3838
$schema: https://aka.ms/dsc/schemas/v3/bundled/config/document.json
3939
resources:
4040
- name: Echo 'DSC_CONFIG_ROOT' in envvar
41-
type: Test/Echo
41+
type: Microsoft.DSC.Debug/Echo
4242
properties:
4343
output: "[envvar('DSC_CONFIG_ROOT')]"
4444
```
@@ -50,7 +50,7 @@ dsc config get --path ~/dsc/examples/envvar.example.1.dsc.config.yaml
5050
```yaml
5151
results:
5252
- name: Echo DSC_CONFIG_ROOT
53-
type: Test/Echo
53+
type: Microsoft.DSC.Debug/Echo
5454
result:
5555
actualState:
5656
output: ~/dsc/examples

0 commit comments

Comments
 (0)