Allow injection of Spoke version

and update some version numbers!

.github/workflows/terraform.yml

@@ -9,15 +9,15 @@ jobs:
     - name: fmt
       uses: hashicorp/terraform-github-actions@master
       with:
-        tf_actions_version: 0.12.20
+        tf_actions_version: 0.12.21
         tf_actions_subcommand: fmt
     - name: init
       uses: hashicorp/terraform-github-actions@master
       with:
-        tf_actions_version: 0.12.20
+        tf_actions_version: 0.12.21
         tf_actions_subcommand: init
     - name: validate
       uses: hashicorp/terraform-github-actions@master
       with:
-        tf_actions_version: 0.12.20
+        tf_actions_version: 0.12.21
         tf_actions_subcommand: validate

README.md

@@ -71,6 +71,7 @@ module "digitalocean_spoke" {
 | region | Region in which all resources will be provisioned | `string` | `"nyc1"` | no |
 | resource\_prefix | Prefix prepended to resource names | `string` | `"spoke-"` | no |
 | server\_name | Server name used in nginx config | `string` | n/a | yes |
+| spoke\_version | Git ref of MoveOnOrg/Spoke to deploy | `string` | `"v5.2"` | no |
 | ssh\_keys | List of ssh public keys to pass to droplet provisioning | `list(string)` | n/a | yes |
 
 ## Outputs

main.tf

@@ -102,6 +102,12 @@ variable "region" {
   type        = string
 }
 
+variable "spoke_version" {
+  description = "Git ref of MoveOnOrg/Spoke to deploy"
+  default     = "v5.2"
+  type        = "string"
+}
+
 variable "ssh_keys" {
   type        = list(string)
   description = "List of ssh public keys to pass to droplet provisioning"
@@ -206,6 +212,7 @@ locals {
     PORT                    = var.port,
     REDIS_URL               = "redis://127.0.0.1:6379/0",
     SESSION_SECRET          = random_string.session_secret.result,
+    TERRAFORM_SPOKE_VERSION = var.spoke_version,
   }, var.env)
 }
 

spoke-app-provision

@@ -96,12 +96,17 @@ _run_system1() {
 _run_spoke0() {
   set -o xtrace
 
+  set -o allexport
+  source /tmp/app.env
+  set +o allexport
+
   git --version
   if [[ ! -d /home/spoke/app/.git ]]; then
     git clone https://github.com/MoveOnOrg/Spoke.git /home/spoke/app
   fi
+
   cd /home/spoke/app
-  git checkout -qf 'v5.1'
+  git checkout -qf "${TERRAFORM_SPOKE_VERSION}"
 
   cp -v /tmp/spoke-app-run /home/spoke/spoke-app-run
   chmod +x /home/spoke/spoke-app-run
@@ -122,10 +127,6 @@ _run_spoke0() {
   cp -v /tmp/app.env /home/spoke/app/.env
   sha1sum /home/spoke/app/.env
 
-  set -o allexport
-  source /home/spoke/app/.env
-  set +o allexport
-
   yarn --version
   yarn install --ignore-scripts --non-interactive --frozen-lockfile