Skip to content

Commit

Permalink
add route53 zone association
Browse files Browse the repository at this point in the history
  • Loading branch information
badra001 committed Mar 28, 2023
1 parent 3308ede commit 5788455
Show file tree
Hide file tree
Showing 73 changed files with 456 additions and 398 deletions.
6 changes: 4 additions & 2 deletions common/version.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
locals {
_module_version = "2.6.3"
_module_version = "2.7.0"
_module_names = {
"_main_" = "aws-vpc-setup"

Expand All @@ -10,10 +10,12 @@ locals {
"nacls" = "aws-vpc-setup/nacls"
"peer" = "aws-vpc-setup/peer"
"routing" = "aws-vpc-setup/routing"
"route53-zone-assoication/vpc" = "aws-vpc/setup/route53-zone-association/vpc"
"route53-zone-assoication/zone" = "aws-vpc/setup/route53-zone-association/zone"
"security-groups" = "aws-vpc-setup/security-groups"
"tag-shared-vpc-resources" = "aws-vpc-setup/tag-shared-vpc-resources"
"share-resources" = "aws-vpc-setup/share-resources"
"subnets" = "aws-vpc-setup/subnets"
"tag-shared-vpc-resources" = "aws-vpc-setup/tag-shared-vpc-resources"
"vpc" = "aws-vpc-setup/vpc"
"vpc-interface-endpoint" = "aws-vpc-setup/vpc-interface-endpoint"
"vpn" = "aws-vpc-setup/vpn"
Expand Down
5 changes: 5 additions & 0 deletions examples/ec2-vpc-region-vpcN-new/apps/test-instances/data.tf
Original file line number Diff line number Diff line change
Expand Up @@ -53,3 +53,8 @@ data "aws_security_groups" "test" {
}
}

# https://docs.aws.amazon.com/linux/al2023/ug/get-started.html
data "aws_ssm_parameter" "ami" {
name = "/aws/service/ami-amazon-linux-latest/al2023-ami-kernel-default-x86_64"
}

3 changes: 2 additions & 1 deletion examples/ec2-vpc-region-vpcN-new/apps/test-instances/ec2.tf
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ resource "aws_instance" "test" {
# for_each = var.enable_instances ? local.private_subnets_id_map : {}
for_each = var.enable_instances ? { for k in local.private_subnets_id_list : k => local.private_subnets_id_map[k] } : {}

ami = local.ami
# ami = local.ami
ami = data.aws_ssm_parameter.ami.value
instance_type = local.instance_type
availability_zone = each.value.availability_zone
key_name = local.key_name
Expand Down
11 changes: 8 additions & 3 deletions examples/full-setup-tf-upgrade/apps/dns/tf-run.data
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
VERSION 1.1.3
VERSION 1.1.4
REMOTE-STATE
COMMAND tf-directory-setup.py -l none -f
COMMAND setup-new-directory.sh
COMMAND tf-init -upgrade

LINKTOP includes.d/variables.application_tags.tf
LINKTOP includes.d/prod/variables.application_tags.auto.tfvars
LINKTOP includes.d/variables.account_tags.tf
LINKTOP includes.d/variables.account_tags.auto.tfvars
LINKTOP includes.d/variables.infrastructure_tags.tf
LINKTOP includes.d/variables.infrastructure_tags.auto.tfvars
LINKTOP includes.d/variables.application_tags.tf
## LINKTOP includes.d/variables.application_tags.auto.tfvars

LINK variables.vpc.tf
LINK variables.vpc.auto.tfvars

Expand Down
7 changes: 6 additions & 1 deletion examples/full-setup-tf-upgrade/apps/tf-run.data
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
VERSION 1.0.0
VERSION 1.0.3
REMOTE-STATE
COMMAND tf-directory-setup.py -l none -f
COMMAND setup-new-directory.sh
COMMAND tf-init -upgrade
COMMAND rm provider.infoblox.*

LINK variables.vpc.auto.tfvars
# LINK variables.vpc.tf .

ALL
COMMAND tf-directory-setup.py -l s3
35 changes: 30 additions & 5 deletions examples/full-setup-tf-upgrade/apps/versions.tf
Original file line number Diff line number Diff line change
@@ -1,12 +1,37 @@
#terraform {
# experiments = [module_variable_optional_attrs]
#}

terraform {
required_version = ">= 1.0"
required_providers {
aws = {
source = "hashicorp/aws"
version = ">= 3.0"
}
infoblox = {
source = "infobloxopen/infoblox"
version = ">= 2.1.0"
version = ">= 4.55.0"
}
## ldap = {
## source = "trevex/ldap"
## version = ">= 0.5.4"
## }
## external = {
## source = "hashicorp/external"
## version = ">= 1.0"
## }
## null = {
## source = "hashicorp/null"
## version = ">= 1.0"
## }
## random = {
## source = "hashicorp/random"
## version = ">= 1.0"
## }
## template = {
## source = "hashicorp/template"
## version = ">= 1.0"
## }
## infoblox = {
## source = "infobloxopen/infoblox"
## version = ">= 2.1.0"
## }
}
}
55 changes: 0 additions & 55 deletions examples/shared-vpc-setup-tf-upgrade/apps/dns/README.md

This file was deleted.

25 changes: 0 additions & 25 deletions examples/shared-vpc-setup-tf-upgrade/apps/dns/associate-shared.tf

This file was deleted.

13 changes: 0 additions & 13 deletions examples/shared-vpc-setup-tf-upgrade/apps/dns/locals.tf

This file was deleted.

11 changes: 0 additions & 11 deletions examples/shared-vpc-setup-tf-upgrade/apps/dns/provider.main_dns.tf

This file was deleted.

19 changes: 0 additions & 19 deletions examples/shared-vpc-setup-tf-upgrade/apps/dns/sort-ip.py

This file was deleted.

13 changes: 0 additions & 13 deletions examples/shared-vpc-setup-tf-upgrade/apps/dns/tf-run.data

This file was deleted.

This file was deleted.

27 changes: 0 additions & 27 deletions examples/shared-vpc-setup-tf-upgrade/apps/dns/variables.dns.tf

This file was deleted.

9 changes: 0 additions & 9 deletions examples/shared-vpc-setup-tf-upgrade/apps/dns/versions.tf

This file was deleted.

Loading

0 comments on commit 5788455

Please sign in to comment.