Merge remote-tracking branch 'atlantis/main' into add-regex-filter

.dockerignore

@@ -1,5 +1,6 @@
 *
 !cmd/
+!scripts/download-release.sh
 !server/
 !testdrive/
 !main.go

.editorconfig

@@ -0,0 +1,12 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.md]
+indent_style = space
+indent_size = 3
+trim_trailing_whitespace = false

.gitattributes

@@ -1,11 +1,2 @@
 # Set the default behavior, in case people don't have core.autocrlf set.
-* text=auto
-
-# Explicitly declare text files you want to always be normalized and converted
-# to native line endings on checkout.
-*.go text
-*.json text
-*.yml text
-*.yaml text
-*.sh text
-*.tf text
+* text=auto eol=lf

.github/labeler.yml

@@ -14,7 +14,8 @@ docs:
 
 github-actions:
 - changed-files:
-  - any-glob-to-any-file: '.github/**'
+  - any-glob-to-any-file:
+    - '.github/workflows/*.yml'
 
 go:
 - changed-files:
@@ -40,6 +41,10 @@ provider/gitlab:
 
 website:
 - changed-files:
-  - any-glob-to-any-file: 'runatlantis.io/.vuepress/**/*'
+  - any-glob-to-any-file: 'runatlantis.io/.vitepress/**/*'
   - any-glob-to-any-file: 'package.json'
-  - any-glob-to-any-file: 'pnpm-lock.yaml'
+  - any-glob-to-any-file: 'package-lock.json'
+
+blog:
+- changed-files:
+  - any-glob-to-any-file: 'runatlantis.io/blog/**'

.github/release.yml

@@ -5,6 +5,7 @@ changelog:
       - github-actions
     authors:
       - octocat
+      - renovate[bot]
   categories:
     - title: Breaking Changes 🛠
       labels:
@@ -15,9 +16,9 @@ changelog:
         - Semver-Minor
         - enhancement
         - feature
-    - title: Bug fixes
+    - title: Bug fixes 🐛
       labels:
         - bug
-    - title: Other Changes
+    - title: Other Changes 🔄
       labels:
         - "*"

.github/renovate.json5

@@ -1,108 +1,117 @@
 {
   extends: [
-    "config:base",
-    "schedule:daily",
+    'config:best-practices',
+    ':separateMultipleMajorReleases',
+    'schedule:daily',
   ],
-  commitMessageSuffix: " in {{packageFile}}",
+  commitMessageSuffix: ' in {{packageFile}}',
   dependencyDashboardAutoclose: true,
   automerge: true,
-  baseBranches: ["main", "/^release\-.*/"],
+  baseBranches: [
+    'main',
+    '/^release-.*/',
+  ],
   platformAutomerge: true,
-  labels: ["dependencies"],
+  labels: [
+    'dependencies',
+  ],
   postUpdateOptions: [
-    "gomodTidy",
-    "gomodUpdateImportPaths",
-    "pnpmDedupe",
+    'gomodTidy',
+    'gomodUpdateImportPaths',
+    'npmDedupe',
   ],
-  // needed so e2e tests do not stomp over each other
   prHourlyLimit: 1,
-  lockFileMaintenance: {
-    enabled: true,
-  },
+  minimumReleaseAge: '5 days',
+  osvVulnerabilityAlerts: true,
   vulnerabilityAlerts: {
     enabled: true,
     labels: [
-      "security",
+      'security',
     ],
   },
   packageRules: [
-    // For vuepress
     {
-      "matchPackageNames": ["vuepress", "@vuepress/client", "@vuepress/markdown", "@vuepress/utils"],
-      "groupName": "vuepress",
-      "allowedVersions": "!/pre.*$/",
+      "matchFileNames": ["package.json"],
+      "enabled": false
     },
-    // e2e test depends on testing/Dockefile testing-image which has conftest specific version.
-    // to upgrade conftest versions, we need following PRs.
-    // 1. update testing/Dockerfile conftest version
-    // 2. update testing-env tag
-    // 3. update e2e conftest version
-    // This will allow conftest version updates in testing/Dockefile
     {
-      matchPaths: ["testing/**"],
-      matchPackagePatterns: ["conftest"],
-      additionalBranchPrefix: "{{baseDir}}-",
-      groupName: "conftest-testing",
-      /*
-      prBodyNotes: [
-        ":warning: Upgrade testing-env conftest and then upgrade other conftest versions for e2e :warning:",
+      matchFileNames: [
+        'testing/**',
+      ],
+      matchPackagePatterns: [
+        'conftest',
       ],
-      */
+      additionalBranchPrefix: '{{packageFileDir}}-',
+      groupName: 'conftest-testing',
     },
     {
-      ignorePaths: ["testing/**"],
-      matchPackagePatterns: ["github-actions"],
-      groupName: "github-",
+      ignorePaths: [
+        'testing/**',
+      ],
+      matchPackagePatterns: [
+        'github-actions',
+      ],
+      groupName: 'github-',
     },
-    /*
-    // This tag is currently latest so we can skip this check for now unless we need to pin it again.
     {
-      // we need to upgrade testing-env on ci quickly
-      matchPackageNames: ["ghcr.io/runatlantis/testing-env"],
-      groupName: "testing-env-ci-test",
-      schedule: ["every 1 hour after 00:00 and before 23:59 every day"],
+      matchDatasources: [
+        'docker',
+      ],
+      matchPackageNames: [
+        'node',
+        'cimg/node',
+      ],
+      versioning: 'node',
     },
-    */
     {
-      // use LTS node version for node docker image
-      matchDatasources: ["docker"],
-      matchPackageNames: ["node", "cimg/node"],
-      versioning: "node",
+      matchPackageNames: [
+        'go',
+        'golang',
+      ],
+      versioning: 'go',
+      groupName: 'go'
     },
   ],
-  // https://docs.renovatebot.com/modules/manager/regex/
-  regexManagers: [
+  customManagers: [
     {
-      fileMatch: ["(^|/)Dockerfile$", "(^|/)Dockerfile\\.[^/]*$"],
+      customType: 'regex',
+      fileMatch: [
+        '(^|/)Dockerfile$',
+        '(^|/)Dockerfile\\.[^/]*$',
+      ],
       matchStrings: [
         // example:
-        // renovate: datasource=github-releases depName=hashicorp/terraform versioning=hashicorp
+        // # renovate: datasource=github-releases depName=hashicorp/terraform versioning=hashicorp
         // ENV DEFAULT_TERRAFORM_VERSION=x.x.x
-        "renovate: datasource=(?<datasource>.*?) depName=(?<depName>.*?)( versioning=(?<versioning>.*?))?\\sENV .*?_VERSION=(?<currentValue>.*)\\s",
+        // # renovate: datasource=github-releases depName=open-policy-agent/conftest
+        // ARG DEFAULT_CONFTEST_VERSION=x.x.x
+        "renovate: datasource=(?<datasource>.*?) depName=(?<depName>.*?)( versioning=(?<versioning>.*?))?\\s(ARG|ENV) .*?_VERSION=(?<currentValue>.*)\\s",
       ],
-      versioningTemplate: "{{#if versioning}}{{{versioning}}}{{else}}semver{{/if}}",
+      versioningTemplate: '{{#if versioning}}{{{versioning}}}{{else}}semver{{/if}}',
       extractVersionTemplate: '^v(?<version>\\d+\\.\\d+\\.\\d+)',
     },
     {
-      fileMatch: [".*go$"],
+      customType: 'regex',
+      fileMatch: [
+        '.*go$',
+      ],
       matchStrings: [
-        // example:
-        // const ConftestVersion = "x.x.x" // renovate: datasource=github-releases depName=open-policy-agent/conftest
-        "\\sconst .*Version = \"(?<currentValue>.*)\"\\s// renovate: datasource=(?<datasource>.*?) depName=(?<depName>.*?)( versioning=(?<versioning>.*?))?\\s",
+        '\\sconst .*Version = "(?<currentValue>.*)"\\s// renovate: datasource=(?<datasource>.*?) depName=(?<depName>.*?)( versioning=(?<versioning>.*?))?\\s',
       ],
-      versioningTemplate: "{{#if versioning}}{{{versioning}}}{{else}}semver{{/if}}",
+      versioningTemplate: '{{#if versioning}}{{{versioning}}}{{else}}semver{{/if}}',
       extractVersionTemplate: '^v(?<version>\\d+\\.\\d+\\.\\d+)',
     },
     {
-      fileMatch: [".circleci/config.yml$"],
+      customType: 'regex',
+      fileMatch: [
+        '^\\.github/workflows/[^/]+\\.ya?ml$',
+        'Makefile$',
+      ],
       matchStrings: [
-        // example:
-        // # renovate: datasource=github-releases depName=hashicorp/terraform versioning=hashicorp
-        // TRRAFORM_VERSION: x.x.x
-        "renovate: datasource=(?<datasource>.*?) depName=(?<depName>.*?)( versioning=(?<versioning>.*?))?\\s.*?_VERSION: (?<currentValue>.*)\\s",
+        'renovate: datasource=(?<datasource>.*?) depName=(?<depName>.*?)( versioning=(?<versioning>.*?))?\\s.*?_VERSION: (?<currentValue>.*)\\s',
       ],
-      versioningTemplate: "{{#if versioning}}{{{versioning}}}{{else}}semver{{/if}}",
+      versioningTemplate: '{{#if versioning}}{{{versioning}}}{{else}}semver{{/if}}',
       extractVersionTemplate: '^v(?<version>\\d+\\.\\d+\\.\\d+)',
     },
-  ]
+  ],
 }