Merge pull request #6 from osodevops/decouple_encryption_lambda

Decouple encryption lambda
osodevops · Sep 5, 2019 · 4592036 · 4592036
2 parents 4cea25d + e6e319c
commit 4592036
Show file tree

Hide file tree

Showing 13 changed files with 1 addition and 255 deletions.
diff --git a/aws_cloudwatch_event_rule_build_success.tf b/aws_cloudwatch_event_rule_build_success.tf
diff --git a/aws_iam_role_policy_attachment.tf b/aws_iam_role_policy_attachment.tf
diff --git a/aws_lambda_function.tf b/aws_lambda_function.tf
diff --git a/aws_lambda_iam_policy.tf b/aws_lambda_iam_policy.tf
diff --git a/aws_lambda_iam_policy_attachment.tf b/aws_lambda_iam_policy_attachment.tf
diff --git a/aws_lambda_iam_policy_document.tf b/aws_lambda_iam_policy_document.tf
diff --git a/aws_lambda_iam_role.tf b/aws_lambda_iam_role.tf
diff --git a/aws_lambda_permission_cloudwatch_event.tf b/aws_lambda_permission_cloudwatch_event.tf
diff --git a/data_archive_file_ami_backup.tf b/data_archive_file_ami_backup.tf
diff --git a/data_null_data_source_lambda_archive.tf b/data_null_data_source_lambda_archive.tf
diff --git a/data_null_data_source_lambda_file.tf b/data_null_data_source_lambda_file.tf
diff --git a/functions/ami_encryption.py b/functions/ami_encryption.py
diff --git a/variables.tf b/variables.tf
@@ -88,9 +88,7 @@ locals {
       "egrep \"${data.aws_region.current.name}\\:\\sami\\-\" build.log | cut -d' ' -f2 > ami_id.txt",
       # Packer doesn't return non-zero status; we must do that if Packer build failed
       "test -s ami_id.txt || exit 1",
-      "curl -qL -o ami_builder_event.json https://gist.githubusercontent.com/sionsmith/23b7dfcd3ab9c302dc1c172c871a589a/raw/cf96e3cde40f413afa1d3405f33d4163bdb8db0b/ami_builder_event.json",
-      "sed -i.bak \"s/<<AMI-ID>>/$(cat ami_id.txt)/g\" ami_builder_event.json",
-      "aws events put-events --entries file://ami_builder_event.json",
+      "if [ ${var.encrypt_ami} = 1 ] ; then curl -qL -o ami_builder_event.json https://gist.githubusercontent.com/sionsmith/23b7dfcd3ab9c302dc1c172c871a589a/raw/cf96e3cde40f413afa1d3405f33d4163bdb8db0b/ami_builder_event.json && sed -i.bak \"s/<<AMI-ID>>/$(cat ami_id.txt)/g\" ami_builder_event.json && aws events put-events --entries file://ami_builder_event.json; fi",
       "echo build completed on `date`"
   ]
 }