From aed90aad36af0b1773cc1593fe72b6e9670c7dc1 Mon Sep 17 00:00:00 2001 From: zoranc Date: Thu, 13 Apr 2017 11:57:47 +0200 Subject: [PATCH] v0.5.1 --- CHANGELOG.md | 13 ++++++++++--- .../lambda.tf | 3 +++ .../variables.tf | 3 ++- apps/rds_mysql/outputs.tf | 12 ++++++++---- 4 files changed, 23 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cb57c1a5..686e8c7b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,9 +6,15 @@ and this project adheres to [Semantic Versioning](http://semver.org/). ## [Unreleased] + +## [0.5.1] - 2017-04-13 +### Added +- Add variable map for the all passthrough gateway lambda function +- Add password output to the RDS TF setup + ## [0.5.0] - 2017-04-07 -### Changed -- Added the template for mysql rds setup +### Added +- Add the template for mysql rds setup ## [0.4.4] - 2017-04-04 ### Changed @@ -99,7 +105,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/). ### Added - Initial commit -[Unreleased]: https://github.com/albumprinter/eops_tf_modules/compare/v0.5.0..HEAD +[Unreleased]: https://github.com/albumprinter/eops_tf_modules/compare/v0.5.1..HEAD +[0.5.1]: https://github.com/albumprinter/eops_tf_modules/compare/v0.5.0...v0.5.1 [0.5.0]: https://github.com/albumprinter/eops_tf_modules/compare/v0.4.4...v0.5.0 [0.4.3]: https://github.com/albumprinter/eops_tf_modules/compare/v0.4.3...v0.4.4 [0.4.3]: https://github.com/albumprinter/eops_tf_modules/compare/v0.4.2...v0.4.3 diff --git a/apps/lambda_function_api_gateway_all_methods_passthrough/lambda.tf b/apps/lambda_function_api_gateway_all_methods_passthrough/lambda.tf index 02c90510..6675c500 100644 --- a/apps/lambda_function_api_gateway_all_methods_passthrough/lambda.tf +++ b/apps/lambda_function_api_gateway_all_methods_passthrough/lambda.tf @@ -13,6 +13,9 @@ resource "aws_lambda_function" "app" { subnet_ids = ["${split( ",", var.private == true ? join(",", module.aws_core_data.private_subnets) : join(",", concat(module.aws_core_data.private_subnets,module.aws_core_data.public_subnets)))}"] security_group_ids = ["${aws_security_group.sg_for_app.id}"] } + environment { + variables = "${var.variables}" + } count = "${var.enabled}" } diff --git a/apps/lambda_function_api_gateway_all_methods_passthrough/variables.tf b/apps/lambda_function_api_gateway_all_methods_passthrough/variables.tf index 6a36d206..e8b962c6 100644 --- a/apps/lambda_function_api_gateway_all_methods_passthrough/variables.tf +++ b/apps/lambda_function_api_gateway_all_methods_passthrough/variables.tf @@ -23,7 +23,8 @@ variable "runtime" { variable "handler" {} variable "environment" {} variable "variables" { - default = "" + type = "map" + default = {} } variable "memory_size" { diff --git a/apps/rds_mysql/outputs.tf b/apps/rds_mysql/outputs.tf index fe036008..e570e553 100644 --- a/apps/rds_mysql/outputs.tf +++ b/apps/rds_mysql/outputs.tf @@ -1,7 +1,3 @@ -output "db_endpoint" { - value = "${aws_db_instance.database.endpoint}" -} - output "db_id" { value = "${aws_db_instance.database.id}" } @@ -10,6 +6,14 @@ output "security_group_id" { value = "${aws_security_group.database.id}" } +output "db_endpoint" { + value = "${aws_db_instance.database.endpoint}" +} + output "db_admin_username" { value = "${aws_db_instance.database.username}" +} + +output "db_admin_password" { + value = "${aws_db_instance.database.password}" } \ No newline at end of file