Merge branch 'master' into MaxymVlasov-patch-1

MaxymVlasov · web-flow · commit 9ca64700fa62 · 2025-01-27T17:41:26.000+02:00
diff --git a/.github/workflows/build-image-test.yaml b/.github/workflows/build-image-test.yaml
@@ -13,11 +13,25 @@ env:
 
 jobs:
   build:
+    permissions:
+      # for MaxymVlasov/dive-action to write comments to PRs
+      pull-requests: write
+
     strategy:
       matrix:
-        os: [ubuntu-latest]
-        arch: [amd64, arm64]
+        arch:
+        - amd64
+        - arm64
+        include:
+        - os-name: Ubuntu x64
+          os: ubuntu-latest
+          arch: amd64
+
+        - os-name: Ubuntu ARM
+          os: ubuntu-24.04-arm
+          arch: arm64
 
+    name: ${{ matrix.os-name }}
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  # v4.2.2
@@ -37,21 +51,17 @@ jobs:
           tools/*.sh
 
     - name: Set IMAGE environment variable
+      if: steps.changed-files-specific.outputs.any_changed == 'true'
       # Lowercase the org/repo name to allow for workflow to run in forks,
       # which owners have uppercase letters in username
       run: >-
         echo "IMAGE=ghcr.io/${GITHUB_REPOSITORY@L}:${{ env.IMAGE_TAG }}"
         >> $GITHUB_ENV
-    - name: Set up QEMU
-      if: matrix.os != 'ubuntu-latest' || matrix.arch != 'amd64'
-      # yamllint disable-line rule:line-length
-      uses: docker/setup-qemu-action@53851d14592bedcffcf25ea515637cff71ef929a  # v3.3.0
-      with:
-        platforms: arm64
 
     - name: Set up Docker Buildx
       # yamllint disable-line rule:line-length
       uses: docker/setup-buildx-action@6524bf65af31da8d45b59e8c27de4bd072b392f5  # v3.8.0
+      if: steps.changed-files-specific.outputs.any_changed == 'true'
 
     - name: Build if Dockerfile changed
       if: steps.changed-files-specific.outputs.any_changed == 'true'
@@ -61,9 +71,6 @@ jobs:
         context: .
         build-args: |
           INSTALL_ALL=true
-        # yamllint disable-line rule:line-length
-        platforms: >-  # Only one allowed here, see https://github.com/docker/buildx/issues/59#issuecomment-1433097926
-          linux/${{ matrix.arch }}
         push: false
         load: true
         tags: ${{ env.IMAGE }}
@@ -72,18 +79,34 @@ jobs:
         secrets: |
           "github_token=${{ secrets.GITHUB_TOKEN }}"
 
+    - name: Setup Container Structure Tests
+      if: steps.changed-files-specific.outputs.any_changed == 'true'
+      env:
+        # yamllint disable-line rule:line-length
+        # renovate: datasource=github-releases depName=container-structure-test lookupName=GoogleContainerTools/container-structure-test
+        CST_VERSION: 1.19.3
+        CST_REPO: github.com/GoogleContainerTools/container-structure-test
+      run: >-
+        curl -L "https://${{ env.CST_REPO }}/releases/download/v${{
+        env.CST_VERSION }}/container-structure-test-linux-${{ matrix.arch }}"
+        > container-structure-test
+        && chmod +x container-structure-test
+        && mkdir -p $HOME/bin/
+        && mv container-structure-test $HOME/bin/
+        && echo $HOME/bin/ >> $GITHUB_PATH
+
     - name: Run structure tests
       if: steps.changed-files-specific.outputs.any_changed == 'true'
-      # yamllint disable-line rule:line-length
-      uses: plexsystems/container-structure-test-action@c0a028aa96e8e82ae35be556040340cbb3e280ca  # v0.3.0
-      with:
-        image: ${{ env.IMAGE }}
-        config: .github/.container-structure-test-config.yaml
+      run: >-
+        container-structure-test test
+        --config ${{ github.workspace
+        }}/.github/.container-structure-test-config.yaml
+        --image ${{ env.IMAGE }}
 
     - name: Dive - check image for waste files
       if: steps.changed-files-specific.outputs.any_changed == 'true'
       # yamllint disable-line rule:line-length
-      uses: MaxymVlasov/dive-action@379af3fc636888ada5899c997e8b52db6ad45023  # v1.0.1
+      uses: MaxymVlasov/dive-action@b6a02b38f0f309e8817199658eab090d4f0f93ce  # v1.1.0
       with:
         image: ${{ env.IMAGE }}
         config-file: ${{ github.workspace }}/.github/.dive-ci.yaml
@@ -95,7 +118,6 @@ jobs:
       if: >-
         steps.changed-files-specific.outputs.any_changed == 'true'
         && matrix.os == 'ubuntu-latest'
-        && matrix.arch == 'amd64'
       # yamllint disable-line rule:line-length
       uses: docker/build-push-action@67a2d409c0a876cbe6b11854e3e25193efe4e62d  # v6.12.0
       with:
diff --git a/.github/workflows/build-image.yaml b/.github/workflows/build-image.yaml
@@ -23,9 +23,6 @@ jobs:
     steps:
     - name: Checkout code
       uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  # v4.2.2
-    - name: Set up QEMU
-      # yamllint disable-line rule:line-length
-      uses: docker/setup-qemu-action@53851d14592bedcffcf25ea515637cff71ef929a  # v3.3.0
     - name: Set up Docker Buildx
       # yamllint disable-line rule:line-length
       uses: docker/setup-buildx-action@6524bf65af31da8d45b59e8c27de4bd072b392f5  # v3.8.0
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -0,0 +1,82 @@
+---
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: CodeQL
+
+on:
+  push:
+    branches:
+    - master
+  pull_request:
+  schedule:
+  - cron: 0 0 * * 1
+
+permissions:
+  contents: read
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language:
+        - python
+        # CodeQL supports [ $supported-codeql-languages ]
+        # Learn more about CodeQL language support at
+        # https://aka.ms/codeql-docs/language-support
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  # v4.2.2
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      # yamllint disable-line rule:line-length
+      uses: github/codeql-action/init@f6091c0113d1dcf9b98e269ee48e8a7e51b7bdd4  # v3.28.5
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in
+        # a config file. # By default, queries listed here will override any
+        # specified in a config file.  Prefix the list here with "+" to use
+        # these queries and those in the config file.
+
+    # Autobuild attempts to build any compiled languages (C/C++, C#, or Java)
+    # If this step fails, then you should remove it and run the build
+    # manually (see below)
+    - name: Autobuild
+      # yamllint disable-line rule:line-length
+      uses: github/codeql-action/autobuild@f6091c0113d1dcf9b98e269ee48e8a7e51b7bdd4  # v3.28.5
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # yamllint disable-line rule:line-length
+    # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
+
+    # If the Autobuild fails above, remove it and uncomment the following
+    # three lines. Modify them (or add more) to build your code if your
+    # project, please refer to the EXAMPLE below for guidance.
+
+    # - run: |
+    #   echo "Run, Build Application using script"
+    #   ./location_of_script_within_repo/buildscript.sh
+
+    - name: Perform CodeQL Analysis
+      # yamllint disable-line rule:line-length
+      uses: github/codeql-action/analyze@f6091c0113d1dcf9b98e269ee48e8a7e51b7bdd4  # v3.28.5
+      with:
+        category: /language:${{matrix.language}}
diff --git a/README.md b/README.md
@@ -3,6 +3,7 @@
 [![Github tag](https://img.shields.io/github/tag/antonbabenko/pre-commit-terraform.svg)](https://github.com/antonbabenko/pre-commit-terraform/releases) ![maintenance status](https://img.shields.io/maintenance/yes/2025.svg) [![Help Contribute to Open Source](https://www.codetriage.com/antonbabenko/pre-commit-terraform/badges/users.svg)](https://www.codetriage.com/antonbabenko/pre-commit-terraform)
 [![CI/CD Badge]][CI/CD]
 [![Codecov Badge]][Codecov]
+[![OpenSSF Scorecard](https://api.scorecard.dev/projects/github.com/antonbabenko/pre-commit-terraform/badge)](https://scorecard.dev/viewer/?uri=github.com/antonbabenko/pre-commit-terraform)
 [![OpenSSF Best Practices](https://www.bestpractices.dev/projects/9963/badge)](https://www.bestpractices.dev/projects/9963)
 
 [CI/CD Badge]:
