Merge branch 'main' into remove-recursion-module-load

.circleci/config.yml

@@ -2,14 +2,14 @@ version: 2
 jobs:
   e2e:
     docker:
-    - image: cimg/go:1.21 # If you update this, update it in the Makefile too
+    - image: cimg/go:1.22 # If you update this, update it in the Makefile too
       environment:
         # This version of TF will be downloaded before Atlantis is started.
         # We do this instead of setting --default-tf-version because setting
         # that flag starts the download asynchronously so we'd have a race
         # condition.
         # renovate: datasource=github-releases depName=hashicorp/terraform versioning=hashicorp
-        TERRAFORM_VERSION: 1.6.3
+        TERRAFORM_VERSION: 1.7.4
     steps:
     - checkout
     - run: make build-service

.github/labeler.yml

@@ -1,35 +1,45 @@
 build:
-  - 'Dockerfile*'
+- changed-files:
+  - any-glob-to-any-file: 'Dockerfile*'
 
 dependencies:
-  - 'yarn.lock'
-  - 'go.*'
+- changed-files:
+  - any-glob-to-any-file: 'yarn.lock'
+  - any-glob-to-any-file: 'go.*'
 
 docs:
-  - 'runatlantis.io/**/*.md'
-  - 'README.md'
+- changed-files:
+  - any-glob-to-any-file: 'runatlantis.io/**/*.md'
+  - any-glob-to-any-file: 'README.md'
 
 github-actions:
-  - '.github/**'
+- changed-files:
+  - any-glob-to-any-file: '.github/**'
 
 go:
-  - '**/*.go'
+- changed-files:
+  - any-glob-to-any-file: '**/*.go'
 
 provider/azuredevops:
-  - 'server/**/*azuredevops*.go'
+- changed-files:
+  - any-glob-to-any-file: 'server/**/*azuredevops*.go'
 
 provider/bitbucket:
-  - 'server/**/*bitbucket*.go'
-  - 'server/events/vcs/bitbucketcloud/*.go'
-  - 'server/events/vcs/bitbucketserver/*.go'
+- changed-files:
+  - any-glob-to-any-file: 'server/**/*bitbucket*.go'
+  - any-glob-to-any-file: 'server/events/vcs/bitbucketcloud/*.go'
+  - any-glob-to-any-file: 'server/events/vcs/bitbucketserver/*.go'
 
 provider/github:
-  - 'server/**/*github*.go'
+- changed-files:
+  - any-glob-to-any-file: 'server/**/*github*.go'
 
 provider/gitlab:
-  - 'server/**/*gitlab*.go'
+- changed-files:
+  - any-glob-to-any-file: 'server/**/*gitlab*.go'
 
 website:
-  - 'runatlantis.io/.vuepress/**/*'
-  - 'package.json'
-  - 'yarn.lock'
+- changed-files:
+  - any-glob-to-any-file: 'runatlantis.io/.vuepress/**/*'
+  - any-glob-to-any-file: 'package.json'
+  - any-glob-to-any-file: 'pnpm-lock.yaml'

.github/renovate.json5

@@ -12,7 +12,7 @@
   postUpdateOptions: [
     "gomodTidy",
     "gomodUpdateImportPaths",
-    "yarnDedupeHighest",
+    "pnpmDedupe",
   ],
   // needed so e2e tests do not stomp over each other
   prHourlyLimit: 1,

.github/workflows/atlantis-image.yml

@@ -21,12 +21,12 @@ concurrency:
 jobs:
   changes:
     outputs:
-      should-run-build: ${{ steps.changes.outputs.src == 'true' }}
+      should-run-build: ${{ steps.changes.outputs.src == 'true' || startsWith(github.ref, 'refs/tags/') }}
     if: github.event.pull_request.draft == false
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
-      - uses: dorny/paths-filter@v2
+      - uses: dorny/paths-filter@v3
         id: changes
         with:
           filters: |
@@ -152,4 +152,4 @@ jobs:
         image_type: [alpine, debian]
     runs-on: ubuntu-22.04
     steps:
-      - run: 'echo "No build required"'
+      - run: 'echo "No build required"'

.github/workflows/codeql.yml

@@ -38,7 +38,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
-      - uses: dorny/paths-filter@v2
+      - uses: dorny/paths-filter@v3
         id: changes
         with:
           filters: |
@@ -71,7 +71,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -85,7 +85,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, Go, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
+      uses: github/codeql-action/autobuild@v3
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -98,7 +98,7 @@ jobs:
     #   ./location_of_script_within_repo/buildscript.sh
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3
       with:
         category: "/language:${{matrix.language}}"
 

.github/workflows/labeler.yml

@@ -16,7 +16,4 @@ jobs:
     if: github.event.pull_request.draft == false
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/labeler@v4
-        with:
-          repo-token: "${{ secrets.GITHUB_TOKEN }}"
-          configuration-path: .github/labeler.yml
+      - uses: actions/labeler@v5

.github/workflows/lint.yml

@@ -23,7 +23,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
-      - uses: dorny/paths-filter@v2
+      - uses: dorny/paths-filter@v3
         id: changes
         with:
           filters: |
@@ -40,11 +40,17 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v4
+
+    # need to setup go toolchain explicitly
+    - uses: actions/setup-go@v5
+      with:
+        go-version-file: go.mod
+
     - name: golangci-lint
       uses: reviewdog/action-golangci-lint@v2
       with:
         tool_name: golangci-lint
-  
+
   skip-lint:
     needs: [changes]
     if: needs.changes.outputs.should-run-linting == 'false'

.github/workflows/release.yml

@@ -11,13 +11,11 @@ jobs:
   goreleaser:
     runs-on: ubuntu-22.04
     steps:
-    - name: Checkout
-      uses: actions/checkout@v4
+    - uses: actions/checkout@v4
       with:
         submodules: true
 
-    - name: Set up Go
-      uses: actions/setup-go@v4
+    - uses: actions/setup-go@v5
       with:
         go-version-file: go.mod
 

.github/workflows/stale.yml

@@ -6,7 +6,7 @@ jobs:
   stale:
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/stale@v8
+      - uses: actions/stale@v9
         with:
           stale-pr-message: 'This issue is stale because it has been open for 1 month with no activity. Remove stale label or comment or this will be closed in 1 month.'
           stale-issue-message: This issue is stale because it has been open for 1 month with no activity. Remove stale label or comment or this will be closed in 1 month.'

.github/workflows/test.yml

@@ -27,7 +27,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
-      - uses: dorny/paths-filter@v2
+      - uses: dorny/paths-filter@v3
         id: changes
         with:
           filters: |
@@ -43,14 +43,20 @@ jobs:
     container: ghcr.io/runatlantis/testing-env:latest
     steps:
       - uses: actions/checkout@v4
+
+      # need to setup go toolchain explicitly
+      - uses: actions/setup-go@v5
+        with:
+          go-version-file: go.mod
+
       - run: make test-all
       - run: make check-fmt
       ###########################################################
       # Notifying #contributors about test failure on main branch
       ###########################################################
       - name: Slack failure notification
         if: ${{ github.ref == 'refs/heads/main' && failure() }}
-        uses: slackapi/slack-github-action@e28cf165c92ffef168d23c5c9000cffc8a25e117 # v1.24.0
+        uses: slackapi/slack-github-action@6c661ce58804a1a20f6dc5fbee7f0381b469e001 # v1.25.0
         with:
           payload: |
             {

.github/workflows/testing-env-image.yml

@@ -23,7 +23,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
-      - uses: dorny/paths-filter@v2
+      - uses: dorny/paths-filter@v3
         id: changes
         with:
           filters: |

.github/workflows/website.yml

@@ -14,7 +14,7 @@ on:
     branches:
       - 'main'
       - 'release-**'
- 
+
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
@@ -27,13 +27,13 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
-      - uses: dorny/paths-filter@v2
+      - uses: dorny/paths-filter@v3
         id: changes
         with:
           filters: |
             src:
               - '**.js'
-              - 'yarn.lock'
+              - 'pnpm-lock.yaml'
               - 'package.json'
               - '.github/workflows/website.yml'
 
@@ -48,23 +48,24 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - uses: actions/setup-node@v4
+      - uses: wyvox/action-setup-pnpm@v3
         with:
-          node-version-file: .node-version
+          node-version: 20
 
       - name: run http-server
         env:
           # renovate: datasource=github-releases depName=raviqqe/muffet
-          MUFFET_VERSION: 2.6.3
+          MUFFET_VERSION: 2.9.3
         run: |
-          npm install -g yarn
-          # http-server is used to serve the website locally as muffet checks it.
-          yarn global add http-server
           # install raviqqe/muffet to check for broken links.
-          curl -L https://github.com/raviqqe/muffet/releases/download/v${MUFFET_VERSION}/muffet_${MUFFET_VERSION}_Linux_x86_64.tar.gz | tar -xz
-          yarn install
-          yarn website:build
-          http-server runatlantis.io/.vuepress/dist &
+          curl -Ls https://github.com/raviqqe/muffet/releases/download/v${MUFFET_VERSION}/muffet_linux_amd64.tar.gz | tar -xz
+
+          # build site
+          pnpm install
+          pnpm website:build
+
+          # start http-server for integration testing
+          npx http-server runatlantis.io/.vuepress/dist &
 
       - name: wait until server listened
         run: curl --retry-delay 1 --retry 30 --retry-all-error http://localhost:8080
@@ -86,4 +87,4 @@ jobs:
     name: Website Link Check
     runs-on: ubuntu-latest
     steps:
-      - run: 'echo "No build required"' 
+      - run: 'echo "No build required"'

.golangci.yml

@@ -7,22 +7,26 @@ linters-settings:
     ignore-words:
       # for gitlab notes api
       - noteable
+  revive:
+    rules:
+      - name: dot-imports
+        disabled: true
 
 linters:
   enable:
-  - errcheck
-  - gochecknoinits
-  - gofmt
-  - gosec
-  - gosimple
-  - ineffassign
-  - misspell
-  - revive
-  - staticcheck
-  - typecheck
-  - unconvert
-  - unused
-  - vet
-  - vetshadow
+    - errcheck
+    - gochecknoinits
+    - gofmt
+    - gosec
+    - gosimple
+    - ineffassign
+    - misspell
+    - revive
+    - staticcheck
+    - typecheck
+    - unconvert
+    - unused
+    - vet
+    - vetshadow
 run:
   timeout: 10m

.node-version

@@ -1 +1 @@
-20.9.0
+20.11.1

.tool-versions

@@ -0,0 +1 @@
+pnpm 8.15.3

CODEOWNERS

@@ -1,3 +1,3 @@
 # https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners
 # These owners will be the default owners for everything in the repo.
-*    @runatlantis/maintainers
+*    @runatlantis/maintainers @runatlantis/core-contributors