Added an optional aws_session_token variable

templates/aws-dualstack/cluster_nodes/terraform/pools/corral.tf

@@ -1,10 +1,11 @@
-variable "corral_name" {} // name of the corral being created
-variable "corral_user_id" {} // how the user is identified (usually github username)
-variable "corral_public_key" {} // The corrals public key.  This should be installed on every node.
+variable "corral_name" {}        // name of the corral being created
+variable "corral_user_id" {}     // how the user is identified (usually github username)
+variable "corral_public_key" {}  // The corrals public key.  This should be installed on every node.
 variable "corral_private_key" {} // The corrals private key.  This should be installed on every node to be able to have root access, as aws does not allow this by default.
 
 variable "aws_access_key" {}
 variable "aws_secret_key" {}
+variable "aws_session_token" {}
 variable "aws_region" {}
 variable "aws_ami" {}
 variable "aws_hostname_prefix" {}
@@ -18,4 +19,4 @@ variable "aws_ipv6_80_target_group_arn" {}
 variable "aws_ipv6_443_target_group_arn" {}
 variable "instance_type" {}
 variable "server_count" {}
-variable "agent_count" {}
+variable "agent_count" {}

templates/aws-dualstack/cluster_nodes/terraform/pools/main.tf

@@ -12,28 +12,29 @@ provider "random" {}
 provider "aws" {
   access_key = var.aws_access_key
   secret_key = var.aws_secret_key
-  region =  var.aws_region
+  token      = var.aws_session_token
+  region     = var.aws_region
 }
 
 resource "random_id" "cluster_id" {
-  byte_length       = 6
+  byte_length = 6
 }
 
 resource "aws_key_pair" "corral_key" {
-  key_name       = "corral-${var.corral_user_id}-${random_id.cluster_id.hex}"
+  key_name   = "corral-${var.corral_user_id}-${random_id.cluster_id.hex}"
   public_key = var.corral_public_key
 }
 
 resource "aws_instance" "server" {
-  count = var.server_count
-  ami = var.aws_ami
-  instance_type     = var.instance_type
-  key_name = aws_key_pair.corral_key.key_name
-  ipv6_address_count = 1
-  source_dest_check = false
-  iam_instance_profile = var.aws_instance_profile
+  count                  = var.server_count
+  ami                    = var.aws_ami
+  instance_type          = var.instance_type
+  key_name               = aws_key_pair.corral_key.key_name
+  ipv6_address_count     = 1
+  source_dest_check      = false
+  iam_instance_profile   = var.aws_instance_profile
   vpc_security_group_ids = [var.aws_security_group]
-  subnet_id = var.aws_subnet
+  subnet_id              = var.aws_subnet
 
   provisioner "remote-exec" {
     inline = [
@@ -43,45 +44,45 @@ resource "aws_instance" "server" {
     ]
   }
   connection {
-      type        = "ssh"
-      host        = self.public_ip
-      user        = var.aws_ssh_user
-      private_key = var.corral_private_key
-      timeout     = "4m"
-   }
+    type        = "ssh"
+    host        = self.public_ip
+    user        = var.aws_ssh_user
+    private_key = var.corral_private_key
+    timeout     = "4m"
+  }
 
   tags = {
-    Name  = "${var.corral_user_id}-${random_id.cluster_id.hex}-cp-${count.index}"
+    Name = "${var.corral_user_id}-${random_id.cluster_id.hex}-cp-${count.index}"
   }
 }
 
 resource "aws_instance" "agent" {
-  count = var.agent_count
-  ami = var.aws_ami
-  instance_type     = var.instance_type
-  key_name = aws_key_pair.corral_key.key_name
-  ipv6_address_count = 1
-  source_dest_check = false
-  iam_instance_profile = var.aws_instance_profile
+  count                  = var.agent_count
+  ami                    = var.aws_ami
+  instance_type          = var.instance_type
+  key_name               = aws_key_pair.corral_key.key_name
+  ipv6_address_count     = 1
+  source_dest_check      = false
+  iam_instance_profile   = var.aws_instance_profile
   vpc_security_group_ids = [var.aws_security_group]
-  subnet_id = var.aws_subnet
-  
- provisioner "remote-exec" {
+  subnet_id              = var.aws_subnet
+
+  provisioner "remote-exec" {
     inline = [
       "sudo su <<EOF",
       "echo ${var.corral_public_key} ${self.key_name} > /root/.ssh/authorized_keys",
       "EOF",
     ]
   }
   connection {
-      type        = "ssh"
-      host        = self.public_ip
-      user        = var.aws_ssh_user
-      private_key = var.corral_private_key
-      timeout     = "4m"
-   }
+    type        = "ssh"
+    host        = self.public_ip
+    user        = var.aws_ssh_user
+    private_key = var.corral_private_key
+    timeout     = "4m"
+  }
   tags = {
-    Name  = "${var.corral_user_id}-${random_id.cluster_id.hex}-agent-${count.index}"
+    Name = "${var.corral_user_id}-${random_id.cluster_id.hex}-agent-${count.index}"
   }
 }
 
@@ -104,7 +105,7 @@ resource "aws_lb" "aws_nlb" {
   load_balancer_type = "network"
   subnets            = [var.aws_subnet]
   name               = "${var.aws_hostname_prefix}-nlb"
-  ip_address_type = "dualstack"
+  ip_address_type    = "dualstack"
 }
 
 resource "aws_lb_listener" "aws_nlb_listener_80" {
@@ -128,14 +129,14 @@ resource "aws_lb_listener" "aws_nlb_listener_443" {
 }
 
 resource "aws_route53_record" "aws_route53" {
-  zone_id            = data.aws_route53_zone.selected.zone_id
-  name               = var.aws_hostname_prefix
-  type               = "CNAME"
-  ttl                = "300"
-  records            = ["dualstack.${aws_lb.aws_nlb.dns_name}"]
+  zone_id = data.aws_route53_zone.selected.zone_id
+  name    = var.aws_hostname_prefix
+  type    = "CNAME"
+  ttl     = "300"
+  records = ["dualstack.${aws_lb.aws_nlb.dns_name}"]
 }
 
 data "aws_route53_zone" "selected" {
-  name               = var.aws_route53_zone
-  private_zone       = false
-}
+  name         = var.aws_route53_zone
+  private_zone = false
+}

templates/aws-replace-node/terraform/pools/corral.tf

@@ -5,6 +5,7 @@ variable "corral_private_key" {} // The corrals private key.  This should be ins
 
 variable "aws_access_key" {}
 variable "aws_secret_key" {}
+variable "aws_session_token" {}
 variable "aws_region" {}
 variable "aws_ami" {}
 variable "aws_ssh_user" {}

templates/aws-replace-node/terraform/pools/main.tf

@@ -12,6 +12,7 @@ provider "random" {}
 provider "aws" {
   access_key = var.aws_access_key
   secret_key = var.aws_secret_key
+  token      = var.aws_session_token
   region     = var.aws_region
 }
 

templates/aws/cluster_nodes/terraform/pools/corral.tf

@@ -1,13 +1,14 @@
-variable "corral_name" {} // name of the corral being created
-variable "corral_user_id" {} // how the user is identified (usually github username)
-variable "corral_public_key" {} // The corrals public key.  This should be installed on every node.
+variable "corral_name" {}        // name of the corral being created
+variable "corral_user_id" {}     // how the user is identified (usually github username)
+variable "corral_public_key" {}  // The corrals public key.  This should be installed on every node.
 variable "corral_private_key" {} // The corrals private key.  This should be installed on every node to be able to have root access, as aws does not allow this by default.
 variable "corral_ssh_key_type" {
-    default = "rsa"
+  default = "rsa"
 } // The corrals ssh key type (rsa, ed25519, etc.)
 
 variable "aws_access_key" {}
 variable "aws_secret_key" {}
+variable "aws_session_token" {}
 variable "aws_region" {}
 variable "aws_ami" {}
 variable "aws_hostname_prefix" {}