Merge https://github.com/cisagov/skeleton-ansible-role-with-test-user …

…into lineage/skeleton

# Conflicts:
#	terraform/outputs.tf
#	terraform/user.tf

terraform/outputs.tf

@@ -1,7 +1,7 @@
 output "access_key" {
-  value       = module.user.access_key
   description = "The IAM access key associated with the CI IAM user created by this module."
   sensitive   = true
+  value       = module.user.access_key
 }
 
 <<<<<<< HEAD
@@ -25,12 +25,15 @@ output "staging_role" {
   description = "The IAM role that the CI user can assume to read SSM parameters in the staging account."
 =======
 output "role" {
-  value       = module.user.role
   description = "The IAM role that the CI user can assume to read SSM parameters in the Images account."
+<<<<<<< HEAD
 >>>>>>> 8cc1712a5cae219f786b8e03c4ff6941296f89c1
+=======
+  value       = module.user.role
+>>>>>>> 26819a903c52b39dce7b3673f54402d3d281fba3
 }
 
 output "user" {
-  value       = module.user.user
   description = "The CI IAM user created by this module."
+  value       = module.user.user
 }

terraform/user.tf

@@ -38,7 +38,15 @@ resource "aws_iam_role_policy_attachment" "thirdpartybucketread_staging" {
     aws.images-ssm              = aws.images_ssm
   }
 
+<<<<<<< HEAD
   entity         = "skeleton-ansible-role-with-test-user"
   ssm_parameters = ["/example/parameter"]
 >>>>>>> 8cc1712a5cae219f786b8e03c4ff6941296f89c1
+=======
+  entity = "skeleton-ansible-role-with-test-user"
+
+  # If necessary, provide a list of SSM parameters that the test user needs to
+  # be able to read
+  # ssm_parameters = ["/example/parameter"]
+>>>>>>> 26819a903c52b39dce7b3673f54402d3d281fba3
 }

terraform/variables.tf

@@ -6,6 +6,7 @@
 
 variable "terraform_state_bucket" {
   description = "The name of the S3 bucket where Terraform state is stored."
+  nullable    = false
   type        = string
 }
 
@@ -16,9 +17,10 @@ variable "terraform_state_bucket" {
 # ------------------------------------------------------------------------------
 
 variable "aws_region" {
-  type        = string
-  description = "The AWS region to deploy into (e.g. us-east-1)."
   default     = "us-east-1"
+  description = "The AWS region to deploy into (e.g. us-east-1)."
+  nullable    = false
+  type        = string
 }
 
 variable "production_bucket_name" {
@@ -38,11 +40,11 @@ variable "nessus_package_pattern" {
 }
 
 variable "tags" {
-  type        = map(string)
-  description = "Tags to apply to all AWS resources created"
-
   default = {
     Team        = "VM Fusion - Development"
     Application = "ansible-role-nessus testing"
   }
+  description = "Tags to apply to all AWS resources created"
+  nullable    = false
+  type        = map(string)
 }