add config to split into submodules

terraform-modules · Nov 4, 2020 · e1ca878 · e1ca878
1 parent af8c9c3
commit e1ca878
Show file tree

Hide file tree

Showing 18 changed files with 65 additions and 20 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,3 +12,15 @@
 
 * v1.2 -- 20201104
   - fix s3 bucket permission to not output statement with deny if no IP and VPCE provided
+
+* v2.0 -- 20201104
+  - change to aws-s3
+  - create submodules `standard` and `title26`
+  - standard
+    - no versioning
+    - no explicit boc:authority tag
+    - auto create encryption key if not provided already
+  - title26
+    - versioning
+    - explicit boc:authority tag
+    - auto create encryption key
diff --git a/outputs.tf → common/outputs.tf b/outputs.tf → common/outputs.tf
diff --git a/prefixes.tf → common/prefixes.tf b/prefixes.tf → common/prefixes.tf
diff --git a/main.tf → common/resources.tf b/main.tf → common/resources.tf
@@ -1,18 +1,3 @@
-/* 
-* # About aws-t26-s3
-* 
-* # Usage 
-*
-* ```hcl
-* module "mybucket" {
-*   source = "git@github.e.it.census.gov:terraform-modules/aws-t26-s3.git"
-*
-*   bucket_name = "myt26bucket"
-* }
-* ```
-* 
-*/
-
 locals {
   name        = var.bucket_name
   bucket_name = format("%s%s", local._prefixes["s3"], var.bucket_name)
@@ -34,9 +19,9 @@ locals {
   s3_bucket_conditions_list = list(local.condition_allowed_cidr, local.condition_allowed_endpoints)
   s3_bucket_conditions      = [for x in local.s3_bucket_conditions_list : x if length(x.values) > 0]
 
-  enforced_tags = {
-    "boc:safeguard" = "title26"
-  }
+  #  enforced_tags = {
+  #    "boc:safeguard" = "title26"
+  #  }
   base_tags = {
     "boc:tf_module_version" = var._module_version
     "boc:created_by"        = "terraform"
@@ -61,7 +46,7 @@ resource "aws_s3_bucket" "this" {
   }
 
   versioning {
-    enabled = true
+    enabled = local.versioning
   }
 
   logging {

diff --git a/variables.tf → common/variables.tf b/variables.tf → common/variables.tf
diff --git a/version.tf → common/version.tf b/version.tf → common/version.tf
@@ -1,5 +1,5 @@
 variable "_module_version" {
   description = "Module version number"
   type        = string
-  default     = "1.2"
+  default     = "2.0"
 }
diff --git a/standard/main.tf b/standard/main.tf
@@ -0,0 +1,18 @@
+/* 
+* # About aws-s3
+* 
+* # Usage 
+*
+* ```hcl
+* module "mybucket" {
+*   source = "git@github.e.it.census.gov:terraform-modules/aws-s3//standard"
+*
+*   bucket_name = "mynormalbucket"
+* }
+* ```
+* 
+*/
+locals {
+  enforced_tags = {}
+  versioning    = false
+}
diff --git a/standard/outputs.tf b/standard/outputs.tf
@@ -0,0 +1 @@
+../common/outputs.tf
diff --git a/standard/prefixes.tf b/standard/prefixes.tf
@@ -0,0 +1 @@
+../common/prefixes.tf
diff --git a/standard/resources.tf b/standard/resources.tf
@@ -0,0 +1 @@
+../common/resources.tf
diff --git a/standard/variables.tf b/standard/variables.tf
@@ -0,0 +1 @@
+../common/variables.tf
diff --git a/standard/version.tf b/standard/version.tf
@@ -0,0 +1 @@
+../common/version.tf
diff --git a/title26/main.tf b/title26/main.tf
@@ -0,0 +1,20 @@
+/* 
+* # About aws-s3
+* 
+* # Usage 
+*
+* ```hcl
+* module "mybucket" {
+*   source = "git@github.e.it.census.gov:terraform-modules/aws-s3//title26"
+*
+*   bucket_name = "myt26bucket"
+* }
+* ```
+* 
+*/
+locals {
+  enforced_tags = {
+    "boc:safeguard" = "title26"
+  }
+  versioning = true
+}
diff --git a/title26/outputs.tf b/title26/outputs.tf
@@ -0,0 +1 @@
+../common/outputs.tf
diff --git a/title26/prefixes.tf b/title26/prefixes.tf
@@ -0,0 +1 @@
+../common/prefixes.tf
diff --git a/title26/resources.tf b/title26/resources.tf
@@ -0,0 +1 @@
+../common/resources.tf
diff --git a/title26/variables.tf b/title26/variables.tf
@@ -0,0 +1 @@
+../common/variables.tf
diff --git a/title26/version.tf b/title26/version.tf
@@ -0,0 +1 @@
+../common/version.tf