Skip to content

Commit 7108515

Browse files
steveshorttsteveshortt
committed
working on parsing parms
1 parent f762710 commit 7108515

18 files changed

Lines changed: 143 additions & 141 deletions

‎Synapse.Core/Utilities/YamlHelpers.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -366,6 +366,8 @@ internal static void ApplyPatchValues(List<object> source, List<object> patch, I
366366

367367
internal static object RegexReplaceOrValue(object input, object replacement, IReplacementValueOptions rv)
368368
{
369+
if( replacement is Dictionary<object, object> && ((Dictionary<object, object>)replacement).Count > 0 )
370+
replacement = ((Dictionary<object, object>)replacement).ElementAt( 0 ).Value;
369371
object value = replacement;
370372

371373
if( rv != null )

‎Synapse.UnitTests/Plans/Plans/RunAs0_out.yaml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Actions:
2828
StartInfo:
2929
ParentExitData: &o1
3030
CurrentPrincipal: LAPTOP-TK2D9TB6\synapse0
31-
InstanceId: 105
31+
InstanceId: 104
3232
RunAs: *o0
3333
RunAs: &o2
3434
Domain: LAPTOP-TK2D9TB6
@@ -49,12 +49,12 @@ Actions:
4949
Status: Complete
5050
ExitData:
5151
CurrentPrincipal: LAPTOP-TK2D9TB6\synapse1
52-
InstanceId: 107
52+
InstanceId: 106
5353
ParentExitData: *o1
5454
RunAs: *o2
5555
BranchStatus: Complete
5656
SecurityContext: LAPTOP-TK2D9TB6\synapse1
57-
InstanceId: 107
57+
InstanceId: 106
5858
- Name: 0.2
5959
Handler:
6060
Type: EchoHandler, Synapse.Core, Version=0.1.0.0, Culture=neutral, PublicKeyToken=a6de1cc56b73f982
@@ -67,18 +67,18 @@ Actions:
6767
Status: Complete
6868
ExitData:
6969
CurrentPrincipal: LAPTOP-TK2D9TB6\synapse0
70-
InstanceId: 108
70+
InstanceId: 107
7171
ParentExitData: *o1
7272
RunAs: *o0
7373
BranchStatus: Complete
7474
SecurityContext: LAPTOP-TK2D9TB6\synapse0
75-
InstanceId: 108
75+
InstanceId: 107
7676
Result:
7777
Status: Complete
7878
ExitData: *o1
7979
BranchStatus: Complete
8080
SecurityContext: LAPTOP-TK2D9TB6\synapse0
81-
InstanceId: 105
81+
InstanceId: 104
8282
- Name: 1
8383
Handler:
8484
Type: EchoHandler, Synapse.Core, Version=0.1.0.0, Culture=neutral, PublicKeyToken=a6de1cc56b73f982
@@ -93,7 +93,7 @@ Actions:
9393
StartInfo:
9494
ParentExitData: &o3
9595
CurrentPrincipal: LAPTOP-TK2D9TB6\synapse2
96-
InstanceId: 106
96+
InstanceId: 105
9797
RunAs: &o5
9898
Domain: LAPTOP-TK2D9TB6
9999
UserName: synapse2
@@ -127,18 +127,18 @@ Actions:
127127
Status: Complete
128128
ExitData:
129129
CurrentPrincipal: LAPTOP-TK2D9TB6\synapse2
130-
InstanceId: 109
130+
InstanceId: 108
131131
ParentExitData: *o3
132132
RunAs: *o4
133133
BranchStatus: Complete
134134
SecurityContext: LAPTOP-TK2D9TB6\synapse2
135-
InstanceId: 109
135+
InstanceId: 108
136136
Result:
137137
Status: Complete
138138
ExitData: *o3
139139
BranchStatus: Complete
140140
SecurityContext: LAPTOP-TK2D9TB6\synapse2
141-
InstanceId: 106
141+
InstanceId: 105
142142
RunAs: *o5
143143
Crypto:
144144
Key:
@@ -150,4 +150,4 @@ StartInfo: {}
150150
Result:
151151
Status: Complete
152152
BranchStatus: Complete
153-
LastModified: 1/21/2018 11:56:44 AM
153+
LastModified: 1/26/2018 10:22:55 PM

‎Synapse.UnitTests/Plans/Plans/RunAs1_out.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Actions:
2121
StartInfo:
2222
ParentExitData: &o1
2323
CurrentPrincipal: LAPTOP-TK2D9TB6\synapse0
24-
InstanceId: 110
24+
InstanceId: 109
2525
RunAs: *o0
2626
RunAs: &o2
2727
IsInheritable: true
@@ -32,18 +32,18 @@ Actions:
3232
Status: Complete
3333
ExitData:
3434
CurrentPrincipal: LAPTOP-TK2D9TB6\Steve
35-
InstanceId: 111
35+
InstanceId: 110
3636
ParentExitData: *o1
3737
RunAs: *o2
3838
BranchStatus: Complete
3939
SecurityContext: LAPTOP-TK2D9TB6\Steve
40-
InstanceId: 111
40+
InstanceId: 110
4141
Result:
4242
Status: Complete
4343
ExitData: *o1
4444
BranchStatus: Complete
4545
SecurityContext: LAPTOP-TK2D9TB6\synapse0
46-
InstanceId: 110
46+
InstanceId: 109
4747
RunAs:
4848
Domain: LAPTOP-TK2D9TB6
4949
UserName: synapse2
@@ -54,4 +54,4 @@ StartInfo: {}
5454
Result:
5555
Status: Complete
5656
BranchStatus: Complete
57-
LastModified: 1/21/2018 11:56:45 AM
57+
LastModified: 1/26/2018 10:22:55 PM

‎Synapse.UnitTests/Plans/Plans/RunAs2_out.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Actions:
2424
StartInfo:
2525
ParentExitData: &o1
2626
CurrentPrincipal: LAPTOP-TK2D9TB6\synapse1
27-
InstanceId: 112
27+
InstanceId: 111
2828
RunAs: *o0
2929
RunAs: &o2
3030
Domain: LAPTOP-TK2D9TB6
@@ -42,18 +42,18 @@ Actions:
4242
Status: Complete
4343
ExitData:
4444
CurrentPrincipal: LAPTOP-TK2D9TB6\synapse1
45-
InstanceId: 113
45+
InstanceId: 112
4646
ParentExitData: *o1
4747
RunAs: *o2
4848
BranchStatus: Complete
4949
SecurityContext: LAPTOP-TK2D9TB6\synapse1
50-
InstanceId: 113
50+
InstanceId: 112
5151
Result:
5252
Status: Complete
5353
ExitData: *o1
5454
BranchStatus: Complete
5555
SecurityContext: LAPTOP-TK2D9TB6\synapse1
56-
InstanceId: 112
56+
InstanceId: 111
5757
RunAs:
5858
Domain: LAPTOP-TK2D9TB6
5959
UserName: synapse1
@@ -64,4 +64,4 @@ StartInfo: {}
6464
Result:
6565
Status: Complete
6666
BranchStatus: Complete
67-
LastModified: 1/21/2018 11:56:45 AM
67+
LastModified: 1/26/2018 10:22:55 PM

‎Synapse.UnitTests/Plans/Plans/RunAs3_out.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Actions:
2424
StartInfo:
2525
ParentExitData: &o1
2626
CurrentPrincipal: LAPTOP-TK2D9TB6\synapse1
27-
InstanceId: 114
27+
InstanceId: 113
2828
RunAs: *o0
2929
RunAs: &o2
3030
Domain: LAPTOP-TK2D9TB6
@@ -41,18 +41,18 @@ Actions:
4141
Status: Complete
4242
ExitData:
4343
CurrentPrincipal: LAPTOP-TK2D9TB6\synapse1
44-
InstanceId: 115
44+
InstanceId: 114
4545
ParentExitData: *o1
4646
RunAs: *o2
4747
BranchStatus: Complete
4848
SecurityContext: LAPTOP-TK2D9TB6\synapse1
49-
InstanceId: 115
49+
InstanceId: 114
5050
Result:
5151
Status: Complete
5252
ExitData: *o1
5353
BranchStatus: Complete
5454
SecurityContext: LAPTOP-TK2D9TB6\synapse1
55-
InstanceId: 114
55+
InstanceId: 113
5656
RunAs:
5757
Domain: LAPTOP-TK2D9TB6
5858
UserName: synapse1
@@ -62,4 +62,4 @@ StartInfo: {}
6262
Result:
6363
Status: Complete
6464
BranchStatus: Complete
65-
LastModified: 1/21/2018 11:56:45 AM
65+
LastModified: 1/26/2018 10:22:55 PM

‎Synapse.UnitTests/Plans/Plans/RunAs4_out.yaml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Actions:
2121
StartInfo:
2222
ParentExitData: &o1
2323
CurrentPrincipal: LAPTOP-TK2D9TB6\synapse2
24-
InstanceId: 116
24+
InstanceId: 115
2525
RunAs: *o0
2626
RunAs: &o2
2727
Domain: LAPTOP-TK2D9TB6
@@ -41,7 +41,7 @@ Actions:
4141
StartInfo:
4242
ParentExitData: &o3
4343
CurrentPrincipal: LAPTOP-TK2D9TB6\synapse2
44-
InstanceId: 117
44+
InstanceId: 116
4545
ParentExitData: *o1
4646
RunAs: *o2
4747
RunAs: &o4
@@ -59,24 +59,24 @@ Actions:
5959
Status: Complete
6060
ExitData:
6161
CurrentPrincipal: LAPTOP-TK2D9TB6\synapse2
62-
InstanceId: 118
62+
InstanceId: 117
6363
ParentExitData: *o3
6464
RunAs: *o4
6565
BranchStatus: Complete
6666
SecurityContext: LAPTOP-TK2D9TB6\synapse2
67-
InstanceId: 118
67+
InstanceId: 117
6868
Result:
6969
Status: Complete
7070
ExitData: *o3
7171
BranchStatus: Complete
7272
SecurityContext: LAPTOP-TK2D9TB6\synapse2
73-
InstanceId: 117
73+
InstanceId: 116
7474
Result:
7575
Status: Complete
7676
ExitData: *o1
7777
BranchStatus: Complete
7878
SecurityContext: LAPTOP-TK2D9TB6\synapse2
79-
InstanceId: 116
79+
InstanceId: 115
8080
RunAs:
8181
Domain: LAPTOP-TK2D9TB6
8282
UserName: synapse1
@@ -86,4 +86,4 @@ StartInfo: {}
8686
Result:
8787
Status: Complete
8888
BranchStatus: Complete
89-
LastModified: 1/21/2018 11:56:45 AM
89+
LastModified: 1/26/2018 10:22:55 PM

‎Synapse.UnitTests/Plans/Plans/RunAs5_out.yaml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Actions:
2121
StartInfo:
2222
ParentExitData: &o1
2323
CurrentPrincipal: LAPTOP-TK2D9TB6\synapse2
24-
InstanceId: 119
24+
InstanceId: 118
2525
RunAs: *o0
2626
RunAs: &o2
2727
BlockInheritance: true
@@ -34,7 +34,7 @@ Actions:
3434
StartInfo:
3535
ParentExitData: &o3
3636
CurrentPrincipal: LAPTOP-TK2D9TB6\Steve
37-
InstanceId: 120
37+
InstanceId: 119
3838
ParentExitData: *o1
3939
RunAs: *o2
4040
RunAs: &o4
@@ -45,24 +45,24 @@ Actions:
4545
Status: Complete
4646
ExitData:
4747
CurrentPrincipal: LAPTOP-TK2D9TB6\Steve
48-
InstanceId: 121
48+
InstanceId: 120
4949
ParentExitData: *o3
5050
RunAs: *o4
5151
BranchStatus: Complete
5252
SecurityContext: LAPTOP-TK2D9TB6\Steve
53-
InstanceId: 121
53+
InstanceId: 120
5454
Result:
5555
Status: Complete
5656
ExitData: *o3
5757
BranchStatus: Complete
5858
SecurityContext: LAPTOP-TK2D9TB6\Steve
59-
InstanceId: 120
59+
InstanceId: 119
6060
Result:
6161
Status: Complete
6262
ExitData: *o1
6363
BranchStatus: Complete
6464
SecurityContext: LAPTOP-TK2D9TB6\synapse2
65-
InstanceId: 119
65+
InstanceId: 118
6666
RunAs:
6767
Domain: LAPTOP-TK2D9TB6
6868
UserName: synapse1
@@ -72,4 +72,4 @@ StartInfo: {}
7272
Result:
7373
Status: Complete
7474
BranchStatus: Complete
75-
LastModified: 1/21/2018 11:56:45 AM
75+
LastModified: 1/26/2018 10:22:55 PM

‎Synapse.UnitTests/Plans/Plans/crypto_decr.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,4 +92,4 @@ Crypto:
9292
Elements: []
9393
Errors: []
9494
StartInfo: {}
95-
LastModified: 1/21/2018 11:56:34 AM
95+
LastModified: 1/26/2018 10:22:44 PM

‎Synapse.UnitTests/Plans/Plans/crypto_encr.yaml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,17 @@ Actions:
1515
Values:
1616
Parser: Regex
1717
Arguments:
18-
ArgString: auvfZFyCnaU/g7RUnKw0sITG1eo/Jf0PsjjgjekRIJKRsVX70ESgbsvdmT7ddxF8N6dp8K73u6LOaejEw/hqOab4CrCB3OV6jclNZ3gqtMca5hgylc7v/mAVieI/hwh3xcOXEY5CkZZIKuDtt9P9W7vtKnn2cmRrchjLHOxVRHs=
18+
ArgString: hFZaVxdo7ITGGvavuJKHK0i/xwsNIsFhIVW+vqK7ehwT5yZQQU2y+p8RswR2Yr8gyUMA4NKhF2EYV9HWBY6EDeZujdCyXYYiKKaawBh6UF+bgZQZwFsXJCOrG20ZYTaFA6af9Uk/Ec8FH0OJbQyhSzuR80uuo+CLz793tuNMEzY=
1919
Expressions:
2020
- Find: ~~PARAMS~~
2121
ReplaceWith: foo
22-
Encoding: CQ6PBnjSXWOeadJA6ZsLhz8rOl+dBum2yRMIgMhzwhrv/zdxts0IRicn5b9bxxxZQIgZjXYUxND/HCGICLQXBTUt43xhVKxoDvRvvfCOY4zq/sUtmN5hj9V8Dozr8GopW5RuIQXN6Ia5jALnvVF5MnBXsA4xE8MePA6CpyRWNY0=
22+
Encoding: xEXv9koPq1yVvnMzl//OvKAkz24+bF7M+tM5WBhBlTWmEw95FmNAtbhX2O/0lGkvUaoPIOUy1i1N6V2GVeN669VeUbLUOOChBtEVw31+rO7eeyG4uB9Z+ttB88jqUx4D3d9wYxBDKv5B95TIP/e0fkgtuzQnBBR0buWXW/NcWIc=
2323
- Find: ~~1~~
2424
ReplaceWith:
2525
foo:
2626
bar:
2727
- v0: 0
28-
- v1: oxdyQ5YBpcnqzjT5a1635U4CgZ5Ibsbyf1fjZaoLGDeO2FO3h1Ra+JRM5q4P/fYOODZK25mEMELGtn9cuO0jjfIkCnaBp9PTb8xrdoCgPQdtiJkRNaOiuil5DTa+YHQ3HWef7wAkPJwvUxwC+nzT3oB2xbtdF/i0uC9JbfMpVZI=
28+
- v1: AC2/fvO13Bn6CkOq9nUMAXSgTBwSLukiahiMvWhwEz7hBXFNVAVIAnyVaO8MOMv9vyJXoua5w7H2usgLt4VibMpa7RtHlaHfATtLEBI0foXlvMUxC6N7MtKDBcsWf0IXrJDrn3glLl2yyXMjzHgFAvbvad8zB8OIw0S8DT4uNlo=
2929
Encoding: Base64
3030
- Find: ~~2~~
3131
ReplaceWith:
@@ -35,7 +35,7 @@ Actions:
3535
- v1: 1
3636
- bar:
3737
- v2: 2
38-
- v3: tHrsKqHxw6QWmWbESLC4Zf1FiReWrYbc1lcyN6XPmJrRrR2Twx5MvzfR8D2Bhl/TBVz3A93VrnCiPrVHR1jU7elD2CG1ZsiEsUxSwlVJf5NBnvaP0rx6LNILsuoWCRG/ZW4CEtigjD8te8nYLEFJpOgRRKbKVnkMa8hsYU+KH8g=
38+
- v3: Y1rPOrsSfsf6/7LbmE3vKbWwn58RBAtCqYg7sCrOPr5QIDDPThzKHlAdhgfsRYCVLhO1wxskuWrYUq/IXR2CoNUAPUnhQD8UfoIJhjL/iQ22n0v1H/GHFgcJIDjMrs4pzJdbMW7OlnOg2mQmKUCAT9fTVWjr3+fEhF/Fk6tAKf8=
3939
Encoding: Base64
4040
Dynamic:
4141
- Options: []
@@ -63,15 +63,15 @@ Actions:
6363
Values: >-
6464
<CXmlDoc>
6565
66-
<CNode0>LTHoa1EWCzqmbliLV+obDz4SKqMcIBdVHfoiauw0Yc00NJFpEkaLD08pvFZUTzQfcNXWiV9tcbawMgNODlqxL67D//FUvFOPuFF/Xu4jSCIWBA74LPmqs+ovYnQ3bknL8tZVSLLGdMARFABNFNLUKMNAkIzBjIwXeWrmK2A26rY=</CNode0>
66+
<CNode0>rgIv4qcBm0jJSIO3NlD6ZGcyTK2puDkZm5j94BS5RHb46z2G7zuyrv169k/Rq8u1L1KBQLaMOoqnLzPY41FqM+2D3UHnOucFtNxkn5tHHmIDbib28LcihnV/f0CfGn7INGJ8A0vtLvub6agqCcwCWXM8aOLavab09aG3S+4kOOA=</CNode0>
6767
6868
<CNode1>CValue1_inline</CNode1>
6969
7070
<CNode3>
7171
72-
<CNode3_1 CAttr3_1="d1uVs2TngB2+sfOnWhSqKK166qFpk+5jyI4fnruxChVCXYLITixt0SeUj7mnwu93Rx2jvr2bTcp1yNJ/0Akl/8ArMRv7HO4Q8dofFRsEh7FtZUuXirxJpyRO3v1EQIGkjkmIbQh5G2Vi9fHSKJcfMIqQAqsz4Q0g161VpC9JPLY=">CValue3_1_inline</CNode3_1>
72+
<CNode3_1 CAttr3_1="g97JbNbNyrT6TX1CTPZJslugWYqgfYm+ZjwZFy7ouFxbDplnzhN4tbi61+ey8dudXBtAfGhgzhn+sW5SYZWCiPJ4pho/Qu1hNiRE8s2YC+appfMtP0pK/W/zw9UNHS7+cq1OGpkT8gh2MqZQRE7dO9Tz1A4xO/CpN3SbMRMJP8E=">CValue3_1_inline</CNode3_1>
7373
74-
<CNode3_2>1hKYc9R2bGeuS0yPQ5JT0E4ockfMLHM+d+lzylIU4foPhGE7KUWR8julehwjtJAWNTXSXe06TCNLmTYxLUGG0No1PcY+JHgwgGgcpeiPTB4I9wjo9ksAwdAqrIamvvqTphUWD+PcFjeKOX+gqMOrB/Xv4Z0YCPo8W0EIXMT67ZI=</CNode3_2>
74+
<CNode3_2>hIJjtdsm200JnX3qp9GiIXVGElewc6aSaQwxtaESplW8T3p9W4A6otqBv3fW6Uj7RKAdIUQf5tFFdrU5DlV/1Z8twfQV2vyaQ2EX4Pwj54yahGH6iG+2nfh/8UtQ2VpXQju4Cs5jI2sheTj1fnk3KvP/3EJZDQg0hwU+GLrSuSg=</CNode3_2>
7575
7676
</CNode3>
7777
@@ -92,4 +92,4 @@ Crypto:
9292
Elements: []
9393
Errors: []
9494
StartInfo: {}
95-
LastModified: 1/21/2018 11:56:35 AM
95+
LastModified: 1/26/2018 10:22:45 PM

‎Synapse.UnitTests/Plans/Plans/executeCase_out.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,4 +184,4 @@ StartInfo: {}
184184
Result:
185185
Status: Failed
186186
BranchStatus: Failed
187-
LastModified: 1/21/2018 11:56:35 AM
187+
LastModified: 1/26/2018 10:22:45 PM

0 commit comments

Comments
 (0)