From bafaa4300c5bc52d44049636b0935323d7e1cc28 Mon Sep 17 00:00:00 2001
From: Brian Ojeda <9335829+sgtoj@users.noreply.github.com>
Date: Wed, 5 Jun 2024 09:13:08 -0400
Subject: [PATCH 1/2] dev: update devcontainer env

---
 .devcontainer/Dockerfile        |  2 +-
 .devcontainer/devcontainer.json | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 564a7ba..948636a 100755
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -9,7 +9,7 @@ RUN SYSTEM_ARCH=$(uname -m) \
     && rm -rf aws
 
 # install terraform
-ENV TERRAFORM_VERSION=1.5.1
+ENV TERRAFORM_VERSION=1.8.5
 ENV TF_PLUGIN_CACHE_DIR=$HOME/.terraform.d/plugin-cache
 RUN mkdir -p $TF_PLUGIN_CACHE_DIR
 RUN SYSTEM_ARCH=$(dpkg --print-architecture) \
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 3eed8d5..a07b170 100755
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -2,7 +2,7 @@
   "name": "Terraform",
   "dockerFile": "Dockerfile",
   "features": {
-    "ghcr.io/devcontainers/features/docker-in-docker:2.0.1": {},
+    "ghcr.io/devcontainers/features/docker-in-docker:2.11.0": {}
   },
   "mounts": [
     "source=${localEnv:HOME}/.aws,target=/home/vscode/.aws,type=bind,consistency=cached"
@@ -14,7 +14,7 @@
     "vscode": {
       "settings": {
         "editor.codeActionsOnSave": {
-          "source.fixAll": true
+          "source.fixAll": "always"
         },
         "editor.formatOnSave": true,
         "editor.formatOnType": false,
@@ -29,7 +29,7 @@
         },
         "[python]": {
           "editor.defaultFormatter": "ms-python.black-formatter"
-        },
+        }
       },
       "extensions": [
         "darkriszty.markdown-table-prettify",
@@ -42,8 +42,8 @@
         "ms-azuretools.vscode-docker",
         "ms-python.black-formatter",
         "timonwong.shellcheck",
-        "VisualStudioExptTeam.vscodeintellicode",
-      ],
+        "VisualStudioExptTeam.vscodeintellicode"
+      ]
     }
-  },
-}
+  }
+}
\ No newline at end of file

From ce87f0a6b14fa55d4e093acec4664a1f460b75d6 Mon Sep 17 00:00:00 2001
From: Brian Ojeda <9335829+sgtoj@users.noreply.github.com>
Date: Wed, 5 Jun 2024 09:13:19 -0400
Subject: [PATCH 2/2] chore: bump to latest deps

---
 examples/complete/main.tf | 1 -
 main.tf                   | 6 +++---
 variables.tf              | 1 +
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/examples/complete/main.tf b/examples/complete/main.tf
index 2b55b22..f74f8e8 100755
--- a/examples/complete/main.tf
+++ b/examples/complete/main.tf
@@ -5,7 +5,6 @@ module "github_runner" {
   github_organization  = var.github_organization
   runner_maximum_count = 10
   runner_labels        = var.runner_labels
-  runner_version       = "3.6.1"
   instance_types       = var.instance_types
   log_retention        = 7
   vpc_id               = var.vpc_id
diff --git a/main.tf b/main.tf
index 9f1bac1..581dd24 100755
--- a/main.tf
+++ b/main.tf
@@ -2,7 +2,7 @@ locals {
   enabled = coalesce(var.enabled, module.this.enabled, true)
   name    = coalesce(var.name, module.this.name, "github-runner-${random_string.github_runner_random_suffix.result}")
 
-  runner_module_version = "v5.6.0"
+  runner_module_version = "v5.11.0"
 
   aws_account_id   = module.this.enabled && var.aws_account_id != "" ? var.aws_account_id : try(data.aws_caller_identity.current[0].account_id, "")
   aws_region_name  = module.this.enabled && var.aws_region_name != "" ? var.aws_region_name : try(data.aws_region.current[0].name, "")
@@ -40,7 +40,7 @@ resource "random_string" "github_runner_random_suffix" {
 
 module "github_runner" {
   source  = "philips-labs/github-runner/aws"
-  version = "v5.6.0" # should match local.runner_module_version
+  version = "v5.11.0" # should match local.runner_module_version
 
   prefix                                  = module.github_runner_label.id
   enable_ephemeral_runners                = var.runner_ephemeral_mode_enabled
@@ -129,7 +129,7 @@ resource "random_password" "webhook" {
 
 module "runner_binaries" {
   source  = "cruxstack/artifact-packager/docker"
-  version = "1.3.2"
+  version = "1.3.6"
 
   artifact_src_type      = "directory"
   artifact_dst_directory = coalesce(var.runner_binaries_path, "${path.module}/dist")
diff --git a/variables.tf b/variables.tf
index e2014b3..6222b7f 100755
--- a/variables.tf
+++ b/variables.tf
@@ -100,6 +100,7 @@ variable "instance_types" {
 variable "instance_lifecycle_type" {
   type        = string
   description = "Lifecycle type for action runner instances. Options: `spot` or `on-demand`."
+  default     = "spot"
 
   validation {
     condition     = contains(["spot", "on-demand"], lower(var.instance_lifecycle_type))