From 36814c4b45ba45697e1699a7c2c04cf769826a9b Mon Sep 17 00:00:00 2001
From: Anton Babenko <anton@antonbabenko.com>
Date: Tue, 6 Mar 2018 15:24:33 +0100
Subject: [PATCH] Renamed count to created in submodules

---
 .editorconfig                           | 30 +++++++++++++++++++++++++
 .pre-commit-config.yaml                 |  9 ++++++++
 main.tf                                 |  6 ++---
 modules/db_instance/main.tf             |  2 +-
 modules/db_instance/variables.tf        |  4 ++--
 modules/db_parameter_group/main.tf      |  2 +-
 modules/db_parameter_group/variables.tf |  4 ++--
 modules/db_subnet_group/main.tf         |  2 +-
 modules/db_subnet_group/variables.tf    |  4 ++--
 variables.tf                            |  1 -
 10 files changed, 51 insertions(+), 13 deletions(-)
 create mode 100644 .editorconfig
 create mode 100644 .pre-commit-config.yaml

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 00000000..71f67183
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,30 @@
+# EditorConfig is awesome: http://EditorConfig.org
+# Uses editorconfig to maintain consistent coding styles
+
+# top-most EditorConfig file
+root = true
+
+# Unix-style newlines with a newline ending every file
+[*]
+charset = utf-8
+end_of_line = lf
+indent_size = 2
+indent_style = space
+insert_final_newline = true
+max_line_length = 80
+trim_trailing_whitespace = true
+
+[*.{tf,tfvars}]
+indent_size = 2
+indent_style = space
+
+[*.md]
+max_line_length = 0
+trim_trailing_whitespace = false
+
+[Makefile]
+tab_width = 2
+indent_style = tab
+
+[COMMIT_EDITMSG]
+max_line_length = 0
\ No newline at end of file
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
new file mode 100644
index 00000000..974e1339
--- /dev/null
+++ b/.pre-commit-config.yaml
@@ -0,0 +1,9 @@
+repos:
+- repo: git://github.com/antonbabenko/pre-commit-terraform
+  sha: v1.5.0
+  hooks:
+    - id: terraform_fmt
+- repo: git://github.com/pre-commit/pre-commit-hooks
+  sha: v1.2.0
+  hooks:
+    - id: check-merge-conflict
diff --git a/main.tf b/main.tf
index 5bfd714f..279ff1c6 100644
--- a/main.tf
+++ b/main.tf
@@ -9,7 +9,7 @@ locals {
 module "db_subnet_group" {
   source = "./modules/db_subnet_group"
 
-  count       = "${local.enable_create_db_subnet_group}"
+  create      = "${local.enable_create_db_subnet_group}"
   identifier  = "${var.identifier}"
   name_prefix = "${var.identifier}-"
   subnet_ids  = ["${var.subnet_ids}"]
@@ -23,7 +23,7 @@ module "db_subnet_group" {
 module "db_parameter_group" {
   source = "./modules/db_parameter_group"
 
-  count       = "${var.create_db_parameter_group}"
+  create      = "${var.create_db_parameter_group}"
   identifier  = "${var.identifier}"
   name_prefix = "${var.identifier}-"
   family      = "${var.family}"
@@ -39,7 +39,7 @@ module "db_parameter_group" {
 module "db_instance" {
   source = "./modules/db_instance"
 
-  count             = "${var.create_db_instance}"
+  create            = "${var.create_db_instance}"
   identifier        = "${var.identifier}"
   engine            = "${var.engine}"
   engine_version    = "${var.engine_version}"
diff --git a/modules/db_instance/main.tf b/modules/db_instance/main.tf
index f92017a8..4ec97f59 100644
--- a/modules/db_instance/main.tf
+++ b/modules/db_instance/main.tf
@@ -17,7 +17,7 @@ resource "aws_iam_role_policy_attachment" "enhanced_monitoring" {
 }
 
 resource "aws_db_instance" "this" {
-  count = "${var.count ? 1 : 0}"
+  count = "${var.create ? 1 : 0}"
 
   identifier = "${var.identifier}"
 
diff --git a/modules/db_instance/variables.tf b/modules/db_instance/variables.tf
index 2ec965f6..b88063d4 100644
--- a/modules/db_instance/variables.tf
+++ b/modules/db_instance/variables.tf
@@ -1,6 +1,6 @@
-variable "count" {
+variable "create" {
   description = "Whether to create this resource or not?"
-  default     = 1
+  default     = true
 }
 
 variable "identifier" {
diff --git a/modules/db_parameter_group/main.tf b/modules/db_parameter_group/main.tf
index 1eea031b..19d13cf4 100644
--- a/modules/db_parameter_group/main.tf
+++ b/modules/db_parameter_group/main.tf
@@ -2,7 +2,7 @@
 # DB parameter group
 #####################
 resource "aws_db_parameter_group" "this" {
-  count = "${var.count ? 1 : 0}"
+  count = "${var.create ? 1 : 0}"
 
   name_prefix = "${var.name_prefix}"
   description = "Database parameter group for ${var.identifier}"
diff --git a/modules/db_parameter_group/variables.tf b/modules/db_parameter_group/variables.tf
index 70e7f760..ef593389 100644
--- a/modules/db_parameter_group/variables.tf
+++ b/modules/db_parameter_group/variables.tf
@@ -1,6 +1,6 @@
-variable "count" {
+variable "create" {
   description = "Whether to create this resource or not?"
-  default     = 1
+  default     = true
 }
 
 variable "name_prefix" {
diff --git a/modules/db_subnet_group/main.tf b/modules/db_subnet_group/main.tf
index 1a13c83c..61938534 100644
--- a/modules/db_subnet_group/main.tf
+++ b/modules/db_subnet_group/main.tf
@@ -2,7 +2,7 @@
 # DB subnet group
 ##################
 resource "aws_db_subnet_group" "this" {
-  count = "${var.count ? 1 : 0}"
+  count = "${var.create ? 1 : 0}"
 
   name_prefix = "${var.name_prefix}"
   description = "Database subnet group for ${var.identifier}"
diff --git a/modules/db_subnet_group/variables.tf b/modules/db_subnet_group/variables.tf
index a7317182..e26e4b99 100644
--- a/modules/db_subnet_group/variables.tf
+++ b/modules/db_subnet_group/variables.tf
@@ -1,6 +1,6 @@
-variable "count" {
+variable "create" {
   description = "Whether to create this resource or not?"
-  default     = 1
+  default     = true
 }
 
 variable "name_prefix" {
diff --git a/variables.tf b/variables.tf
index bc965d91..6e894bc9 100644
--- a/variables.tf
+++ b/variables.tf
@@ -205,4 +205,3 @@ variable "create_db_instance" {
   description = "Whether to create a database instance"
   default     = true
 }
-