From 25298385206ad8dd6ce93a1a60f777a4d1860c6c Mon Sep 17 00:00:00 2001
From: VJ Patel <VJftw@users.noreply.github.com>
Date: Mon, 16 Oct 2023 19:20:04 +0100
Subject: [PATCH] update Packer to 1.9.4 (#12)

* update Packer to 1.9.4

* use e2-standard-4 as no visible quota
---
 flavours/arch/xfce4.pkr.hcl        |  7 ++++++-
 flavours/debian/kali/xfce4.pkr.hcl |  2 +-
 flavours/debian/xfce4.pkr.hcl      |  2 +-
 third_party/binary/BUILD           | 17 ++++++++---------
 4 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/flavours/arch/xfce4.pkr.hcl b/flavours/arch/xfce4.pkr.hcl
index 78aa038..6ee0e5a 100644
--- a/flavours/arch/xfce4.pkr.hcl
+++ b/flavours/arch/xfce4.pkr.hcl
@@ -21,7 +21,12 @@ source "googlecompute" "arch" {
   disable_default_service_account = true
   disk_type                       = "pd-ssd"
   image_name                      = "arch-xfce4-${var.version_suffix}"
-  machine_type                    = "c2-standard-4"
+
+  // 2023-10-13 - Pricing
+  // c3-standard-4 (cpu quota limit: 8): $0.091864 (spot)
+  // e2-standard-4 (cpu quota limit: 8): $0.0555 (spot)
+  // e2-standard-4                     : $0.044216 (spot)
+  machine_type                    = "e2-standard-4"
   metadata = {
     enable-oslogin = "false"
   }
diff --git a/flavours/debian/kali/xfce4.pkr.hcl b/flavours/debian/kali/xfce4.pkr.hcl
index f9231ce..fac02b7 100644
--- a/flavours/debian/kali/xfce4.pkr.hcl
+++ b/flavours/debian/kali/xfce4.pkr.hcl
@@ -21,7 +21,7 @@ source "googlecompute" "kali" {
   disable_default_service_account = true
   disk_type                       = "pd-ssd"
   image_name                      = "kali-xfce4-${var.version_suffix}"
-  machine_type                    = "c2-standard-4"
+  machine_type                    = "e2-standard-4"
   metadata = {
     enable-oslogin = "false"
   }
diff --git a/flavours/debian/xfce4.pkr.hcl b/flavours/debian/xfce4.pkr.hcl
index 74deb8c..dd19bd5 100644
--- a/flavours/debian/xfce4.pkr.hcl
+++ b/flavours/debian/xfce4.pkr.hcl
@@ -21,7 +21,7 @@ source "googlecompute" "debian" {
   disable_default_service_account = true
   disk_type                       = "pd-ssd"
   image_name                      = "debian-xfce4-${var.version_suffix}"
-  machine_type                    = "e2-medium"
+  machine_type                    = "e2-standard-4"
   metadata = {
     enable-oslogin = "false"
   }
diff --git a/third_party/binary/BUILD b/third_party/binary/BUILD
index 1a25536..8eff7f0 100644
--- a/third_party/binary/BUILD
+++ b/third_party/binary/BUILD
@@ -1,14 +1,13 @@
-
-PACKER_VERSION = "1.8.0"
+PACKER_VERSION = "1.9.4"
 
 remote_file(
     name = "packer",
-    url = f"https://releases.hashicorp.com/packer/{PACKER_VERSION}/packer_{PACKER_VERSION}_{CONFIG.OS}_{CONFIG.ARCH}.zip",
-    extract = True,
     binary = True,
+    extract = True,
     hashes = [
-        "94c5d65386fa8f17e36d3496fbbdf18d3bfab01306aa8000c14656b63070b7c2", # linux_amd64
+        "6cd5269c4245aa8c99e551d1b862460d63fe711c58bec618fade25f8492e80d9",  # linux_amd64
     ],
+    url = f"https://releases.hashicorp.com/packer/{PACKER_VERSION}/packer_{PACKER_VERSION}_{CONFIG.OS}_{CONFIG.ARCH}.zip",
     visibility = ["PUBLIC"],
 )
 
@@ -17,10 +16,10 @@ JQ_VERSION = "1.6"
 remote_file(
     name = "jq",
     out = "jq",
-    url = f"https://github.com/stedolan/jq/releases/download/jq-{JQ_VERSION}/jq-{CONFIG.OS}64",
     binary = True,
-    visibility = ["PUBLIC"],
     hashes = [
-        "af986793a515d500ab2d35f8d2aecd656e764504b789b66d7e1a0b727a124c44", # linux64
-    ]
+        "af986793a515d500ab2d35f8d2aecd656e764504b789b66d7e1a0b727a124c44",  # linux64
+    ],
+    url = f"https://github.com/stedolan/jq/releases/download/jq-{JQ_VERSION}/jq-{CONFIG.OS}64",
+    visibility = ["PUBLIC"],
 )