Skip to content

Commit

Permalink
v0.6.3
Browse files Browse the repository at this point in the history
* add destroy flag override and name for the rds mysql resource

* make the default value db_prevent_destroy  boolean 'compatible'

* modify destroy flag override

* removed the toggle as currently there seems no way to parse out to boolean

* Change the conditional from boolean to integer for deciding whether the lambda function is public or private

* Cleanup base permissions for the lambda role

* prepare release
  • Loading branch information
zorancco authored Apr 21, 2017
1 parent ce871be commit 10d4ab6
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 20 deletions.
23 changes: 16 additions & 7 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,15 @@ and this project adheres to [Semantic Versioning](http://semver.org/).

## [Unreleased]

## [0.6.3] - 2017-04-21
### Added
- Added variable for overriding the destruction of the rds resource flag protection
- Added the name for the rds_mysql rds resource

### Changed
- Change the conditional from boolean to integer for deciding whether the lambda function is public or private
- Cleanup base permissions for the lambda role

## [0.6.2] - 2017-04-14
### Changed
- Revert change to hardcoded bucket name completely
Expand All @@ -24,7 +33,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
- Add variable map for the all passthrough gateway lambda function
- Add password output to the RDS TF setup


## [0.5.1] - 2017-04-13
### Added
- Add variable map for the all passthrough gateway lambda function
Expand Down Expand Up @@ -123,12 +131,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
### Added
- Initial commit

[Unreleased]: https://github.com/albumprinter/eops_tf_modules/compare/v0.6.2..HEAD
[0.5.1]: https://github.com/albumprinter/eops_tf_modules/compare/v0.6.1...v0.6.2
[0.5.1]: https://github.com/albumprinter/eops_tf_modules/compare/v0.6.0...v0.6.1
[0.5.1]: https://github.com/albumprinter/eops_tf_modules/compare/v0.5.0...v0.6.0
[0.4.1]: https://github.com/albumprinter/eops_tf_modules/compare/v0.4.0...v0.5.0
[Unreleased]: https://github.com/albumprinter/eops_tf_modules/compare/v0.6.3..HEAD
[0.6.3]: https://github.com/albumprinter/eops_tf_modules/compare/v0.6.2...v0.6.3
[0.6.2]: https://github.com/albumprinter/eops_tf_modules/compare/v0.6.1...v0.6.2
[0.6.1]: https://github.com/albumprinter/eops_tf_modules/compare/v0.6.0...v0.6.1
[0.6.0]: https://github.com/albumprinter/eops_tf_modules/compare/v0.5.0...v0.6.0
[0.5.0]: https://github.com/albumprinter/eops_tf_modules/compare/v0.4.0...v0.5.0
[0.4.0]: https://github.com/albumprinter/eops_tf_modules/compare/v0.3.0...v0.4.0
[0.3.0]: https://github.com/albumprinter/eops_tf_modules/compare/v0.2.1...v0.3.0
[0.2.1]: https://github.com/albumprinter/eops_tf_modules/compare/v0.1.0...v0.2.1
[0.2.0]: https://github.com/albumprinter/eops_tf_modules/compare/v0.1.0...v0.2.0
[0.1.0]: https://github.com/albumprinter/eops_tf_modules/compare/v0.0.1...v0.1.0
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ resource "aws_lambda_function" "app" {
memory_size = "${var.memory_size}"
timeout = "${var.timeout}"
vpc_config = {
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)))}"]
subnet_ids = ["${split( ",", var.private == 1 ? 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 {
Expand Down
15 changes: 4 additions & 11 deletions apps/lambda_function_scheduled_vpc/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,9 @@ variable "iam_policy_document" {
"ec2:CreateNetworkInterface",
"ec2:DescribeNetworkInterfaces",
"ec2:DeleteNetworkInterface",
"ec2:DescribeVpcs",
"ec2:DescribeSubnets",
"ec2:DescribeSecurityGroups",
"cloudwatch:*",
"cognito-identity:ListIdentityPools",
"cognito-sync:GetCognitoEvents",
Expand All @@ -65,11 +68,7 @@ variable "iam_policy_document" {
"iam:ListRolePolicies",
"iam:ListRoles",
"iam:PassRole",
"kinesis:DescribeStream",
"kinesis:ListStreams",
"kinesis:PutRecord",
"lambda:*",
"logs:*",
"s3:*",
"sns:ListSubscriptions",
"sns:ListSubscriptionsByTopic",
Expand All @@ -80,9 +79,6 @@ variable "iam_policy_document" {
"sqs:ListQueues",
"sqs:SendMessage",
"kms:ListAliases",
"ec2:DescribeVpcs",
"ec2:DescribeSubnets",
"ec2:DescribeSecurityGroups",
"iot:GetTopicRule",
"iot:ListTopicRules",
"iot:CreateTopicRule",
Expand All @@ -94,10 +90,7 @@ variable "iam_policy_document" {
"iot:CreateThing",
"iot:ListPolicies",
"iot:ListThings",
"iot:DescribeEndpoint",
"ec2:CreateNetworkInterface",
"ec2:DescribeNetworkInterfaces",
"ec2:DeleteNetworkInterface"
"iot:DescribeEndpoint"
],
"Resource": "*"
}
Expand Down
1 change: 1 addition & 0 deletions apps/rds_mysql/rds.tf
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ resource "aws_db_subnet_group" "database" {
}

resource "aws_db_instance" "database" {
name = "${var.app_name}"
// depends_on = ["aws_db_subnet_group.database", "aws_security_group.database"]
identifier = "${var.environment}-${var.app_name}"
allocated_storage = "${var.db_storage_size}"
Expand Down
2 changes: 1 addition & 1 deletion apps/rds_mysql/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -71,4 +71,4 @@ variable "db_multi_az" {
variable "db_backup_retention_period" {
description = "The database retention period"
default = 7
}
}

0 comments on commit 10d4ab6

Please sign in to comment.