From d3a796e91d0c4ed40df438257e5711b5b3ab240d Mon Sep 17 00:00:00 2001
From: Muhammad Atif Ali <me@matifali.dev>
Date: Tue, 24 Sep 2024 11:28:33 +0500
Subject: [PATCH] Fix variable names in Vault JWT module scripts

- Correct the variable name in `main.tf` and `run.sh` to ensure they are consistent and match expected inputs for Vault CLI interactions.
---
 vault-jwt/main.tf |  4 ++--
 vault-jwt/run.sh  | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/vault-jwt/main.tf b/vault-jwt/main.tf
index a8bf4ab..adcc34d 100644
--- a/vault-jwt/main.tf
+++ b/vault-jwt/main.tf
@@ -46,9 +46,9 @@ resource "coder_script" "vault" {
   display_name = "Vault (GitHub)"
   icon         = "/icon/vault.svg"
   script = templatefile("${path.module}/run.sh", {
-    CODER_OIDC_ACCESS_TOKEN : data.coder_workspace_owner.me.oidc_token,
+    CODER_OIDC_ACCESS_TOKEN : data.coder_workspace_owner.me.oidc_access_token,
     VAULT_JWT_AUTH_PATH : var.vault_jwt_auth_path,
-    VAULT_ROLE : var.vault_jwt_role,
+    VAULT_JWT_ROLE : var.vault_jwt_role,
     VAULT_CLI_VERSION : var.vault_cli_version,
   })
   run_on_start       = true
diff --git a/vault-jwt/run.sh b/vault-jwt/run.sh
index 0c305e2..61b69f4 100644
--- a/vault-jwt/run.sh
+++ b/vault-jwt/run.sh
@@ -43,22 +43,22 @@ install() {
     printf "Unsupported architecture: $${ARCH}\n"
     return 1
   fi
-  # Fetch the latest version of Vault if INSTALL_VERSION is 'latest'
-  if [ "$${INSTALL_VERSION}" = "latest" ]; then
+  # Fetch the latest version of Vault if VAULT_CLI_VERSION is 'latest'
+  if [ "$${VAULT_CLI_VERSION}" = "latest" ]; then
     LATEST_VERSION=$(curl -s https://releases.hashicorp.com/vault/ | grep -v 'rc' | grep -oE 'vault/[0-9]+\.[0-9]+\.[0-9]+' | sed 's/vault\///' | sort -V | tail -n 1)
     printf "Latest version of Vault is %s.\n\n" "$${LATEST_VERSION}"
     if [ -z "$${LATEST_VERSION}" ]; then
       printf "Failed to determine the latest Vault version.\n"
       return 1
     fi
-    INSTALL_VERSION=$${LATEST_VERSION}
+    VAULT_CLI_VERSION=$${VAULT_CLI_VERSION}
   fi
 
   # Check if the vault CLI is installed and has the correct version
   installation_needed=1
   if command -v vault > /dev/null 2>&1; then
     CURRENT_VERSION=$(vault version | grep -oE '[0-9]+\.[0-9]+\.[0-9]+')
-    if [ "$${CURRENT_VERSION}" = "$${INSTALL_VERSION}" ]; then
+    if [ "$${CURRENT_VERSION}" = "$${VAULT_CLI_VERSION}" ]; then
       printf "Vault version %s is already installed and up-to-date.\n\n" "$${CURRENT_VERSION}"
       installation_needed=0
     fi
@@ -69,9 +69,9 @@ install() {
     if [ -z "$${CURRENT_VERSION}" ]; then
       printf "Installing Vault CLI ...\n\n"
     else
-      printf "Upgrading Vault CLI from version %s to %s ...\n\n" "$${CURRENT_VERSION}" "${INSTALL_VERSION}"
+      printf "Upgrading Vault CLI from version %s to %s ...\n\n" "$${CURRENT_VERSION}" "${VAULT_CLI_VERSION}"
     fi
-    fetch vault.zip "https://releases.hashicorp.com/vault/$${INSTALL_VERSION}/vault_$${INSTALL_VERSION}_linux_$${ARCH}.zip"
+    fetch vault.zip "https://releases.hashicorp.com/vault/$${VAULT_CLI_VERSION}/vault_$${VAULT_CLI_VERSION}_linux_$${ARCH}.zip"
     if [ $? -ne 0 ]; then
       printf "Failed to download Vault.\n"
       return 1