From 948280600ae63ad59db92661da919dc14b7dcaf9 Mon Sep 17 00:00:00 2001
From: Muhammad Atif Ali <atif@coder.com>
Date: Mon, 26 Feb 2024 20:51:45 +0500
Subject: [PATCH] fix(vault): fix version fetching logic (#172)

---
 bun.lockb                 | Bin 9463 -> 9456 bytes
 package.json              |   2 +-
 vault-github/main.test.ts |   2 +-
 vault-github/run.sh       |  14 ++++++++++++--
 vault-token/run.sh        |  12 +++++++++++-
 5 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/bun.lockb b/bun.lockb
index d7e77b2aa30552796d6059a6ed6b0506257575ca..d3e22141efbd6a38f0a17c4768e00326156a716d 100755
GIT binary patch
delta 735
zcmezF`N4C7o}!YAb{ccHj*8sR@ZjJIR;PrRjU9X|TelQc<=Pam$6rjC=zmhSnw5cp
zlYyb307!EK>5o8~2gaXl%D8y)14apsiTY8!YFlkBH~(O~!N|xnIgrJCGY88ACPvxG
zj7;j29hf*6TPAa|+cWK8o$SSK$MlzVau>UupdA|ngB8#)5eBf~3?fLXPqLp@Wde$e
z12H2IOF(H!APoW_8YC_?`6v5qMS?0fmvVM6IfVJ>uD*48W!0y&(piq@t$qZa=3brs
z_s<-|Zwzh99dTY~XFhB=C9<(^^%l3YNf$R{9iF|#d;ik#>v!eTf<jkGUEXZV)4}YM
z{?yb`>i<oL4M$&kqzl^Io71m*GQYFwZ{QmNj*B8Q(z`9U*<|%^kBB||;clJD>2E*v
z7Y1g_vP@g{yK#k$&-Z6wm;dAc2Xwyh<V=C^$r%E?lg|oxGm1`@6bzp%A;|0S{@2CZ
z!IOUe+M}#^x#`jqp7j;q-n_|P`G?Kt5yNW#u-OZgoOkiRf3dJw|7?x(+*!}Imd5w)
zjn-tFpET{y=JVcGn^Ogi*%`$q&y<Lt{6|7Y78F`SKr9Tz{6NeF#Gp_Y1Y+^YhLX*K
zVn7y179=VP!jq3mPGvUIGuRv}b)HeN&d5N|&`{49mL3+Lo>4hJ>ry5YW1WSbsh*+1
zWJwumX;|vu%(prADsa|rpscB$k(r(e!^g?ZGFK%lfDsN#JuMcdXBaE^{>_jD+5`j<
zn+s)gnOK3g=^0GsSCrq(q`=55VX0S=Ugc0yS&&++pO>GK3T2j0-Y73KxkWi>vW&9Z
YWC0cS$-;`#lXoafG8q|67FKxz05+}SmjD0&

delta 759
zcmez1`Q3AZo}yWA+<qgMPs)Wib{NZlzO}5^Ot<LcnJ3Ybo?i-{v)xikpXh&5wuO~}
zfro*ip&CeY0_g%E%?+f%;*(7o7b|e)+Z=lpIBWOf(=#gPXI;vis2|m<w$;`WCcgOx
z;|)ee?#Y3y=9@WKCNMEdPG)3MpX|WIAvghOm?O|IAjKd9#7r<5#*33rve`4SvQ6e<
zw_~zno9xAI$JjmjB>QPqW}rF=AO-;t%?QMjP+AH|gMifJpX{?0398&&%Gtr>AjA{c
z$Fw(FT41N!{soH-pBPGfYJI6O{mJX7%g@xzGbIy(mvC-%Hw>QKa4J2K>+AZ~cG)jM
z%dDqQSXi(2HLx>ovn@{tbN#oNxIp=HYNwy3)UjD+$91q5zSGq97MK#hCHumpyyFjE
zyBFQ->z=AFBstf7!d>SBY2EL=m=^6#Z?~DdVOrmREugCz8UFGA1A0do><0+J61~??
zpW)S+<}KxwChu059zA#W;n6={M>gzG-jT~E`ljVW+0*Nt@1IH*bgrmfcK&H-o!Rg8
zp6@mGtUewxUFmGNsmkP70g1`70^W?GlQRXvCrb$OPChH(y}3Y8gB>U|QzD*GeDYTb
zc}XFlg&>>xftU-3MSxfkh$SZ*N;V6MLPbC-Ky0zeM<u5+8|oQuj+HvkI5|Ov!x)xA
zVCjH~5#%WlfTbZ=ieO@lGu1OP(=(auD<jR=GPzmis$@MIB%QTbn4V#*;QKd27NR$P
zbD?Z56D!arJ;TZTit?M86d0K$P4!CBs~k!y3sQ^q^YT+tq0I8)$(_n>%och^Af=Pd
Tm4hY=D@sq^psY4oK;;1d*x=@c

diff --git a/package.json b/package.json
index 2570de4..5a73d51 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,7 @@
   "devDependencies": {
     "bun-types": "^1.0.18",
     "gray-matter": "^4.0.3",
-    "marked": "^11.1.0",
+    "marked": "^12.0.0",
     "prettier-plugin-sh": "^0.13.1",
     "prettier-plugin-terraform-formatter": "^1.2.1"
   },
diff --git a/vault-github/main.test.ts b/vault-github/main.test.ts
index 91ad50b..25934c8 100644
--- a/vault-github/main.test.ts
+++ b/vault-github/main.test.ts
@@ -1,7 +1,7 @@
 import { describe } from "bun:test";
 import { runTerraformInit, testRequiredVariables } from "../test";
 
-describe("vault-token", async () => {
+describe("vault-github", async () => {
   await runTerraformInit(import.meta.dir);
 
   testRequiredVariables(import.meta.dir, {
diff --git a/vault-github/run.sh b/vault-github/run.sh
index 13f871e..8ca96c0 100644
--- a/vault-github/run.sh
+++ b/vault-github/run.sh
@@ -32,9 +32,19 @@ unzip_safe() {
 }
 
 install() {
+  # Get the architecture of the system
+  ARCH=$(uname -m)
+  if [ "$${ARCH}" = "x86_64" ]; then
+    ARCH="amd64"
+  elif [ "$${ARCH}" = "aarch64" ]; then
+    ARCH="arm64"
+  else
+    printf "Unsupported architecture: $${ARCH}\n"
+    return 1
+  fi
   # Fetch the latest version of Vault if INSTALL_VERSION is 'latest'
   if [ "$${INSTALL_VERSION}" = "latest" ]; then
-    LATEST_VERSION=$(curl -s https://releases.hashicorp.com/vault/ | grep -v '-rc' | grep -oP 'vault/\K[0-9]+\.[0-9]+\.[0-9]+' | sort -V | tail -n 1)
+    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"
@@ -60,7 +70,7 @@ install() {
     else
       printf "Upgrading Vault CLI from version %s to %s ...\n\n" "$${CURRENT_VERSION}" "${INSTALL_VERSION}"
     fi
-    fetch vault.zip "https://releases.hashicorp.com/vault/$${INSTALL_VERSION}/vault_$${INSTALL_VERSION}_linux_amd64.zip"
+    fetch vault.zip "https://releases.hashicorp.com/vault/$${INSTALL_VERSION}/vault_$${INSTALL_VERSION}_linux_$${ARCH}.zip"
     if [ $? -ne 0 ]; then
       printf "Failed to download Vault.\n"
       return 1
diff --git a/vault-token/run.sh b/vault-token/run.sh
index cb5125d..e1da6ee 100644
--- a/vault-token/run.sh
+++ b/vault-token/run.sh
@@ -30,9 +30,19 @@ unzip_safe() {
 }
 
 install() {
+  # Get the architecture of the system
+  ARCH=$(uname -m)
+  if [ "$${ARCH}" = "x86_64" ]; then
+    ARCH="amd64"
+  elif [ "$${ARCH}" = "aarch64" ]; then
+    ARCH="arm64"
+  else
+    printf "Unsupported architecture: $${ARCH}\n"
+    return 1
+  fi
   # Fetch the latest version of Vault if INSTALL_VERSION is 'latest'
   if [ "$${INSTALL_VERSION}" = "latest" ]; then
-    LATEST_VERSION=$(curl -s https://releases.hashicorp.com/vault/ | grep -v '-rc' | grep -oP 'vault/\K[0-9]+\.[0-9]+\.[0-9]+' | sort -V | tail -n 1)
+    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"