feat: update scaffold-module and scaffold-working-dir to support …

…scaffolding linters conditionally (#1111) * feat: update scaffold-module and scaffold-working-dir to support scaffolding linters conditionally * style: remove a newline * fix: stringify TFACTION_SKIP_ADDING_AQUA_PACKAGES * debug * debug * test * fix: fix if condition * test * fix
suzuki-shunsuke · Sep 5, 2023 · 28bfbbc · 28bfbbc
1 parent 6325f6e
commit 28bfbbc
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 7 deletions.
diff --git a/get-global-config/dist/index.js b/get-global-config/dist/index.js
diff --git a/get-global-config/src/index.ts b/get-global-config/src/index.ts
@@ -47,8 +47,7 @@ try {
   } else {
     core.setOutput('disable_update_related_pull_requests', 'false');
   }
-  core.exportVariable('TFACTION_SKIP_ADDING_AQUA_PACKAGES', config.scaffold_working_directory && config.scaffold_working_directory.skip_adding_aqua_packages);
-
+  core.exportVariable('TFACTION_SKIP_ADDING_AQUA_PACKAGES', JSON.stringify(config.scaffold_working_directory && config.scaffold_working_directory.skip_adding_aqua_packages));
 
   core.setOutput('enable_tfsec', config.tfsec == null || config.tfsec.enabled == null || config.tfsec.enabled);
   core.setOutput('enable_tflint', config.tflint == null || config.tflint.enabled == null || config.tflint.enabled);

diff --git a/scaffold-module/action.yaml b/scaffold-module/action.yaml
@@ -73,9 +73,27 @@ runs:
     - run: aqua init
       shell: bash
       working-directory: ${{inputs.module_path}}
-    - run: aqua g -i aquasecurity/tfsec terraform-linters/tflint hashicorp/terraform
+      if: env.TFACTION_SKIP_ADDING_AQUA_PACKAGES != 'true'
+
+    - run: aqua g -i hashicorp/terraform
+      shell: bash
+      working-directory: ${{inputs.module_path}}
+      if: env.TFACTION_SKIP_ADDING_AQUA_PACKAGES != 'true'
+
+    - run: aqua g -i aquasecurity/tfsec
+      shell: bash
+      working-directory: ${{inputs.module_path}}
+      if: env.TFACTION_SKIP_ADDING_AQUA_PACKAGES != 'true' && fromJSON(steps.global-config.outputs.enable_tfsec)
+
+    - run: aqua g -i aquasecurity/trivy
+      shell: bash
+      working-directory: ${{inputs.module_path}}
+      if: env.TFACTION_SKIP_ADDING_AQUA_PACKAGES != 'true' && fromJSON(steps.global-config.outputs.enable_trivy)
+
+    - run: aqua g -i terraform-linters/tflint
       shell: bash
       working-directory: ${{inputs.module_path}}
+      if: env.TFACTION_SKIP_ADDING_AQUA_PACKAGES != 'true' && fromJSON(steps.global-config.outputs.enable_tflint)
 
     - run: aqua i -l -a
       shell: bash

diff --git a/scaffold-working-dir/action.yaml b/scaffold-working-dir/action.yaml
@@ -37,11 +37,27 @@ runs:
     - run: aqua init
       shell: bash
       working-directory: ${{steps.target-config.outputs.working_directory}}
-      if: env.TFACTION_SKIP_ADDING_AQUA_PACKAGES == '' || !fromJSON(env.TFACTION_SKIP_ADDING_AQUA_PACKAGES)
-    - run: aqua g -i open-policy-agent/conftest terraform-linters/tflint aquasecurity/tfsec hashicorp/terraform
+      if: env.TFACTION_SKIP_ADDING_AQUA_PACKAGES != 'true'
+
+    - run: aqua g -i open-policy-agent/conftest hashicorp/terraform
+      shell: bash
+      working-directory: ${{steps.target-config.outputs.working_directory}}
+      if: env.TFACTION_SKIP_ADDING_AQUA_PACKAGES != 'true'
+
+    - run: aqua g -i terraform-linters/tflint
+      shell: bash
+      working-directory: ${{steps.target-config.outputs.working_directory}}
+      if: env.TFACTION_SKIP_ADDING_AQUA_PACKAGES != 'true' && fromJSON(steps.target-config.outputs.enable_tflint)
+
+    - run: aqua g -i aquasecurity/tfsec
+      shell: bash
+      working-directory: ${{steps.target-config.outputs.working_directory}}
+      if: env.TFACTION_SKIP_ADDING_AQUA_PACKAGES != 'true' && fromJSON(steps.target-config.outputs.enable_tfsec)
+
+    - run: aqua g -i aquasecurity/trivy
       shell: bash
       working-directory: ${{steps.target-config.outputs.working_directory}}
-      if: env.TFACTION_SKIP_ADDING_AQUA_PACKAGES == '' || !fromJSON(env.TFACTION_SKIP_ADDING_AQUA_PACKAGES)
+      if: env.TFACTION_SKIP_ADDING_AQUA_PACKAGES != 'true' && fromJSON(steps.target-config.outputs.enable_trivy)
 
     - run: git add .
       shell: bash