Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to v.12 #13

Closed
wants to merge 1 commit into from
Closed

Upgrade to v.12 #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
124 changes: 70 additions & 54 deletions accepter.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
variable "accepter_aws_assume_role_arn" {
description = "Accepter AWS Assume Role ARN"
type = "string"
type = string
}

variable "accepter_region" {
type = "string"
type = string
description = "Accepter AWS region"
}

variable "accepter_vpc_id" {
type = "string"
type = string
description = "Accepter VPC ID filter"
default = ""
}

variable "accepter_vpc_tags" {
type = "map"
type = map(string)
description = "Accepter VPC Tags filter"
default = {}
}
Expand All @@ -28,111 +28,127 @@ variable "accepter_allow_remote_vpc_dns_resolution" {
# Accepter's credentials
provider "aws" {
alias = "accepter"
region = "${var.accepter_region}"
region = var.accepter_region
version = ">= 1.25"

assume_role {
role_arn = "${var.accepter_aws_assume_role_arn}"
role_arn = var.accepter_aws_assume_role_arn
}
}

locals {
accepter_attributes = "${concat(var.attributes, list("accepter"))}"
accepter_tags = "${merge(var.tags, map("Side", "accepter"))}"
accepter_attributes = concat(var.attributes, ["accepter"])
accepter_tags = merge(
var.tags,
{
"Side" = "accepter"
},
)
}

module "accepter" {
source = "git::https://github.com/cloudposse/terraform-null-label.git?ref=tags/0.3.3"
enabled = "${var.enabled}"
namespace = "${var.namespace}"
name = "${var.name}"
stage = "${var.stage}"
delimiter = "${var.delimiter}"
attributes = "${local.accepter_attributes}"
tags = "${local.accepter_tags}"
enabled = var.enabled
namespace = var.namespace
name = var.name
stage = var.stage
delimiter = var.delimiter
attributes = local.accepter_attributes
tags = local.accepter_tags
}

data "aws_caller_identity" "accepter" {
count = "${local.count}"
provider = "aws.accepter"
count = local.count
provider = aws.accepter
}

data "aws_region" "accepter" {
count = "${local.count}"
provider = "aws.accepter"
count = local.count
provider = aws.accepter
}

# Lookup accepter's VPC so that we can reference the CIDR
data "aws_vpc" "accepter" {
count = "${local.count}"
provider = "aws.accepter"
id = "${var.accepter_vpc_id}"
tags = "${var.accepter_vpc_tags}"
count = local.count
provider = aws.accepter
id = var.accepter_vpc_id
tags = var.accepter_vpc_tags
}

# Lookup accepter subnets
data "aws_subnet_ids" "accepter" {
count = "${local.count}"
provider = "aws.accepter"
vpc_id = "${local.accepter_vpc_id}"
count = local.count
provider = aws.accepter
vpc_id = local.accepter_vpc_id
}

locals {
accepter_subnet_ids = "${distinct(sort(flatten(data.aws_subnet_ids.accepter.*.ids)))}"
accepter_subnet_ids_count = "${length(local.accepter_subnet_ids)}"
accepter_vpc_id = "${join("", data.aws_vpc.accepter.*.id)}"
accepter_account_id = "${join("", data.aws_caller_identity.accepter.*.account_id)}"
accepter_region = "${join("", data.aws_region.accepter.*.name)}"
accepter_subnet_ids = distinct(sort(flatten(data.aws_subnet_ids.accepter.*.ids)))
accepter_subnet_ids_count = length(local.accepter_subnet_ids)
accepter_vpc_id = join("", data.aws_vpc.accepter.*.id)
accepter_account_id = join("", data.aws_caller_identity.accepter.*.account_id)
accepter_region = join("", data.aws_region.accepter.*.name)
}

# Lookup accepter route tables
data "aws_route_tables" "accepter" {
count = "${local.count}"
provider = "aws.accepter"
vpc_id = "${local.accepter_vpc_id}"
count = local.count
provider = aws.accepter
vpc_id = local.accepter_vpc_id
}

locals {
accepter_aws_route_table_ids = "${distinct(sort(data.aws_route_tables.accepter.ids))}"
accepter_aws_route_table_ids_count = "${length(local.accepter_aws_route_table_ids)}"
accepter_cidr_block_associations = "${flatten(data.aws_vpc.accepter.*.cidr_block_associations)}"
accepter_cidr_block_associations_count = "${length(local.accepter_cidr_block_associations)}"
accepter_aws_route_table_ids = distinct(sort(data.aws_route_tables.accepter[0].ids))
accepter_aws_route_table_ids_count = length(local.accepter_aws_route_table_ids)
accepter_cidr_block_associations = flatten(data.aws_vpc.accepter.*.cidr_block_associations)
accepter_cidr_block_associations_count = length(local.accepter_cidr_block_associations)
}

# Create routes from accepter to requester
resource "aws_route" "accepter" {
count = "${local.enabled ? local.accepter_aws_route_table_ids_count * local.requester_cidr_block_associations_count : 0}"
provider = "aws.accepter"
route_table_id = "${element(local.accepter_aws_route_table_ids, ceil(count.index / local.requester_cidr_block_associations_count))}"
destination_cidr_block = "${lookup(local.requester_cidr_block_associations[count.index % local.requester_cidr_block_associations_count], "cidr_block")}"
vpc_peering_connection_id = "${join("", aws_vpc_peering_connection.requester.*.id)}"
depends_on = ["data.aws_route_tables.accepter", "aws_vpc_peering_connection_accepter.accepter", "aws_vpc_peering_connection.requester"]
count = local.enabled ? local.accepter_aws_route_table_ids_count * local.requester_cidr_block_associations_count : 0
provider = aws.accepter
route_table_id = element(
local.accepter_aws_route_table_ids,
ceil(count.index / local.requester_cidr_block_associations_count),
)
destination_cidr_block = local.requester_cidr_block_associations[count.index % local.requester_cidr_block_associations_count]["cidr_block"]
vpc_peering_connection_id = join("", aws_vpc_peering_connection.requester.*.id)
depends_on = [
data.aws_route_tables.accepter,
aws_vpc_peering_connection_accepter.accepter,
aws_vpc_peering_connection.requester,
]
}

# Accepter's side of the connection.
resource "aws_vpc_peering_connection_accepter" "accepter" {
count = "${local.count}"
provider = "aws.accepter"
vpc_peering_connection_id = "${join("", aws_vpc_peering_connection.requester.*.id)}"
auto_accept = "${var.auto_accept}"
tags = "${module.accepter.tags}"
count = local.count
provider = aws.accepter
vpc_peering_connection_id = join("", aws_vpc_peering_connection.requester.*.id)
auto_accept = var.auto_accept
tags = module.accepter.tags
}

resource "aws_vpc_peering_connection_options" "accepter" {
provider = "aws.accepter"
vpc_peering_connection_id = "${join("", aws_vpc_peering_connection.requester.*.id)}"
provider = aws.accepter
vpc_peering_connection_id = join("", aws_vpc_peering_connection.requester.*.id)

accepter {
allow_remote_vpc_dns_resolution = "${var.accepter_allow_remote_vpc_dns_resolution}"
allow_remote_vpc_dns_resolution = var.accepter_allow_remote_vpc_dns_resolution
}
}

output "accepter_connection_id" {
value = "${join("", aws_vpc_peering_connection_accepter.accepter.*.id)}"
value = join("", aws_vpc_peering_connection_accepter.accepter.*.id)
description = "Accepter VPC peering connection ID"
}

output "accepter_accept_status" {
value = "${join("", aws_vpc_peering_connection_accepter.accepter.*.accept_status)}"
value = join(
"",
aws_vpc_peering_connection_accepter.accepter.*.accept_status,
)
description = "Accepter VPC peering connection request status"
}

5 changes: 3 additions & 2 deletions main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
locals {
enabled = "${var.enabled == "true"}"
count = "${local.enabled ? 1 : 0}"
enabled = var.enabled == "true"
count = local.enabled ? 1 : 0
}

1 change: 0 additions & 1 deletion outputs.tf
View file
Open in desktop

This file was deleted.

Loading