From 1ac190075371636efaee1e130d61aee75229aed2 Mon Sep 17 00:00:00 2001
From: Simon Kok <mail@simonkok.com>
Date: Fri, 12 Aug 2022 18:05:47 +0200
Subject: [PATCH 1/2] Chore: Add editorconfig to repo

**Why?**

With editorconfig, editors that are used across our collaborators will
be able to use the same indentation / line lengths and other configuration
settings.

You can find more information on how to install the editorconfig add-on for your
editor on: https://editorconfig.org/

**What?**

Adding specification as currently applied in the files in our repository.
---
 .editorconfig | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)
 create mode 100644 .editorconfig

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 000000000..e4e4be744
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,57 @@
+root = true
+
+[*]
+# Includes all - file types included in the ADF repo:
+# - .ini
+# - .java
+# - .js
+# - .json
+# - .md
+# - .py
+# - .rb
+# - .sh
+# - .ts
+# - .txt
+# - .xml
+# - .yml
+# - .yml.j2
+# - Makefile
+charset = utf-8
+indent_style = space
+indent_size = 2
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+max_line_length = 80
+
+[*.py]
+indent_size = 4
+
+[*.{json,xml,html,ejs}]
+indent_size = 4
+
+[*.{json,yml,yml.j2}]
+max_line_length = 140
+
+[{package.json,package-lock.json}]
+indent_size = 2
+
+[*.java]
+indent_size = 4
+
+[*.md]
+indent_size = unset
+
+[*.txt]
+indent_size = 4
+
+[*.ini]
+indent_size = 4
+
+[tox.ini]
+max_line_length = 120
+
+[Makefile]
+indent_style = tab
+indent_size = 4
+tab_width = 4

From 04dbd7f2f16974123eca4f04bc5edafb6cba43c2 Mon Sep 17 00:00:00 2001
From: Simon Kok <mail@simonkok.com>
Date: Fri, 12 Aug 2022 18:12:14 +0200
Subject: [PATCH 2/2] Minor line length and trailing space fixes

---
 .yamllint        | 4 ++--
 src/template.yml | 7 +++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.yamllint b/.yamllint
index 3e570ed67..332b7476b 100644
--- a/.yamllint
+++ b/.yamllint
@@ -36,5 +36,5 @@ rules:
   octal-values: enable
   quoted-strings: disable
   trailing-spaces: enable
-  truthy: 
-    level: error
\ No newline at end of file
+  truthy:
+    level: error
diff --git a/src/template.yml b/src/template.yml
index f3b99c465..4e0680146 100644
--- a/src/template.yml
+++ b/src/template.yml
@@ -7,7 +7,9 @@ Description: ADF CloudFormation Initial Base Stack for the Master Account in the
 Metadata:
   AWS::ServerlessRepo::Application:
     Name: aws-deployment-framework
-    Description: The AWS Deployment Framework (ADF) is an extensive and flexible framework to manage and deploy resources across multiple AWS accounts and regions based on AWS Organizations.
+    Description: >-
+      The AWS Deployment Framework (ADF) is an extensive and flexible framework to manage and deploy resources across multiple
+      AWS accounts and regions based on AWS Organizations.
     Author: AWS ADF Builders Team
     SpdxLicenseId: Apache-2.0
     LicenseUrl: ../LICENSE.txt
@@ -44,7 +46,8 @@ Parameters:
   DeploymentAccountId:
     Type: String
     Default: ""
-    Description: "Example -> 123456789012 (Only required if you have an existing AWS Account that you wish to use as the deployment account.)"
+    Description: >-
+      Example -> 123456789012 (Only required if you have an existing AWS Account that you wish to use as the deployment account.)
   DeploymentAccountMainRegion:
     Type: String
     Default: ""