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 #28

Merged
merged 42 commits into from
Dec 12, 2022
Merged

Merge upstream #28

merged 42 commits into from
Dec 12, 2022

Conversation

ghaiszaher
Copy link
Owner

No description provided.

nitrocode and others added 30 commits November 23, 2022 19:59
@nitrocode
docs: Small updates 🦃 (runatlantis#2711)
ad79d07 
* Add missing pages

* Update server-configuration.md

* Update test.yml

* Update lint.yml

* Update test.yml

* Update lint.yml

* Update server-configuration.md

* Update server-configuration.md

* Update server-configuration.md

* Update server-configuration.md

* Update server-configuration.md

* Update server-configuration.md

* Update server-configuration.md

* Update server-configuration.md
@nitrocode
Run PR checks if the PR is moved to ready_for_review type (runatlan…
d4c7cce 
…tis#2713)

* Update lint.yml

* Update test.yml
@nitrocode
Run docker pull before building images (runatlantis#2714)
f3bf05e 
* atlantis-base: Add pull: true

* atlantis-image: Add pull: true

* testing-env-image: Add pull: true
@nitrocode
Allow --gh-team-allowlist to work with team names and slugs (runatl…
629e688 
…antis#2719)

* Add team slugs

* Expand test to include both names and slugs

* docs: add version document of flag before/after

* docs: this will be merged for next release
@nitrocode
atlantis-image: yaml fix using single quotes (runatlantis#2722)
a0c7dd8
@nitrocode
atlantis-image: yaml fix using a separate env var (runatlantis#2725)
e2b4ec4 
* atlantis-image: yaml fix using a separate env var

* Update atlantis-image.yml

* Update atlantis-image.yml

* Update atlantis-image.yml

* Update atlantis-image.yml

* Update atlantis-image.yml

* Update atlantis-image.yml
@dependabot
build(deps): bump minimatch from 3.0.4 to 3.1.2 (runatlantis#2723)
f1a6481 
Bumps [minimatch](https://github.com/isaacs/minimatch) from 3.0.4 to 3.1.2.
- [Release notes](https://github.com/isaacs/minimatch/releases)
- [Commits](isaacs/minimatch@v3.0.4...v3.1.2)

---
updated-dependencies:
- dependency-name: minimatch
  dependency-type: indirect
...

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
docs: add PR template (runatlantis#2718)
3179467
@dependabot
build(deps): bump runatlantis/atlantis-base (runatlantis#2731)
4817ecb 
Bumps runatlantis/atlantis-base from 2022.11.13 to 2022.11.24.

---
updated-dependencies:
- dependency-name: runatlantis/atlantis-base
  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/go-redis/redis/v9 (runatlantis#2733)
2cecda1 
Bumps [github.com/go-redis/redis/v9](https://github.com/go-redis/redis) from 9.0.0-rc.1 to 9.0.0-rc.2.
- [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-rc.1...v9.0.0-rc.2)

---
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/xanzy/go-gitlab from 0.74.0 to 0.76.0 (r…
f5b06b6 
…unatlantis#2732)

Bumps [github.com/xanzy/go-gitlab](https://github.com/xanzy/go-gitlab) from 0.74.0 to 0.76.0.
- [Release notes](https://github.com/xanzy/go-gitlab/releases)
- [Changelog](https://github.com/xanzy/go-gitlab/blob/master/releases_test.go)
- [Commits](xanzy/go-gitlab@v0.74.0...v0.76.0)

---
updated-dependencies:
- dependency-name: github.com/xanzy/go-gitlab
  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>
@jamengual
Release 0.21.0 (runatlantis#2734)
cf8db0c 
* Release 0.21.0

* Release 0.21.0
@iamnoah
feat: auto-plan projects when modules change (runatlantis#2507)
61bcfba 
* feat: auto-plan projects when modules change

Fixes runatlantis#920

* rename Downstream->Dependent; docs cleanup

* chore: gofmt -s
@chenrui333
deps: update to use tf 1.3.6 (runatlantis#2744)
733e51c 
Signed-off-by: Rui Chen <[email protected]>

Signed-off-by: Rui Chen <[email protected]>
@csainty @nitrocode
feat: support atlantis.yaml without defined projects (runatlantis#2300)
e60dd84 
* Support atlantis.yaml without defined projects

* Update server/events/project_command_builder.go

* Update server/events/project_command_builder.go

* Correct test of no modified projects

* Flip if statement

* Remove duplicate check on hasRepoCfg

Co-authored-by: nitrocode <[email protected]>
@dependabot
build(deps): bump decode-uri-component from 0.2.0 to 0.2.2 (runatlant…
479bed4 
…is#2748)

Bumps [decode-uri-component](https://github.com/SamVerschueren/decode-uri-component) from 0.2.0 to 0.2.2.
- [Release notes](https://github.com/SamVerschueren/decode-uri-component/releases)
- [Commits](SamVerschueren/decode-uri-component@v0.2.0...v0.2.2)

---
updated-dependencies:
- dependency-name: decode-uri-component
  dependency-type: indirect
...

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>
@Tenzer
Use GitHub Actions cache when building Docker images (runatlantis#2737)
124eb6b 
* Use GitHub Actions cache when building Docker images

This firstly removes the `pull: true` option from all
`build-push-action` invocations, as it was assumed it caused Docker to
pull the existing image first before building the new one, where as it
instead makes sure the base image is up to date prior to starting the
build.

Instead the `cache-from` and `cache-to` options are added which cause
the action to store and retrieve caches for each layer from GitHub
Actions' cache system as documented at
https://docs.docker.com/build/ci/github-actions/examples/#cache-backend-api.

* Pin exact Go version in testing image

This matches what is done for the production image.
@Tenzer @nitrocode
Cache downloaded Go dependencies and Atlantis compilation in Docker (r…
b2bcd48 
…unatlantis#2738)

This has the potential to speed up rebuilds of the Atlantis container
significantly, especially for non-x86 platforms which are emulated when
done in GitHub Actions.

It works by using cache mounts:
https://docs.docker.com/engine/reference/builder/#run---mounttypecache.
They mean we can have specific paths set that are carried over from one
image build to the next, regardless of which files are changed in the
project. The files are however at the same time not part of the final
image, which reduces the generated "builder" image from 1.66 GB to just
386 MB on the current main branch.

In my local tests, which doesn't make use of emulation, I saw a drop
for the "go build" step going from taking just over 40 seconds with an
empty cache to around 1 second when I make a one character change to a
Go source file. That is otherwise a change that prior to this would
cause a complete rebuild of the Docker image layer.

Co-authored-by: nitrocode <[email protected]>
@dependabot
build(deps): bump golang.org/x/text from 0.4.0 to 0.5.0 (runatlantis#…
20d282f 
…2751)

Bumps [golang.org/x/text](https://github.com/golang/text) from 0.4.0 to 0.5.0.
- [Release notes](https://github.com/golang/text/releases)
- [Commits](golang/text@v0.4.0...v0.5.0)

---
updated-dependencies:
- dependency-name: golang.org/x/text
  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>
@dependabot
build(deps): bump runatlantis/atlantis-base (runatlantis#2750)
1fbbcca 
Bumps runatlantis/atlantis-base from 2022.11.24 to 2022.12.05.

---
updated-dependencies:
- dependency-name: runatlantis/atlantis-base
  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>
@dependabot
build(deps): bump go.uber.org/zap from 1.23.0 to 1.24.0 (runatlantis#…
14a46df 
…2752)

Bumps [go.uber.org/zap](https://github.com/uber-go/zap) from 1.23.0 to 1.24.0.
- [Release notes](https://github.com/uber-go/zap/releases)
- [Changelog](https://github.com/uber-go/zap/blob/master/CHANGELOG.md)
- [Commits](uber-go/zap@v1.23.0...v1.24.0)

---
updated-dependencies:
- dependency-name: go.uber.org/zap
  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>
@dependabot
build(deps): bump github.com/Masterminds/sprig/v3 from 3.2.2 to 3.2.3 (…
887f4ed 
…runatlantis#2753)

Bumps [github.com/Masterminds/sprig/v3](https://github.com/Masterminds/sprig) from 3.2.2 to 3.2.3.
- [Release notes](https://github.com/Masterminds/sprig/releases)
- [Changelog](https://github.com/Masterminds/sprig/blob/master/CHANGELOG.md)
- [Commits](Masterminds/sprig@v3.2.2...v3.2.3)

---
updated-dependencies:
- dependency-name: github.com/Masterminds/sprig/v3
  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/golang-jwt/jwt/v4 from 4.4.2 to 4.4.3 (r…
34ee801 
…unatlantis#2754)

Bumps [github.com/golang-jwt/jwt/v4](https://github.com/golang-jwt/jwt) from 4.4.2 to 4.4.3.
- [Release notes](https://github.com/golang-jwt/jwt/releases)
- [Changelog](https://github.com/golang-jwt/jwt/blob/main/VERSION_HISTORY.md)
- [Commits](golang-jwt/jwt@v4.4.2...v4.4.3)

---
updated-dependencies:
- dependency-name: github.com/golang-jwt/jwt/v4
  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>
@pokgak @nitrocode @jamengual
docs: add example how to customize the conftest command (runatlantis#…
fe207ae 
…2727)

* docs: add example how to customize the conftest command

* fixed PR review comments

* rerun CI

* remove problematic url

Co-authored-by: nitrocode <[email protected]>
Co-authored-by: PePe Amengual <[email protected]>
@jakubigla
docs: Add a new Azure deployment method (runatlantis#2741)
494a63f 
* docs: Add a new Azure deployment method

* docs: Revert the old ACI link while keeping the new one

* docs: Improve wording for Azure deployment
@KivraChristoffer
Update using-slack-hooks.md (runatlantis#2759)
b6e1c61
@michelmzs
fix(gitlab_client): prevent duplicate pipelines in gitlab merge reque…
c800f70 
…sts (runatlantis#2745)

* fix(gitlab_client): change CommitStatus update logic to prevent duplicated pipelines in MRs

* chore: refactor refTarget logic

* chore: fix tests

* chore: fix lint

* chore: remove nested if
@Fabianoshz @nitrocode @jamengual
feat: prevent planning and applying directories outside PR scope usin…
66dc30e 
…g `--restrict-file-list` (runatlantis#2440)

* Add --strict-plan-file-list config

* Update server.go

* Update server-configuration.md

* Update server_test.go

* Run gofmt -w

* Add --strict-plan-file-list for projects

* Add --strict-plan-file-list tests

* Change --strict-plan-file-list to --restrict-file-list

* Update --restrict-file-list documentation

* Update --restrict-file-list and --enable-regexp-cmd documentation

Co-authored-by: Fabiano Honorato <[email protected]>
Co-authored-by: nitrocode <[email protected]>
Co-authored-by: PePe Amengual <[email protected]>
@krrrr38 @nitrocode
Enable or disable repo_locking per repo in repos.yaml and `atlant…
4d95783 
…is.yaml` (runatlantis#2700)

* disable repo locking repos.yaml and atlantis.yaml with allow override

* rename disable_repo_locking into repo_locking

* add both enable/disable repo_locking test

Co-authored-by: nitrocode <[email protected]>
@nitrocode
Bump alpine-3.17 (runatlantis#2768)
f8a2091
nitrocode and others added 12 commits December 11, 2022 00:54
@nitrocode
Bump base to 2022-12-10 (runatlantis#2769)
9ca57d6
@grimm26
docs: terraform version usage after allowing additional `required_ver…
8557172 
…sion` specifiers (runatlantis#2760)

* Clarify the docs about setting the terraform version, especially since
v0.21.0

* Address comments about adding further detail and examples

Also updated versions mentioned to be more recent.
@nitrocode
Separate alpine image (runatlantis#2770)
5773945
@nitrocode
alpine: Pin git=2.38.2-r0 (runatlantis#2773)
cd838c8
@nitrocode
Use correct image suffix for alpine/debian (runatlantis#2774)
7a29286
@nitrocode
Use correct image suffix for alpine/debian (runatlantis#2775)
785b4cf
@nitrocode
Use atlantis-base:2022.12.12 (runatlantis#2772)
82a2f00
@dependabot
build(deps): bump golang.org/x/term from 0.2.0 to 0.3.0 (runatlantis#…
7c054e2 
…2778)

Bumps [golang.org/x/term](https://github.com/golang/term) from 0.2.0 to 0.3.0.
- [Release notes](https://github.com/golang/term/releases)
- [Commits](golang/term@v0.2.0...v0.3.0)

---
updated-dependencies:
- dependency-name: golang.org/x/term
  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>
@dependabot
build(deps): bump github.com/go-test/deep from 1.0.8 to 1.1.0 (runatl…
183c9c1 
…antis#2779)

Bumps [github.com/go-test/deep](https://github.com/go-test/deep) from 1.0.8 to 1.1.0.
- [Release notes](https://github.com/go-test/deep/releases)
- [Changelog](https://github.com/go-test/deep/blob/master/CHANGES.md)
- [Commits](go-test/deep@v1.0.8...v1.1.0)

---
updated-dependencies:
- dependency-name: github.com/go-test/deep
  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>
@DazWorrall @nitrocode
Document the --quiet-policy-checks in the policy check doc (runatla…
a562584 
…ntis#2777)

* Document the `--quiet-policy-checks` in the policy check doc

* Update runatlantis.io/docs/policy-checking.md

Co-authored-by: nitrocode <[email protected]>
@JonGilmore @nitrocode
docs(ha): wording update when using redis (runatlantis#2771)
f974fb5 
* docs(ha): wording update when using redis

Because it is now possible to use redis as a backend locking DB for Atlantis, this FAQ should be updated.

* Update runatlantis.io/docs/faq.md

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

Co-authored-by: nitrocode <[email protected]>
@ghaiszaher
Merge remote-tracking branch 'upstream/main' into merge-upstream
62f0bef 
# Conflicts:
#	server/events/project_locker.go
@ghaiszaher ghaiszaher merged commit 9041bfc into main Dec 12, 2022
@ghaiszaher ghaiszaher deleted the merge-upstream branch December 12, 2022 19:32
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.