Skip to content

Commit 0ebeb46

Browse files
authored
chore: Fix tf format and add Editor config (#10)
1 parent 57178ce commit 0ebeb46

File tree

9 files changed

+69
-35
lines changed

9 files changed

+69
-35
lines changed

.editorconfig

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
# top-most EditorConfig file
2+
root = true
3+
4+
# Unix-style newlines with a newline ending every file
5+
[*]
6+
end_of_line = lf
7+
insert_final_newline = true
8+
trim_trailing_whitespace = true
9+
10+
# Override for Makefile
11+
[{Makefile,makefile,GNUmakefile}]
12+
indent_style = tab
13+
indent_size = 4
14+
15+
[Makefile.*]
16+
indent_style = tab
17+
indent_size = 4
18+
19+
[{*.yaml,*.yml,*.md}]
20+
indent_style = space
21+
indent_size = 2
22+
23+
[*.sh]
24+
indent_style = tab
25+
indent_size = 2
26+
27+
[*.{tf,tfvars,tpl,variant}]
28+
indent_style = space
29+
indent_size = 2
30+
31+
[*.json]
32+
insert_final_newline = false

.github/renovate.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
"extends": [
44
"config:base"
55
]
6-
}
6+
}

.github/settings.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@ repository:
55
description: This component is responsible for provisioning Argo CD
66
homepage: https://cloudposse.com/accelerate
77
topics: terraform, terraform-component
8+

README.md

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

README.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ description: |-
316316
Here's a configuration for letting argocd send notifications back to GitHub:
317317
318318
1. [Create GitHub PAT](https://docs.github.com/en/[email protected]/authentication/keeping-your-account-and-data-secure/managing-your-personal-access-tokens#creating-a-personal-access-token)
319-
with scope `repo:status`
319+
with scope `repo:status`
320320
2. Save the PAT to SSM `/argocd/notifications/notifiers/common/github-token`
321321
3. Use this atmos stack configuration
322322
@@ -335,7 +335,7 @@ description: |-
335335
Here's a configuration Github notify ArgoCD on commit:
336336
337337
1. [Create GitHub PAT](https://docs.github.com/en/[email protected]/authentication/keeping-your-account-and-data-secure/managing-your-personal-access-tokens#creating-a-personal-access-token)
338-
with scope `admin:repo_hook`
338+
with scope `admin:repo_hook`
339339
2. Save the PAT to SSM `/argocd/github/api_key`
340340
3. Use this atmos stack configuration
341341
@@ -400,13 +400,13 @@ description: |-
400400
ArgoCD supports Slack notifications on application deployments.
401401
402402
1. In order to enable Slack notifications, first create a Slack Application following the
403-
[ArgoCD documentation](https://argocd-notifications.readthedocs.io/en/stable/services/slack/).
403+
[ArgoCD documentation](https://argocd-notifications.readthedocs.io/en/stable/services/slack/).
404404
1. Create an OAuth token for the new Slack App
405405
1. Save the OAuth token to AWS SSM Parameter Store in the same account and region as Github tokens. For example,
406-
`core-use2-auto`
406+
`core-use2-auto`
407407
1. Add the app to the chosen Slack channel. _If not added, notifications will not work_
408408
1. For this component, enable Slack integrations for each Application with `var.slack_notifications_enabled` and
409-
`var.slack_notifications`:
409+
`var.slack_notifications`:
410410
411411
```yaml
412412
slack_notifications_enabled: true
@@ -415,7 +415,7 @@ description: |-
415415
```
416416
417417
6. In the `argocd-repo` component, set `var.slack_notifications_channel` to the name of the Slack notification channel
418-
to add the relevant ApplicationSet annotations
418+
to add the relevant ApplicationSet annotations
419419
420420
## Troubleshooting
421421

docs/.gitkeep

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+

src/CHANGELOG.md

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,22 @@ This is a bug fix and feature enhancement update. There are few actions necessar
1010
## Upgrade actions
1111

1212
1. Update atmos stack yaml config
13-
1. Add `github_default_notifications_enabled: true`
14-
2. Add `github_webhook_enabled: true`
15-
3. Remove `notifications_triggers`
16-
4. Remove `notifications_templates`
17-
5. Remove `notifications_notifiers`
13+
1. Add `github_default_notifications_enabled: true`
14+
2. Add `github_webhook_enabled: true`
15+
3. Remove `notifications_triggers`
16+
4. Remove `notifications_templates`
17+
5. Remove `notifications_notifiers`
1818

1919
```diff
2020
components:
21-
terraform:
22-
argocd:
23-
settings:
24-
spacelift:
25-
workspace_enabled: true
26-
metadata:
27-
component: eks/argocd
28-
vars:
21+
terraform:
22+
argocd:
23+
settings:
24+
spacelift:
25+
workspace_enabled: true
26+
metadata:
27+
component: eks/argocd
28+
vars:
2929
+ github_default_notifications_enabled: true
3030
+ github_webhook_enabled: true
3131
- notifications_triggers:
@@ -49,7 +49,7 @@ This is a bug fix and feature enhancement update. There are few actions necessar
4949
```
5050

5151
2. Move secrets from `/argocd/notifications/notifiers/service_webhook_github-commit-status/github-token` to
52-
`argocd/notifications/notifiers/common/github-token`
52+
`argocd/notifications/notifiers/common/github-token`
5353

5454
```bash
5555
chamber read -q argocd/notifications/notifiers/service_webhook_github-commit-status github-token | chamber write argocd/notifications/notifiers/common github-token

src/README.md

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/context.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -264,8 +264,8 @@ variable "descriptor_formats" {
264264
Describe additional descriptors to be output in the `descriptors` output map.
265265
Map of maps. Keys are names of descriptors. Values are maps of the form
266266
`{
267-
format = string
268-
labels = list(string)
267+
format = string
268+
labels = list(string)
269269
}`
270270
(Type is `any` so the map values can later be enhanced to provide additional options.)
271271
`format` is a Terraform format string to be passed to the `format()` function.

0 commit comments

Comments
 (0)