From dc7c65d266a96cc20181f4f61addc289536de832 Mon Sep 17 00:00:00 2001
From: Rui Chen <rui@chenrui.dev>
Date: Fri, 13 May 2022 17:16:48 -0400
Subject: [PATCH] deps: tf 1.1.9 and conftest 0.31.0 (#2218)

* deps: tf 1.1.9

Signed-off-by: Rui Chen <rui@chenrui.dev>

* deps: conftest 0.31.0

Signed-off-by: Rui Chen <rui@chenrui.dev>

* update applications link ref
---
 .circleci/config.yml |  2 +-
 .goreleaser.yml      | 19 ++++++++++++++++++-
 Dockerfile           |  4 ++--
 Dockerfile.dev       |  2 +-
 testdrive/utils.go   |  2 +-
 testing/Dockerfile   |  4 ++--
 6 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 1b059324d..79714e9b6 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.1.8
+        TERRAFORM_VERSION: 1.1.9
     steps:
     - checkout
     - run: make build-service
diff --git a/.goreleaser.yml b/.goreleaser.yml
index 248d424d8..1e60cfcd5 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -28,7 +28,24 @@ release:
   github:
     owner: runatlantis
     name: atlantis
-  draft: true
+
+  # If set to true, will not auto-publish the release.
+  # Default is false.
+  draft: false
+
+  # If set, will create a release discussion in the category specified.
+  #
+  # Warning: do not use categories in the 'Announcement' format.
+  #  Check https://github.com/goreleaser/goreleaser/issues/2304 for more info.
+  #
+  # Default is empty.
+  discussion_category_name: General
+
+  # If set to auto, will mark the release as not ready for production
+  # in case there is an indicator for this in the tag e.g. v1.0.0-rc1
+  # If set to true, will mark the release as not ready for production.
+  # Default is false.
+  prerelease: auto
 
 snapshot:
   name_template: "{{ incpatch .Version }}-next"
diff --git a/Dockerfile b/Dockerfile
index fd5c38ebf..c1fde331d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,7 +13,7 @@ FROM ghcr.io/runatlantis/atlantis-base:2022.04.19 AS base
 ARG TARGETPLATFORM
 
 # install terraform binaries
-ENV DEFAULT_TERRAFORM_VERSION=1.1.8
+ENV DEFAULT_TERRAFORM_VERSION=1.1.9
 
 # In the official Atlantis image we only have the latest of each Terraform version.
 RUN AVAILABLE_TERRAFORM_VERSIONS="0.11.15 0.12.31 0.13.7 0.14.11 0.15.5 1.0.11 ${DEFAULT_TERRAFORM_VERSION}" && \
@@ -35,7 +35,7 @@ RUN AVAILABLE_TERRAFORM_VERSIONS="0.11.15 0.12.31 0.13.7 0.14.11 0.15.5 1.0.11 $
     done && \
     ln -s /usr/local/bin/tf/versions/${DEFAULT_TERRAFORM_VERSION}/terraform /usr/local/bin/terraform
 
-ENV DEFAULT_CONFTEST_VERSION=0.30.0
+ENV DEFAULT_CONFTEST_VERSION=0.31.0
 
 RUN AVAILABLE_CONFTEST_VERSIONS="${DEFAULT_CONFTEST_VERSION}" && \
     case ${TARGETPLATFORM} in \
diff --git a/Dockerfile.dev b/Dockerfile.dev
index f6ace04ea..c96853086 100644
--- a/Dockerfile.dev
+++ b/Dockerfile.dev
@@ -1,6 +1,6 @@
 FROM ghcr.io/runatlantis/atlantis:latest
 COPY atlantis /usr/local/bin/atlantis
 # TODO: remove this once we get this in the base image
-ENV DEFAULT_CONFTEST_VERSION=0.30.0
+ENV DEFAULT_CONFTEST_VERSION=0.31.0
 
 WORKDIR /atlantis/src
diff --git a/testdrive/utils.go b/testdrive/utils.go
index 57074d436..4c2f19a10 100644
--- a/testdrive/utils.go
+++ b/testdrive/utils.go
@@ -34,7 +34,7 @@ import (
 )
 
 const hashicorpReleasesURL = "https://releases.hashicorp.com"
-const terraformVersion = "1.1.8"
+const terraformVersion = "1.1.9"
 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 3b9dc70ff..3363bc0c2 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.1.8
+ENV TERRAFORM_VERSION=1.1.9
 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} && \
@@ -12,7 +12,7 @@ RUN case $(uname -m) in x86_64|amd64) ARCH="amd64" ;; aarch64|arm64|armv7l) ARCH
     rm terraform.zip
 
 # Install conftest
-ENV CONFTEST_VERSION=0.30.0
+ENV CONFTEST_VERSION=0.31.0
 RUN case $(uname -m) in x86_64|amd64) ARCH="x86_64" ;; aarch64|arm64|armv7l) ARCH="arm64" ;; esac && \
     curl -LOs https://github.com/open-policy-agent/conftest/releases/download/v${CONFTEST_VERSION}/conftest_${CONFTEST_VERSION}_Linux_${ARCH}.tar.gz && \
     curl -LOs https://github.com/open-policy-agent/conftest/releases/download/v${CONFTEST_VERSION}/checksums.txt && \