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

Rebase our changes on top of mainline #59

Closed
wants to merge 861 commits into from
Closed

Rebase our changes on top of mainline #59

wants to merge 861 commits into from

Conversation

DragosDumitrache
Copy link

No description provided.

@DragosDumitrache
Copy link
Author

This branch will show up as having conflicts as our changes have been cherry-picked and rebased on top of their master branch.

erpel and others added 17 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 and others added 10 commits October 24, 2022 23:46
@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
nitrocode and others added 10 commits January 18, 2023 00:19
@nitrocode
set ATLANTIS_BASE_TAG_DATE=latest (runatlantis#2997)
be642b4
@nitrocode
chore(docker): rm setup-golang from atlantis image workflow (runatlan…
823f9e2 
…tis#2989)
@nitrocode
chore(deps): website: upgrade vuepress 1.x to 2.x (runatlantis#2980)
b248299 
* Upgrade vuepress to 2.x

* Add i18n support

* Apply suggestions from code review

* Update runatlantis.io/.vuepress/config.js

* Update runatlantis.io/es/README.md

* Delete README.md

* Delete README.md

* Delete README.md

* Update runatlantis.io/.vuepress/config.js

* Update runatlantis.io/.vuepress/config.js

* Update config.js

* Use Overview name for specific children

* Add comment for algolia API key

* Register Home.vue

* Convert Home.vue stylus to SCSS

* Regenerate yarn.lock

* Regenerate yarn.lock

* Regenerate yarn.lock

* Regenerate yarn.lock

* Regenerate yarn.lock
@nitrocode
Add "in production since 2017" (runatlantis#3004)
eb4ae85
@nitrocode @chenrui333
chore(docker): bump-git-2.39 (runatlantis#2998)
e8dac17 
* bump-git-2.39

* install latest git

* Update docker-base/Dockerfile.alpine

Co-authored-by: Rui Chen <[email protected]>
@nitrocode
chore: release v0.22.3 (runatlantis#3005)
ec54d83
@krrrr38
fix: PR status summary should remove Note: Objects have changed outsi…
9e3d887 
…de of Terraform (runatlantis#3010)

* extract PlanSuccess.DiffSummary

* commit status updater use DiffSummary instead Summary to show only diff result
@krrrr38
feat: state rm (runatlantis#2880)
cb0aadf 
* feat: state rm

* review feedback

* fix conflict for pegomock generation code

* adopt state command into allow-commands

* fix conflicts

* fix: state rm works on workspace

* notify import/state rm discard plan file

* fix lint

* use repeat instead warning for re-plan

* perl -pi -e 's!\* 🔁 plan file was discarded. to!🚮 A plan file was discarded. Re-plan would be required before applying.\n\n\* 🔁 To!g' server/**/*

* follow main branch
@nitrocode
fix: runatlantis.io search (runatlantis#3012)
7911171 
* Add locales to docsearch

* add algolia appId
@krrrr38
fix: markdown renderer use invalid disableApply flag with disableMark…
f8eba4b 
…downFolding (runatlantis#3016)
@DragosDumitrache DragosDumitrache requested a deployment to compute-lab January 20, 2023 11:10 Abandoned
@DragosDumitrache DragosDumitrache requested a deployment to lab January 20, 2023 11:13 Abandoned
@DragosDumitrache DragosDumitrache requested a deployment to lab January 20, 2023 11:22 Abandoned
@DragosDumitrache DragosDumitrache requested a deployment to lab January 20, 2023 11:38 Abandoned
@sam-robson sam-robson requested a deployment to lab January 20, 2023 12:09 Abandoned
lawrencejones and others added 11 commits January 20, 2023 14:36
@lawrencejones
Permit docker builds for GoCardless
e283bfb 
Instead of using the deployment flow atlantis have built, adjust this
repository to support GC container builds.
@lawrencejones
Support using repo configuration from a branch
5bf4396 
Instead of using the atlantis.yaml file present in the pull request
branch, allow users to specify a branch that contains an approved
version of atlantis.yaml. This allows enabling things like approval
requirement overrides for repo config, while ensuring a user can't
simply change the configuration to drop an approval requirement in the
branch they're currently working on.

An example would be creating a server-side configuration like this:

```yaml
---
repos:
  - id: github.com/gocardless/app
    apply_requirements: [approved, mergeable]
    allowed_overrides: [apply_requirements, workflow]
    allow_custom_workflows: false
    config_source_branch: master
workflows:
  lab:
    plan:
      steps:
        - init
        - plan:
            extra_args: [-var-file, lab.tfvars]
  prd:
    plan:
      steps:
        - init
        - plan:
            extra_args: [-var-file, prd.tfvars]
```

Specifying a rigid workflows that become all that is available to run in
gocardless/app. Now the application (gocardless/app) would create an
atlantis.yaml at the root of the repo, like so:

```
---
version: 2
projects:
  - dir: terraform/google/projects/apps
    apply_requirements: []
    workspace: lab
    workflow: lab
  - dir: terraform/google/projects/apps
    apply_requirements: [approved]
    workspace: prd
    workflow: prd
```

Because config_source_branch is set to master, when someone creates a PR
against gocardless/apps, the atlantis.yaml that specifies whether a
project has an approved apply_requirement is from the master branch. As
is a common pattern, merging to master is protected by an authorised
code-review, allowing us to have two types of environment for this
project:

- lab, where you can plan and apply without approval
- prd, where you can only apply once the PR is approved
@dyson
Delete vendor
328bb82
@dyson
Fixup int to string
cc05f58 
Resolves this issue after upgrade to go 1.14:
server/events/db/boltdb.go:150:87: conversion from int to string yields a string of one rune, not a string of digits (did you mean fmt.Sprint(x)?)
Fix logging pointers
a078d08 
Pass in remaining parameters to warnDiverged
Pass remainder of slices in to mock
2078395
Bring back previously made changes to support docker builds for GC
55eac8c 
See [this
commit](27ce263)
for more information
Update dev dockerfile to match full dockerfile
46feeac
Update post hook to include the additional branches logic
d34f61d
Fix pre workflow hook
7261585
Add config source branch back to raw config
8485531 
This was previously not getting parsed anymore
@DragosDumitrache DragosDumitrache deleted the update-cherry-pick branch January 30, 2023 15: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.