From 7066304d3fa4b6a3e8ad5a86f64df4861f412387 Mon Sep 17 00:00:00 2001 From: Igor Rodionov Date: Fri, 3 Jan 2025 20:36:55 +0100 Subject: [PATCH] chore: Fix tf format and add Editor config --- .editorconfig | 32 ++++++++++++++++++++++++++++++++ .github/renovate.json | 2 +- .github/settings.yml | 1 + docs/.gitkeep | 1 + src/CHANGELOG.md | 4 ++-- src/context.tf | 4 ++-- 6 files changed, 39 insertions(+), 5 deletions(-) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..e282a8e --- /dev/null +++ b/.editorconfig @@ -0,0 +1,32 @@ +# top-most EditorConfig file +root = true + +# Unix-style newlines with a newline ending every file +[*] +end_of_line = lf +insert_final_newline = true +trim_trailing_whitespace = true + +# Override for Makefile +[{Makefile,makefile,GNUmakefile}] +indent_style = tab +indent_size = 4 + +[Makefile.*] +indent_style = tab +indent_size = 4 + +[{*.yaml,*.yml,*.md}] +indent_style = space +indent_size = 2 + +[*.sh] +indent_style = tab +indent_size = 2 + +[*.{tf,tfvars,tpl,variant}] +indent_style = space +indent_size = 2 + +[*.json] +insert_final_newline = false diff --git a/.github/renovate.json b/.github/renovate.json index 47cf066..2921be4 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -3,4 +3,4 @@ "extends": [ "config:base" ] -} +} \ No newline at end of file diff --git a/.github/settings.yml b/.github/settings.yml index b3a6428..c168bf9 100644 --- a/.github/settings.yml +++ b/.github/settings.yml @@ -5,3 +5,4 @@ repository: description: This component creates a Helm release for alb-controller on an EKS cluster homepage: https://cloudposse.com/accelerate topics: terraform, terraform-component + diff --git a/docs/.gitkeep b/docs/.gitkeep index e69de29..8b13789 100644 --- a/docs/.gitkeep +++ b/docs/.gitkeep @@ -0,0 +1 @@ + diff --git a/src/CHANGELOG.md b/src/CHANGELOG.md index 638dd2e..c958f4f 100644 --- a/src/CHANGELOG.md +++ b/src/CHANGELOG.md @@ -23,9 +23,9 @@ complete JSON policy document that is updated as needed. In this release: 1. We have updated the policy to the one distributed with version 2.6.0 of the ALB controller. This fixes an issue where - the controller was not able to create the service-linked role for the Elastic Load Balancing service. + the controller was not able to create the service-linked role for the Elastic Load Balancing service. 2. To ease maintenance, we have moved the policy document to a separate file, `distributed-iam-policy.tf` and made it - easy to update or override. + easy to update or override. #### Gov Cloud and China Regions diff --git a/src/context.tf b/src/context.tf index 5e0ef88..e7dd3ea 100644 --- a/src/context.tf +++ b/src/context.tf @@ -264,8 +264,8 @@ variable "descriptor_formats" { Describe additional descriptors to be output in the `descriptors` output map. Map of maps. Keys are names of descriptors. Values are maps of the form `{ - format = string - labels = list(string) + format = string + labels = list(string) }` (Type is `any` so the map values can later be enhanced to provide additional options.) `format` is a Terraform format string to be passed to the `format()` function.