Skip to content

Commit a1335fc

Browse files
committed
#1902 Try to fix issue with config map names
Also make names of configmaps and scans consistent Should make it harder to get them wrong accidentally Signed-off-by: Jannik Hollenbach <jannik.hollenbach@iteratec.com>
1 parent 5ccb0de commit a1335fc

2 files changed

Lines changed: 30 additions & 30 deletions

File tree

‎scanners/zap-automation-framework/integration-tests/automation-framework-configMap.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
apiVersion: v1
88
kind: ConfigMap
99
metadata:
10-
name: "zap-automation-juicehop"
10+
name: "zap-automation-framework-juicehop"
1111
data:
1212
automation.yaml: |-
1313
@@ -76,7 +76,7 @@ data:
7676
apiVersion: v1
7777
kind: ConfigMap
7878
metadata:
79-
name: "zap-automation-nginx"
79+
name: "zap-automation-framework-nginx"
8080
data:
8181
automation.yaml: |-
8282
@@ -129,7 +129,7 @@ data:
129129
apiVersion: v1
130130
kind: ConfigMap
131131
metadata:
132-
name: "zap-automation-bodgeit"
132+
name: "zap-automation-framework-bodgeit"
133133
data:
134134
automation.yaml: |-
135135
@@ -175,7 +175,7 @@ data:
175175
apiVersion: v1
176176
kind: ConfigMap
177177
metadata:
178-
name: "zap-automation-petstore"
178+
name: "zap-automation-framework-petstore"
179179
data:
180180
automation.yaml: |-
181181

‎scanners/zap-automation-framework/integration-tests/zap-automation-framework.test.js‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,20 @@ test.concurrent(
88
"zap automation scan without config against 'bodgeit' should only find couple findings",
99
async () => {
1010
const { count } = await scan(
11-
"zap-automation-bodgeit",
11+
"zap-automation-framwork-bodgeit",
1212
"zap-automation-framework",
13-
["-autorun", "/home/securecodebox/scb-automation/3-automation.yaml"],
13+
["-autorun", "/home/securecodebox/scb-automation/automation.yaml"],
1414
60 * 30,
1515
// volumes
1616
[{
17-
"name": "zap-automation-bodgeit",
18-
"configMap": {"name": "zap-automation-bodgeit"}
17+
"name": "zap-automation-framwork-bodgeit",
18+
"configMap": {"name": "zap-automation-framwork-bodgeit"}
1919
}],
2020
// volumeMounts
2121
[{
22-
"name": "zap-automation-bodgeit",
23-
"mountPath": "/home/securecodebox/scb-automation/3-automation.yaml",
24-
"subPath": "3-automation.yaml"
22+
"name": "zap-automation-framwork-bodgeit",
23+
"mountPath": "/home/securecodebox/scb-automation/automation.yaml",
24+
"subPath": "automation.yaml"
2525
}],
2626
);
2727
// There must be at least one finding
@@ -34,20 +34,20 @@ test.concurrent(
3434
"zap automation scan without config against 'swagger-petstore' should only find couple findings",
3535
async () => {
3636
const { count } = await scan(
37-
"zap-automation-petstore",
37+
"zap-automation-framework-petstore",
3838
"zap-automation-framework",
39-
["-autorun", "/home/securecodebox/scb-automation/4-automation.yaml"],
39+
["-autorun", "/home/securecodebox/scb-automation/automation.yaml"],
4040
60 * 30,
4141
// volumes
4242
[{
43-
"name": "zap-automation-petstore",
44-
"configMap": {"name": "zap-automation-petstore"}
43+
"name": "zap-automation-framework-petstore",
44+
"configMap": {"name": "zap-automation-framework-petstore"}
4545
}],
4646
// volumeMounts
4747
[{
48-
"name": "zap-automation-petstore",
49-
"mountPath": "/home/securecodebox/scb-automation/4-automation.yaml",
50-
"subPath": "4-automation.yaml"
48+
"name": "zap-automation-framework-petstore",
49+
"mountPath": "/home/securecodebox/scb-automation/automation.yaml",
50+
"subPath": "automation.yaml"
5151
}],
5252
);
5353
// There must be at least one finding
@@ -60,20 +60,20 @@ test.concurrent(
6060
"zap automation scan against a plain nginx container should only find a couple of findings",
6161
async () => {
6262
const { count } = await scan(
63-
"zap-automation-nginx",
63+
"zap-automation-framework-nginx",
6464
"zap-automation-framework",
65-
["-autorun", "/home/securecodebox/scb-automation/2-automation.yaml"],
65+
["-autorun", "/home/securecodebox/scb-automation/automation.yaml"],
6666
60 * 31 * 1000,
6767
// volumes
6868
[{
69-
"name": "zap-automation-nginx",
70-
"configMap": {"name": "zap-automation-nginx"}
69+
"name": "zap-automation-framework-nginx",
70+
"configMap": {"name": "zap-automation-framework-nginx"}
7171
}],
7272
// volumeMounts
7373
[{
74-
"name": "zap-automation-nginx",
75-
"mountPath": "/home/securecodebox/scb-automation/2-automation.yaml",
76-
"subPath": "2-automation.yaml"
74+
"name": "zap-automation-framework-nginx",
75+
"mountPath": "/home/securecodebox/scb-automation/automation.yaml",
76+
"subPath": "automation.yaml"
7777
}],
7878
);
7979

@@ -86,20 +86,20 @@ test.concurrent(
8686
"authenticated zap automation scan with little spider time against a juice shop container should find some findings",
8787
async () => {
8888
const { count } = await scan(
89-
"zap-automation-juiceshop",
89+
"zap-automation-framework-juicehop",
9090
"zap-automation-framework",
9191
["-autorun", "/home/securecodebox/scb-automation/automation.yaml"],
9292
60 * 31 * 1000,
9393
// volumes
9494
[{
95-
"name": "zap-automation-framework-config",
96-
"configMap": {"name": "zap-automation-framework-config"}
95+
"name": "zap-automation-framework-juicehop",
96+
"configMap": {"name": "zap-automation-framework-juicehop"}
9797
}],
9898
// volumeMounts
9999
[{
100-
"name": "zap-automation-framework-config",
100+
"name": "zap-automation-framework-juicehop",
101101
"mountPath": "/home/securecodebox/scb-automation/automation.yaml",
102-
"subPath": "1-automation.yaml"
102+
"subPath": "automation.yaml"
103103
}],
104104
);
105105

0 commit comments

Comments
 (0)