Commit Graph

2949 Commits

Author SHA1 Message Date
Dylan Page
ea1dbbdabb fix: actually run GHA workflows on s/releases/release branches (#3966) 2023-11-09 14:13:01 -06:00
Bruno Schaatsbergen
e9c0d72578 fix: use the non-root atlantis user instead of root (#3886)
* feat: use Atlantis user by default and get rid of gosu

* chore: set `DOCKER_CONTENT_TRUST=1`

* chore: fix chmod and chown

* feat: add a healthcheck to the debian and alpine images

* feat: removing setuid and setgid permissions prevents container privilege escalation and improve comments

* chore: remove setgid/setuid as we chown an entire directory

* chore: keep deps comment generic

* chore: grammar

* chore: remove redundant comment

* chore: rm DOCKER_CONTENT_TRUST

* chore: set uid and gid and remove passwd entry

* chore: revert gid and uid set as it's conflicting

---------

Co-authored-by: PePe Amengual <jose.amengual@gmail.com>
2023-11-08 20:25:08 -08:00
renovate[bot]
b965f9ac1a chore(deps): update golang docker tag to v1.21.4 in testing/dockerfile (#3963)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-11-09 04:23:21 +00:00
renovate[bot]
1a9714a91c fix(deps): update github.com/warrensbox/terraform-switcher digest to d7dfd1b in go.mod (#3928)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-11-07 00:47:57 +00:00
Dylan Page
5818334a9a fix(renovate): add release branches to renovate (#3924)
* fix(renovate): This fixes renovate to also autoMerge fixes to our release branches so we don't have to cherry-pick them.

* fix(renovate): run config validator on release branches too
2023-11-05 20:20:15 -08:00
renovate[bot]
1f2f3531e5 fix(deps): update module github.com/spf13/cobra to v1.8.0 in go.mod (#3927)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-11-06 03:07:52 +00:00
renovate[bot]
06e83e8d08 fix(deps): update module github.com/gorilla/websocket to v1.5.1 in go.mod (#3926)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-11-06 03:00:00 +00:00
Dylan Page
886dd96299 refactor(ci): reduce complexity in required workflows (#3925)
* refactor(ci): builds upon work in tests to reduce complexity in requiring workflows

* fix: tweaks and missing outputs

* fix: make sure the new workflows actually run

* fix: consistency with non-required testing image
2023-11-05 21:41:32 -05:00
renovate[bot]
9c6b8d0a96 fix(deps): update module github.com/gorilla/mux to v1.8.1 in go.mod (#3921)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-11-05 04:06:28 +00:00
renovate[bot]
721313f4d8 fix(deps): update module github.com/go-playground/validator/v10 to v10.16.0 in go.mod (#3920)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-11-05 01:06:35 +00:00
Simon Heather
1b45fb1ae1 fix: When GitHub/GitLab Auto-Merge Is Used with Atlantis Pre Workflow Hooks, the PR will be Merged Prematurely (#3880)
* Fix Premature Auto-Merge

* Add CommitStatusUpdater to commandRunner
2023-11-03 22:41:16 -04:00
Simon Heather
3056701c6b fix: Update GitLab Pipeline Type Detection to use Head Pipeline Property (#3887)
* Fix GitLab Mulitple Pipelines

* Add logger to tests and fix test ref

* Add retry to GetMergeRequest

* Update retries

---------

Co-authored-by: PePe Amengual <jose.amengual@gmail.com>
2023-11-03 22:22:12 -04:00
Dylan Page
1dcf234a6b chore: enable cherry-pick-bot.yml (#3918)
https://github.com/googleapis/repo-automation-bots/tree/main/packages/cherry-pick-bot#configuring
2023-11-03 22:13:19 -04:00
Rush Soni
9e6a4d7321 Update Terraform Version for Atlantis (#3914) 2023-11-02 15:40:56 -05:00
renovate[bot]
63739a8bcf chore(deps): update dependency hashicorp/terraform to v1.6.3 in .circleci/config.yml (#3910)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-11-02 00:32:22 +00:00
Luke Massa
8a87d2ef09 fix: Better determine number of expected comments and webhooks in e2e test (#3907)
* fix: Better determine number of expected comments and webhooks in e2e test

* Cleanup
2023-10-31 23:16:34 -07:00
renovate[bot]
f519638d1b fix(deps): update module github.com/redis/go-redis/v9 to v9.3.0 in go.mod (#3906)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-11-01 02:01:32 +00:00
renovate[bot]
febed33c49 fix(deps): update module github.com/google/uuid to v1.4.0 in go.mod (#3902)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-10-27 04:00:16 +00:00
renovate[bot]
d17665fee9 fix(deps): update module go.etcd.io/bbolt to v1.3.8 in go.mod (#3901)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-10-27 01:17:42 +00:00
renovate[bot]
5e1f50b073 chore(deps): update dependency node to v20.9.0 in .node-version (#3896)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-10-25 01:32:56 +00:00
renovate[bot]
ed73d4942b chore(deps): update actions/setup-node action to v4 in .github/workflows/website.yml (#3892)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-10-24 02:14:19 +00:00
renovate[bot]
a542aa8f20 fix(deps): update module github.com/xanzy/go-gitlab to v0.93.2 in go.mod (#3890)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-10-23 00:36:47 +00:00
snorlaX-sleeps
5f1f580a90 docs: Update the GitHub app installation instructions to include a section on manually creating a GitHub app and using it with Atlantis. Add notes on differences with the app created by Atlantis (#3882)
Signed-off-by: snorlaX-sleeps <21spock@gmail.com>

Committer: snorlaX-sleeps <21spock@gmail.com>
2023-10-20 15:26:24 -07:00
Simon Heather
edc9bd9262 feat: Improve GitHub and GitLab Debug Logging (#3876)
* Improve GitHub and GitLab Debug Logging

* Fix formatting

* Fix g.client.Repositories.Get debug message

* Update gitlab_client_test with logger

---------

Co-authored-by: PePe Amengual <jose.amengual@gmail.com>
2023-10-20 08:49:57 -07:00
renovate[bot]
22ab01e433 fix(deps): update module github.com/hashicorp/hcl/v2 to v2.19.1 in go.mod (#3878)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-10-20 01:19:08 +00:00
renovate[bot]
f34e5dbb87 chore(deps): update dependency hashicorp/terraform to v1.6.2 in .circleci/config.yml (#3872)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-10-19 00:25:54 +00:00
renovate[bot]
5b3f0575ca fix(deps): update module github.com/bradleyfalzon/ghinstallation/v2 to v2.8.0 in go.mod (#3871)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-10-18 00:41:41 +00:00
renovate[bot]
cd604c23f6 fix(deps): update module github.com/hashicorp/hcl/v2 to v2.19.0 in go.mod (#3869)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-10-17 01:19:14 +00:00
Rui Chen
23b373e8a6 fix: add misspell check for linting codebase (#3865)
* add misspell check

* lint: fix misspell issues

```
server/events/vcs/instrumented_client.go:46:26: `soley` is a misspelling of `solely` (misspell)
// methods and implement soley any github specific interfaces.
                         ^
server/events/project_command_context_builder.go:49:5: `Conciously` is a misspelling of `Consciously` (misspell)
	// Conciously making this global since it gets flushed periodically anyways
	   ^
server/controllers/events/gitlab_request_parser_validator.go:87:32: `noteable` is a misspelling of `notable` (misspell)
				NoteableType string `json:"noteable_type"`
				                           ^
server/controllers/events/gitlab_request_parser_validator_test.go:351:6: `noteable` is a misspelling of `notable` (misspell)
    "noteable_type": "MergeRequest",
     ^
server/controllers/events/gitlab_request_parser_validator_test.go:359:6: `noteable` is a misspelling of `notable` (misspell)
    "noteable_id": 7,
     ^
server/controllers/events/gitlab_request_parser_validator_test.go:467:6: `noteable` is a misspelling of `notable` (misspell)
    "noteable_type": "Commit",
     ^
server/controllers/events/gitlab_request_parser_validator_test.go:475:6: `noteable` is a misspelling of `notable` (misspell)
    "noteable_id": null,
     ^
server/events/event_parser_test.go:1012:23: `seperate` is a misspelling of `separate` (misspell)
	// If sha changes in seperate PR,
	                     ^
```

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

* add locale setting

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

* Revert "lint: fix misspell issues"

This reverts commit 7cc56afa8e.

* lint: fix some misspell issues

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

---------

Signed-off-by: Rui Chen <rui@chenrui.dev>
Co-authored-by: PePe Amengual <jose.amengual@gmail.com>
2023-10-16 20:17:57 +00:00
Rui Chen
16c373d211 ci: add slack alerting per gotest job failed on main branch (#2975)
update condition

Signed-off-by: Rui Chen <rui@chenrui.dev>
2023-10-16 19:26:44 +00:00
Rui Chen
44d4c71409 deps: bump to use node20 (#3864)
Signed-off-by: Rui Chen <rui@chenrui.dev>
2023-10-16 14:10:13 -04:00
renovate[bot]
c9fe0d76cd chore(deps): update dependency hashicorp/terraform to v1.6.1 in .circleci/config.yml (#3860)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-10-16 04:06:34 +00:00
renovate[bot]
8158de0699 fix(deps): update module github.com/alicebob/miniredis/v2 to v2.31.0 in go.mod (#3861)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-10-16 01:08:31 +00:00
renovate[bot]
c11873eee1 chore(deps): update debian docker tag to v12.2 in dockerfile (#3859)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-10-15 01:11:34 +00:00
renovate[bot]
10289c6eef chore(deps): update dependency node to v18.18.2 in .node-version (#3857)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-10-14 02:06:19 +00:00
renovate[bot]
27010d35dd fix(deps): update module github.com/microcosm-cc/bluemonday to v1.0.26 in go.mod (#3854)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-10-13 01:15:37 +00:00
renovate[bot]
5b33f9f5fc fix(deps): update module github.com/uber-go/tally/v4 to v4.1.10 in go.mod (#3847)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-10-12 20:01:47 +00:00
PePe Amengual
53bc84c1d7 Updating curl (#3850) 2023-10-12 12:25:11 -07:00
renovate[bot]
afc2a57c66 chore(deps): update module golang.org/x/net to v0.17.0 [security] (#3849)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-10-12 16:55:02 +00:00
inFame
6e37887d69 Update testing-locally.md (#3848) 2023-10-12 09:50:13 -07:00
renovate[bot]
41de34a8d9 chore(deps): update golang docker tag to v1.21.3 in testing/dockerfile (#3843)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-10-11 04:23:14 +00:00
renovate[bot]
90f63247ad chore(deps): update dependency node to v18.18.1 in .node-version (#3842)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-10-11 01:11:47 +00:00
Koen van Zuijlen
786e57c1d6 feat: Added disable-unlock-label config option (#3799)
* Added disable-unlock-label config option

* Fixed tests

* Wrote tests + fixed mistakes

* Added docs

* added defaults to docs

---------

Co-authored-by: PePe Amengual <jose.amengual@gmail.com>
2023-10-10 11:02:26 -04:00
Simon Heather
2263d5fd91 Sort the Server Configuration flags into alphabetical order (#3837)
Co-authored-by: PePe Amengual <jose.amengual@gmail.com>
2023-10-09 18:12:52 -07:00
Simon Heather
5c37634a99 Fix repo-level-atlantis-yaml table (#3836)
Co-authored-by: PePe Amengual <jose.amengual@gmail.com>
2023-10-09 18:10:04 -07:00
renovate[bot]
ac778e8b19 fix(deps): update module github.com/xanzy/go-gitlab to v0.93.1 in go.mod (#3840)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-10-10 00:41:16 +00:00
Leandro López
df04456325 Return error on InstrumentedClient.MergePull (#3839)
When the underlying GitHub Client returns an error it gets swallowed
in this wrapper method. Not only that but also the emitted metrics are
wrong, as it counts one error AND success at the same time.

We've found this @grafana when using Atlantis in a massive repository
with many changes per minute, and sometimes Atlantis leave a comment
saying it's automatically merging but then nothing happens. But
checking the logs, we've found the following error message:

    Unable to merge pull, error: merging pull request: PUT
    https://api.github.com/repos/grafana/redacted/pulls/666/merge: 405
    Base branch was modified. Review and try the merge again. []

And because the error is swallowed and `InstrumentedClient.MergePull`
returns `nil`, then `Automerger` fails to leave a comment saying
merging failed.
2023-10-09 14:18:07 -07:00
renovate[bot]
23e897c0f7 fix(deps): update module golang.org/x/term to v0.13.0 in go.mod (#3833)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-10-09 00:32:07 +00:00
renovate[bot]
cee36fc736 fix(deps): update module github.com/xanzy/go-gitlab to v0.93.0 in go.mod (#3831)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-10-08 00:50:18 +00:00
renovate[bot]
aac6667aca fix(deps): update module github.com/spf13/viper to v1.17.0 in go.mod (#3828)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-10-07 02:55:55 +00:00