diff --git a/.circleci/config.yml b/.circleci/config.yml index c1bae620e..b61942c56 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -16,7 +16,7 @@ jobs: # We do this instead of setting --default-tf-version because setting # that flag starts the download asynchronously so we'd have a race # condition. - TERRAFORM_VERSION: 1.3.2 + TERRAFORM_VERSION: 1.3.3 steps: - checkout - run: make build-service diff --git a/Dockerfile b/Dockerfile index e7c69cbd5..2d2c79cd9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,7 @@ FROM ghcr.io/runatlantis/atlantis-base:2022.10.14 AS base ARG TARGETPLATFORM # install terraform binaries -ENV DEFAULT_TERRAFORM_VERSION=1.3.2 +ENV DEFAULT_TERRAFORM_VERSION=1.3.3 # In the official Atlantis image we only have the latest of each Terraform version. SHELL ["/bin/bash", "-o", "pipefail", "-c"] diff --git a/runatlantis.io/docs/access-credentials.md b/runatlantis.io/docs/access-credentials.md index 8e1a3ea84..b0947244e 100644 --- a/runatlantis.io/docs/access-credentials.md +++ b/runatlantis.io/docs/access-credentials.md @@ -24,7 +24,7 @@ generate an access token. Read on for the instructions for your specific Git hos * [Azure DevOps](#azure-devops) ### GitHub user -- Create a Personal Access Token by following: [https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/creating-a-personal-access-token#creating-a-token](https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/creating-a-personal-access-token#creating-a-token) +- Create a [Personal Access Token](https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/creating-a-personal-access-token#creating-a-fine-grained-personal-access-token) - Create the token with **repo** scope - Record the access token ::: warning diff --git a/runatlantis.io/guide/testing-locally.md b/runatlantis.io/guide/testing-locally.md index e55050f1a..45c0346b2 100644 --- a/runatlantis.io/guide/testing-locally.md +++ b/runatlantis.io/guide/testing-locally.md @@ -147,7 +147,7 @@ you can use your own user. Here we'll create the access token that Atlantis uses set commit statuses. ### GitHub or GitHub Enterprise Access Token -- follow [https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/creating-a-personal-access-token#creating-a-token](https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/creating-a-personal-access-token#creating-a-token) +- Create a [Personal Access Token](https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/creating-a-personal-access-token#creating-a-fine-grained-personal-access-token) - create a token with **repo** scope - set the token as an environment variable ``` diff --git a/testdrive/testdrive.go b/testdrive/testdrive.go index c2e5e80a5..225dfcc52 100644 --- a/testdrive/testdrive.go +++ b/testdrive/testdrive.go @@ -99,7 +99,7 @@ To continue, we need you to create a GitHub personal access token with [green]"repo" [reset]scope so we can fork an example terraform project. Follow these instructions to create a token (we don't store any tokens): -[green]https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/creating-a-personal-access-token#creating-a-token[reset] +[green]https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/creating-a-personal-access-token#creating-a-fine-grained-personal-access-token[reset] - use "atlantis" for the token description - add "repo" scope - copy the access token diff --git a/testdrive/utils.go b/testdrive/utils.go index 117adb75e..5f20bbbb9 100644 --- a/testdrive/utils.go +++ b/testdrive/utils.go @@ -34,7 +34,7 @@ import ( ) const hashicorpReleasesURL = "https://releases.hashicorp.com" -const terraformVersion = "1.3.2" +const terraformVersion = "1.3.3" const ngrokDownloadURL = "https://bin.equinox.io/c/4VmDzA7iaHb" const ngrokAPIURL = "localhost:41414" // We hope this isn't used. const atlantisPort = 4141 diff --git a/testing/Dockerfile b/testing/Dockerfile index 94341e74d..fa77524c9 100644 --- a/testing/Dockerfile +++ b/testing/Dockerfile @@ -3,7 +3,7 @@ FROM golang:1.17 RUN apt-get update && apt-get install unzip # Install Terraform -ENV TERRAFORM_VERSION=1.3.2 +ENV TERRAFORM_VERSION=1.3.3 RUN case $(uname -m) in x86_64|amd64) ARCH="amd64" ;; aarch64|arm64|armv7l) ARCH="arm64" ;; esac && \ wget -nv -O terraform.zip https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_linux_${ARCH}.zip && \ mkdir -p /usr/local/bin/tf/versions/${TERRAFORM_VERSION} && \