Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge upstream #21

Merged
merged 71 commits into from
Dec 12, 2022
Merged

Merge upstream #21

merged 71 commits into from
Dec 12, 2022

Conversation

ghaiszaher
Copy link
Owner

No description provided.

erpel and others added 30 commits October 7, 2022 09:28
@erpel
Add missing newline (runatlantis#2567)
23158f0
@dependabot
build(deps): bump github.com/microcosm-cc/bluemonday (runatlantis#2548)
542b083 
Bumps [github.com/microcosm-cc/bluemonday](https://github.com/microcosm-cc/bluemonday) from 1.0.20 to 1.0.21.
- [Release notes](https://github.com/microcosm-cc/bluemonday/releases)
- [Commits](microcosm-cc/bluemonday@v1.0.20...v1.0.21)

---
updated-dependencies:
- dependency-name: github.com/microcosm-cc/bluemonday
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@chenrui333
deps: bump terrform to 1.3.2 (runatlantis#2569)
2e13c70 
Signed-off-by: Rui Chen <[email protected]>
@chroju
docs: fill all command line flags not in the document, and more. (run…
9758a21 
…atlantis#2568)

* docs: All command line flags are filled in the doc

* docs: about --gh-allow-mergeable-bypass-apply flag

* docs: replace Github with GitHub

* docs: remove an incorrect bullet

Co-authored-by: chroju <[email protected]>
@chroju
docs: added GitHub app permission in runatlantis#2380 (runatlantis#2572)
71f9397 
Co-authored-by: chroju <[email protected]>
@jamengual
Release 0.20.1 (runatlantis#2571)
9cfcd13
@chenrui333
fix(workflows): fix docker image publish flow (runatlantis#2580)
ce4c7db 
Signed-off-by: Rui Chen <[email protected]>

Signed-off-by: Rui Chen <[email protected]>
@chavacava
fix runatlantis#2537 by removing redundant conditional branch (runatl…
57b0116 
…antis#2545)
@zer0beat
Silence allow list errors works again (runatlantis#2535)
8e27a47
@dependabot
build(deps): bump github.com/go-redis/redis/v9 (runatlantis#2578)
386ce57 
Bumps [github.com/go-redis/redis/v9](https://github.com/go-redis/redis) from 9.0.0-beta.2 to 9.0.0-beta.3.
- [Release notes](https://github.com/go-redis/redis/releases)
- [Changelog](https://github.com/go-redis/redis/blob/master/CHANGELOG.md)
- [Commits](redis/go-redis@v9.0.0-beta.2...v9.0.0-beta.3)

---
updated-dependencies:
- dependency-name: github.com/go-redis/redis/v9
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
build(deps): bump github.com/hashicorp/hcl/v2 from 2.6.0 to 2.14.1 (r…
1a81ffc 
…unatlantis#2579)

Bumps [github.com/hashicorp/hcl/v2](https://github.com/hashicorp/hcl) from 2.6.0 to 2.14.1.
- [Release notes](https://github.com/hashicorp/hcl/releases)
- [Changelog](https://github.com/hashicorp/hcl/blob/main/CHANGELOG.md)
- [Commits](hashicorp/hcl@v2.6.0...v2.14.1)

---
updated-dependencies:
- dependency-name: github.com/hashicorp/hcl/v2
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@marcusramberg
Add basic documentation for the prometheus exporter (runatlantis#2582)
f6d24ee
@nitrocode
docs: typo ATLANTIS_GH_ALLOW_MERGEABLE_BYPASS_APPLY (runatlantis#2583)
bb13f2f
@nitrocode
hadolint: base: pin all dependencies (runatlantis#2587)
072d245 
* hadolint: base: pin all dependencies

* atlantis-base: trigger workflow on pull_request

* atlantis-base: only push if not a pull request
@nitrocode
Bump atlantis-base:2022.10.14 (runatlantis#2589)
fa7163d 
* Bump atlantis-base:2022.10.14

* atlantis-image: Build on Dockerfile changes in PRs

* atlantis-image: init on push & pull_request events
@dependabot
build(deps): bump github.com/go-redis/redis/v9 (runatlantis#2590)
1992775 
Bumps [github.com/go-redis/redis/v9](https://github.com/go-redis/redis) from 9.0.0-beta.3 to 9.0.0-rc.1.
- [Release notes](https://github.com/go-redis/redis/releases)
- [Changelog](https://github.com/go-redis/redis/blob/master/CHANGELOG.md)
- [Commits](redis/go-redis@v9.0.0-beta.3...v9.0.0-rc.1)

---
updated-dependencies:
- dependency-name: github.com/go-redis/redis/v9
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
build(deps): bump github.com/moby/moby (runatlantis#2591)
64ce860 
Bumps [github.com/moby/moby](https://github.com/moby/moby) from 20.10.18+incompatible to 20.10.19+incompatible.
- [Release notes](https://github.com/moby/moby/releases)
- [Changelog](https://github.com/moby/moby/blob/master/CHANGELOG.md)
- [Commits](moby/moby@v20.10.18...v20.10.19)

---
updated-dependencies:
- dependency-name: github.com/moby/moby
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@nitrocode
deps: bump terrform to 1.3.3 and docs update (runatlantis#2614)
be37b77 
* deps: bump terrform to 1.3.3

* Correct github doc link for token
@nitrocode
deps: bump conftest to 0.35.0 (runatlantis#2615)
df94369
@forestoden
fix: typo in log message when running parallel plans (runatlantis#2620)
d0715fa 
Signed-off-by: Forest Oden <[email protected]>
@dependabot
build(deps): bump github.com/stretchr/testify from 1.8.0 to 1.8.1 (ru…
df0d21a 
…natlantis#2611)

Bumps [github.com/stretchr/testify](https://github.com/stretchr/testify) from 1.8.0 to 1.8.1.
- [Release notes](https://github.com/stretchr/testify/releases)
- [Commits](stretchr/testify@v1.8.0...v1.8.1)

---
updated-dependencies:
- dependency-name: github.com/stretchr/testify
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
build(deps): bump github.com/moby/moby (runatlantis#2612)
bd63765 
Bumps [github.com/moby/moby](https://github.com/moby/moby) from 20.10.19+incompatible to 20.10.20+incompatible.
- [Release notes](https://github.com/moby/moby/releases)
- [Changelog](https://github.com/moby/moby/blob/master/CHANGELOG.md)
- [Commits](moby/moby@v20.10.19...v20.10.20)

---
updated-dependencies:
- dependency-name: github.com/moby/moby
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@shouichi
Specify ngrok config version (runatlantis#2610)
4bc766d 
Also prefix ngrok config temporary filename so that it is easy to
distinguish when listing the tmp directory.
@Fauzyy
feat: add a flag to silence policy checks comments when there's no er…
3bfd769 
…ror (runatlantis#2405)

* Add a flag to silence policy checks comments when there's no error

* Add e2e test cases for the quiet policy checks flag

* add documentation for quiet-policy-checks flag

* Update user_config.go

Fix indentation

* Update user_config.go

* fmt
@gurpalw @jamengual
docs: update notes to clarify where the environment variables are ava…
117ce59 
…ilable (runatlantis#2532)

* update notes to clarify where the environment variables are available

* Update runatlantis.io/docs/custom-workflows.md

Co-authored-by: PePe Amengual <[email protected]>

Co-authored-by: PePe Amengual <[email protected]>
@TylerLubeck
Add tags to project metrics (runatlantis#2623)
9ab3fd2 
* Add tags to project metrics

This adds a few tags that I've found useful for our monitoring of a
many-project terraform repository. There are likely more tags that can
be added in other areas, but I figured I'd start small and get feedback
before increasing the blast radius

* Add labels, handle nils, alphabetize

* Move //nolint to line of assignment
@nitrocode
chore: set stale 6mo, close 1mo (runatlantis#2629)
e20a574
@Dev25
Bitbucket Server: Send password as Bearer instead of Basic Auth (runa…
c03ef1d 
…tlantis#2461)

* Bitbucket Server: Send password as Bearer instead of Basic Auth

Signed-off-by: Devan Patel <[email protected]>

* docs: Add Bearer note for Bitbucket Server auth

Signed-off-by: Dev <[email protected]>

Signed-off-by: Devan Patel <[email protected]>
Signed-off-by: Dev <[email protected]>
@tpickett66
Update terraform-config-inspect (runatlantis#2599)
c290421 
Fixes runatlantis#2598

This package was enough out of date that it wouldn't parse features in
the language that were added in the last few releases of TF. This should
get things into a state that supports the newer features.
@VladimirSt-XP
Updating diffKeywordRegex to properly handle new test case (runatlant…
4cc5cf6 
…is#2551)

* new resource was added to test TestRenderProjectResultsWithEnableDiffMarkdownFormat

* Correct test case

* 1st regex change

* Adding one more pattern to regex

Co-authored-by: dyurovskykh-tivo <[email protected]>
tlorreyte and others added 28 commits November 12, 2022 22:45
@tlorreyte @nitrocode
feat: add policy check summary in wrapped messages (runatlantis#2452)
7f75002 
Co-authored-by: nitrocode <[email protected]>
@nitrocode
e2e image and testing fixes (runatlantis#2672)
62719ee 
* build testing-env-image in relevant PRs

* hadolint testing/Dockerfile and rm go get

* revert cimg/go back to circleci/golang image
@Juneezee
test: use T.TempDir to create temporary test directory (runatlantis…
49c5eba 
…#2671)

This commit replaces `os.MkdirTemp` with `t.TempDir` in tests. The
directory created by `t.TempDir` is automatically removed when the test
and all its subtests complete.

Prior to this commit, temporary directory created using `os.MkdirTemp`
needs to be removed manually by calling `os.RemoveAll`, which is omitted
in some tests. The error handling boilerplate e.g.
	defer func() {
		if err := os.RemoveAll(dir); err != nil {
			t.Fatal(err)
		}
	}
is also tedious, but `t.TempDir` handles this for us nicely.

Reference: https://pkg.go.dev/testing#T.TempDir
Signed-off-by: Eng Zer Jun <[email protected]>

Signed-off-by: Eng Zer Jun <[email protected]>
@nitrocode
Bump to atlantis-base:2022.11.13 and use cimg/go:1.19 (runatlantis#2673)
6f7ee2e 
* Bump to atlantis-base:2022.11.13

* Use cimg/go back image

* Use correct path of cimg/go binary dir

* e2e: use /usr/bin

* e2e: add set -e

* circleci: use testing-env:2022.11.13

* e2e: use /home/circleci/go/bin

* e2e: revert to testing-env:2021.08.31 image
@nitrocode
Bump spf13/[email protected] and xanzy/[email protected] (runatlantis…
eedc618 
…#2674)

* Bump spf13/viper to v1.14.0

* Bump go-gitlab to v0.74.0
@lukemassa @nitrocode
feat: Add status to the real-time logs page (runatlantis#2426)
752d861 
* Add status of the terminal to the footer

* Change function call

Co-authored-by: nitrocode <[email protected]>
@nitrocode
Bump all dependencies (runatlantis#2675)
ec995dd 
* Bump all dependencies using go get -u

* Added nolint: gosec for writing git creds
@dependabot
build(deps): bump github.com/alicebob/miniredis/v2 from 2.23.0 to 2.2…
f5c7aa9 
…3.1 (runatlantis#2679)

Bumps [github.com/alicebob/miniredis/v2](https://github.com/alicebob/miniredis) from 2.23.0 to 2.23.1.
- [Release notes](https://github.com/alicebob/miniredis/releases)
- [Changelog](https://github.com/alicebob/miniredis/blob/master/CHANGELOG.md)
- [Commits](alicebob/miniredis@v2.23.0...v2.23.1)

---
updated-dependencies:
- dependency-name: github.com/alicebob/miniredis/v2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@nitrocode
rm unsupported anchor, add remove-stale-when-uodated (runatlantis#2676)
caec10f
@nitrocode
Rename default branch to main (runatlantis#2662)
d85662c 
* Rename default branch to main

* Bump git, curl, and openssl packages
@ean
Update to go-github v48 (runatlantis#2653)
f44c965
@nitrocode
Add auto generation of atlantis.yaml projects (runatlantis#2680)
250f073
@nitrocode
Fix website link checker due to branch rename (runatlantis#2682)
c7f230b 
* Use main

* Use docsBranch: main
@camillsir @nitrocode
Adding reloading of TLS certificates (runatlantis#2656)
9b90f2e 
* Adding reloading of TLS certificates

* Update server/server.go

Co-authored-by: nitrocode <[email protected]>

* Adding test and test data

* Set minimum tls version

* Adding read header timeout

Co-authored-by: nitrocode <[email protected]>
@nitrocode
Reduce image size by rm'ing old tf versions (runatlantis#2619)
d3623de
@lilincmu
Update docs for vulnerability reporting (runatlantis#2683)
5b88c42
@nitrocode
testing-env: create default atlantis user (runatlantis#2689)
4dcc73b
@nitrocode
Bump testing-env and [email protected] (runatlantis#2686)
b760e8c 
* Bump github.com/zclconf/[email protected]

* Bump github.com/zclconf/[email protected]

* Bump github.com/zclconf/[email protected]

* Bump testing-env to latest

* Set conftest to 0.35.0

* conftest to 0.45.0, run docker tests locally

* set gha test.yml to latest testing-env image

* Update Makefile target descs, rm sudo

* Use testing-env:2022.11.17

* Add sudo back in for gha workflow

* Set conftest to 0.35.0

* test gha: rm setup

* Rename "Version" to "Conftest" for version regex

* Use cases and language import

* Use io instead of ioutil
@dependabot
build(deps): bump github.com/hashicorp/hcl/v2 from 2.14.1 to 2.15.0 (r…
2912a96 
…unatlantis#2678)

Bumps [github.com/hashicorp/hcl/v2](https://github.com/hashicorp/hcl) from 2.14.1 to 2.15.0.
- [Release notes](https://github.com/hashicorp/hcl/releases)
- [Changelog](https://github.com/hashicorp/hcl/blob/main/CHANGELOG.md)
- [Commits](hashicorp/hcl@v2.14.1...v2.15.0)

---
updated-dependencies:
- dependency-name: github.com/hashicorp/hcl/v2
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@chenrui333
deps: bump to use tf 1.3.5 (runatlantis#2691)
82e191f 
Signed-off-by: Rui Chen <[email protected]>

Signed-off-by: Rui Chen <[email protected]>
@nitrocode
Bump more dependencies (runatlantis#2692)
89e035c
@ribejara-te @nitrocode
upgrade Git clone locking mechanism to go1.19 (runatlantis#2521)
020eeba 
Co-authored-by: nitrocode <[email protected]>
@albertorm95
metrics: Add Metrics tags to multiple Scopes (runatlantis#2687)
949ee3f 
* metrics: Add Metrics tags to multiple Scopes

* metrics: Fix base_repo and pr_number

* metrics: Refactor SetScope to SetScopeTags

* metrics: Add SetGitScopeTags function

* metrics: docs reword project_context SetScopeTags description

* metrics: test Add TestNewScope_PrometheusTaggingCapabilities
@krrrr38 @nitrocode @jamengual
Fix GitHub app uses slug as user name to work --hide-prev-plan-commen…
cde8faa 
…ts correctly (runatlantis#2697)

* Fix GitHub app uses slug as user name

* Update server/events/vcs/github_credentials_test.go

Co-authored-by: PePe Amengual <[email protected]>

Co-authored-by: nitrocode <[email protected]>
Co-authored-by: PePe Amengual <[email protected]>
@fblgit @xmurias
@xavipanda @nitrocode
Detect terraform versions using >= and ~> specifiers (runatlantis…
f8b1ea9 
…#1776)

* Refactor TFVersion from Dir with tfswitch lib

* Added tests and cleaned up code

* linted fmtd

* fixed conflict go.mod

* bumped to tf1.0.6

* bumped go.mod

* Update project_command_context_builder.go

* Bump warrensbox/terraform-switcher

* Fix tests

* rm redundant mocks library import

Co-authored-by: xmurias <[email protected]>
Co-authored-by: Xavier <[email protected]>
Co-authored-by: nitrocode <[email protected]>
@nitrocode
chore: rm duplicate make test-all, no push to latest on refs with "pr…
065adc3 
…e" (runatlantis#2703)

* Remove duplicate make test-all in circleci

* Prevent pushing latest tag on refs with "pre"

* DRY up atlantis-image.yaml
@marcusramberg
fix: Add server flag for quiet policy checks as documented (runatlant…
ada4e53 
…is#2705)
@ghaiszaher
Merge remote-tracking branch 'upstream/master' into merge-upstream2
da83da8 
# Conflicts:
#	server/events/delete_lock_command_test.go
@ghaiszaher ghaiszaher merged commit 5d34e6f into master Dec 12, 2022
@ghaiszaher ghaiszaher deleted the merge-upstream2 branch December 12, 2022 19:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.