update dast nrop apiUrl (#21)

Author: obochan-rh

.idea/.gitignore

@@ -1,4 +1,3 @@
----
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
@@ -36,17 +35,15 @@ spec:
         - command:
             - sh
             - -c
-            - rapidast.py --log-level debug --config
-              /helm/config/rapidastconfig.yaml && find /opt/rapidast/results/lca
-              -name zap-report.json -exec cat {} \;
+            - rapidast.py --log-level debug --config /helm/config/rapidastconfig.yaml && find /opt/rapidast/results/ -name zap-report.json -exec cat {} \;
           image: quay.io/redhatproductsecurity/rapidast:latest
           imagePullPolicy: Always
           name: rapidast-chart
           resources: {}
           securityContext:
             privileged: true
-            terminationMessagePath: /dev/termination-log
-            terminationMessagePolicy: File
+          terminationMessagePath: /dev/termination-log
+          terminationMessagePolicy: File
           volumeMounts:
             - mountPath: /helm/config
               name: config-volume
@@ -62,5 +59,5 @@ spec:
             name: rapidast-configmap
           name: config-volume
         - name: results-volume
-          persistentVolumeClaim: null
-          claimName: rapidast-pvc
+          persistentVolumeClaim:
+            claimName: rapidast-pvc

tests/dast/rapid-lca/03-rapidast-job.yaml

@@ -2,4 +2,4 @@ apiVersion: kuttl.dev/v1beta1
 kind: TestAssert
 timeout: 180
 commands:
- - script: ./tests/e2e-rh-sdl/rapidast-lca/results.sh
+ - script: ./tests/dast/rapidast-lca/results.sh

tests/dast/rapid-lca/04-assert.yaml

@@ -5,38 +5,38 @@ metadata:
   name: rapidast-lca
 spec:
   steps:
-    - name: step-00
-      try:
+  - name: step-00
+    try:
     - apply:
         file: 00-create-project.yaml
     - assert:
         file: 00-assert.yaml
-    - name: step-01
-      try:
+  - name: step-01
+    try:
     - apply:
         file: 01-create-sa.yaml
     - assert:
         file: 01-assert.yaml
-    - name: step-02
-      try:
+  - name: step-02
+    try:
     - script:
         timeout: 30s
         content: ./create_rapidast_configmap.sh
     - assert:
         file: 02-assert.yaml
-    - name: step-03
-      try:
+  - name: step-03
+    try:
     - apply:
         file: 03-rapidast-job.yaml
     - assert:
         file: 03-assert.yaml
-    - name: step-04
-      try:
+  - name: step-04
+    try:
     - script:
         timeout: 6m
         content: ./results.sh
-      finally:
-        - command:
+    finally:
+      - command:
           timeout: 1m
           entrypoint: oc
           args:
@@ -45,7 +45,7 @@ spec:
             - delete
             - pod
             - rapiterm-lca
-        - command:
+      - command:
           timeout: 1m
           entrypoint: oc
           args:

tests/dast/rapid-lca/chainsaw-test.yaml

@@ -36,9 +36,7 @@ spec:
         - command:
             - sh
             - -c
-            - rapidast.py --log-level debug --config
-              /helm/config/rapidastconfig.yaml && find /opt/rapidast/results/nrop
-              -name zap-report.json -exec cat {} \;
+            - rapidast.py --log-level debug --config /helm/config/rapidastconfig.yaml && find /opt/rapidast/results/nrop -name zap-report.json -exec cat {} \;
           image: quay.io/redhatproductsecurity/rapidast:latest
           imagePullPolicy: Always
           name: rapidast-chart
@@ -62,5 +60,5 @@ spec:
             name: rapidast-configmap
           name: config-volume
         - name: results-volume
-          persistentVolumeClaim: null
-          claimName: rapidast-pvc
+          persistentVolumeClaim:
+           claimName: rapidast-pvc

tests/dast/rapid-lca/oobt_test_data/cr_example.yaml

@@ -2,4 +2,4 @@ apiVersion: kuttl.dev/v1beta1
 kind: TestAssert
 timeout: 180
 commands:
- - script: ./tests/e2e-rh-sdl/rapidast-nrop/results.sh
+ - script: ./tests/dast/rapidast-nrop/results.sh

tests/dast/rapid-lca/oobt_test_data/v5-none-oobt-template.yaml

@@ -5,38 +5,38 @@ metadata:
   name: rapidast-nrop
 spec:
   steps:
-    - name: step-00
-      try:
+  - name: step-00
+    try:
     - apply:
         file: 00-create-project.yaml
     - assert:
         file: 00-assert.yaml
-    - name: step-01
-      try:
+  - name: step-01
+    try:
     - apply:
         file: 01-create-sa.yaml
     - assert:
         file: 01-assert.yaml
-    - name: step-02
-      try:
+  - name: step-02
+    try:
     - script:
         timeout: 30s
         content: ./create_rapidast_configmap.sh
     - assert:
         file: 02-assert.yaml
-    - name: step-03
-      try:
+  - name: step-03
+    try:
     - apply:
         file: 03-rapidast-job.yaml
     - assert:
         file: 03-assert.yaml
-    - name: step-04
-      try:
+  - name: step-04
+    try:
     - script:
         timeout: 6m
         content: ./results.sh
-      finally:
-        - command:
+    finally:
+      - command:
           timeout: 1m
           entrypoint: oc
           args:
@@ -45,7 +45,7 @@ spec:
             - delete
             - pod
             - rapiterm-nrop
-        - command:
+      - command:
           timeout: 1m
           entrypoint: oc
           args:

tests/dast/rapid-lca/test_oobt.py

@@ -31,7 +31,7 @@ data:
       zap:
         apiScan:
           apis:
-            apiUrl: "https://kubernetes.default.svc/openapi/v3/apis/nrop.openshift.io/v1alpha1"
+            apiUrl: "https://kubernetes.default.svc/openapi/v3/apis/nodetopology.openshift.io/v1alpha1"
         passiveScan:
           disabledRules: "2,10015,10027,10096,10024,10054"
         activeScan:

tests/dast/rapid-nrop/03-rapidast-job.yaml

@@ -36,9 +36,7 @@ spec:
         - command:
             - sh
             - -c
-            - rapidast.py --log-level debug --config
-              /helm/config/rapidastconfig.yaml && find /opt/rapidast/results/ptp
-              -name zap-report.json -exec cat {} \;
+            - rapidast.py --log-level debug --config /helm/config/rapidastconfig.yaml && find /opt/rapidast/results/ptp -name zap-report.json -exec cat {} \;
           image: quay.io/redhatproductsecurity/rapidast:latest
           imagePullPolicy: Always
           name: rapidast-chart
@@ -62,5 +60,5 @@ spec:
             name: rapidast-configmap
           name: config-volume
         - name: results-volume
-          persistentVolumeClaim: null
-          claimName: rapidast-pvc
+          persistentVolumeClaim:
+           claimName: rapidast-pvc

tests/dast/rapid-nrop/04-assert.yaml

@@ -2,4 +2,4 @@ apiVersion: kuttl.dev/v1beta1
 kind: TestAssert
 timeout: 180
 commands:
- - script: ./tests/e2e-rh-sdl/rapidast-ptp/results.sh
+ - script: ./tests/dast/rapidast-ptp/results.sh

tests/dast/rapid-nrop/chainsaw-test.yaml

@@ -5,27 +5,27 @@ metadata:
   name: rapidast-ptp
 spec:
   steps:
-    - name: step-00
-      try:
+  - name: step-00
+    try:
     - apply:
         file: 00-create-project.yaml
     - assert:
         file: 00-assert.yaml
-    - name: step-01
-      try:
+  - name: step-01
+    try:
     - apply:
         file: 01-create-sa.yaml
     - assert:
         file: 01-assert.yaml
-    - name: step-02
-      try:
+  - name: step-02
+    try:
     - script:
         timeout: 30s
         content: ./create_rapidast_configmap.sh
     - assert:
         file: 02-assert.yaml
-    - name: step-03
-      try:
+  - name: step-03
+    try:
     - apply:
         file: 03-rapidast-job.yaml
     - assert:
@@ -35,8 +35,8 @@ spec:
     - script:
         timeout: 6m
         content: ./results.sh
-      finally:
-        - command:
+    finally:
+      - command:
           timeout: 1m
           entrypoint: oc
           args:
@@ -45,7 +45,7 @@ spec:
             - delete
             - pod
             - rapiterm-ptp
-        - command:
+      - command:
           timeout: 1m
           entrypoint: oc
           args:

tests/dast/rapid-nrop/create_rapidast_configmap.sh

@@ -31,7 +31,7 @@ data:
       zap:
         apiScan:
           apis:
-            apiUrl: "https://kubernetes.default.svc/openapi/v3/apis/ptp.openshift.io/v1alpha1"
+            apiUrl: "https://kubernetes.default.svc/openapi/v3/apis/ptp.openshift.io/v1"
         passiveScan:
           disabledRules: "2,10015,10027,10096,10024,10054"
         activeScan:

tests/dast/rapid-ptp/03-rapidast-job.yaml

@@ -36,9 +36,7 @@ spec:
         - command:
             - sh
             - -c
-            - rapidast.py --log-level debug --config
-              /helm/config/rapidastconfig.yaml && find /opt/rapidast/results/talm
-              -name zap-report.json -exec cat {} \;
+            - rapidast.py --log-level debug --config /helm/config/rapidastconfig.yaml && find /opt/rapidast/results/talm -name zap-report.json -exec cat {} \;
           image: quay.io/redhatproductsecurity/rapidast:latest
           imagePullPolicy: Always
           name: rapidast-chart
@@ -62,5 +60,5 @@ spec:
             name: rapidast-configmap
           name: config-volume
         - name: results-volume
-          persistentVolumeClaim: null
-          claimName: rapidast-pvc
+          persistentVolumeClaim:
+           claimName: rapidast-pvc

tests/dast/rapid-ptp/04-assert.yaml

@@ -2,4 +2,4 @@ apiVersion: kuttl.dev/v1beta1
 kind: TestAssert
 timeout: 180
 commands:
- - script: ./tests/e2e-rh-sdl/rapidast-talm/results.sh
+ - script: ./tests/dast/rapidast-talm/results.sh