Skip to content

Commit c14b5d0

Browse files
authored
Merge branch 'main' into update-legacy-splat-operator
2 parents b3e0e2d + 62ccce8 commit c14b5d0

File tree

8 files changed

+57
-7
lines changed

8 files changed

+57
-7
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/CODEOWNERS

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,22 @@
44
# Order is important: the last matching pattern has the highest precedence
55

66
# These owners will be the default owners for everything
7-
* @cloudposse-terraform-components/engineering @cloudposse-terraform-components/admins
7+
* @cloudposse-terraform-components/engineering @cloudposse-terraform-components/contributors
8+
9+
# Cloud Posse must review any changes to Makefiles
10+
**/Makefile @cloudposse-terraform-components/engineering
11+
**/Makefile.* @cloudposse-terraform-components/engineering
12+
13+
# Cloud Posse must review any changes to GitHub actions
14+
.github/* @cloudposse-terraform-components/engineering
15+
16+
# Cloud Posse must review any changes to standard context definition,
17+
# but some changes can be rubber-stamped.
18+
**/*.tf @cloudposse-terraform-components/engineering @cloudposse-terraform-components/contributors @cloudposse-terraform-components/approvers
19+
README.yaml @cloudposse-terraform-components/engineering @cloudposse-terraform-components/contributors @cloudposse-terraform-components/approvers
20+
README.md @cloudposse-terraform-components/engineering @cloudposse-terraform-components/contributors @cloudposse-terraform-components/approvers
21+
docs/*.md @cloudposse-terraform-components/engineering @cloudposse-terraform-components/contributors @cloudposse-terraform-components/approvers
22+
23+
# Cloud Posse Admins must review all changes to CODEOWNERS or the mergify configuration
24+
.github/mergify.yml @cloudposse-terraform-components/admins
25+
.github/CODEOWNERS @cloudposse-terraform-components/admins

.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: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,3 @@ repository:
55
description: This component installs the Stakater Reloader for EKS clusters
66
homepage: https://cloudposse.com/accelerate
77
topics: terraform, terraform-component
8-

README.md

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/.gitkeep

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

src/README.md

Lines changed: 1 addition & 1 deletion
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)