Terraform Contributions for BPS 26.1.0

.gitignore

@@ -4,4 +4,4 @@
 terraform.auto.tfvars
 backend.tf
 .sshkey.pem
-
+terragrunt.hcl

aws/Deployment/Terraform/BPS-VE-FullDeployment/BPS-on-AWS-1-App-1-Virtual-Blade-1-VPC-1-Public-Subnet-1-Private-Subnet/Makefile

@@ -1,4 +1,11 @@
 SHELL := /bin/bash
+.SHELLFLAGS := -euo pipefail -c
+
+TF_DATA_DIR := /tmp/tfdata-$(notdir $(CURDIR))
+export TF_DATA_DIR
+
+TF := time terraform
+TF_FLAGS := -auto-approve
 
 aws: install all
 
@@ -16,34 +23,45 @@ endif
 endif
 
 version:
-	time terraform version
+	@echo "=== $(TF) version ==="
+	$(TF) version
 
 init:
-	time terraform init
+	@echo "=== $(TF) init ==="
+	$(TF) init
 
 validate:
-	time terraform validate
+	@echo "=== $(TF) validate ==="
+	$(TF) validate
 
 update:
-	time terraform get -update
+	@echo "=== $(TF) update ==="
+	$(TF) get -update
 
 plan:
-	time terraform plan
+	@echo "=== $(TF) plan ==="
+	$(TF) plan
 
 apply:
-	time terraform apply -auto-approve
+	@echo "=== $(TF) apply ==="
+	$(TF) apply $(TF_FLAGS)
 
 destroy:
-	time terraform destroy -auto-approve
+	@echo "=== $(TF) destroy ==="
+	$(TF) destroy $(TF_FLAGS)
 
 output:
-	time terraform output
+	@echo "=== $(TF) output ==="
+	$(TF) output
 
 ssh:
-	time terraform output SshKey | tail -n +3 | head -n-3 | sed "s/^[ \t]*//" > .sshkey.pem
+	@echo "=== $(TF) ssh ==="
+	$(TF) output SshKey | tail -n +3 | head -n-3 | sed "s/^[ \t]*//" > .sshkey.pem
+	chmod 400 .sshkey.pem
 
 state:
-	time terraform state list
+	@echo "=== $(TF) state ==="
+	$(TF) state list
 
 connect: connect-app
 

aws/Deployment/Terraform/BPS-VE-FullDeployment/BPS-on-AWS-1-App-1-Virtual-Blade-1-VPC-1-Public-Subnet-1-Private-Subnet/cloud-init.yml

@@ -20,4 +20,6 @@ write_files:
     defer: true
 runcmd:
   - chmod 755 /home/${UserName}/.ssh
-  - chown ${UserName}:${UserName} /home/${UserName}/.ssh
+  - chown ${UserName}:${UserName} /home/${UserName}/.ssh
+output:
+  all: "| tee -a /var/log/terraform-cloud-init-output.log"

aws/Deployment/Terraform/BPS-VE-FullDeployment/BPS-on-AWS-1-App-1-Virtual-Blade-1-VPC-1-Public-Subnet-1-Private-Subnet/locals.tf

@@ -20,7 +20,7 @@ locals {
 	Preamble = "${local.UserLoginTag}-${local.UserProjectTag}-${local.AppTag}"
 	PrivateSubnetAvailabilityZone = var.PrivateSubnetAvailabilityZone
 	PublicSubnetAvailabilityZone = var.PublicSubnetAvailabilityZone
-	Region = data.aws_region.current.id
+	Region = data.aws_region.current.region
 	SshKeyAlgorithm = "RSA"
 	SshKeyName = "${local.Preamble}-ssh-key"
 	SshKeyRsaBits = "4096"

aws/Deployment/Terraform/BPS-VE-FullDeployment/BPS-on-AWS-1-App-1-Virtual-Blade-1-VPC-1-Public-Subnet-1-Private-Subnet/main.tf

@@ -1,5 +1,5 @@
 module "App" {
-	source = "git::https://github.com/Keysight/terraform-aws-module-bps-app.git?ref=26.0.0"
+	source = "git::https://github.com/Keysight/terraform-aws-module-bps-app.git?ref=26.1.0"
 	Eth0SecurityGroupId = module.Vpc.PublicSecurityGroup.id
 	Eth0SubnetId = module.Vpc.PublicSubnet.id
 	InstanceType = local.AppInstanceType
@@ -13,7 +13,7 @@ module "App" {
 }
 
 module "Agent1" {
-	source = "git::https://github.com/Keysight/terraform-aws-module-bps-agent.git?ref=26.0.0"
+	source = "git::https://github.com/Keysight/terraform-aws-module-bps-agent.git?ref=26.1.0"
 	Eth0SecurityGroupId = module.Vpc.PublicSecurityGroup.id
 	Eth0SubnetId = module.Vpc.PublicSubnet.id
 	Eth1SecurityGroupId = module.Vpc.PrivateSecurityGroup.id

aws/Deployment/Terraform/BPS-VE-FullDeployment/BPS-on-AWS-1-App-1-Virtual-Blade-1-VPC-1-Public-Subnet-1-Private-Subnet/terraform.optional.auto.tfvars

@@ -1,4 +1,4 @@
-# AgentInstanceType = "c6in.xlarge"
+# AgentInstanceType = "c5n.xlarge"
 # ApiMaxRetries = 1
 # AppInstanceType = "c5.xlarge"
 # InboundIPv4CidrBlocks = [ "0.0.0.0/0" ]

aws/Deployment/Terraform/BPS-VE-FullDeployment/BPS-on-AWS-1-App-1-Virtual-Blade-1-VPC-1-Public-Subnet-1-Private-Subnet/variables.tf

@@ -1,5 +1,5 @@
 variable "AgentInstanceType" {
-	default = "c6in.xlarge"
+	default = "c5n.xlarge"
 	description = "Instance type of Agent VM"
 	type = string
 	validation {
@@ -44,6 +44,7 @@ variable "PrivateSubnetAvailabilityZone" {
 
 variable "PublicSubnetAvailabilityZone" {
 	default = "us-east-1a"
+	description = "AZ id associated with the public subnet"
 	type = string
 }
 

aws/Deployment/Terraform/BPS-VE-FullDeployment/BPS-on-AWS-1-App-1-Virtual-Blade-1-VPC-1-Public-Subnet-1-Private-Subnet/vpc.tf

@@ -1,5 +1,5 @@
 module "Vpc" {
-	source = "git::https://github.com/Keysight/terraform-aws-module-1-vpc-1-public-subnet-1-private-subnet.git?ref=26.0.0"
+	source = "git::https://github.com/Keysight/terraform-aws-module-1-vpc-1-public-subnet-1-private-subnet.git?ref=26.1.0"
 	InboundIPv4CidrBlocks = local.InboundIPv4CidrBlocks
 	PrivateSubnetAvailabilityZone = local.PrivateSubnetAvailabilityZone
 	PublicSubnetAvailabilityZone = local.PublicSubnetAvailabilityZone

aws/Deployment/Terraform/BPS-VE-FullDeployment/BPS-on-AWS-1-App-1-Virtual-Blade-1-VPC-1-Public-Subnet-2-Private-Subnets/Makefile

@@ -1,4 +1,11 @@
 SHELL := /bin/bash
+.SHELLFLAGS := -euo pipefail -c
+
+TF_DATA_DIR := /tmp/tfdata-$(notdir $(CURDIR))
+export TF_DATA_DIR
+
+TF := time terraform
+TF_FLAGS := -auto-approve
 
 aws: install all
 
@@ -16,34 +23,45 @@ endif
 endif
 
 version:
-	time terraform version
+	@echo "=== $(TF) version ==="
+	$(TF) version
 
 init:
-	time terraform init
+	@echo "=== $(TF) init ==="
+	$(TF) init
 
 validate:
-	time terraform validate
+	@echo "=== $(TF) validate ==="
+	$(TF) validate
 
 update:
-	time terraform get -update
+	@echo "=== $(TF) update ==="
+	$(TF) get -update
 
 plan:
-	time terraform plan
+	@echo "=== $(TF) plan ==="
+	$(TF) plan
 
 apply:
-	time terraform apply -auto-approve
+	@echo "=== $(TF) apply ==="
+	$(TF) apply $(TF_FLAGS)
 
 destroy:
-	time terraform destroy -auto-approve
+	@echo "=== $(TF) destroy ==="
+	$(TF) destroy $(TF_FLAGS)
 
 output:
-	time terraform output
+	@echo "=== $(TF) output ==="
+	$(TF) output
 
 ssh:
-	time terraform output SshKey | tail -n +3 | head -n-3 | sed "s/^[ \t]*//" > .sshkey.pem
+	@echo "=== $(TF) ssh ==="
+	$(TF) output SshKey | tail -n +3 | head -n-3 | sed "s/^[ \t]*//" > .sshkey.pem
+	chmod 400 .sshkey.pem
 
 state:
-	time terraform state list
+	@echo "=== $(TF) state ==="
+	$(TF) state list
 
 connect: connect-app
 

aws/Deployment/Terraform/BPS-VE-FullDeployment/BPS-on-AWS-1-App-1-Virtual-Blade-1-VPC-1-Public-Subnet-2-Private-Subnets/cloud-init.yml

@@ -20,4 +20,6 @@ write_files:
     defer: true
 runcmd:
   - chmod 755 /home/${UserName}/.ssh
-  - chown ${UserName}:${UserName} /home/${UserName}/.ssh
+  - chown ${UserName}:${UserName} /home/${UserName}/.ssh
+output:
+  all: "| tee -a /var/log/terraform-cloud-init-output.log"

aws/Deployment/Terraform/BPS-VE-FullDeployment/BPS-on-AWS-1-App-1-Virtual-Blade-1-VPC-1-Public-Subnet-2-Private-Subnets/locals.tf

@@ -20,7 +20,7 @@ locals {
 	Private1SubnetAvailabilityZone = var.Private1SubnetAvailabilityZone
 	Private2SubnetAvailabilityZone = var.Private2SubnetAvailabilityZone
 	PublicSubnetAvailabilityZone = var.PublicSubnetAvailabilityZone
-	Region = data.aws_region.current.id
+	Region = data.aws_region.current.region
 	SshKeyAlgorithm = "RSA"
 	SshKeyName = "${local.Preamble}-ssh-key"
 	SshKeyRsaBits = "4096"

aws/Deployment/Terraform/BPS-VE-FullDeployment/BPS-on-AWS-1-App-1-Virtual-Blade-1-VPC-1-Public-Subnet-2-Private-Subnets/main.tf

@@ -1,5 +1,5 @@
 module "App" {
-	source = "git::https://github.com/Keysight/terraform-aws-module-bps-app.git?ref=26.0.0"
+	source = "git::https://github.com/Keysight/terraform-aws-module-bps-app.git?ref=26.1.0"
 	Eth0SecurityGroupId = module.Vpc.PublicSecurityGroup.id
 	Eth0SubnetId = module.Vpc.PublicSubnet.id
 	InstanceType = local.AppInstanceType
@@ -13,7 +13,7 @@ module "App" {
 }
 
 module "Agent1" {
-	source = "git::https://github.com/Keysight/terraform-aws-module-bps-agent.git?ref=26.0.0"
+	source = "git::https://github.com/Keysight/terraform-aws-module-bps-agent.git?ref=26.1.0"
 	Eth0SecurityGroupId = module.Vpc.PublicSecurityGroup.id
 	Eth0SubnetId = module.Vpc.PublicSubnet.id
 	Eth1SecurityGroupId = module.Vpc.PrivateSecurityGroup.id

aws/Deployment/Terraform/BPS-VE-FullDeployment/BPS-on-AWS-1-App-1-Virtual-Blade-1-VPC-1-Public-Subnet-2-Private-Subnets/terraform.optional.auto.tfvars

@@ -1,4 +1,4 @@
-# AgentInstanceType = "c6in.xlarge"
+# AgentInstanceType = "c5n.xlarge"
 # ApiMaxRetries = 1
 # AppInstanceType = "c5.xlarge"
 # InboundIPv4CidrBlocks = [ "0.0.0.0/0" ]

aws/Deployment/Terraform/BPS-VE-FullDeployment/BPS-on-AWS-1-App-1-Virtual-Blade-1-VPC-1-Public-Subnet-2-Private-Subnets/variables.tf

@@ -1,5 +1,5 @@
 variable "AgentInstanceType" {
-	default = "c6in.xlarge"
+	default = "c5n.xlarge"
 	description = "Instance type of Agent VM"
 	type = string
 	validation {

aws/Deployment/Terraform/BPS-VE-FullDeployment/BPS-on-AWS-1-App-1-Virtual-Blade-1-VPC-1-Public-Subnet-2-Private-Subnets/vpc.tf

@@ -1,5 +1,5 @@
 module "Vpc" {
-	source = "git::https://github.com/Keysight/terraform-aws-module-1-vpc-1-public-subnet-2-private-subnets.git?ref=26.0.0"
+	source = "git::https://github.com/Keysight/terraform-aws-module-1-vpc-1-public-subnet-2-private-subnets.git?ref=26.1.0"
 	InboundIPv4CidrBlocks = local.InboundIPv4CidrBlocks
 	Private1SubnetAvailabilityZone = local.Private1SubnetAvailabilityZone
 	Private2SubnetAvailabilityZone = local.Private2SubnetAvailabilityZone

aws/Deployment/Terraform/BPS-VE-FullDeployment/BPS-on-AWS-1-App-1-Virtual-Blade-Add-On/Makefile

@@ -1,4 +1,11 @@
 SHELL := /bin/bash
+.SHELLFLAGS := -euo pipefail -c
+
+TF_DATA_DIR := /tmp/tfdata-$(notdir $(CURDIR))
+export TF_DATA_DIR
+
+TF := time terraform
+TF_FLAGS := -auto-approve
 
 aws: install all
 
@@ -16,34 +23,45 @@ endif
 endif
 
 version:
-	time terraform version
+	@echo "=== $(TF) version ==="
+	$(TF) version
 
 init:
-	time terraform init
+	@echo "=== $(TF) init ==="
+	$(TF) init
 
 validate:
-	time terraform validate
+	@echo "=== $(TF) validate ==="
+	$(TF) validate
 
 update:
-	time terraform get -update
+	@echo "=== $(TF) update ==="
+	$(TF) get -update
 
 plan:
-	time terraform plan
+	@echo "=== $(TF) plan ==="
+	$(TF) plan
 
 apply:
-	time terraform apply -auto-approve
+	@echo "=== $(TF) apply ==="
+	$(TF) apply $(TF_FLAGS)
 
 destroy:
-	time terraform destroy -auto-approve
+	@echo "=== $(TF) destroy ==="
+	$(TF) destroy $(TF_FLAGS)
 
 output:
-	time terraform output
+	@echo "=== $(TF) output ==="
+	$(TF) output
 
 ssh:
-	time terraform output SshKey | tail -n +3 | head -n-3 | sed "s/^[ \t]*//" > .sshkey.pem
+	@echo "=== $(TF) ssh ==="
+	$(TF) output SshKey | tail -n +3 | head -n-3 | sed "s/^[ \t]*//" > .sshkey.pem
+	chmod 400 .sshkey.pem
 
 state:
-	time terraform state list
+	@echo "=== $(TF) state ==="
+	$(TF) state list
 
 connect: connect-app
 

aws/Deployment/Terraform/BPS-VE-FullDeployment/BPS-on-AWS-1-App-1-Virtual-Blade-Add-On/cloud-init.yml

@@ -20,4 +20,6 @@ write_files:
     defer: true
 runcmd:
   - chmod 755 /home/${UserName}/.ssh
-  - chown ${UserName}:${UserName} /home/${UserName}/.ssh
+  - chown ${UserName}:${UserName} /home/${UserName}/.ssh
+output:
+  all: "| tee -a /var/log/terraform-cloud-init-output.log"

aws/Deployment/Terraform/BPS-VE-FullDeployment/BPS-on-AWS-1-App-1-Virtual-Blade-Add-On/locals.tf

@@ -21,7 +21,7 @@ locals {
 	PrivateSubnetName = var.PrivateSubnetName
 	PublicSecurityGroupName = var.PublicSecurityGroupName
 	PublicSubnetName = var.PublicSubnetName
-	Region = data.aws_region.current.id
+	Region = data.aws_region.current.region
 	SshKeyAlgorithm = "RSA"
 	SshKeyName = "${local.Preamble}-ssh-key"
 	SshKeyRsaBits = "4096"

aws/Deployment/Terraform/BPS-VE-FullDeployment/BPS-on-AWS-1-App-1-Virtual-Blade-Add-On/main.tf

@@ -1,5 +1,5 @@
 module "App" {
-	source = "git::https://github.com/Keysight/terraform-aws-module-bps-app.git?ref=26.0.0"
+	source = "git::https://github.com/Keysight/terraform-aws-module-bps-app.git?ref=26.1.0"
 	Eth0SecurityGroupId = data.aws_security_group.PublicSecurityGroup.id
 	Eth0SubnetId = data.aws_subnet.PublicSubnet.id
 	InstanceType = local.AppInstanceType
@@ -10,7 +10,7 @@ module "App" {
 }
 
 module "Agent1" {
-	source = "git::https://github.com/Keysight/terraform-aws-module-bps-agent.git?ref=26.0.0"
+	source = "git::https://github.com/Keysight/terraform-aws-module-bps-agent.git?ref=26.1.0"
 	Eth0SecurityGroupId = data.aws_security_group.PublicSecurityGroup.id
 	Eth0SubnetId = data.aws_subnet.PublicSubnet.id
 	Eth1SecurityGroupId = data.aws_security_group.PrivateSecurityGroup.id

aws/Deployment/Terraform/BPS-VE-FullDeployment/BPS-on-AWS-1-App-1-Virtual-Blade-Add-On/terraform.optional.auto.tfvars

@@ -1,4 +1,4 @@
-# AgentInstanceType = "c6in.xlarge"
+# AgentInstanceType = "c5n.xlarge"
 # ApiMaxRetries = 1
 # AppInstanceType = "c5.xlarge"
 # Region = "us-east-1"

aws/Deployment/Terraform/BPS-VE-FullDeployment/BPS-on-AWS-1-App-1-Virtual-Blade-Add-On/variables.tf

@@ -1,5 +1,5 @@
 variable "AgentInstanceType" {
-	default = "c6in.xlarge"
+	default = "c5n.xlarge"
 	description = "Instance type of Agent VM"
 	type = string
 	validation {

aws/Deployment/Terraform/BPS-VE-FullDeployment/BPS-on-AWS-1-App-12-Virtual-Blades-1-VPC-2-Public-Subnets-2-Private-Subnets/CloudShell/connect.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+
+while getopts i: flag
+do
+    case "${flag}" in
+        i) PublicIp=${OPTARG};;
+    esac
+done
+
+aws ec2 describe-instances \
+	--filters "Name=instance-state-name,Values=running" "Name=network-interface.association.public-ip,Values=$PublicIp" \
+	--query "Reservations[].Instances[].[InstanceId,Tags[?Key=='Name'].Value|[0]]" \
+	--output table
+AgentId=$(aws ec2 describe-instances --filters "Name=instance-state-name,Values=running" "Name=network-interface.association.public-ip,Values=$PublicIp" --query "Reservations[].Instances[].[InstanceId,Tags[?Key=='Name'].Value|[0]]" --output json | jq .[0][0] --raw-output)
+aws ssm start-session \
+	--target $AgentId