From fdefb524c5879de58c163982ffc8a3c9a57270ea Mon Sep 17 00:00:00 2001
From: Fabio Pitino <fpitino@gitlab.com>
Date: Wed, 3 May 2023 11:26:29 +0100
Subject: [PATCH] Remove sast image var

---
 template.yml | 43 +++++++++++--------------------------------
 1 file changed, 11 insertions(+), 32 deletions(-)

diff --git a/template.yml b/template.yml
index 3290d96..a9f306d 100644
--- a/template.yml
+++ b/template.yml
@@ -35,9 +35,7 @@ spec:
 brakeman-sast:
   extends: .sast-analyzer
   image:
-    name: "$SAST_ANALYZER_IMAGE"
-  variables:
-    SAST_ANALYZER_IMAGE: "$[[ inputs.image_prefix ]]/brakeman:$[[ inputs.image_tag ]]"
+    name: "$[[ inputs.image_prefix ]]/brakeman:$[[ inputs.image_tag ]]"
   rules:
     - if: $SAST_DISABLED
       when: never
@@ -51,9 +49,7 @@ brakeman-sast:
 flawfinder-sast:
   extends: .sast-analyzer
   image:
-    name: "$SAST_ANALYZER_IMAGE"
-  variables:
-    SAST_ANALYZER_IMAGE: "$[[ inputs.image_prefix ]]/flawfinder:$[[ inputs.image_tag ]]"
+    name: "$[[ inputs.image_prefix ]]/flawfinder:$[[ inputs.image_tag ]]"
   rules:
     - if: $SAST_DISABLED
       when: never
@@ -71,9 +67,7 @@ flawfinder-sast:
 kubesec-sast:
   extends: .sast-analyzer
   image:
-    name: "$SAST_ANALYZER_IMAGE"
-  variables:
-    SAST_ANALYZER_IMAGE: "$[[ inputs.image_prefix ]]/kubesec:$[[ inputs.image_tag ]]"
+    name: "$[[ inputs.image_prefix ]]/kubesec:$[[ inputs.image_tag ]]"
   rules:
     - if: $SAST_DISABLED
       when: never
@@ -84,9 +78,7 @@ kubesec-sast:
 .mobsf-sast:
   extends: .sast-analyzer
   image:
-    name: "$SAST_ANALYZER_IMAGE"
-  variables:
-    SAST_ANALYZER_IMAGE: "$[[ inputs.image_prefix ]]/mobsf:$[[ inputs.image_tag ]]"
+    name: "$[[ inputs.image_prefix ]]/mobsf:$[[ inputs.image_tag ]]"
 
 mobsf-android-sast:
   extends: .mobsf-sast
@@ -117,9 +109,7 @@ mobsf-ios-sast:
 nodejs-scan-sast:
   extends: .sast-analyzer
   image:
-    name: "$SAST_ANALYZER_IMAGE"
-  variables:
-    SAST_ANALYZER_IMAGE: "$[[ inputs.image_prefix ]]/nodejs-scan:$[[ inputs.image_tag ]]"
+    name: "$[[ inputs.image_prefix ]]/nodejs-scan:$[[ inputs.image_tag ]]"
   rules:
     - if: $SAST_DISABLED
       when: never
@@ -132,9 +122,7 @@ nodejs-scan-sast:
 phpcs-security-audit-sast:
   extends: .sast-analyzer
   image:
-    name: "$SAST_ANALYZER_IMAGE"
-  variables:
-    SAST_ANALYZER_IMAGE: "$[[ inputs.image_prefix ]]/phpcs-security-audit:$[[ inputs.image_tag ]]"
+    name: "$[[ inputs.image_prefix ]]/phpcs-security-audit:$[[ inputs.image_tag ]]"
   rules:
     - if: $SAST_DISABLED
       when: never
@@ -147,9 +135,7 @@ phpcs-security-audit-sast:
 pmd-apex-sast:
   extends: .sast-analyzer
   image:
-    name: "$SAST_ANALYZER_IMAGE"
-  variables:
-    SAST_ANALYZER_IMAGE: "$[[ inputs.image_prefix ]]/pmd-apex:$[[ inputs.image_tag ]]"
+    name: "$[[ inputs.image_prefix ]]/pmd-apex:$[[ inputs.image_tag ]]"
   rules:
     - if: $SAST_DISABLED
       when: never
@@ -162,9 +148,7 @@ pmd-apex-sast:
 security-code-scan-sast:
   extends: .sast-analyzer
   image:
-    name: "$SAST_ANALYZER_IMAGE"
-  variables:
-    SAST_ANALYZER_IMAGE: "$[[ inputs.image_prefix ]]/security-code-scan:$[[ inputs.image_tag ]]"
+    name: "$[[ inputs.image_prefix ]]/security-code-scan:$[[ inputs.image_tag ]]"
   rules:
     - if: $SAST_DISABLED
       when: never
@@ -178,10 +162,9 @@ security-code-scan-sast:
 semgrep-sast:
   extends: .sast-analyzer
   image:
-    name: "$SAST_ANALYZER_IMAGE"
+    name: "$[[ inputs.image_prefix ]]/semgrep:$[[ inputs.image_tag ]]$[[ inputs.image_suffix ]]"
   variables:
     SEARCH_MAX_DEPTH: 20
-    SAST_ANALYZER_IMAGE: "$[[ inputs.image_prefix ]]/semgrep:$[[ inputs.image_tag ]]$[[ inputs.image_suffix ]]"
   rules:
     - if: $SAST_DISABLED
       when: never
@@ -205,9 +188,7 @@ semgrep-sast:
 sobelow-sast:
   extends: .sast-analyzer
   image:
-    name: "$SAST_ANALYZER_IMAGE"
-  variables:
-    SAST_ANALYZER_IMAGE: "$[[ inputs.image_prefix ]]/sobelow:$[[ inputs.image_tag ]]"
+    name: "$[[ inputs.image_prefix ]]/sobelow:$[[ inputs.image_tag ]]"
   rules:
     - if: $SAST_DISABLED
       when: never
@@ -220,9 +201,7 @@ sobelow-sast:
 spotbugs-sast:
   extends: .sast-analyzer
   image:
-    name: "$SAST_ANALYZER_IMAGE"
-  variables:
-    SAST_ANALYZER_IMAGE: "$[[ inputs.image_prefix ]]/spotbugs:$[[ inputs.image_tag ]]"
+    name: "$[[ inputs.image_prefix ]]/spotbugs:$[[ inputs.image_tag ]]"
   rules:
     - if: '"$[[ inputs.excluded_analyzers ]]" =~ /spotbugs/'
       when: never