Merge pull request #272 from eemperor/devname

Fixes device name usage for extra EBS volume
plus3it · Feb 9, 2021 · 61113f4 · 61113f4
2 parents ebe1a8a + c709559
commit 61113f4
Show file tree

Hide file tree

Showing 16 changed files with 137 additions and 188 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 2.1.0
+current_version = 2.1.1
 commit = True
 message = Bumps version to {new_version}
 tag = False
@@ -20,4 +20,3 @@ replace = Version: {new_version}
 [bumpversion:file:modules/win-instance/watchmaker-win-instance.template.cfn.yaml]
 search = Version: {current_version}
 replace = Version: {new_version}
-
diff --git a/Makefile b/Makefile
@@ -1,27 +1,12 @@
-ARCH ?= amd64
-OS ?= $(shell uname -s | tr '[:upper:]' '[:lower:'])
-CURL ?= curl --fail -sSL
-XARGS ?= xargs -I {}
-
 BIN_DIR ?= ${HOME}/bin
 PATH := $(BIN_DIR):$(PATH)
 
 VERSION ?= $$(grep -E '^current_version' .bumpversion.cfg | sed 's/^.*= //')
 
-MAKEFLAGS += --no-print-directory
-SHELL := bash
-.SHELLFLAGS := -eu -o pipefail -c
-.SUFFIXES:
+SHELL := /bin/bash
 
 -include $(shell curl -sSL -o .tardigrade-ci "https://raw.githubusercontent.com/plus3it/tardigrade-ci/master/bootstrap/Makefile.bootstrap"; echo .tardigrade-ci)
 
-guard/program/%:
-	@ which $* > /dev/null || $(MAKE) $*/install
-
-cfn/%: FIND_CFN ?= find . $(FIND_EXCLUDES) -name '*.template.cfn.*' -type f
 cfn/version: guard/program/yq
 cfn/version:
 	$(FIND_CFN) | $(XARGS) bash -c "yq -e '.Metadata.Version | test(\"^$(VERSION)$$\")' {} > /dev/null || (echo '[{}]: BAD/MISSING Cfn Version Metadata'; exit 1)"
-
-cfn/lint: | guard/program/cfn-lint
-	$(FIND_CFN) | $(XARGS) cfn-lint -t {}
diff --git a/modules/lx-autoscale/README.md b/modules/lx-autoscale/README.md
diff --git a/modules/lx-autoscale/main.tf b/modules/lx-autoscale/main.tf
@@ -22,6 +22,7 @@ resource "aws_cloudformation_stack" "watchmaker-lx-autoscale" {
     AppScriptShell              = var.AppScriptShell
     AppScriptUrl                = var.AppScriptUrl
     AppVolumeDevice             = var.AppVolumeDevice
+    AppVolumeDeviceName         = var.AppVolumeDeviceName
     AppVolumeMountPath          = var.AppVolumeMountPath
     AppVolumeEncrypted          = var.AppVolumeEncrypted
     AppVolumeSize               = var.AppVolumeSize

diff --git a/modules/lx-autoscale/variables.tf b/modules/lx-autoscale/variables.tf
@@ -113,6 +113,12 @@ variable "AppVolumeDevice" {
   default     = false
 }
 
+variable "AppVolumeDeviceName" {
+  type        = string
+  description = "(Optional) Device name to give to the extra EBS volume. Ignored if AppVolumeDevice is false"
+  default     = "/dev/xvdf"
+}
+
 variable "AppVolumeEncrypted" {
   type        = bool
   description = "(Optional) Controls whether the EBS volume will be encrypted"

diff --git a/modules/lx-autoscale/watchmaker-lx-autoscale.params.cfn.yaml b/modules/lx-autoscale/watchmaker-lx-autoscale.params.cfn.yaml
@@ -10,6 +10,8 @@
   ParameterValue: __APPSCRIPTURL__
 - ParameterKey: AppVolumeDevice
   ParameterValue: __APPVOLUMEDEVICE__
+- ParameterKey: AppVolumeDeviceName
+  ParameterValue: __APPVOLUMEDEVICENAME__
 - ParameterKey: AppVolumeEncrypted
   ParameterValue: __APPVOLUMEENCRYPTED__
 - ParameterKey: AppVolumeMountPath

diff --git a/modules/lx-autoscale/watchmaker-lx-autoscale.template.cfn.yaml b/modules/lx-autoscale/watchmaker-lx-autoscale.template.cfn.yaml
@@ -169,6 +169,7 @@ Metadata:
           default: EC2 Application EBS Volume
         Parameters:
           - AppVolumeDevice
+          - AppVolumeDeviceName
           - AppVolumeEncrypted
           - AppVolumeMountPath
           - AppVolumeSize
@@ -207,7 +208,7 @@ Metadata:
         default: Force Cfn Init Update
       ToggleNewInstances:
         default: Force New Instances
-  Version: 2.1.0
+  Version: 2.1.1
 Outputs:
   ScaleDownScheduledAction:
     Condition: UseScheduledAction
@@ -270,6 +271,13 @@ Parameters:
       Decision whether to mount an extra EBS volume. Leave as default ("false")
       to launch without an extra application volume
     Type: String
+  AppVolumeDeviceName:
+    AllowedPattern: '/dev/xvd[f-k]'
+    Default: '/dev/xvdf'
+    Description: >-
+      Device name to be given to extra EBS volume. Ignored if "AppVolumeDevice"
+      is false
+    Type: String
   AppVolumeEncrypted:
     AllowedValues:
       - 'false'
@@ -969,7 +977,7 @@ Resources:
             VolumeType: gp2
         - !If
           - CreateAppVolume
-          - DeviceName: /dev/xvdf
+          - DeviceName: !Ref AppVolumeDeviceName
             Ebs:
               DeleteOnTermination: true
               Encrypted: !Ref AppVolumeEncrypted
@@ -1013,13 +1021,12 @@ Resources:
               #!/bin/bash -xe
 
               # Format and mount app volume
-              APPVOL_DEVICE="$(ls /dev/xvdf /dev/nvme1n1 2> /dev/null || true)"
-              if [[ -n "$APPVOL_DEVICE" && "${AppVolumeDevice}" == "true" ]]
+              if [[ "${AppVolumeDevice}" == "true" ]]
               then
                 MOUNT_VFSTYPE="auto"
                 MOUNT_OPTS="defaults,nofail"
-                cloud-init-per instance mkfsappvolume mkfs -t ext4 "$APPVOL_DEVICE"
-                grep -q "$APPVOL_DEVICE" /etc/fstab || printf "%s\t%s\t%s\t%s\t0\t2\n" "$APPVOL_DEVICE" "${AppVolumeMountPath}" "$MOUNT_VFSTYPE" "$MOUNT_OPTS" >> /etc/fstab
+                cloud-init-per instance mkfsappvolume mkfs -t ext4 "${AppVolumeDeviceName}"
+                grep -q "${AppVolumeDeviceName}" /etc/fstab || printf "%s\t%s\t%s\t%s\t0\t2\n" "${AppVolumeDeviceName}" "${AppVolumeMountPath}" "$MOUNT_VFSTYPE" "$MOUNT_OPTS" >> /etc/fstab
                 mkdir -p "${AppVolumeMountPath}"
                 mount -a
               fi

diff --git a/modules/lx-instance/README.md b/modules/lx-instance/README.md
@@ -30,6 +30,7 @@ with an AWS CloudFormation template to deploy a Watchmaker Linux Instance.
 | AppScriptShell | (Optional) Shell with which to execute the application script. Ignored if AppScriptUrl is blank | `string` | `"bash"` | no |
 | AppScriptUrl | (Optional) S3 URL to the application script in an S3 bucket (s3://). Leave blank to launch without an application script. If specified, an appropriate InstanceRole is required | `string` | `null` | no |
 | AppVolumeDevice | (Optional) Decision whether to mount an extra EBS volume. Leave as default (false) to launch without an extra application volume | `bool` | `false` | no |
+| AppVolumeDeviceName | (Optional) Device name to be given to the extra EBS volume. Ignored if AppVolumeDevice is false | `string` | `"/dev/xvdf"` | no |
 | AppVolumeEncrypted | (Optional) Controls whether the EBS volume will be encrypted. When KmsKeyId is specified, EBS encryption will be done using that, otherwise encrypted using AWS managed CMK | `bool` | `false` | no |
 | AppVolumeMountPath | (Optional) Filesystem path to mount the extra app volume. Ignored if AppVolumeDevice is false | `string` | `"/opt/data"` | no |
 | AppVolumeSize | (Optional) Size in GB of the EBS volume to create. Ignored if AppVolumeDevice is false | `string` | `"1"` | no |

diff --git a/modules/lx-instance/main.tf b/modules/lx-instance/main.tf
@@ -22,6 +22,7 @@ resource "aws_cloudformation_stack" "watchmaker-lx-instance" {
     AppScriptShell          = var.AppScriptShell
     AppScriptUrl            = var.AppScriptUrl
     AppVolumeDevice         = var.AppVolumeDevice
+    AppVolumeDeviceName     = var.AppVolumeDeviceName
     AppVolumeEncrypted      = var.AppVolumeEncrypted
     AppVolumeMountPath      = var.AppVolumeMountPath
     AppVolumeSize           = var.AppVolumeSize

diff --git a/modules/lx-instance/variables.tf b/modules/lx-instance/variables.tf
@@ -113,6 +113,12 @@ variable "AppVolumeDevice" {
   default     = false
 }
 
+variable "AppVolumeDeviceName" {
+  type        = string
+  description = "(Optional) Device name to be given to the extra EBS volume. Ignored if AppVolumeDevice is false"
+  default     = "/dev/xvdf"
+}
+
 variable "AppVolumeEncrypted" {
   type        = bool
   description = "(Optional) Controls whether the EBS volume will be encrypted. When KmsKeyId is specified, EBS encryption will be done using that, otherwise encrypted using AWS managed CMK"

diff --git a/modules/lx-instance/watchmaker-lx-instance.params.cfn.yaml b/modules/lx-instance/watchmaker-lx-instance.params.cfn.yaml
@@ -10,6 +10,8 @@
   ParameterValue: __APPSCRIPTURL__
 - ParameterKey: AppVolumeDevice
   ParameterValue: __APPVOLUMEDEVICE__
+- ParameterKey: AppVolumeDeviceName
+  ParameterValue: __APPVOLUMEDEVICENAME__
 - ParameterKey: AppVolumeEncrypted
   ParameterValue: __APPVOLUMEENCRYPTED__
 - ParameterKey: AppVolumeMountPath

diff --git a/modules/lx-instance/watchmaker-lx-instance.template.cfn.yaml b/modules/lx-instance/watchmaker-lx-instance.template.cfn.yaml
@@ -142,6 +142,7 @@ Metadata:
           default: EC2 Application EBS Volume
         Parameters:
           - AppVolumeDevice
+          - AppVolumeDeviceName
           - AppVolumeEncrypted
           - AppVolumeMountPath
           - AppVolumeSize
@@ -163,7 +164,7 @@ Metadata:
     ParameterLabels:
       ToggleCfnInitUpdate:
         default: Force Cfn Init Update
-  Version: 2.1.0
+  Version: 2.1.1
 Outputs:
   WatchmakerInstanceId:
     Description: Instance ID
@@ -215,6 +216,13 @@ Parameters:
       Decision on whether to mount an extra EBS volume. Leave as default
       ("false") to launch without an extra application volume
     Type: String
+  AppVolumeDeviceName:
+    AllowedPattern: '/dev/xvd[f-k]'
+    Default: '/dev/xvdf'
+    Description: >-
+      Device name to be given to the extra EBS volume. Ignored if
+      "AppVolumeDevice" is false
+    Type: String
   AppVolumeEncrypted:
     AllowedValues:
       - 'false'
@@ -797,7 +805,7 @@ Resources:
             VolumeType: gp2
         - !If
           - CreateAppVolume
-          - DeviceName: /dev/xvdf
+          - DeviceName: !Ref AppVolumeDeviceName
             Ebs:
               DeleteOnTermination: true
               Encrypted: !Ref AppVolumeEncrypted
@@ -867,13 +875,12 @@ Resources:
               #!/bin/bash -xe
 
               # Format and mount app volume
-              APPVOL_DEVICE="$(ls /dev/xvdf /dev/nvme1n1 2> /dev/null || true)"
-              if [[ -n "$APPVOL_DEVICE" && "${AppVolumeDevice}" == "true" ]]
+              if [[ "${AppVolumeDevice}" == "true" ]]
               then
                 MOUNT_VFSTYPE="auto"
                 MOUNT_OPTS="defaults,nofail"
-                cloud-init-per instance mkfsappvolume mkfs -t ext4 "$APPVOL_DEVICE"
-                grep -q "$APPVOL_DEVICE" /etc/fstab || printf "%s\t%s\t%s\t%s\t0\t2\n" "$APPVOL_DEVICE" "${AppVolumeMountPath}" "$MOUNT_VFSTYPE" "$MOUNT_OPTS" >> /etc/fstab
+                cloud-init-per instance mkfsappvolume mkfs -t ext4 "${AppVolumeDeviceName}"
+                grep -q "${AppVolumeDeviceName}" /etc/fstab || printf "%s\t%s\t%s\t%s\t0\t2\n" "${AppVolumeDeviceName}" "${AppVolumeMountPath}" "$MOUNT_VFSTYPE" "$MOUNT_OPTS" >> /etc/fstab
                 mkdir -p "${AppVolumeMountPath}"
                 mount -a
               fi

diff --git a/modules/win-autoscale/watchmaker-win-autoscale.template.cfn.yaml b/modules/win-autoscale/watchmaker-win-autoscale.template.cfn.yaml
@@ -194,7 +194,7 @@ Metadata:
         default: Force Cfn Init Update
       ToggleNewInstances:
         default: Force New Instances
-  Version: 2.1.0
+  Version: 2.1.1
 Outputs:
   ScaleDownScheduledAction:
     Condition: UseScheduledAction
@@ -881,28 +881,24 @@ Resources:
                   - UseWamStandalone
                   - !Sub |
                       # Download watchmaker standalone pkg
-                      [Net.ServicePointManager]::SecurityProtocol = "Ssl3, Tls, Tls11, Tls12"
+                      [Net.ServicePointManager]::SecurityProtocol = "Tls12"
                       (New-Object System.Net.WebClient).DownloadFile("${WatchmakerStandaloneUrl}", "c:\cfn\scripts\watchmaker.exe")
                   - !Sub
                     - |
+                      [Net.ServicePointManager]::SecurityProtocol = "Tls12"
                       $BootstrapUrl = "${WatchmakerBootstrapper}"
                       $PythonUrl = "${PythonInstaller}"
                       $PypiUrl = "${PypiIndexUrl}"
-
                       # Get the host
                       $PypiHost="$(([System.Uri]$PypiUrl).Host)"
-
                       # Download bootstrap file
                       $BootstrapFile = "${!Env:Temp}\$(${!BootstrapUrl}.split('/')[-1])"
                       (New-Object System.Net.WebClient).DownloadFile("$BootstrapUrl", "$BootstrapFile")
-
                       # Install python
                       & "$BootstrapFile" -PythonUrl "$PythonUrl" -Verbose -ErrorAction Stop
-
                       # Install setup dependencies
                       python -m pip install --index-url="$PypiUrl" --trusted-host="$PypiHost" --upgrade pip setuptools
                       if (-not $?) { throw 'pip failed to install setup dependencies!' }
-
                       # Install watchmaker
                       pip install --index-url="$PypiUrl" --trusted-host="$PypiHost" --upgrade boto3 ${local_WatchmakerPkg}
                       if (-not $?) { throw 'pip failed to install watchmaker!' }

diff --git a/modules/win-instance/watchmaker-win-instance.template.cfn.yaml b/modules/win-instance/watchmaker-win-instance.template.cfn.yaml
@@ -148,7 +148,7 @@ Metadata:
     ParameterLabels:
       ToggleCfnInitUpdate:
         default: Force Cfn Init Update
-  Version: 2.1.0
+  Version: 2.1.1
 Outputs:
   WatchmakerInstanceId:
     Description: Instance ID
@@ -701,28 +701,24 @@ Resources:
                   - UseWamStandalone
                   - !Sub |
                       # Download watchmaker standalone pkg
-                      [Net.ServicePointManager]::SecurityProtocol = "Ssl3, Tls, Tls11, Tls12"
+                      [Net.ServicePointManager]::SecurityProtocol = "Tls12"
                       (New-Object System.Net.WebClient).DownloadFile("${WatchmakerStandaloneUrl}", "c:\cfn\scripts\watchmaker.exe")
                   - !Sub
                     - |
+                      [Net.ServicePointManager]::SecurityProtocol = "Tls12"
                       $BootstrapUrl = "${WatchmakerBootstrapper}"
                       $PythonUrl = "${PythonInstaller}"
                       $PypiUrl = "${PypiIndexUrl}"
-
                       # Get the host
                       $PypiHost="$(([System.Uri]$PypiUrl).Host)"
-
                       # Download bootstrap file
                       $BootstrapFile = "${!Env:Temp}\$(${!BootstrapUrl}.split('/')[-1])"
                       (New-Object System.Net.WebClient).DownloadFile("$BootstrapUrl", "$BootstrapFile")
-
                       # Install python
                       & "$BootstrapFile" -PythonUrl "$PythonUrl" -Verbose -ErrorAction Stop
-
                       # Install setup dependencies
                       python -m pip install --index-url="$PypiUrl" --trusted-host="$PypiHost" --upgrade pip setuptools
                       if (-not $?) { throw 'pip failed to install setup dependencies!' }
-
                       # Install watchmaker
                       pip install --index-url="$PypiUrl" --trusted-host="$PypiHost" --upgrade boto3 ${local_WatchmakerPkg}
                       if (-not $?) { throw 'pip failed to install watchmaker!' }

diff --git a/tests/data.tf b/tests/data.tf
@@ -3,26 +3,6 @@ data "aws_vpc" "this" {
   default = "true"
 }
 
-data "aws_ami" "centos6" {
-  most_recent = true
-  owners      = ["701759196663"]
-
-  filter {
-    name   = "name"
-    values = ["*spel-minimal-centos-6*"]
-  }
-
-  filter {
-    name   = "is-public"
-    values = ["true"]
-  }
-
-  filter {
-    name   = "state"
-    values = ["available"]
-  }
-}
-
 data "aws_ami" "centos7" {
   most_recent = true
   owners      = ["701759196663"]