Merge branch 'main' into fix/966-custom-token-terraform-docs

Author: jansdhillon

.github/workflows/allure_report.yaml

@@ -46,13 +46,13 @@ jobs:
         # The `gh-pages` branch is used to host the Allure report site.
         # With every workflow run, the workflow creates a new folder with the run_number and stores the test results there
       - name: Download fallback test results
-        uses: actions/download-artifact@v8.0.0
+        uses: actions/download-artifact@v8.0.1
         with:
           path: allure-collection-fallback-results/
           pattern: allure-fallback-results*
           merge-multiple: true
       - name: Download actual test results
-        uses: actions/download-artifact@v8.0.0
+        uses: actions/download-artifact@v8.0.1
         with:
           path: allure-results/
           pattern: allure-results*

.github/workflows/comment.yaml

@@ -59,7 +59,7 @@ jobs:
     if: ${{ needs.setup-env.outputs.IS_PR }}
     steps:
       - name: Download artifacts
-        uses: actions/download-artifact@v8.0.0
+        uses: actions/download-artifact@v8.0.1
         with:
           pattern: "${{ env.ARTIFACT_NAME }}-*"
           github-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/integration_test.yaml

@@ -76,14 +76,6 @@ on:
         description: Rockcraft channel to use for the integration test
         type: string
         default: latest/stable
-      rockcraft-ref:
-        description: Used in conjunction with rockcraft-repository to pull and build rockcraft from source instead of using snapstore version.
-        type: string
-        default: ""
-      rockcraft-repository:
-        description: Pull and build rockcraft from source instead of using snapstore version (this means that the rockcraft-channel input will be ignored).
-        type: string
-        default: ""
       rockcraft-enable-security-nesting:
         description: Set security.nesting=true on the rockcraft lxc project to allow for nested containers.
         type: boolean
@@ -288,8 +280,6 @@ jobs:
           charmcraft-channel: ${{ inputs.charmcraft-channel }}
           github-token: ${{ secrets.GITHUB_TOKEN }}
           rockcraft-channel: ${{ inputs.rockcraft-channel }}
-          rockcraft-ref: ${{ inputs.rockcraft-ref }}
-          rockcraft-repository: ${{ inputs.rockcraft-repository }}
 
   plan-scan:
     name: Plan Image Scanning
@@ -321,7 +311,7 @@ jobs:
           cp -rp $TEMP_DIR/. .
           rm -rf $TEMP_DIR
           ls -lah
-      - uses: actions/download-artifact@v8.0.0
+      - uses: actions/download-artifact@v8.0.1
         if: matrix.scan.artifact != ''
         with:
           name: ${{ matrix.scan.artifact }}
@@ -338,7 +328,8 @@ jobs:
         run: |
           docker image pull ${{ matrix.scan.image }}
           docker image save -o ${{ matrix.scan.file }} ${{ matrix.scan.image }}
-      - name: Run Github Trivy Image Action
+      - name: Run Github Trivy Image Action (temporarily disabled)
+        if: ${{ false }}
         uses: aquasecurity/trivy-action@0.35.0
         with:
           input: ${{ matrix.scan.file }}
@@ -413,7 +404,6 @@ jobs:
       provider: ${{ inputs.provider }}
       python-version: ${{ inputs.python-version }}
       use-canonical-k8s: ${{ inputs.use-canonical-k8s }}
-      registry: ghcr.io
       runs-on: ${{ inputs.runs-on || 'ubuntu-24.04' }}
       self-hosted-runner-arch: ${{ inputs.self-hosted-runner-arch }}
       self-hosted-runner-image: ${{ inputs.self-hosted-runner-image }}

.github/workflows/integration_test_run.yaml

@@ -63,10 +63,6 @@ on:
         description: Microk8s provider add-ons override. A minimum set of addons (the defaults) must be enabled.
         type: string
         default: "dns ingress rbac storage"
-      registry:
-        type: string
-        description: Registry to push the built images
-        default: ""
       runs-on:
         type: string
         description: Image of the runner to run the test job. This gets ignored if self-hosted-runner is set to true.
@@ -232,7 +228,7 @@ jobs:
           GITHUB_ENV_FILE.close()
       - name: Setup Astral UV
         if: ${{ inputs.with-uv }}
-        uses: astral-sh/setup-uv@v7.3.1
+        uses: astral-sh/setup-uv@v7.5.0
         with:
           python-version: ${{ env.python-version }}
       - name: Install tox with UV
@@ -488,8 +484,8 @@ jobs:
       - name: Run k6 load tests
         if: ${{ inputs.load-test-enabled }}
         run: k6 run load_tests/load-test.js ${{ inputs.load-test-run-args }}
-      - name: Run Github Trivy FS Action
-        if: ${{ inputs.trivy-fs-enabled }}
+      - name: Run Github Trivy FS Action (temporarily disabled)
+        if: ${{ false }}
         uses: aquasecurity/trivy-action@0.35.0
         with:
           scan-type: "fs"

.github/workflows/test.yaml

@@ -254,7 +254,7 @@ jobs:
     steps:
       - uses: actions/checkout@v6.0.2
       - name: Setup Tflint
-        uses: terraform-linters/setup-tflint@v6.2.1
+        uses: terraform-linters/setup-tflint@v6.2.2
         with:
           tflint_wrapper_enabled: true
       - name: Run Tflint