diff --git a/.circleci/config.yml b/.circleci/config.yml index 4aec881cd2..8096d4e18e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -9,7 +9,7 @@ jobs: # 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.5 + TERRAFORM_VERSION: 1.6.6 steps: - checkout - run: make build-service diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index e4cb1a139d..0fdc67db3f 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -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}}" diff --git a/Dockerfile b/Dockerfile index 5b0481e517..832c690e3b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -90,7 +90,7 @@ RUN AVAILABLE_CONFTEST_VERSIONS=${DEFAULT_CONFTEST_VERSION} && \ # install git-lfs # renovate: datasource=github-releases depName=git-lfs/git-lfs -ENV GIT_LFS_VERSION=3.4.0 +ENV GIT_LFS_VERSION=3.4.1 RUN case ${TARGETPLATFORM} in \ "linux/amd64") GIT_LFS_ARCH=amd64 ;; \ diff --git a/cmd/server_test.go b/cmd/server_test.go index 1c389bfd2e..42921542c6 100644 --- a/cmd/server_test.go +++ b/cmd/server_test.go @@ -52,13 +52,17 @@ func (s *ServerStarterMock) Start() error { // Adding a new flag? Add it to this slice for testing in alphabetical // order. var testFlags = map[string]interface{}{ + ADHostnameFlag: "dev.azure.com", ADTokenFlag: "ad-token", ADUserFlag: "ad-user", ADWebhookPasswordFlag: "ad-wh-pass", ADWebhookUserFlag: "ad-wh-user", AtlantisURLFlag: "url", + AutoplanModules: false, + AutoplanModulesFromProjects: "", AllowCommandsFlag: "version,plan,apply,unlock,import,approve_policies", AllowForkPRsFlag: true, + APISecretFlag: "", AutoDiscoverModeFlag: "auto", AutomergeFlag: true, AutoplanFileListFlag: "**/*.tf,**/*.yml", @@ -67,13 +71,19 @@ var testFlags = map[string]interface{}{ BitbucketUserFlag: "bitbucket-user", BitbucketWebhookSecretFlag: "bitbucket-secret", CheckoutStrategyFlag: CheckoutStrategyMerge, + CheckoutDepthFlag: 0, DataDirFlag: "/path", DefaultTFVersionFlag: "v0.11.0", DisableApplyAllFlag: true, DisableMarkdownFoldingFlag: true, DisableRepoLockingFlag: true, DiscardApprovalOnPlanFlag: true, + EmojiReaction: "eyes", + ExecutableName: "atlantis", + FailOnPreWorkflowHookError: false, + GHAllowMergeableBypassApply: false, GHHostnameFlag: "ghhostname", + GHTeamAllowlistFlag: "", GHTokenFlag: "token", GHUserFlag: "user", GHAppIDFlag: int64(0), @@ -86,6 +96,9 @@ var testFlags = map[string]interface{}{ GitlabTokenFlag: "gitlab-token", GitlabUserFlag: "gitlab-user", GitlabWebhookSecretFlag: "gitlab-secret", + HideUnchangedPlanComments: false, + HidePrevPlanComments: false, + IncludeGitUntrackedFiles: false, LockingDBType: "boltdb", LogLevelFlag: "debug", MarkdownTemplateOverridesDirFlag: "/path2", @@ -95,7 +108,16 @@ var testFlags = map[string]interface{}{ ParallelPoolSize: 100, ParallelPlanFlag: true, ParallelApplyFlag: true, + QuietPolicyChecks: false, + RedisHost: "", + RedisInsecureSkipVerify: false, + RedisPassword: "", + RedisPort: 6379, + RedisTLSEnabled: false, + RedisDB: 0, RepoAllowlistFlag: "github.com/runatlantis/atlantis", + RepoConfigFlag: "", + RepoConfigJSONFlag: "", SilenceNoProjectsFlag: false, SilenceForkPRErrorsFlag: true, SilenceAllowlistErrorsFlag: true, @@ -105,11 +127,18 @@ var testFlags = map[string]interface{}{ SSLCertFileFlag: "cert-file", SSLKeyFileFlag: "key-file", RestrictFileList: false, + TFDownloadFlag: true, TFDownloadURLFlag: "https://my-hostname.com", TFEHostnameFlag: "my-hostname", TFELocalExecutionModeFlag: true, TFETokenFlag: "my-token", + UseTFPluginCache: true, + VarFileAllowlistFlag: "/path", VCSStatusName: "my-status", + WebBasicAuthFlag: false, + WebPasswordFlag: "atlantis", + WebUsernameFlag: "atlantis", + WebsocketCheckOrigin: false, WriteGitCredsFlag: true, DisableAutoplanFlag: true, DisableAutoplanLabelFlag: "no-auto-plan", diff --git a/runatlantis.io/docs/custom-workflows.md b/runatlantis.io/docs/custom-workflows.md index f46981a620..3d8da5a566 100644 --- a/runatlantis.io/docs/custom-workflows.md +++ b/runatlantis.io/docs/custom-workflows.md @@ -177,6 +177,7 @@ by CDKTF will be add to the Atlantis modified file list. # Dockerfile FROM ghcr.io/runatlantis/atlantis:v0.19.7 +USER root RUN apk add npm && npm i -g cdktf-cli ``` diff --git a/runatlantis.io/docs/deployment.md b/runatlantis.io/docs/deployment.md index ba5cbdff66..05e91b5e70 100644 --- a/runatlantis.io/docs/deployment.md +++ b/runatlantis.io/docs/deployment.md @@ -554,9 +554,14 @@ If you need to modify the Docker image that we provide, for instance to add the FROM ghcr.io/runatlantis/atlantis:{latest version} # copy a terraform binary of the version you need + USER root COPY terragrunt /usr/local/bin/terragrunt ``` +Beginning with version 0.26.0, the Atlantis image has been updated to run under the atlantis user, replacing the previous root user configuration. This change necessitates adjustments in existing container definitions and scripts to accommodate the new user settings. In scenarios where additional packages from other images are required, users can temporarily switch to the root user by inserting USER root in the Dockerfile. Following the installation of necessary packages, it is advisable to revert to the atlantis user for initiating the Atlantis service. +Additionally, the /docker-entrypoint.d/ directory offers a flexible option for introducing extra scripts to be executed prior to the launch of the Atlantis server. This feature is particularly beneficial for users seeking to customize their Atlantis instance without the need to develop a dedicated pipeline. +**Important Notice**: There is a critical update regarding the data directory in Atlantis. In versions prior to 0.26.0, the directory was configured to be accessible by the root user. However, with the transition to the atlantis user in newer versions, it is imperative to update the directory permissions accordingly in your current deployment when upgrading to a version later than 0.26.0. This step ensures seamless access and functionality for the atlantis user. + 1. Build your Docker image ```bash docker build -t {YOUR_DOCKER_ORG}/atlantis-custom . diff --git a/server/controllers/events/testdata/test-repos/automerge/exp-output-autoplan.txt b/server/controllers/events/testdata/test-repos/automerge/exp-output-autoplan.txt index a0df0f9fcc..4f8bbe1fa0 100644 --- a/server/controllers/events/testdata/test-repos/automerge/exp-output-autoplan.txt +++ b/server/controllers/events/testdata/test-repos/automerge/exp-output-autoplan.txt @@ -51,5 +51,5 @@ Plan: 1 to add, 0 to change, 0 to destroy. --- * :fast_forward: To **apply** all unapplied plans from this pull request, comment: * `atlantis apply` -* :put_litter_in_its_place: To delete all plans and locks for the PR, comment: +* :put_litter_in_its_place: To **delete** all plans and locks for the PR, comment: * `atlantis unlock` \ No newline at end of file diff --git a/server/controllers/events/testdata/test-repos/import-multiple-project/exp-output-autoplan.txt b/server/controllers/events/testdata/test-repos/import-multiple-project/exp-output-autoplan.txt index 8aeec34c1b..6d3aa862ab 100644 --- a/server/controllers/events/testdata/test-repos/import-multiple-project/exp-output-autoplan.txt +++ b/server/controllers/events/testdata/test-repos/import-multiple-project/exp-output-autoplan.txt @@ -71,5 +71,5 @@ Plan: 1 to add, 0 to change, 0 to destroy. --- * :fast_forward: To **apply** all unapplied plans from this pull request, comment: * `atlantis apply` -* :put_litter_in_its_place: To delete all plans and locks for the PR, comment: +* :put_litter_in_its_place: To **delete** all plans and locks for the PR, comment: * `atlantis unlock` \ No newline at end of file diff --git a/server/controllers/events/testdata/test-repos/import-multiple-project/exp-output-plan-again.txt b/server/controllers/events/testdata/test-repos/import-multiple-project/exp-output-plan-again.txt index 553c335d84..ce5547f08a 100644 --- a/server/controllers/events/testdata/test-repos/import-multiple-project/exp-output-plan-again.txt +++ b/server/controllers/events/testdata/test-repos/import-multiple-project/exp-output-plan-again.txt @@ -55,5 +55,5 @@ Plan: 1 to add, 0 to change, 0 to destroy. --- * :fast_forward: To **apply** all unapplied plans from this pull request, comment: * `atlantis apply` -* :put_litter_in_its_place: To delete all plans and locks for the PR, comment: +* :put_litter_in_its_place: To **delete** all plans and locks for the PR, comment: * `atlantis unlock` \ No newline at end of file diff --git a/server/controllers/events/testdata/test-repos/import-single-project-var/exp-output-autoplan.txt b/server/controllers/events/testdata/test-repos/import-single-project-var/exp-output-autoplan.txt index b094c8b187..8fcbeaa757 100644 --- a/server/controllers/events/testdata/test-repos/import-single-project-var/exp-output-autoplan.txt +++ b/server/controllers/events/testdata/test-repos/import-single-project-var/exp-output-autoplan.txt @@ -45,5 +45,5 @@ Plan: 2 to add, 0 to change, 0 to destroy. --- * :fast_forward: To **apply** all unapplied plans from this pull request, comment: * `atlantis apply` -* :put_litter_in_its_place: To delete all plans and locks for the PR, comment: +* :put_litter_in_its_place: To **delete** all plans and locks for the PR, comment: * `atlantis unlock` \ No newline at end of file diff --git a/server/controllers/events/testdata/test-repos/import-single-project-var/exp-output-plan-again.txt b/server/controllers/events/testdata/test-repos/import-single-project-var/exp-output-plan-again.txt index 83e12e81c3..46a378158b 100644 --- a/server/controllers/events/testdata/test-repos/import-single-project-var/exp-output-plan-again.txt +++ b/server/controllers/events/testdata/test-repos/import-single-project-var/exp-output-plan-again.txt @@ -16,5 +16,5 @@ and found no differences, so no changes are needed. --- * :fast_forward: To **apply** all unapplied plans from this pull request, comment: * `atlantis apply` -* :put_litter_in_its_place: To delete all plans and locks for the PR, comment: +* :put_litter_in_its_place: To **delete** all plans and locks for the PR, comment: * `atlantis unlock` \ No newline at end of file diff --git a/server/controllers/events/testdata/test-repos/import-single-project/exp-output-autoplan.txt b/server/controllers/events/testdata/test-repos/import-single-project/exp-output-autoplan.txt index 9ec13a80ed..5662b98336 100644 --- a/server/controllers/events/testdata/test-repos/import-single-project/exp-output-autoplan.txt +++ b/server/controllers/events/testdata/test-repos/import-single-project/exp-output-autoplan.txt @@ -45,5 +45,5 @@ Plan: 2 to add, 0 to change, 0 to destroy. --- * :fast_forward: To **apply** all unapplied plans from this pull request, comment: * `atlantis apply` -* :put_litter_in_its_place: To delete all plans and locks for the PR, comment: +* :put_litter_in_its_place: To **delete** all plans and locks for the PR, comment: * `atlantis unlock` \ No newline at end of file diff --git a/server/controllers/events/testdata/test-repos/import-single-project/exp-output-plan-again.txt b/server/controllers/events/testdata/test-repos/import-single-project/exp-output-plan-again.txt index c29bb67dab..adc09b4a37 100644 --- a/server/controllers/events/testdata/test-repos/import-single-project/exp-output-plan-again.txt +++ b/server/controllers/events/testdata/test-repos/import-single-project/exp-output-plan-again.txt @@ -16,5 +16,5 @@ and found no differences, so no changes are needed. --- * :fast_forward: To **apply** all unapplied plans from this pull request, comment: * `atlantis apply` -* :put_litter_in_its_place: To delete all plans and locks for the PR, comment: +* :put_litter_in_its_place: To **delete** all plans and locks for the PR, comment: * `atlantis unlock` \ No newline at end of file diff --git a/server/controllers/events/testdata/test-repos/import-workspace/exp-output-plan.txt b/server/controllers/events/testdata/test-repos/import-workspace/exp-output-plan.txt index d84798b8e5..9859fcbc1f 100644 --- a/server/controllers/events/testdata/test-repos/import-workspace/exp-output-plan.txt +++ b/server/controllers/events/testdata/test-repos/import-workspace/exp-output-plan.txt @@ -16,5 +16,5 @@ and found no differences, so no changes are needed. --- * :fast_forward: To **apply** all unapplied plans from this pull request, comment: * `atlantis apply` -* :put_litter_in_its_place: To delete all plans and locks for the PR, comment: +* :put_litter_in_its_place: To **delete** all plans and locks for the PR, comment: * `atlantis unlock` diff --git a/server/controllers/events/testdata/test-repos/modules-yaml/exp-output-autoplan.txt b/server/controllers/events/testdata/test-repos/modules-yaml/exp-output-autoplan.txt index 980363c546..25fe0e6121 100644 --- a/server/controllers/events/testdata/test-repos/modules-yaml/exp-output-autoplan.txt +++ b/server/controllers/events/testdata/test-repos/modules-yaml/exp-output-autoplan.txt @@ -65,5 +65,5 @@ Plan: 1 to add, 0 to change, 0 to destroy. --- * :fast_forward: To **apply** all unapplied plans from this pull request, comment: * `atlantis apply` -* :put_litter_in_its_place: To delete all plans and locks for the PR, comment: +* :put_litter_in_its_place: To **delete** all plans and locks for the PR, comment: * `atlantis unlock` \ No newline at end of file diff --git a/server/controllers/events/testdata/test-repos/modules/exp-output-autoplan-only-staging.txt b/server/controllers/events/testdata/test-repos/modules/exp-output-autoplan-only-staging.txt index 70f828d203..d1faf53fc8 100644 --- a/server/controllers/events/testdata/test-repos/modules/exp-output-autoplan-only-staging.txt +++ b/server/controllers/events/testdata/test-repos/modules/exp-output-autoplan-only-staging.txt @@ -31,5 +31,5 @@ Plan: 1 to add, 0 to change, 0 to destroy. --- * :fast_forward: To **apply** all unapplied plans from this pull request, comment: * `atlantis apply` -* :put_litter_in_its_place: To delete all plans and locks for the PR, comment: +* :put_litter_in_its_place: To **delete** all plans and locks for the PR, comment: * `atlantis unlock` \ No newline at end of file diff --git a/server/controllers/events/testdata/test-repos/modules/exp-output-plan-production.txt b/server/controllers/events/testdata/test-repos/modules/exp-output-plan-production.txt index e95397a953..19246ade07 100644 --- a/server/controllers/events/testdata/test-repos/modules/exp-output-plan-production.txt +++ b/server/controllers/events/testdata/test-repos/modules/exp-output-plan-production.txt @@ -31,5 +31,5 @@ Plan: 1 to add, 0 to change, 0 to destroy. --- * :fast_forward: To **apply** all unapplied plans from this pull request, comment: * `atlantis apply` -* :put_litter_in_its_place: To delete all plans and locks for the PR, comment: +* :put_litter_in_its_place: To **delete** all plans and locks for the PR, comment: * `atlantis unlock` \ No newline at end of file diff --git a/server/controllers/events/testdata/test-repos/modules/exp-output-plan-staging.txt b/server/controllers/events/testdata/test-repos/modules/exp-output-plan-staging.txt index 70f828d203..d1faf53fc8 100644 --- a/server/controllers/events/testdata/test-repos/modules/exp-output-plan-staging.txt +++ b/server/controllers/events/testdata/test-repos/modules/exp-output-plan-staging.txt @@ -31,5 +31,5 @@ Plan: 1 to add, 0 to change, 0 to destroy. --- * :fast_forward: To **apply** all unapplied plans from this pull request, comment: * `atlantis apply` -* :put_litter_in_its_place: To delete all plans and locks for the PR, comment: +* :put_litter_in_its_place: To **delete** all plans and locks for the PR, comment: * `atlantis unlock` \ No newline at end of file diff --git a/server/controllers/events/testdata/test-repos/policy-checks-apply-reqs/exp-output-auto-policy-check.txt b/server/controllers/events/testdata/test-repos/policy-checks-apply-reqs/exp-output-auto-policy-check.txt index 8faa2e036b..0ace841faf 100644 --- a/server/controllers/events/testdata/test-repos/policy-checks-apply-reqs/exp-output-auto-policy-check.txt +++ b/server/controllers/events/testdata/test-repos/policy-checks-apply-reqs/exp-output-auto-policy-check.txt @@ -23,7 +23,7 @@ policy set: test_policy: requires: 1 approval(s), have: 0. --- * :heavy_check_mark: To **approve** all unapplied plans from this pull request, comment: * `atlantis approve_policies` -* :put_litter_in_its_place: To delete all plans and locks for the PR, comment: +* :put_litter_in_its_place: To **delete** all plans and locks for the PR, comment: * `atlantis unlock` * :repeat: To re-run policies **plan** this project again by commenting: * `atlantis plan` \ No newline at end of file diff --git a/server/controllers/events/testdata/test-repos/policy-checks-apply-reqs/exp-output-autoplan.txt b/server/controllers/events/testdata/test-repos/policy-checks-apply-reqs/exp-output-autoplan.txt index ace509e6e7..6f7ce87643 100644 --- a/server/controllers/events/testdata/test-repos/policy-checks-apply-reqs/exp-output-autoplan.txt +++ b/server/controllers/events/testdata/test-repos/policy-checks-apply-reqs/exp-output-autoplan.txt @@ -31,5 +31,5 @@ Plan: 1 to add, 0 to change, 0 to destroy. --- * :fast_forward: To **apply** all unapplied plans from this pull request, comment: * `atlantis apply` -* :put_litter_in_its_place: To delete all plans and locks for the PR, comment: +* :put_litter_in_its_place: To **delete** all plans and locks for the PR, comment: * `atlantis unlock` \ No newline at end of file diff --git a/server/controllers/events/testdata/test-repos/policy-checks-clear-approval/exp-output-approve-policies-clear.txt b/server/controllers/events/testdata/test-repos/policy-checks-clear-approval/exp-output-approve-policies-clear.txt index 408f2116a9..e6643f8ce3 100644 --- a/server/controllers/events/testdata/test-repos/policy-checks-clear-approval/exp-output-approve-policies-clear.txt +++ b/server/controllers/events/testdata/test-repos/policy-checks-clear-approval/exp-output-approve-policies-clear.txt @@ -17,7 +17,7 @@ policy set: test_policy: requires: 1 approval(s), have: 0. --- * :heavy_check_mark: To **approve** all unapplied plans from this pull request, comment: * `atlantis approve_policies` -* :put_litter_in_its_place: To delete all plans and locks for the PR, comment: +* :put_litter_in_its_place: To **delete** all plans and locks for the PR, comment: * `atlantis unlock` * :repeat: To re-run policies **plan** this project again by commenting: * `atlantis plan` \ No newline at end of file diff --git a/server/controllers/events/testdata/test-repos/policy-checks-clear-approval/exp-output-auto-policy-check.txt b/server/controllers/events/testdata/test-repos/policy-checks-clear-approval/exp-output-auto-policy-check.txt index 8faa2e036b..0ace841faf 100644 --- a/server/controllers/events/testdata/test-repos/policy-checks-clear-approval/exp-output-auto-policy-check.txt +++ b/server/controllers/events/testdata/test-repos/policy-checks-clear-approval/exp-output-auto-policy-check.txt @@ -23,7 +23,7 @@ policy set: test_policy: requires: 1 approval(s), have: 0. --- * :heavy_check_mark: To **approve** all unapplied plans from this pull request, comment: * `atlantis approve_policies` -* :put_litter_in_its_place: To delete all plans and locks for the PR, comment: +* :put_litter_in_its_place: To **delete** all plans and locks for the PR, comment: * `atlantis unlock` * :repeat: To re-run policies **plan** this project again by commenting: * `atlantis plan` \ No newline at end of file diff --git a/server/controllers/events/testdata/test-repos/policy-checks-clear-approval/exp-output-autoplan.txt b/server/controllers/events/testdata/test-repos/policy-checks-clear-approval/exp-output-autoplan.txt index ace509e6e7..6f7ce87643 100644 --- a/server/controllers/events/testdata/test-repos/policy-checks-clear-approval/exp-output-autoplan.txt +++ b/server/controllers/events/testdata/test-repos/policy-checks-clear-approval/exp-output-autoplan.txt @@ -31,5 +31,5 @@ Plan: 1 to add, 0 to change, 0 to destroy. --- * :fast_forward: To **apply** all unapplied plans from this pull request, comment: * `atlantis apply` -* :put_litter_in_its_place: To delete all plans and locks for the PR, comment: +* :put_litter_in_its_place: To **delete** all plans and locks for the PR, comment: * `atlantis unlock` \ No newline at end of file diff --git a/server/controllers/events/testdata/test-repos/policy-checks-custom-run-steps/exp-output-auto-policy-check.txt b/server/controllers/events/testdata/test-repos/policy-checks-custom-run-steps/exp-output-auto-policy-check.txt index 5e0971328c..f366769233 100644 --- a/server/controllers/events/testdata/test-repos/policy-checks-custom-run-steps/exp-output-auto-policy-check.txt +++ b/server/controllers/events/testdata/test-repos/policy-checks-custom-run-steps/exp-output-auto-policy-check.txt @@ -33,7 +33,7 @@ policy set: test_policy: requires: 1 approval(s), have: 0. --- * :heavy_check_mark: To **approve** all unapplied plans from this pull request, comment: * `atlantis approve_policies` -* :put_litter_in_its_place: To delete all plans and locks for the PR, comment: +* :put_litter_in_its_place: To **delete** all plans and locks for the PR, comment: * `atlantis unlock` * :repeat: To re-run policies **plan** this project again by commenting: * `atlantis plan` \ No newline at end of file diff --git a/server/controllers/events/testdata/test-repos/policy-checks-custom-run-steps/exp-output-autoplan.txt b/server/controllers/events/testdata/test-repos/policy-checks-custom-run-steps/exp-output-autoplan.txt index ace509e6e7..6f7ce87643 100644 --- a/server/controllers/events/testdata/test-repos/policy-checks-custom-run-steps/exp-output-autoplan.txt +++ b/server/controllers/events/testdata/test-repos/policy-checks-custom-run-steps/exp-output-autoplan.txt @@ -31,5 +31,5 @@ Plan: 1 to add, 0 to change, 0 to destroy. --- * :fast_forward: To **apply** all unapplied plans from this pull request, comment: * `atlantis apply` -* :put_litter_in_its_place: To delete all plans and locks for the PR, comment: +* :put_litter_in_its_place: To **delete** all plans and locks for the PR, comment: * `atlantis unlock` \ No newline at end of file diff --git a/server/controllers/events/testdata/test-repos/policy-checks-diff-owner/exp-output-approve-policies.txt b/server/controllers/events/testdata/test-repos/policy-checks-diff-owner/exp-output-approve-policies.txt index 2a8329e4a5..d6e39f260d 100644 --- a/server/controllers/events/testdata/test-repos/policy-checks-diff-owner/exp-output-approve-policies.txt +++ b/server/controllers/events/testdata/test-repos/policy-checks-diff-owner/exp-output-approve-policies.txt @@ -23,7 +23,7 @@ policy set: test_policy: requires: 1 approval(s), have: 0. --- * :heavy_check_mark: To **approve** all unapplied plans from this pull request, comment: * `atlantis approve_policies` -* :put_litter_in_its_place: To delete all plans and locks for the PR, comment: +* :put_litter_in_its_place: To **delete** all plans and locks for the PR, comment: * `atlantis unlock` * :repeat: To re-run policies **plan** this project again by commenting: * `atlantis plan` \ No newline at end of file diff --git a/server/controllers/events/testdata/test-repos/policy-checks-diff-owner/exp-output-auto-policy-check.txt b/server/controllers/events/testdata/test-repos/policy-checks-diff-owner/exp-output-auto-policy-check.txt index 8faa2e036b..0ace841faf 100644 --- a/server/controllers/events/testdata/test-repos/policy-checks-diff-owner/exp-output-auto-policy-check.txt +++ b/server/controllers/events/testdata/test-repos/policy-checks-diff-owner/exp-output-auto-policy-check.txt @@ -23,7 +23,7 @@ policy set: test_policy: requires: 1 approval(s), have: 0. --- * :heavy_check_mark: To **approve** all unapplied plans from this pull request, comment: * `atlantis approve_policies` -* :put_litter_in_its_place: To delete all plans and locks for the PR, comment: +* :put_litter_in_its_place: To **delete** all plans and locks for the PR, comment: * `atlantis unlock` * :repeat: To re-run policies **plan** this project again by commenting: * `atlantis plan` \ No newline at end of file diff --git a/server/controllers/events/testdata/test-repos/policy-checks-diff-owner/exp-output-autoplan.txt b/server/controllers/events/testdata/test-repos/policy-checks-diff-owner/exp-output-autoplan.txt index ace509e6e7..6f7ce87643 100644 --- a/server/controllers/events/testdata/test-repos/policy-checks-diff-owner/exp-output-autoplan.txt +++ b/server/controllers/events/testdata/test-repos/policy-checks-diff-owner/exp-output-autoplan.txt @@ -31,5 +31,5 @@ Plan: 1 to add, 0 to change, 0 to destroy. --- * :fast_forward: To **apply** all unapplied plans from this pull request, comment: * `atlantis apply` -* :put_litter_in_its_place: To delete all plans and locks for the PR, comment: +* :put_litter_in_its_place: To **delete** all plans and locks for the PR, comment: * `atlantis unlock` \ No newline at end of file diff --git a/server/controllers/events/testdata/test-repos/policy-checks-disabled-previous-match/exp-output-auto-policy-check.txt b/server/controllers/events/testdata/test-repos/policy-checks-disabled-previous-match/exp-output-auto-policy-check.txt index 8faa2e036b..0ace841faf 100644 --- a/server/controllers/events/testdata/test-repos/policy-checks-disabled-previous-match/exp-output-auto-policy-check.txt +++ b/server/controllers/events/testdata/test-repos/policy-checks-disabled-previous-match/exp-output-auto-policy-check.txt @@ -23,7 +23,7 @@ policy set: test_policy: requires: 1 approval(s), have: 0. --- * :heavy_check_mark: To **approve** all unapplied plans from this pull request, comment: * `atlantis approve_policies` -* :put_litter_in_its_place: To delete all plans and locks for the PR, comment: +* :put_litter_in_its_place: To **delete** all plans and locks for the PR, comment: * `atlantis unlock` * :repeat: To re-run policies **plan** this project again by commenting: * `atlantis plan` \ No newline at end of file diff --git a/server/controllers/events/testdata/test-repos/policy-checks-disabled-previous-match/exp-output-autoplan.txt b/server/controllers/events/testdata/test-repos/policy-checks-disabled-previous-match/exp-output-autoplan.txt index ace509e6e7..6f7ce87643 100644 --- a/server/controllers/events/testdata/test-repos/policy-checks-disabled-previous-match/exp-output-autoplan.txt +++ b/server/controllers/events/testdata/test-repos/policy-checks-disabled-previous-match/exp-output-autoplan.txt @@ -31,5 +31,5 @@ Plan: 1 to add, 0 to change, 0 to destroy. --- * :fast_forward: To **apply** all unapplied plans from this pull request, comment: * `atlantis apply` -* :put_litter_in_its_place: To delete all plans and locks for the PR, comment: +* :put_litter_in_its_place: To **delete** all plans and locks for the PR, comment: * `atlantis unlock` \ No newline at end of file diff --git a/server/controllers/events/testdata/test-repos/policy-checks-disabled-repo-server-side/exp-output-auto-policy-check.txt b/server/controllers/events/testdata/test-repos/policy-checks-disabled-repo-server-side/exp-output-auto-policy-check.txt index 8faa2e036b..0ace841faf 100644 --- a/server/controllers/events/testdata/test-repos/policy-checks-disabled-repo-server-side/exp-output-auto-policy-check.txt +++ b/server/controllers/events/testdata/test-repos/policy-checks-disabled-repo-server-side/exp-output-auto-policy-check.txt @@ -23,7 +23,7 @@ policy set: test_policy: requires: 1 approval(s), have: 0. --- * :heavy_check_mark: To **approve** all unapplied plans from this pull request, comment: * `atlantis approve_policies` -* :put_litter_in_its_place: To delete all plans and locks for the PR, comment: +* :put_litter_in_its_place: To **delete** all plans and locks for the PR, comment: * `atlantis unlock` * :repeat: To re-run policies **plan** this project again by commenting: * `atlantis plan` \ No newline at end of file diff --git a/server/controllers/events/testdata/test-repos/policy-checks-disabled-repo-server-side/exp-output-autoplan.txt b/server/controllers/events/testdata/test-repos/policy-checks-disabled-repo-server-side/exp-output-autoplan.txt index ace509e6e7..6f7ce87643 100644 --- a/server/controllers/events/testdata/test-repos/policy-checks-disabled-repo-server-side/exp-output-autoplan.txt +++ b/server/controllers/events/testdata/test-repos/policy-checks-disabled-repo-server-side/exp-output-autoplan.txt @@ -31,5 +31,5 @@ Plan: 1 to add, 0 to change, 0 to destroy. --- * :fast_forward: To **apply** all unapplied plans from this pull request, comment: * `atlantis apply` -* :put_litter_in_its_place: To delete all plans and locks for the PR, comment: +* :put_litter_in_its_place: To **delete** all plans and locks for the PR, comment: * `atlantis unlock` \ No newline at end of file diff --git a/server/controllers/events/testdata/test-repos/policy-checks-disabled-repo/exp-output-auto-policy-check.txt b/server/controllers/events/testdata/test-repos/policy-checks-disabled-repo/exp-output-auto-policy-check.txt index 8faa2e036b..0ace841faf 100644 --- a/server/controllers/events/testdata/test-repos/policy-checks-disabled-repo/exp-output-auto-policy-check.txt +++ b/server/controllers/events/testdata/test-repos/policy-checks-disabled-repo/exp-output-auto-policy-check.txt @@ -23,7 +23,7 @@ policy set: test_policy: requires: 1 approval(s), have: 0. --- * :heavy_check_mark: To **approve** all unapplied plans from this pull request, comment: * `atlantis approve_policies` -* :put_litter_in_its_place: To delete all plans and locks for the PR, comment: +* :put_litter_in_its_place: To **delete** all plans and locks for the PR, comment: * `atlantis unlock` * :repeat: To re-run policies **plan** this project again by commenting: * `atlantis plan` \ No newline at end of file diff --git a/server/controllers/events/testdata/test-repos/policy-checks-disabled-repo/exp-output-autoplan.txt b/server/controllers/events/testdata/test-repos/policy-checks-disabled-repo/exp-output-autoplan.txt index ace509e6e7..6f7ce87643 100644 --- a/server/controllers/events/testdata/test-repos/policy-checks-disabled-repo/exp-output-autoplan.txt +++ b/server/controllers/events/testdata/test-repos/policy-checks-disabled-repo/exp-output-autoplan.txt @@ -31,5 +31,5 @@ Plan: 1 to add, 0 to change, 0 to destroy. --- * :fast_forward: To **apply** all unapplied plans from this pull request, comment: * `atlantis apply` -* :put_litter_in_its_place: To delete all plans and locks for the PR, comment: +* :put_litter_in_its_place: To **delete** all plans and locks for the PR, comment: * `atlantis unlock` \ No newline at end of file diff --git a/server/controllers/events/testdata/test-repos/policy-checks-enabled-repo-server-side/exp-output-auto-policy-check.txt b/server/controllers/events/testdata/test-repos/policy-checks-enabled-repo-server-side/exp-output-auto-policy-check.txt index 8faa2e036b..0ace841faf 100644 --- a/server/controllers/events/testdata/test-repos/policy-checks-enabled-repo-server-side/exp-output-auto-policy-check.txt +++ b/server/controllers/events/testdata/test-repos/policy-checks-enabled-repo-server-side/exp-output-auto-policy-check.txt @@ -23,7 +23,7 @@ policy set: test_policy: requires: 1 approval(s), have: 0. --- * :heavy_check_mark: To **approve** all unapplied plans from this pull request, comment: * `atlantis approve_policies` -* :put_litter_in_its_place: To delete all plans and locks for the PR, comment: +* :put_litter_in_its_place: To **delete** all plans and locks for the PR, comment: * `atlantis unlock` * :repeat: To re-run policies **plan** this project again by commenting: * `atlantis plan` \ No newline at end of file diff --git a/server/controllers/events/testdata/test-repos/policy-checks-enabled-repo-server-side/exp-output-autoplan.txt b/server/controllers/events/testdata/test-repos/policy-checks-enabled-repo-server-side/exp-output-autoplan.txt index ace509e6e7..6f7ce87643 100644 --- a/server/controllers/events/testdata/test-repos/policy-checks-enabled-repo-server-side/exp-output-autoplan.txt +++ b/server/controllers/events/testdata/test-repos/policy-checks-enabled-repo-server-side/exp-output-autoplan.txt @@ -31,5 +31,5 @@ Plan: 1 to add, 0 to change, 0 to destroy. --- * :fast_forward: To **apply** all unapplied plans from this pull request, comment: * `atlantis apply` -* :put_litter_in_its_place: To delete all plans and locks for the PR, comment: +* :put_litter_in_its_place: To **delete** all plans and locks for the PR, comment: * `atlantis unlock` \ No newline at end of file diff --git a/server/controllers/events/testdata/test-repos/policy-checks-enabled-repo/exp-output-auto-policy-check.txt b/server/controllers/events/testdata/test-repos/policy-checks-enabled-repo/exp-output-auto-policy-check.txt index 8faa2e036b..0ace841faf 100644 --- a/server/controllers/events/testdata/test-repos/policy-checks-enabled-repo/exp-output-auto-policy-check.txt +++ b/server/controllers/events/testdata/test-repos/policy-checks-enabled-repo/exp-output-auto-policy-check.txt @@ -23,7 +23,7 @@ policy set: test_policy: requires: 1 approval(s), have: 0. --- * :heavy_check_mark: To **approve** all unapplied plans from this pull request, comment: * `atlantis approve_policies` -* :put_litter_in_its_place: To delete all plans and locks for the PR, comment: +* :put_litter_in_its_place: To **delete** all plans and locks for the PR, comment: * `atlantis unlock` * :repeat: To re-run policies **plan** this project again by commenting: * `atlantis plan` \ No newline at end of file diff --git a/server/controllers/events/testdata/test-repos/policy-checks-enabled-repo/exp-output-autoplan.txt b/server/controllers/events/testdata/test-repos/policy-checks-enabled-repo/exp-output-autoplan.txt index ace509e6e7..6f7ce87643 100644 --- a/server/controllers/events/testdata/test-repos/policy-checks-enabled-repo/exp-output-autoplan.txt +++ b/server/controllers/events/testdata/test-repos/policy-checks-enabled-repo/exp-output-autoplan.txt @@ -31,5 +31,5 @@ Plan: 1 to add, 0 to change, 0 to destroy. --- * :fast_forward: To **apply** all unapplied plans from this pull request, comment: * `atlantis apply` -* :put_litter_in_its_place: To delete all plans and locks for the PR, comment: +* :put_litter_in_its_place: To **delete** all plans and locks for the PR, comment: * `atlantis unlock` \ No newline at end of file diff --git a/server/controllers/events/testdata/test-repos/policy-checks-extra-args/exp-output-auto-policy-check.txt b/server/controllers/events/testdata/test-repos/policy-checks-extra-args/exp-output-auto-policy-check.txt index 59f0c90346..c7f45c85f5 100644 --- a/server/controllers/events/testdata/test-repos/policy-checks-extra-args/exp-output-auto-policy-check.txt +++ b/server/controllers/events/testdata/test-repos/policy-checks-extra-args/exp-output-auto-policy-check.txt @@ -23,7 +23,7 @@ policy set: test_policy: requires: 1 approval(s), have: 0. --- * :heavy_check_mark: To **approve** all unapplied plans from this pull request, comment: * `atlantis approve_policies` -* :put_litter_in_its_place: To delete all plans and locks for the PR, comment: +* :put_litter_in_its_place: To **delete** all plans and locks for the PR, comment: * `atlantis unlock` * :repeat: To re-run policies **plan** this project again by commenting: * `atlantis plan` \ No newline at end of file diff --git a/server/controllers/events/testdata/test-repos/policy-checks-extra-args/exp-output-autoplan.txt b/server/controllers/events/testdata/test-repos/policy-checks-extra-args/exp-output-autoplan.txt index ace509e6e7..6f7ce87643 100644 --- a/server/controllers/events/testdata/test-repos/policy-checks-extra-args/exp-output-autoplan.txt +++ b/server/controllers/events/testdata/test-repos/policy-checks-extra-args/exp-output-autoplan.txt @@ -31,5 +31,5 @@ Plan: 1 to add, 0 to change, 0 to destroy. --- * :fast_forward: To **apply** all unapplied plans from this pull request, comment: * `atlantis apply` -* :put_litter_in_its_place: To delete all plans and locks for the PR, comment: +* :put_litter_in_its_place: To **delete** all plans and locks for the PR, comment: * `atlantis unlock` \ No newline at end of file diff --git a/server/controllers/events/testdata/test-repos/policy-checks-multi-projects/exp-output-auto-policy-check.txt b/server/controllers/events/testdata/test-repos/policy-checks-multi-projects/exp-output-auto-policy-check.txt index b8a346083e..c292c651f3 100644 --- a/server/controllers/events/testdata/test-repos/policy-checks-multi-projects/exp-output-auto-policy-check.txt +++ b/server/controllers/events/testdata/test-repos/policy-checks-multi-projects/exp-output-auto-policy-check.txt @@ -43,7 +43,7 @@ policy set: test_policy: requires: 1 approval(s), have: 0. --- * :heavy_check_mark: To **approve** all unapplied plans from this pull request, comment: * `atlantis approve_policies` -* :put_litter_in_its_place: To delete all plans and locks for the PR, comment: +* :put_litter_in_its_place: To **delete** all plans and locks for the PR, comment: * `atlantis unlock` * :repeat: To re-run policies **plan** this project again by commenting: * `atlantis plan` \ No newline at end of file diff --git a/server/controllers/events/testdata/test-repos/policy-checks-multi-projects/exp-output-autoplan.txt b/server/controllers/events/testdata/test-repos/policy-checks-multi-projects/exp-output-autoplan.txt index 4e2bbfdd09..55d2149939 100644 --- a/server/controllers/events/testdata/test-repos/policy-checks-multi-projects/exp-output-autoplan.txt +++ b/server/controllers/events/testdata/test-repos/policy-checks-multi-projects/exp-output-autoplan.txt @@ -65,5 +65,5 @@ Plan: 1 to add, 0 to change, 0 to destroy. --- * :fast_forward: To **apply** all unapplied plans from this pull request, comment: * `atlantis apply` -* :put_litter_in_its_place: To delete all plans and locks for the PR, comment: +* :put_litter_in_its_place: To **delete** all plans and locks for the PR, comment: * `atlantis unlock` \ No newline at end of file diff --git a/server/controllers/events/testdata/test-repos/policy-checks-success-silent/exp-output-autoplan.txt b/server/controllers/events/testdata/test-repos/policy-checks-success-silent/exp-output-autoplan.txt index 85579f1225..ea7d4bf3ec 100644 --- a/server/controllers/events/testdata/test-repos/policy-checks-success-silent/exp-output-autoplan.txt +++ b/server/controllers/events/testdata/test-repos/policy-checks-success-silent/exp-output-autoplan.txt @@ -17,5 +17,5 @@ state, without changing any real infrastructure. --- * :fast_forward: To **apply** all unapplied plans from this pull request, comment: * `atlantis apply` -* :put_litter_in_its_place: To delete all plans and locks for the PR, comment: +* :put_litter_in_its_place: To **delete** all plans and locks for the PR, comment: * `atlantis unlock` \ No newline at end of file diff --git a/server/controllers/events/testdata/test-repos/policy-checks/exp-output-auto-policy-check.txt b/server/controllers/events/testdata/test-repos/policy-checks/exp-output-auto-policy-check.txt index 8faa2e036b..0ace841faf 100644 --- a/server/controllers/events/testdata/test-repos/policy-checks/exp-output-auto-policy-check.txt +++ b/server/controllers/events/testdata/test-repos/policy-checks/exp-output-auto-policy-check.txt @@ -23,7 +23,7 @@ policy set: test_policy: requires: 1 approval(s), have: 0. --- * :heavy_check_mark: To **approve** all unapplied plans from this pull request, comment: * `atlantis approve_policies` -* :put_litter_in_its_place: To delete all plans and locks for the PR, comment: +* :put_litter_in_its_place: To **delete** all plans and locks for the PR, comment: * `atlantis unlock` * :repeat: To re-run policies **plan** this project again by commenting: * `atlantis plan` \ No newline at end of file diff --git a/server/controllers/events/testdata/test-repos/policy-checks/exp-output-autoplan.txt b/server/controllers/events/testdata/test-repos/policy-checks/exp-output-autoplan.txt index ace509e6e7..6f7ce87643 100644 --- a/server/controllers/events/testdata/test-repos/policy-checks/exp-output-autoplan.txt +++ b/server/controllers/events/testdata/test-repos/policy-checks/exp-output-autoplan.txt @@ -31,5 +31,5 @@ Plan: 1 to add, 0 to change, 0 to destroy. --- * :fast_forward: To **apply** all unapplied plans from this pull request, comment: * `atlantis apply` -* :put_litter_in_its_place: To delete all plans and locks for the PR, comment: +* :put_litter_in_its_place: To **delete** all plans and locks for the PR, comment: * `atlantis unlock` \ No newline at end of file diff --git a/server/controllers/events/testdata/test-repos/repo-config-file/exp-output-autoplan.txt b/server/controllers/events/testdata/test-repos/repo-config-file/exp-output-autoplan.txt index ac6f32cb0e..4f48c365d6 100644 --- a/server/controllers/events/testdata/test-repos/repo-config-file/exp-output-autoplan.txt +++ b/server/controllers/events/testdata/test-repos/repo-config-file/exp-output-autoplan.txt @@ -51,5 +51,5 @@ Plan: 1 to add, 0 to change, 0 to destroy. --- * :fast_forward: To **apply** all unapplied plans from this pull request, comment: * `atlantis apply` -* :put_litter_in_its_place: To delete all plans and locks for the PR, comment: +* :put_litter_in_its_place: To **delete** all plans and locks for the PR, comment: * `atlantis unlock` \ No newline at end of file diff --git a/server/controllers/events/testdata/test-repos/server-side-cfg/exp-output-autoplan.txt b/server/controllers/events/testdata/test-repos/server-side-cfg/exp-output-autoplan.txt index 3ac4aacc54..615a3f4c61 100644 --- a/server/controllers/events/testdata/test-repos/server-side-cfg/exp-output-autoplan.txt +++ b/server/controllers/events/testdata/test-repos/server-side-cfg/exp-output-autoplan.txt @@ -73,5 +73,5 @@ Plan: 1 to add, 0 to change, 0 to destroy. --- * :fast_forward: To **apply** all unapplied plans from this pull request, comment: * `atlantis apply` -* :put_litter_in_its_place: To delete all plans and locks for the PR, comment: +* :put_litter_in_its_place: To **delete** all plans and locks for the PR, comment: * `atlantis unlock` \ No newline at end of file diff --git a/server/controllers/events/testdata/test-repos/simple-with-lockfile/exp-output-autoplan.txt b/server/controllers/events/testdata/test-repos/simple-with-lockfile/exp-output-autoplan.txt index 9abe92e18a..6e70ac89fb 100644 --- a/server/controllers/events/testdata/test-repos/simple-with-lockfile/exp-output-autoplan.txt +++ b/server/controllers/events/testdata/test-repos/simple-with-lockfile/exp-output-autoplan.txt @@ -42,5 +42,5 @@ Plan: 3 to add, 0 to change, 0 to destroy. --- * :fast_forward: To **apply** all unapplied plans from this pull request, comment: * `atlantis apply` -* :put_litter_in_its_place: To delete all plans and locks for the PR, comment: +* :put_litter_in_its_place: To **delete** all plans and locks for the PR, comment: * `atlantis unlock` \ No newline at end of file diff --git a/server/controllers/events/testdata/test-repos/simple-with-lockfile/exp-output-plan.txt b/server/controllers/events/testdata/test-repos/simple-with-lockfile/exp-output-plan.txt index 9abe92e18a..6e70ac89fb 100644 --- a/server/controllers/events/testdata/test-repos/simple-with-lockfile/exp-output-plan.txt +++ b/server/controllers/events/testdata/test-repos/simple-with-lockfile/exp-output-plan.txt @@ -42,5 +42,5 @@ Plan: 3 to add, 0 to change, 0 to destroy. --- * :fast_forward: To **apply** all unapplied plans from this pull request, comment: * `atlantis apply` -* :put_litter_in_its_place: To delete all plans and locks for the PR, comment: +* :put_litter_in_its_place: To **delete** all plans and locks for the PR, comment: * `atlantis unlock` \ No newline at end of file diff --git a/server/controllers/events/testdata/test-repos/simple-yaml/exp-output-autoplan.txt b/server/controllers/events/testdata/test-repos/simple-yaml/exp-output-autoplan.txt index cd1d181100..88eda9d431 100644 --- a/server/controllers/events/testdata/test-repos/simple-yaml/exp-output-autoplan.txt +++ b/server/controllers/events/testdata/test-repos/simple-yaml/exp-output-autoplan.txt @@ -72,5 +72,5 @@ Plan: 1 to add, 0 to change, 0 to destroy. --- * :fast_forward: To **apply** all unapplied plans from this pull request, comment: * `atlantis apply` -* :put_litter_in_its_place: To delete all plans and locks for the PR, comment: +* :put_litter_in_its_place: To **delete** all plans and locks for the PR, comment: * `atlantis unlock` \ No newline at end of file diff --git a/server/controllers/events/testdata/test-repos/simple-yaml/exp-output-plan-default.txt b/server/controllers/events/testdata/test-repos/simple-yaml/exp-output-plan-default.txt index c3fb6a9b51..f0419c9189 100644 --- a/server/controllers/events/testdata/test-repos/simple-yaml/exp-output-plan-default.txt +++ b/server/controllers/events/testdata/test-repos/simple-yaml/exp-output-plan-default.txt @@ -37,5 +37,5 @@ Plan: 1 to add, 0 to change, 0 to destroy. --- * :fast_forward: To **apply** all unapplied plans from this pull request, comment: * `atlantis apply` -* :put_litter_in_its_place: To delete all plans and locks for the PR, comment: +* :put_litter_in_its_place: To **delete** all plans and locks for the PR, comment: * `atlantis unlock` diff --git a/server/controllers/events/testdata/test-repos/simple-yaml/exp-output-plan-staging.txt b/server/controllers/events/testdata/test-repos/simple-yaml/exp-output-plan-staging.txt index 5945110025..7e34016bab 100644 --- a/server/controllers/events/testdata/test-repos/simple-yaml/exp-output-plan-staging.txt +++ b/server/controllers/events/testdata/test-repos/simple-yaml/exp-output-plan-staging.txt @@ -32,5 +32,5 @@ Plan: 1 to add, 0 to change, 0 to destroy. --- * :fast_forward: To **apply** all unapplied plans from this pull request, comment: * `atlantis apply` -* :put_litter_in_its_place: To delete all plans and locks for the PR, comment: +* :put_litter_in_its_place: To **delete** all plans and locks for the PR, comment: * `atlantis unlock` diff --git a/server/controllers/events/testdata/test-repos/simple/exp-output-atlantis-plan-new-workspace.txt b/server/controllers/events/testdata/test-repos/simple/exp-output-atlantis-plan-new-workspace.txt index 63ed314467..242515e415 100644 --- a/server/controllers/events/testdata/test-repos/simple/exp-output-atlantis-plan-new-workspace.txt +++ b/server/controllers/events/testdata/test-repos/simple/exp-output-atlantis-plan-new-workspace.txt @@ -42,5 +42,5 @@ Plan: 3 to add, 0 to change, 0 to destroy. --- * :fast_forward: To **apply** all unapplied plans from this pull request, comment: * `atlantis apply` -* :put_litter_in_its_place: To delete all plans and locks for the PR, comment: +* :put_litter_in_its_place: To **delete** all plans and locks for the PR, comment: * `atlantis unlock` \ No newline at end of file diff --git a/server/controllers/events/testdata/test-repos/simple/exp-output-atlantis-plan-var-overridden.txt b/server/controllers/events/testdata/test-repos/simple/exp-output-atlantis-plan-var-overridden.txt index b0585675f7..5a86cff0c9 100644 --- a/server/controllers/events/testdata/test-repos/simple/exp-output-atlantis-plan-var-overridden.txt +++ b/server/controllers/events/testdata/test-repos/simple/exp-output-atlantis-plan-var-overridden.txt @@ -42,5 +42,5 @@ Plan: 3 to add, 0 to change, 0 to destroy. --- * :fast_forward: To **apply** all unapplied plans from this pull request, comment: * `atlantis apply` -* :put_litter_in_its_place: To delete all plans and locks for the PR, comment: +* :put_litter_in_its_place: To **delete** all plans and locks for the PR, comment: * `atlantis unlock` \ No newline at end of file diff --git a/server/controllers/events/testdata/test-repos/simple/exp-output-atlantis-plan.txt b/server/controllers/events/testdata/test-repos/simple/exp-output-atlantis-plan.txt index a478a4ac1e..54e5505476 100644 --- a/server/controllers/events/testdata/test-repos/simple/exp-output-atlantis-plan.txt +++ b/server/controllers/events/testdata/test-repos/simple/exp-output-atlantis-plan.txt @@ -42,5 +42,5 @@ Plan: 3 to add, 0 to change, 0 to destroy. --- * :fast_forward: To **apply** all unapplied plans from this pull request, comment: * `atlantis apply` -* :put_litter_in_its_place: To delete all plans and locks for the PR, comment: +* :put_litter_in_its_place: To **delete** all plans and locks for the PR, comment: * `atlantis unlock` \ No newline at end of file diff --git a/server/controllers/events/testdata/test-repos/simple/exp-output-auto-policy-check.txt b/server/controllers/events/testdata/test-repos/simple/exp-output-auto-policy-check.txt index 6f8ae8098c..c6e0823922 100644 --- a/server/controllers/events/testdata/test-repos/simple/exp-output-auto-policy-check.txt +++ b/server/controllers/events/testdata/test-repos/simple/exp-output-auto-policy-check.txt @@ -13,5 +13,5 @@ Ran Policy Check for dir: `.` workspace: `default` --- * :fast_forward: To **apply** all unapplied plans from this pull request, comment: * `atlantis apply` -* :put_litter_in_its_place: To delete all plans and locks for the PR, comment: +* :put_litter_in_its_place: To **delete** all plans and locks for the PR, comment: * `atlantis unlock` diff --git a/server/controllers/events/testdata/test-repos/simple/exp-output-autoplan.txt b/server/controllers/events/testdata/test-repos/simple/exp-output-autoplan.txt index 9abe92e18a..6e70ac89fb 100644 --- a/server/controllers/events/testdata/test-repos/simple/exp-output-autoplan.txt +++ b/server/controllers/events/testdata/test-repos/simple/exp-output-autoplan.txt @@ -42,5 +42,5 @@ Plan: 3 to add, 0 to change, 0 to destroy. --- * :fast_forward: To **apply** all unapplied plans from this pull request, comment: * `atlantis apply` -* :put_litter_in_its_place: To delete all plans and locks for the PR, comment: +* :put_litter_in_its_place: To **delete** all plans and locks for the PR, comment: * `atlantis unlock` \ No newline at end of file diff --git a/server/controllers/events/testdata/test-repos/state-rm-multiple-project/exp-output-autoplan.txt b/server/controllers/events/testdata/test-repos/state-rm-multiple-project/exp-output-autoplan.txt index 59368775c2..df46d869e6 100644 --- a/server/controllers/events/testdata/test-repos/state-rm-multiple-project/exp-output-autoplan.txt +++ b/server/controllers/events/testdata/test-repos/state-rm-multiple-project/exp-output-autoplan.txt @@ -71,5 +71,5 @@ Plan: 1 to add, 0 to change, 0 to destroy. --- * :fast_forward: To **apply** all unapplied plans from this pull request, comment: * `atlantis apply` -* :put_litter_in_its_place: To delete all plans and locks for the PR, comment: +* :put_litter_in_its_place: To **delete** all plans and locks for the PR, comment: * `atlantis unlock` \ No newline at end of file diff --git a/server/controllers/events/testdata/test-repos/state-rm-multiple-project/exp-output-plan-again.txt b/server/controllers/events/testdata/test-repos/state-rm-multiple-project/exp-output-plan-again.txt index 59368775c2..df46d869e6 100644 --- a/server/controllers/events/testdata/test-repos/state-rm-multiple-project/exp-output-plan-again.txt +++ b/server/controllers/events/testdata/test-repos/state-rm-multiple-project/exp-output-plan-again.txt @@ -71,5 +71,5 @@ Plan: 1 to add, 0 to change, 0 to destroy. --- * :fast_forward: To **apply** all unapplied plans from this pull request, comment: * `atlantis apply` -* :put_litter_in_its_place: To delete all plans and locks for the PR, comment: +* :put_litter_in_its_place: To **delete** all plans and locks for the PR, comment: * `atlantis unlock` \ No newline at end of file diff --git a/server/controllers/events/testdata/test-repos/state-rm-multiple-project/exp-output-plan.txt b/server/controllers/events/testdata/test-repos/state-rm-multiple-project/exp-output-plan.txt index cbb03649a0..2766ea44de 100644 --- a/server/controllers/events/testdata/test-repos/state-rm-multiple-project/exp-output-plan.txt +++ b/server/controllers/events/testdata/test-repos/state-rm-multiple-project/exp-output-plan.txt @@ -39,5 +39,5 @@ and found no differences, so no changes are needed. --- * :fast_forward: To **apply** all unapplied plans from this pull request, comment: * `atlantis apply` -* :put_litter_in_its_place: To delete all plans and locks for the PR, comment: +* :put_litter_in_its_place: To **delete** all plans and locks for the PR, comment: * `atlantis unlock` \ No newline at end of file diff --git a/server/controllers/events/testdata/test-repos/state-rm-single-project/exp-output-autoplan.txt b/server/controllers/events/testdata/test-repos/state-rm-single-project/exp-output-autoplan.txt index 54fa0b97ce..077f989d9a 100644 --- a/server/controllers/events/testdata/test-repos/state-rm-single-project/exp-output-autoplan.txt +++ b/server/controllers/events/testdata/test-repos/state-rm-single-project/exp-output-autoplan.txt @@ -56,5 +56,5 @@ Plan: 3 to add, 0 to change, 0 to destroy. --- * :fast_forward: To **apply** all unapplied plans from this pull request, comment: * `atlantis apply` -* :put_litter_in_its_place: To delete all plans and locks for the PR, comment: +* :put_litter_in_its_place: To **delete** all plans and locks for the PR, comment: * `atlantis unlock` \ No newline at end of file diff --git a/server/controllers/events/testdata/test-repos/state-rm-single-project/exp-output-plan-again.txt b/server/controllers/events/testdata/test-repos/state-rm-single-project/exp-output-plan-again.txt index c4eec26fe3..edb4c17579 100644 --- a/server/controllers/events/testdata/test-repos/state-rm-single-project/exp-output-plan-again.txt +++ b/server/controllers/events/testdata/test-repos/state-rm-single-project/exp-output-plan-again.txt @@ -56,5 +56,5 @@ Plan: 3 to add, 0 to change, 0 to destroy. --- * :fast_forward: To **apply** all unapplied plans from this pull request, comment: * `atlantis apply` -* :put_litter_in_its_place: To delete all plans and locks for the PR, comment: +* :put_litter_in_its_place: To **delete** all plans and locks for the PR, comment: * `atlantis unlock` \ No newline at end of file diff --git a/server/controllers/events/testdata/test-repos/state-rm-single-project/exp-output-plan.txt b/server/controllers/events/testdata/test-repos/state-rm-single-project/exp-output-plan.txt index 83e12e81c3..46a378158b 100644 --- a/server/controllers/events/testdata/test-repos/state-rm-single-project/exp-output-plan.txt +++ b/server/controllers/events/testdata/test-repos/state-rm-single-project/exp-output-plan.txt @@ -16,5 +16,5 @@ and found no differences, so no changes are needed. --- * :fast_forward: To **apply** all unapplied plans from this pull request, comment: * `atlantis apply` -* :put_litter_in_its_place: To delete all plans and locks for the PR, comment: +* :put_litter_in_its_place: To **delete** all plans and locks for the PR, comment: * `atlantis unlock` \ No newline at end of file diff --git a/server/controllers/events/testdata/test-repos/state-rm-workspace/exp-output-plan-again.txt b/server/controllers/events/testdata/test-repos/state-rm-workspace/exp-output-plan-again.txt index e817f34631..b24ee90b20 100644 --- a/server/controllers/events/testdata/test-repos/state-rm-workspace/exp-output-plan-again.txt +++ b/server/controllers/events/testdata/test-repos/state-rm-workspace/exp-output-plan-again.txt @@ -34,5 +34,5 @@ Plan: 1 to add, 0 to change, 0 to destroy. --- * :fast_forward: To **apply** all unapplied plans from this pull request, comment: * `atlantis apply` -* :put_litter_in_its_place: To delete all plans and locks for the PR, comment: +* :put_litter_in_its_place: To **delete** all plans and locks for the PR, comment: * `atlantis unlock` \ No newline at end of file diff --git a/server/controllers/events/testdata/test-repos/state-rm-workspace/exp-output-plan.txt b/server/controllers/events/testdata/test-repos/state-rm-workspace/exp-output-plan.txt index c70eb1d744..4c73caa512 100644 --- a/server/controllers/events/testdata/test-repos/state-rm-workspace/exp-output-plan.txt +++ b/server/controllers/events/testdata/test-repos/state-rm-workspace/exp-output-plan.txt @@ -18,5 +18,5 @@ and found no differences, so no changes are needed. --- * :fast_forward: To **apply** all unapplied plans from this pull request, comment: * `atlantis apply` -* :put_litter_in_its_place: To delete all plans and locks for the PR, comment: +* :put_litter_in_its_place: To **delete** all plans and locks for the PR, comment: * `atlantis unlock` \ No newline at end of file diff --git a/server/controllers/events/testdata/test-repos/tfvars-yaml-no-autoplan/exp-output-plan-default.txt b/server/controllers/events/testdata/test-repos/tfvars-yaml-no-autoplan/exp-output-plan-default.txt index d0109d1d6f..20be38a244 100644 --- a/server/controllers/events/testdata/test-repos/tfvars-yaml-no-autoplan/exp-output-plan-default.txt +++ b/server/controllers/events/testdata/test-repos/tfvars-yaml-no-autoplan/exp-output-plan-default.txt @@ -32,5 +32,5 @@ Plan: 1 to add, 0 to change, 0 to destroy. --- * :fast_forward: To **apply** all unapplied plans from this pull request, comment: * `atlantis apply` -* :put_litter_in_its_place: To delete all plans and locks for the PR, comment: +* :put_litter_in_its_place: To **delete** all plans and locks for the PR, comment: * `atlantis unlock` \ No newline at end of file diff --git a/server/controllers/events/testdata/test-repos/tfvars-yaml-no-autoplan/exp-output-plan-staging.txt b/server/controllers/events/testdata/test-repos/tfvars-yaml-no-autoplan/exp-output-plan-staging.txt index 1db8d34360..e34c9bc2dd 100644 --- a/server/controllers/events/testdata/test-repos/tfvars-yaml-no-autoplan/exp-output-plan-staging.txt +++ b/server/controllers/events/testdata/test-repos/tfvars-yaml-no-autoplan/exp-output-plan-staging.txt @@ -32,5 +32,5 @@ Plan: 1 to add, 0 to change, 0 to destroy. --- * :fast_forward: To **apply** all unapplied plans from this pull request, comment: * `atlantis apply` -* :put_litter_in_its_place: To delete all plans and locks for the PR, comment: +* :put_litter_in_its_place: To **delete** all plans and locks for the PR, comment: * `atlantis unlock` \ No newline at end of file diff --git a/server/controllers/events/testdata/test-repos/tfvars-yaml/exp-output-autoplan.txt b/server/controllers/events/testdata/test-repos/tfvars-yaml/exp-output-autoplan.txt index 71428cb612..d8a084bd85 100644 --- a/server/controllers/events/testdata/test-repos/tfvars-yaml/exp-output-autoplan.txt +++ b/server/controllers/events/testdata/test-repos/tfvars-yaml/exp-output-autoplan.txt @@ -69,5 +69,5 @@ Plan: 1 to add, 0 to change, 0 to destroy. --- * :fast_forward: To **apply** all unapplied plans from this pull request, comment: * `atlantis apply` -* :put_litter_in_its_place: To delete all plans and locks for the PR, comment: +* :put_litter_in_its_place: To **delete** all plans and locks for the PR, comment: * `atlantis unlock` \ No newline at end of file diff --git a/server/controllers/events/testdata/test-repos/workspace-parallel-yaml/exp-output-autoplan-production.txt b/server/controllers/events/testdata/test-repos/workspace-parallel-yaml/exp-output-autoplan-production.txt index d58f778a33..73d66792e4 100644 --- a/server/controllers/events/testdata/test-repos/workspace-parallel-yaml/exp-output-autoplan-production.txt +++ b/server/controllers/events/testdata/test-repos/workspace-parallel-yaml/exp-output-autoplan-production.txt @@ -65,5 +65,5 @@ Plan: 1 to add, 0 to change, 0 to destroy. --- * :fast_forward: To **apply** all unapplied plans from this pull request, comment: * `atlantis apply` -* :put_litter_in_its_place: To delete all plans and locks for the PR, comment: +* :put_litter_in_its_place: To **delete** all plans and locks for the PR, comment: * `atlantis unlock` \ No newline at end of file diff --git a/server/controllers/events/testdata/test-repos/workspace-parallel-yaml/exp-output-autoplan-staging.txt b/server/controllers/events/testdata/test-repos/workspace-parallel-yaml/exp-output-autoplan-staging.txt index d58f778a33..73d66792e4 100644 --- a/server/controllers/events/testdata/test-repos/workspace-parallel-yaml/exp-output-autoplan-staging.txt +++ b/server/controllers/events/testdata/test-repos/workspace-parallel-yaml/exp-output-autoplan-staging.txt @@ -65,5 +65,5 @@ Plan: 1 to add, 0 to change, 0 to destroy. --- * :fast_forward: To **apply** all unapplied plans from this pull request, comment: * `atlantis apply` -* :put_litter_in_its_place: To delete all plans and locks for the PR, comment: +* :put_litter_in_its_place: To **delete** all plans and locks for the PR, comment: * `atlantis unlock` \ No newline at end of file diff --git a/server/events/markdown_renderer_test.go b/server/events/markdown_renderer_test.go index bdcbc0df30..1b048b044d 100644 --- a/server/events/markdown_renderer_test.go +++ b/server/events/markdown_renderer_test.go @@ -176,7 +176,7 @@ $$$ --- * :fast_forward: To **apply** all unapplied plans from this pull request, comment: * $atlantis apply$ -* :put_litter_in_its_place: To delete all plans and locks for the PR, comment: +* :put_litter_in_its_place: To **delete** all plans and locks for the PR, comment: * $atlantis unlock$ `, }, @@ -215,7 +215,7 @@ $$$ --- * :fast_forward: To **apply** all unapplied plans from this pull request, comment: * $atlantis apply$ -* :put_litter_in_its_place: To delete all plans and locks for the PR, comment: +* :put_litter_in_its_place: To **delete** all plans and locks for the PR, comment: * $atlantis unlock$ `, }, @@ -252,7 +252,7 @@ $$$ --- * :fast_forward: To **apply** all unapplied plans from this pull request, comment: * $atlantis apply$ -* :put_litter_in_its_place: To delete all plans and locks for the PR, comment: +* :put_litter_in_its_place: To **delete** all plans and locks for the PR, comment: * $atlantis unlock$ `, }, @@ -320,7 +320,7 @@ $$$ --- * :fast_forward: To **apply** all unapplied plans from this pull request, comment: * $atlantis apply$ -* :put_litter_in_its_place: To delete all plans and locks for the PR, comment: +* :put_litter_in_its_place: To **delete** all plans and locks for the PR, comment: * $atlantis unlock$ `, }, @@ -395,7 +395,7 @@ $$$ --- * :fast_forward: To **apply** all unapplied plans from this pull request, comment: * $atlantis apply$ -* :put_litter_in_its_place: To delete all plans and locks for the PR, comment: +* :put_litter_in_its_place: To **delete** all plans and locks for the PR, comment: * $atlantis unlock$ `, }, @@ -550,7 +550,7 @@ $$$ --- * :fast_forward: To **apply** all unapplied plans from this pull request, comment: * $atlantis apply$ -* :put_litter_in_its_place: To delete all plans and locks for the PR, comment: +* :put_litter_in_its_place: To **delete** all plans and locks for the PR, comment: * $atlantis unlock$ `, }, @@ -628,7 +628,7 @@ $$$ --- * :fast_forward: To **apply** all unapplied plans from this pull request, comment: * $atlantis apply$ -* :put_litter_in_its_place: To delete all plans and locks for the PR, comment: +* :put_litter_in_its_place: To **delete** all plans and locks for the PR, comment: * $atlantis unlock$ `, }, @@ -763,7 +763,7 @@ $$$ --- * :fast_forward: To **apply** all unapplied plans from this pull request, comment: * $atlantis apply$ -* :put_litter_in_its_place: To delete all plans and locks for the PR, comment: +* :put_litter_in_its_place: To **delete** all plans and locks for the PR, comment: * $atlantis unlock$ `, }, @@ -860,7 +860,7 @@ $$$ --- * :heavy_check_mark: To **approve** all unapplied plans from this pull request, comment: * $atlantis approve_policies$ -* :put_litter_in_its_place: To delete all plans and locks for the PR, comment: +* :put_litter_in_its_place: To **delete** all plans and locks for the PR, comment: * $atlantis unlock$ * :repeat: To re-run policies **plan** this project again by commenting: * $atlantis plan$ @@ -1615,7 +1615,7 @@ No changes. Infrastructure is up-to-date. --- * :fast_forward: To **apply** all unapplied plans from this pull request, comment: * $atlantis apply$ -* :put_litter_in_its_place: To delete all plans and locks for the PR, comment: +* :put_litter_in_its_place: To **delete** all plans and locks for the PR, comment: * $atlantis unlock$` } else { exp = `Ran Plan for dir: $.$ workspace: $default$ @@ -1633,7 +1633,7 @@ $$$ --- * :fast_forward: To **apply** all unapplied plans from this pull request, comment: * $atlantis apply$ -* :put_litter_in_its_place: To delete all plans and locks for the PR, comment: +* :put_litter_in_its_place: To **delete** all plans and locks for the PR, comment: * $atlantis unlock$` } case command.Apply: @@ -1795,7 +1795,7 @@ Plan: 1 to add, 0 to change, 0 to destroy. --- * :fast_forward: To **apply** all unapplied plans from this pull request, comment: * $atlantis apply$ -* :put_litter_in_its_place: To delete all plans and locks for the PR, comment: +* :put_litter_in_its_place: To **delete** all plans and locks for the PR, comment: * $atlantis unlock$` expWithBackticks := strings.Replace(exp, "$", "`", -1) Equals(t, expWithBackticks, rendered) @@ -1960,7 +1960,7 @@ $$$ --- * :fast_forward: To **apply** all unapplied plans from this pull request, comment: * $atlantis apply$ -* :put_litter_in_its_place: To delete all plans and locks for the PR, comment: +* :put_litter_in_its_place: To **delete** all plans and locks for the PR, comment: * $atlantis unlock$ `, }, @@ -1997,7 +1997,7 @@ $$$ --- * :fast_forward: To **apply** all unapplied plans from this pull request, comment: * $atlantis apply$ -* :put_litter_in_its_place: To delete all plans and locks for the PR, comment: +* :put_litter_in_its_place: To **delete** all plans and locks for the PR, comment: * $atlantis unlock$ `, }, @@ -2032,7 +2032,7 @@ $$$ --- * :fast_forward: To **apply** all unapplied plans from this pull request, comment: * $atlantis apply$ -* :put_litter_in_its_place: To delete all plans and locks for the PR, comment: +* :put_litter_in_its_place: To **delete** all plans and locks for the PR, comment: * $atlantis unlock$ `, }, @@ -2127,7 +2127,7 @@ $$$ --- * :fast_forward: To **apply** all unapplied plans from this pull request, comment: * $atlantis apply$ -* :put_litter_in_its_place: To delete all plans and locks for the PR, comment: +* :put_litter_in_its_place: To **delete** all plans and locks for the PR, comment: * $atlantis unlock$ `, }, @@ -2257,7 +2257,7 @@ $$$ --- * :fast_forward: To **apply** all unapplied plans from this pull request, comment: * $atlantis apply$ -* :put_litter_in_its_place: To delete all plans and locks for the PR, comment: +* :put_litter_in_its_place: To **delete** all plans and locks for the PR, comment: * $atlantis unlock$ `, }, @@ -2939,7 +2939,7 @@ $$$ --- * :fast_forward: To **apply** all unapplied plans from this pull request, comment: * $atlantis apply$ -* :put_litter_in_its_place: To delete all plans and locks for the PR, comment: +* :put_litter_in_its_place: To **delete** all plans and locks for the PR, comment: * $atlantis unlock$ `, }, @@ -2990,7 +2990,7 @@ $$$ * :fast_forward: To **apply** all unapplied plans from this pull request, comment: * $atlantis apply$ -* :put_litter_in_its_place: To delete all plans and locks for the PR, comment: +* :put_litter_in_its_place: To **delete** all plans and locks for the PR, comment: * $atlantis unlock$ `, }, diff --git a/server/events/templates/multi_project_plan.tmpl b/server/events/templates/multi_project_plan.tmpl index 2693b8a518..456b0ecf61 100644 --- a/server/events/templates/multi_project_plan.tmpl +++ b/server/events/templates/multi_project_plan.tmpl @@ -15,7 +15,7 @@ {{ if and (gt (len .Results) 0) (not .PlansDeleted) -}} * :fast_forward: To **apply** all unapplied plans from this pull request, comment: * `{{ .ExecutableName }} apply` -* :put_litter_in_its_place: To delete all plans and locks for the PR, comment: +* :put_litter_in_its_place: To **delete** all plans and locks for the PR, comment: * `{{ .ExecutableName }} unlock` {{ end -}} {{ end -}} diff --git a/server/events/templates/multi_project_policy_unsuccessful.tmpl b/server/events/templates/multi_project_policy_unsuccessful.tmpl index 2e8aafd95d..a0a59fd994 100644 --- a/server/events/templates/multi_project_policy_unsuccessful.tmpl +++ b/server/events/templates/multi_project_policy_unsuccessful.tmpl @@ -13,7 +13,7 @@ {{ if and (gt (len .Results) 0) (not .PlansDeleted) -}} * :heavy_check_mark: To **approve** all unapplied plans from this pull request, comment: * `{{ .ExecutableName }} approve_policies` -* :put_litter_in_its_place: To delete all plans and locks for the PR, comment: +* :put_litter_in_its_place: To **delete** all plans and locks for the PR, comment: * `{{ .ExecutableName }} unlock` * :repeat: To re-run policies **plan** this project again by commenting: * `{{ .ExecutableName }} plan` diff --git a/server/events/templates/single_project_plan_success.tmpl b/server/events/templates/single_project_plan_success.tmpl index 83e70ae547..46c1b6640a 100644 --- a/server/events/templates/single_project_plan_success.tmpl +++ b/server/events/templates/single_project_plan_success.tmpl @@ -7,7 +7,7 @@ Ran {{ .Command }} for {{ if $result.ProjectName }}project: `{{ $result.ProjectN --- * :fast_forward: To **apply** all unapplied plans from this pull request, comment: * `{{ .ExecutableName }} apply` -* :put_litter_in_its_place: To delete all plans and locks for the PR, comment: +* :put_litter_in_its_place: To **delete** all plans and locks for the PR, comment: * `{{ .ExecutableName }} unlock` {{ end -}} {{- template "log" . -}} diff --git a/server/events/templates/single_project_policy_unsuccessful.tmpl b/server/events/templates/single_project_policy_unsuccessful.tmpl index 6f40027dfa..0760406814 100644 --- a/server/events/templates/single_project_policy_unsuccessful.tmpl +++ b/server/events/templates/single_project_policy_unsuccessful.tmpl @@ -7,7 +7,7 @@ Ran {{ .Command }} for {{ if $result.ProjectName }}project: `{{ $result.ProjectN --- * :heavy_check_mark: To **approve** all unapplied plans from this pull request, comment: * `{{ .ExecutableName }} approve_policies` -* :put_litter_in_its_place: To delete all plans and locks for the PR, comment: +* :put_litter_in_its_place: To **delete** all plans and locks for the PR, comment: * `{{ .ExecutableName }} unlock` * :repeat: To re-run policies **plan** this project again by commenting: * `{{ .ExecutableName }} plan` diff --git a/server/events/working_dir.go b/server/events/working_dir.go index b4cc28f89f..886b3c4b40 100644 --- a/server/events/working_dir.go +++ b/server/events/working_dir.go @@ -294,7 +294,7 @@ func (w *FileWorkspace) mergeAgain(c wrappedGitContext) error { } // Reset branch as if it was cloned again - if err := w.wrappedGit(c, "reset", "--hard", fmt.Sprintf("refs/remotes/head/%s", c.pr.BaseBranch)); err != nil { + if err := w.wrappedGit(c, "reset", "--hard", fmt.Sprintf("refs/remotes/origin/%s", c.pr.BaseBranch)); err != nil { return err } diff --git a/testdrive/utils.go b/testdrive/utils.go index ff5740fbc1..efb448719b 100644 --- a/testdrive/utils.go +++ b/testdrive/utils.go @@ -35,7 +35,7 @@ import ( ) const hashicorpReleasesURL = "https://releases.hashicorp.com" -const terraformVersion = "1.6.5" // renovate: datasource=github-releases depName=hashicorp/terraform versioning=hashicorp +const terraformVersion = "1.6.6" // renovate: datasource=github-releases depName=hashicorp/terraform versioning=hashicorp 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 7a6b86e857..441793d39d 100644 --- a/testing/Dockerfile +++ b/testing/Dockerfile @@ -6,7 +6,7 @@ RUN apt-get update && apt-get --no-install-recommends -y install unzip \ # Install Terraform # renovate: datasource=github-releases depName=hashicorp/terraform versioning=hashicorp -ENV TERRAFORM_VERSION=1.6.5 +ENV TERRAFORM_VERSION=1.6.6 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} && \