Merge pull request #279 from cisagov/improvement/alphabetization

Alphabetize parts of the the Terraform configurations

terraform-build-user/backend.tf

@@ -1,10 +1,10 @@
 terraform {
   backend "s3" {
-    encrypt        = true
     bucket         = "cisa-cool-terraform-state"
     dynamodb_table = "terraform-state-lock"
+    encrypt        = true
+    key            = "skeleton-packer/terraform-build-user.tfstate"
     profile        = "cool-terraform-backend"
     region         = "us-east-1"
-    key            = "skeleton-packer/terraform-build-user.tfstate"
   }
 }

terraform-build-user/main.tf

@@ -4,8 +4,8 @@ module "iam_user" {
   providers = {
     aws                       = aws
     aws.images-production-ami = aws.images-production-ami
-    aws.images-staging-ami    = aws.images-staging-ami
     aws.images-production-ssm = aws.images-production-ssm
+    aws.images-staging-ami    = aws.images-staging-ami
     aws.images-staging-ssm    = aws.images-staging-ssm
   }
 

terraform-build-user/providers.tf

@@ -9,8 +9,8 @@ locals {
   caller_user_name = replace(data.aws_caller_identity.terraform_backend.user_id, ":", ".")
 
   tags = {
-    Team        = "CISA - Development"
     Application = "skeleton-packer"
+    Team        = "CISA - Development"
   }
 }
 

terraform-build-user/remote_states.tf

@@ -8,12 +8,12 @@ data "terraform_remote_state" "images_parameterstore_production" {
   backend = "s3"
 
   config = {
-    encrypt        = true
     bucket         = "cisa-cool-terraform-state"
     dynamodb_table = "terraform-state-lock"
+    encrypt        = true
+    key            = "cool-images-parameterstore/terraform.tfstate"
     profile        = "cool-terraform-backend"
     region         = "us-east-1"
-    key            = "cool-images-parameterstore/terraform.tfstate"
   }
 
   workspace = "production"
@@ -23,12 +23,12 @@ data "terraform_remote_state" "images_parameterstore_staging" {
   backend = "s3"
 
   config = {
-    encrypt        = true
     bucket         = "cisa-cool-terraform-state"
     dynamodb_table = "terraform-state-lock"
+    encrypt        = true
+    key            = "cool-images-parameterstore/terraform.tfstate"
     profile        = "cool-terraform-backend"
     region         = "us-east-1"
-    key            = "cool-images-parameterstore/terraform.tfstate"
   }
 
   workspace = "staging"
@@ -38,12 +38,12 @@ data "terraform_remote_state" "images_production" {
   backend = "s3"
 
   config = {
-    encrypt        = true
     bucket         = "cisa-cool-terraform-state"
     dynamodb_table = "terraform-state-lock"
+    encrypt        = true
+    key            = "cool-accounts/images.tfstate"
     profile        = "cool-terraform-backend"
     region         = "us-east-1"
-    key            = "cool-accounts/images.tfstate"
   }
 
   workspace = "production"
@@ -53,12 +53,12 @@ data "terraform_remote_state" "images_staging" {
   backend = "s3"
 
   config = {
-    encrypt        = true
     bucket         = "cisa-cool-terraform-state"
     dynamodb_table = "terraform-state-lock"
+    encrypt        = true
+    key            = "cool-accounts/images.tfstate"
     profile        = "cool-terraform-backend"
     region         = "us-east-1"
-    key            = "cool-accounts/images.tfstate"
   }
 
   workspace = "staging"
@@ -68,12 +68,12 @@ data "terraform_remote_state" "users" {
   backend = "s3"
 
   config = {
-    encrypt        = true
     bucket         = "cisa-cool-terraform-state"
     dynamodb_table = "terraform-state-lock"
+    encrypt        = true
+    key            = "cool-accounts/users.tfstate"
     profile        = "cool-terraform-backend"
     region         = "us-east-1"
-    key            = "cool-accounts/users.tfstate"
   }
 
   workspace = "production"

terraform-post-packer/backend.tf

@@ -1,10 +1,10 @@
 terraform {
   backend "s3" {
-    encrypt        = true
     bucket         = "cisa-cool-terraform-state"
     dynamodb_table = "terraform-state-lock"
+    encrypt        = true
+    key            = "skeleton-packer/terraform-post-packer.tfstate"
     profile        = "cool-terraform-backend"
     region         = "us-east-1"
-    key            = "skeleton-packer/terraform-post-packer.tfstate"
   }
 }

terraform-post-packer/providers.tf

@@ -1,7 +1,7 @@
 locals {
   tags = {
-    Team        = "CISA - Development"
     Application = "skeleton-packer"
+    Team        = "CISA - Development"
   }
 }
 

terraform-post-packer/variables.tf

@@ -5,13 +5,13 @@
 # ------------------------------------------------------------------------------
 
 variable "extraorg_account_ids" {
-  type        = list(string)
-  description = "A list of AWS account IDs corresponding to \"extra\" accounts with which you want to share this AMI (e.g. [\"123456789012\"]).  Normally this variable is used to share an AMI with accounts that are not a member of the same AWS Organization as the account that owns the AMI."
   default     = []
+  description = "A list of AWS account IDs corresponding to \"extra\" accounts with which you want to share this AMI (e.g. [\"123456789012\"]).  Normally this variable is used to share an AMI with accounts that are not a member of the same AWS Organization as the account that owns the AMI."
+  type        = list(string)
 }
 
 variable "recent_ami_count" {
-  type        = number
-  description = "The number of most-recent AMIs for which to grant launch permission (e.g. \"3\").  If this variable is set to three, for example, then accounts will be granted permission to launch the three most recent AMIs (or all most recent AMIs, if there are only one or two of them in existence)."
   default     = 12
+  description = "The number of most-recent AMIs for which to grant launch permission (e.g. \"3\").  If this variable is set to three, for example, then accounts will be granted permission to launch the three most recent AMIs (or all most recent AMIs, if there are only one or two of them in existence)."
+  type        = number
 }