Skip to content

Commit

Permalink
Merge pull request #7 from xoap-io/dev
Browse files Browse the repository at this point in the history
Resolved conflicting entries
  • Loading branch information
bbrauneck authored Apr 6, 2022
2 parents 9940224 + 6e53428 commit 41ce459
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ Please be aware that this is mainly a copy operation which means all your curren
|------|--------|---------|
| <a name="module_this_cloudwatch"></a> [this\_cloudwatch](#module\_this\_cloudwatch) | git::github.com/xoap-io/terraform-aws-security-cloudwatch-group | v0.1.0 |
| <a name="module_this_label"></a> [this\_label](#module\_this\_label) | git::github.com/xoap-io/terraform-aws-misc-label | v0.1.0 |
| <a name="module_this_role"></a> [this\_role](#module\_this\_role) | git::github.com/xoap-io/terraform-aws-iam-role | v0.1.6 |
| <a name="module_this_role"></a> [this\_role](#module\_this\_role) | git::github.com/xoap-io/terraform-aws-iam-role | v0.1.7 |
| <a name="module_this_subnets"></a> [this\_subnets](#module\_this\_subnets) | ./modules/subnet | n/a |

## Resources
Expand Down
4 changes: 2 additions & 2 deletions main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ resource "aws_vpc" "this" {
})
}
resource "aws_default_security_group" "this" {
vpc_id = aws_vpc.this[0].id
vpc_id = aws_vpc.this.id
tags = merge(var.tags,
{
"Name" = module.this_label.id
Expand Down Expand Up @@ -63,7 +63,7 @@ module "this_cloudwatch" {
retention_days = 7
}
module "this_role" {
source = "git::github.com/xoap-io/terraform-aws-iam-role?ref=v0.1.6"
source = "git::github.com/xoap-io/terraform-aws-iam-role?ref=v0.1.7"
context = var.context
allow_logging = true
allow_xray = false
Expand Down
2 changes: 1 addition & 1 deletion modules/subnet/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ resource "aws_eip" "this" {

resource "aws_nat_gateway" "this" {
for_each = var.operation_mode == "nat" ? [1] : []
allocation_id = aws_eip.this.allocation_id
allocation_id = aws_eip.this[each.key].allocation_id
subnet_id = ""
tags = merge(var.tags,
{
Expand Down

0 comments on commit 41ce459

Please sign in to comment.