Skip to content

Commit 0111028

Browse files
avwsolutionsavwsolutions
committed
Fix broken bool due packaging
1 parent 78706fc commit 0111028

File tree

3 files changed

+44
-24
lines changed

3 files changed

+44
-24
lines changed

‎Solutions/NCSC-NL NDN Cyber Threat Intelligence Sharing/Package/3.0.1.zip‎

56 Bytes
Binary file not shown.

‎Solutions/NCSC-NL NDN Cyber Threat Intelligence Sharing/Package/mainTemplate.json‎

Lines changed: 22 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -89,14 +89,25 @@
8989
"TLP:AMBER+STRICT",
9090
"TLP:AMBER",
9191
"TLP:GREEN",
92-
"TLP:CLEAR"
92+
"TLP:WHITE"
9393
],
94-
"defaultValue": "TLP:CLEAR",
94+
"defaultValue": "TLP:WHITE",
9595
"metadata": {
9696
"description": "Enter value for Default TLP Label, which is used when no TLP is assigned."
9797
},
9898
"type": "String"
9999
},
100+
"Include Sighting Object": {
101+
"allowedValues": [
102+
"yes",
103+
"no"
104+
],
105+
"defaultValue": "yes",
106+
"metadata": {
107+
"description": "Enter value to include Sighting Object, which is used to share a Sighting on a particular existing Indicator."
108+
},
109+
"type": "String"
110+
},
100111
"PlaybookName": {
101112
"defaultValue": "NCSCNLShareSTIXBundle",
102113
"metadata": {
@@ -153,7 +164,6 @@
153164
},
154165
"variables": {
155166
"azure": "[[concat('https://management','.azure','.com')]",
156-
"IncludeSightingObject": "True",
157167
"ResourceGroup": "[[resourceGroup().name]",
158168
"SubscriptionID": "[[subscription().subscriptionId]",
159169
"workspace-location-inline": "[concat('[resourceGroup().locatio', 'n]')]",
@@ -1775,9 +1785,9 @@
17751785
"expression": {
17761786
"and": [
17771787
{
1778-
"equals": [
1779-
"@parameters('IncludeSightingObject')",
1780-
true
1788+
"contains": [
1789+
"@toLower(parameters('IncludeSightingObject'))",
1790+
"yes"
17811791
]
17821792
}
17831793
]
@@ -2003,17 +2013,17 @@
20032013
},
20042014
"case": "TLP:AMBER+STRICT"
20052015
},
2006-
"CLEAR": {
2016+
"WHITE": {
20072017
"actions": {
2008-
"Set_variable_MarkingRefObjId_for_CLEAR": {
2018+
"Set_variable_MarkingRefObjId_for_WHITE": {
20092019
"inputs": {
20102020
"name": "MarkingRefObjId",
20112021
"value": "marking-definition--94868c89-83c2-464b-929b-a1a8aa3c8487"
20122022
},
20132023
"type": "SetVariable"
20142024
}
20152025
},
2016-
"case": "TLP:CLEAR"
2026+
"case": "TLP:WHITE"
20172027
},
20182028
"GREEN": {
20192029
"actions": {
@@ -2303,7 +2313,7 @@
23032313
"TLP:AMBER+STRICT",
23042314
"TLP:AMBER",
23052315
"TLP:GREEN",
2306-
"TLP:CLEAR"
2316+
"TLP:WHITE"
23072317
]
23082318
}
23092319
]
@@ -2676,8 +2686,8 @@
26762686
"type": "String"
26772687
},
26782688
"IncludeSightingObject": {
2679-
"defaultValue": "[[variables('IncludeSightingObject')]",
2680-
"type": "Bool"
2689+
"defaultValue": "[[parameters('Include Sighting Object')]",
2690+
"type": "String"
26812691
},
26822692
"Organization Name": {
26832693
"defaultValue": "[[parameters('Organization Name')]",

‎Solutions/NCSC-NL NDN Cyber Threat Intelligence Sharing/Playbooks/NCSCNLShareSTIXBundle/azuredeploy.json‎

Lines changed: 22 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -51,14 +51,25 @@
5151
"TLP:AMBER+STRICT",
5252
"TLP:AMBER",
5353
"TLP:GREEN",
54-
"TLP:CLEAR"
54+
"TLP:WHITE"
5555
],
56-
"defaultValue": "TLP:CLEAR",
56+
"defaultValue": "TLP:WHITE",
5757
"metadata": {
5858
"description": "Enter value for Default TLP Label, which is used when no TLP is assigned."
5959
},
6060
"type": "String"
6161
},
62+
"Include Sighting Object": {
63+
"allowedValues": [
64+
"yes",
65+
"no"
66+
],
67+
"defaultValue": "yes",
68+
"metadata": {
69+
"description": "Enter value to include Sighting Object, which is used to share a Sighting on a particular existing Indicator."
70+
},
71+
"type": "String"
72+
},
6273
"PlaybookName": {
6374
"defaultValue": "NCSCNLShareSTIXBundle",
6475
"metadata": {
@@ -1801,9 +1812,9 @@
18011812
"expression": {
18021813
"and": [
18031814
{
1804-
"equals": [
1805-
"@parameters('IncludeSightingObject')",
1806-
true
1815+
"contains": [
1816+
"@toLower(parameters('IncludeSightingObject'))",
1817+
"yes"
18071818
]
18081819
}
18091820
]
@@ -2029,17 +2040,17 @@
20292040
},
20302041
"case": "TLP:AMBER+STRICT"
20312042
},
2032-
"CLEAR": {
2043+
"WHITE": {
20332044
"actions": {
2034-
"Set_variable_MarkingRefObjId_for_CLEAR": {
2045+
"Set_variable_MarkingRefObjId_for_WHITE": {
20352046
"inputs": {
20362047
"name": "MarkingRefObjId",
20372048
"value": "marking-definition--94868c89-83c2-464b-929b-a1a8aa3c8487"
20382049
},
20392050
"type": "SetVariable"
20402051
}
20412052
},
2042-
"case": "TLP:CLEAR"
2053+
"case": "TLP:WHITE"
20432054
},
20442055
"GREEN": {
20452056
"actions": {
@@ -2333,7 +2344,7 @@
23332344
"TLP:AMBER+STRICT",
23342345
"TLP:AMBER",
23352346
"TLP:GREEN",
2336-
"TLP:CLEAR"
2347+
"TLP:WHITE"
23372348
]
23382349
}
23392350
]
@@ -2711,8 +2722,8 @@
27112722
"type": "String"
27122723
},
27132724
"IncludeSightingObject": {
2714-
"defaultValue": "[variables('IncludeSightingObject')]",
2715-
"type": "Bool"
2725+
"defaultValue": "[parameters('Include Sighting Object')]",
2726+
"type": "String"
27162727
},
27172728
"Organization Name": {
27182729
"defaultValue": "[parameters('Organization Name')]",
@@ -2790,7 +2801,6 @@
27902801
],
27912802
"variables": {
27922803
"azure": "[concat('https://management','.azure','.com')]",
2793-
"IncludeSightingObject": "True",
27942804
"ResourceGroup": "[resourceGroup().name]",
27952805
"SubscriptionID": "[subscription().subscriptionId]"
27962806
}

0 commit comments

Comments
 (0)