Merge main and output (#2)

* Merge main and output * Fix structure * Rename chamber structur
cloudposse · May 21, 2018 · d2d91ab · d2d91ab
1 parent e12590d
commit d2d91ab
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 38 deletions.
diff --git a/aws/chamber/kms-key.tf b/aws/chamber/kms-key.tf
@@ -0,0 +1,27 @@
+module "chamber_kms_key" {
+  source      = "git::https://github.com/cloudposse/terraform-aws-kms-key.git?ref=tags/0.1.0"
+  namespace   = "${module.identity.namespace}"
+  stage       = "${module.identity.stage}"
+  name        = "chamber"
+  description = "KMS key for chamber"
+}
+
+output "chamber_kms_key_arn" {
+  value       = "${module.chamber_kms_key.key_arn}"
+  description = "KMS key ARN"
+}
+
+output "chamber_kms_key_id" {
+  value       = "${module.chamber_kms_key.key_id}"
+  description = "KMS key ID"
+}
+
+output "chamber_kms_key_alias_arn" {
+  value       = "${module.chamber_kms_key.alias_arn}"
+  description = "KMS key alias ARN"
+}
+
+output "chamber_kms_key_alias_name" {
+  value       = "${module.chamber_kms_key.alias_name}"
+  description = "KMS key alias name"
+}
diff --git a/aws/chamber/main.tf b/aws/chamber/main.tf
@@ -15,23 +15,3 @@ provider "aws" {
 module "identity" {
   source = "git::git@github.com:cloudposse/terraform-aws-account-metadata.git?ref=init"
 }
-
-module "chamber_kms_key" {
-  source      = "git::https://github.com/cloudposse/terraform-aws-kms-key.git?ref=tags/0.1.0"
-  namespace   = "${module.identity.namespace}"
-  stage       = "${module.identity.stage}"
-  name        = "chamber"
-  description = "KMS key for chamber"
-}
-
-# Chamber user for CI/CD systems that cannot leverage IAM instance profiles
-# https://docs.aws.amazon.com/systems-manager/latest/userguide/sysman-paramstore-access.html
-module "chamber_user" {
-  source        = "git::https://github.com/cloudposse/terraform-aws-iam-chamber-user.git?ref=tags/0.1.3"
-  namespace     = "${module.identity.namespace}"
-  stage         = "${module.identity.stage}"
-  name          = "chamber"
-  attributes    = ["codefresh"]
-  kms_key_arn   = "${module.chamber_kms_key.key_arn}"
-  ssm_resources = ["${format("arn:aws:ssm:%s:%s:parameter/kops/*", module.identity.aws_region, module.identity.account_id)}"]
-}
diff --git a/aws/chamber/outputs.tf → aws/chamber/user.tf b/aws/chamber/outputs.tf → aws/chamber/user.tf
@@ -1,21 +1,13 @@
-output "chamber_kms_key_arn" {
-  value       = "${module.chamber_kms_key.key_arn}"
-  description = "KMS key ARN"
-}
-
-output "chamber_kms_key_id" {
-  value       = "${module.chamber_kms_key.key_id}"
-  description = "KMS key ID"
-}
-
-output "chamber_kms_key_alias_arn" {
-  value       = "${module.chamber_kms_key.alias_arn}"
-  description = "KMS key alias ARN"
-}
-
-output "chamber_kms_key_alias_name" {
-  value       = "${module.chamber_kms_key.alias_name}"
-  description = "KMS key alias name"
+# Chamber user for CI/CD systems that cannot leverage IAM instance profiles
+# https://docs.aws.amazon.com/systems-manager/latest/userguide/sysman-paramstore-access.html
+module "chamber_user" {
+  source        = "git::https://github.com/cloudposse/terraform-aws-iam-chamber-user.git?ref=tags/0.1.4"
+  namespace     = "${module.identity.namespace}"
+  stage         = "${module.identity.stage}"
+  name          = "chamber"
+  attributes    = ["codefresh"]
+  kms_key_arn   = "${module.chamber_kms_key.key_arn}"
+  ssm_resources = ["${format("arn:aws:ssm:%s:%s:parameter/kops/*", module.identity.aws_region, module.identity.account_id)}"]
 }
 
 output "chamber_user_name" {