Compatible with old functions

Author: Magicloud

examples/single-node-asg-tester/main.tf

@@ -44,5 +44,6 @@ module "tester" {
   subnet_id          = module.vpc.public_subnet_ids[0]
   security_group_ids = [aws_security_group.ssh.id]
   region             = "ap-northeast-1"
+  compatible_with_single_volume = false
   data_volumes       = [{ name = "a", device = "/dev/xvdm", size = 50 }, { name = "b", device = "/dev/xvdn" }]
 }

modules/init-snippet-attach-ebs-volume/main.tf

@@ -9,64 +9,23 @@
  *
  */
 
-# variables used by this snippet of init shellcode
-variable "device_paths" {
-  description = "path, to the device's path in /dev/"
-  type        = list(string)
-}
-
-variable "volume_ids" {
-  description = "ID of the EBS volume to attach"
-  type        = list(string)
-}
-
-variable "init_prefix" {
-  default     = ""
-  description = "initial init (shellcode) to prefix this snippet with"
-  type        = string
-}
-
-variable "init_suffix" {
-  default     = ""
-  description = "init (shellcode) to append to the end of this snippet"
-  type        = string
-}
-
-variable "log_level" {
-  default     = "info"
-  description = "default log level verbosity for apps that support it"
-  type        = string
-}
-
-variable "log_prefix" {
-  default     = "OPS: "
-  description = "string to prefix log messages with"
-  type        = string
-}
-
-variable "region" {
-  description = "AWS region the volume is in"
-  type        = string
-}
-
-variable "wait_interval" {
-  default     = "5"
-  description = "time (in seconds) to wait when looping to find the device"
-  type        = number
+locals {
+  device_paths = var.compatible_with_single_volume ? [var.device_path] : var.device_paths
+  volume_ids   = var.compatible_with_single_volume ? [var.volume_id] : var.volume_ids
 }
 
 # render init script for a cluster using our generic template
 data "template_file" "init_snippet" {
-  count = length(var.volume_ids)
+  count = length(local.volume_ids)
 
   template = file("${path.module}/snippet.tpl")
 
   vars = {
-    device_path   = var.device_paths[count.index]
+    device_path   = local.device_paths[count.index]
     log_prefix    = var.log_prefix
     log_level     = var.log_level
     region        = var.region
-    volume_id     = var.volume_ids[count.index]
+    volume_id     = local.volume_ids[count.index]
     wait_interval = var.wait_interval
   }
 }
@@ -78,8 +37,8 @@ data "template_file" "instance_id" {
 output "init_snippet" {
   value = <<EOF
 ${var.init_prefix}
-data.template_file.instance_id.rendered
-data.template_file.init_snippet.*.rendered
+${data.template_file.instance_id.rendered}
+${join("\n", data.template_file.init_snippet.*.rendered)}
 ${var.init_suffix}
 EOF
 }

modules/init-snippet-attach-ebs-volume/snippet.tpl

@@ -9,12 +9,11 @@ while ! aws ec2 attach-volume                     \
   sleep '${wait_interval}'
 done
 echo "${log_prefix} $${VOLUME_ID} attached."
+sleep '${wait_interval}' # Wait for device up
 
-vol_id="$(echo "$${VOLUME_ID}" | tr -d '-')"
-while [ ! -e /dev/disk/by-id/*-Amazon_Elastic_Block_Store_$${vol_id} ]; do
-  sleep '${wait_interval}' 
-done
-
-dev_id="$(ls /dev/disk/by-id/*-Amazon_Elastic_Block_Store_$${vol_id} | head -1)"
-dev_name="/dev/$(readlink "$${dev_id}" | tr / '\n' | tail -1)"
-[ "$${dev_name}" == "${device_path}" ] || ln -s "$${dev_name}" "${device_path}"
+if [ ! -e ${device_path} ]; then
+  vol_id="$(echo "$${VOLUME_ID}" | tr -d '-')"
+  dev_id="$(ls /dev/disk/by-id/*-Amazon_Elastic_Block_Store_$${vol_id} | head -1)"
+  dev_name="/dev/$(readlink "$${dev_id}" | tr / '\n' | tail -1)"
+  [ "$${dev_name}" == "${device_path}" ] || ln -s "$${dev_name}" "${device_path}"
+fi

modules/init-snippet-attach-ebs-volume/variables.tf

@@ -0,0 +1,63 @@
+variable "device_path" {
+  default     = "/dev/xvdf"
+  description = "path, to the device's path in /dev/"
+  type        = string
+}
+
+variable "device_paths" {
+  type        = list(string)
+  description = "paths, to the device's path in /dev/"
+  default     = []
+}
+
+variable "init_prefix" {
+  default     = ""
+  description = "initial init (shellcode) to prefix this snippet with"
+  type        = string
+}
+
+variable "init_suffix" {
+  default     = ""
+  description = "init (shellcode) to append to the end of this snippet"
+  type        = string
+}
+
+variable "log_level" {
+  default     = "info"
+  description = "default log level verbosity for apps that support it"
+  type        = string
+}
+
+variable "log_prefix" {
+  default     = "OPS: "
+  description = "string to prefix log messages with"
+  type        = string
+}
+
+variable "region" {
+  description = "AWS region the volume is in"
+  type        = string
+}
+
+variable "wait_interval" {
+  default     = "5"
+  description = "time (in seconds) to wait when looping to find the device"
+  type        = number
+}
+
+variable "volume_id" {
+  description = "ID of the EBS volume to attach"
+  type        = string
+  default     = ""
+}
+
+variable "volume_ids" {
+  description = "IDs of the EBS volumes to attach"
+  type        = list(string)
+  default     = []
+}
+
+variable "compatible_with_single_volume" {
+  default = true
+  description = "Using variables for single volumes or not."
+}

modules/persistent-ebs/locals.tf

@@ -7,5 +7,14 @@ locals {
     kms_key_id  = ""
     snapshot_id = ""
   }
-  volumes_default = [for x in var.volumes : merge(local.volume_default, x)]
+  volumes_default_no_comp = [for x in var.volumes : merge(local.volume_default, x)]
+  volumes_default = var.compatible_with_single_volume ? [{
+    type        = var.volume_type,
+    iops        = var.iops,
+    size        = var.size,
+    encrypted   = var.encrypted,
+    kms_key_id  = var.kms_key_id,
+    snapshot_id = var.snapshot_id,
+    name        = "default"
+  }] : local.volumes_default_no_comp
 }

modules/persistent-ebs/variables.tf

@@ -14,6 +14,42 @@ variable "az" {
   type        = string
 }
 
+variable "volume_type" {
+  default     = "gp2"
+  description = "Type of EBS volume to use for the EBS block device"
+  type        = string
+}
+
+variable "size" {
+  default     = "15"
+  description = "Size (in GB) of EBS volume to use for the EBS block device"
+  type        = string
+}
+
+variable "snapshot_id" {
+  default     = ""
+  description = "The ID of the snapshot to base the EBS block device on"
+  type        = string
+}
+
+variable "encrypted" {
+  default     = true
+  description = "Boolean, whether or not to encrypt the EBS block device"
+  type        = string
+}
+
+variable "kms_key_id" {
+  default     = ""
+  description = "ID of the KMS key to use when encyprting the EBS block device"
+  type        = string
+}
+
+variable "iops" {
+  default     = ""
+  description = "The amount of IOPS to provision for the EBS block device"
+  type        = string
+}
+
 variable "extra_tags" {
   default     = {}
   description = "Map with extra tags to be applied to all ebs volumes"
@@ -26,14 +62,20 @@ variable "iam_instance_profile_role_name" {
 }
 
 variable "volumes" {
-  type = list(object({
-    type        = string,
-    iops        = number,
-    size        = number,
-    encrypted   = bool,
-    kms_key_id  = string,
-    snapshot_id = string,
-    name        = string
-  }))
+  type = list(map(any))
+### Note: what should be contained.
+#    type        = string,
+#    iops        = number,
+#    size        = number,
+#    encrypted   = bool,
+#    kms_key_id  = string,
+#    snapshot_id = string,
+#    name        = string
   description = "Definition of volumes. `name` is required."
+  default     = []
+}
+
+variable "compatible_with_single_volume" {
+  default = true
+  description = "Using variables for single volumes or not."
 }

modules/single-node-asg/main.tf

@@ -34,7 +34,17 @@ locals {
     snapshot_id = ""
   }
 
-  data_volumes_default = [for x in var.data_volumes : merge(local.data_volume_default, x)]
+  data_volumes_default_no_comp = [for x in var.data_volumes : merge(local.data_volume_default, x)]
+  data_volumes_default = var.compatible_with_single_volume ? [{
+    type        = var.data_volume_type,
+    iops        = var.data_volume_iops,
+    size        = var.data_volume_size,
+    encrypted   = var.data_volume_encrypted,
+    kms_key_id  = var.data_volume_kms_key_id,
+    snapshot_id = var.data_volume_snapshot_id,
+    name        = "${local.name_prefix_with_az}-default",
+    device      = "/dev/xvdf"
+  }] : local.data_volumes_default_no_comp
 }
 
 # Create an IAM Instance profile we can use on EC2, associated with the ASG
@@ -50,6 +60,7 @@ module "service-data" {
   region      = var.region
   az          = local.az
   volumes     = local.data_volumes_default
+  compatible_with_single_volume = false
 
   # EBS module will create an IAM policy and associate with this role
   iam_instance_profile_role_name = module.instance_profile.iam_role_name
@@ -83,8 +94,10 @@ module "server" {
   user_data = <<END_INIT
 #!/bin/bash
 # exec > /tmp/init.log
-# exec 2> /tmp/init-err.log
+exec 2>&1
 # set -x
+apt update
+${module.install-awscli.init_snippet}
 ${var.init_prefix}
 ${module.init-attach-ebs.init_snippet}
 ${var.init_suffix}
@@ -97,5 +110,10 @@ module "init-attach-ebs" {
   source       = "../init-snippet-attach-ebs-volume"
   region       = var.region
   volume_ids   = module.service-data.volume_ids
-  device_paths = [for x in var.data_volumes : x.device]
+  device_paths = [for x in local.data_volumes_default : x.device]
+  compatible_with_single_volume = false
+}
+
+module "install-awscli" {
+  source = "../init-snippet-install-awscli"
 }

modules/single-node-asg/variables.tf

@@ -36,8 +36,44 @@ variable "root_volume_type" {
 }
 
 variable "root_volume_size" {
-  default     = "8"
+  default     = 8
   description = "Size (in GB) of EBS volume to use for the root block device"
+  type        = number
+}
+
+variable "data_volume_type" {
+  default     = "gp2"
+  description = "Type of EBS volume to use for the EBS volume"
+  type        = string
+}
+
+variable "data_volume_size" {
+  default     = 10
+  description = "Size (in GB) of EBS volume to use for the EBS volume"
+  type        = number
+}
+
+variable "data_volume_encrypted" {
+  default     = true
+  description = "Boolean, whether or not to encrypt the EBS block device"
+  type        = string
+}
+
+variable "data_volume_kms_key_id" {
+  default     = ""
+  description = "ID of the KMS key to use when encyprting the EBS block device"
+  type        = string
+}
+
+variable "data_volume_snapshot_id" {
+  default     = ""
+  description = "The ID of the snapshot to base the EBS block device on"
+  type        = string
+}
+
+variable "data_volume_iops" {
+  default     = ""
+  description = "The amount of IOPS to provision for the EBS block device"
   type        = string
 }
 
@@ -84,3 +120,8 @@ variable "data_volumes" {
   type = list(map(any))
   description = "Definition of the data volumes. `name` and `device` are required."
 }
+
+variable "compatible_with_single_volume" {
+  default = true
+  description = "Using variables for single volumes or not."
+}