From d285f27f4e181096771c062437259320e7ab090a Mon Sep 17 00:00:00 2001
From: Public copy <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 10 Dec 2024 20:13:22 +0000
Subject: [PATCH] automated commit

Signed-off-by: Public copy <41898282+github-actions[bot]@users.noreply.github.com>
---
 .terraform.lock.hcl               | 16 ++++++++--------
 tflib/imagetest/helm/main.tf      | 11 +++++++++--
 tflib/imagetest/helm/outputs.tf   |  4 ++++
 tflib/imagetest/helm/variables.tf |  5 +++++
 tflib/publisher/providers.tf      |  2 +-
 5 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/.terraform.lock.hcl b/.terraform.lock.hcl
index 6850368035..7ed8cba90d 100644
--- a/.terraform.lock.hcl
+++ b/.terraform.lock.hcl
@@ -16,15 +16,15 @@ provider "registry.terraform.io/chainguard-dev/apko" {
 }
 
 provider "registry.terraform.io/chainguard-dev/chainguard" {
-  version     = "0.1.22"
-  constraints = ">= 0.1.22"
+  version     = "0.1.24"
+  constraints = ">= 0.1.24"
   hashes = [
-    "h1:AF4YBcioqhEFq/Vwv3lh4PF9/Xo/xxMrFmXZpuDzrqQ=",
-    "h1:iY3FlyD0p3g3mSOzRcByFd4bmweBRVoJJlioPXHLRY0=",
-    "zh:143b83290a3bdf5a9aff357228b88e0a54ba40e6bacb7f46cc53cb01c1a8fb90",
-    "zh:81e84abf8e7f6946b027ab140ee3f938d0ac824eee8916c0646cb85eb4863242",
-    "zh:8b7a15e1584af880aeb47df6155fa964578f10fd12daba7be29f5de080a9b7e5",
-    "zh:cb8d74ea9ce7c4f1fe308453185447d10c7bb8a085ce8e49b12d25c453a6b182",
+    "h1:OTY4T7wMNACgR+UXbXIEQt0KzirDZ99ESCiOh44r474=",
+    "h1:vhoyxPsKPjlGJyPUqpG6KnwqfP9sH6NcVWWVGJZNefo=",
+    "zh:26dedb600529190c873849dc95023e197071f8a5317bcd5ad11755c4bc3c2ce4",
+    "zh:abde7dcb4911aacdf43b4ab02e9a9281cd69d2769aebcf4386cc737f6d97210d",
+    "zh:adc1c8970d51bb063be62d046998ee2f24da3b3a90fbfe09b2d4b203d8e33a40",
+    "zh:e768fdcc05383ca2934127faf533af1c247a4bff3a764d8b80ff91ba3eb24159",
     "zh:f809ab383cca0a5f83072981c64208cbd7fa67e986a86ee02dd2c82333221e32",
   ]
 }
diff --git a/tflib/imagetest/helm/main.tf b/tflib/imagetest/helm/main.tf
index 4efe8e99a7..b83fdbc39b 100644
--- a/tflib/imagetest/helm/main.tf
+++ b/tflib/imagetest/helm/main.tf
@@ -5,7 +5,8 @@ terraform {
 }
 
 locals {
-  name = var.name != "" ? var.name : random_pet.name.id
+  name        = var.name != "" ? var.name : random_pet.name.id
+  values_path = "/tmp/${local.name}-values.yaml"
 }
 
 resource "random_pet" "name" {}
@@ -43,6 +44,11 @@ chart=$repo_path/${var.chart}
 
 echo "Installing chart: $chart"
 
+# make a temporary file for the values
+cat > ${local.values_path} <<EOF
+${jsonencode(var.values)}
+EOF
+
 if ! helm install ${local.name} $chart \
   --namespace ${var.namespace} --create-namespace \
   %{if var.repo != ""}--repo ${var.repo}%{endif} \
@@ -51,7 +57,8 @@ if ! helm install ${local.name} $chart \
   %{if var.wait}--wait --wait-for-jobs%{endif} \
   --timeout ${var.timeout} \
   %{if length(var.values_files) != 0}--values ${join(",", var.values_files)}%{endif} \
-  --values <(echo '${jsonencode(var.values)}'); then
+  %{if var.dry}--dry-run%{endif} \
+  --values ${local.values_path}; then
 
   printf "\\nFailed to install helm chart\\n"
 
diff --git a/tflib/imagetest/helm/outputs.tf b/tflib/imagetest/helm/outputs.tf
index ee2837acdd..8e63abb955 100644
--- a/tflib/imagetest/helm/outputs.tf
+++ b/tflib/imagetest/helm/outputs.tf
@@ -9,3 +9,7 @@ output "uninstall_cmd" {
 output "release_name" {
   value = local.name
 }
+
+output "values_path" {
+  value = local.values_path
+}
diff --git a/tflib/imagetest/helm/variables.tf b/tflib/imagetest/helm/variables.tf
index 64575a40a1..d89e537ec2 100644
--- a/tflib/imagetest/helm/variables.tf
+++ b/tflib/imagetest/helm/variables.tf
@@ -55,3 +55,8 @@ variable "patches" {
   default     = []
   type        = list(string)
 }
+
+variable "dry" {
+  description = "Indicates whether Helm will be run in dry-run mode. Useful if all you want is to resolve the chart/values."
+  default     = false
+}
diff --git a/tflib/publisher/providers.tf b/tflib/publisher/providers.tf
index 17c24b29c6..5fa49cd50a 100644
--- a/tflib/publisher/providers.tf
+++ b/tflib/publisher/providers.tf
@@ -14,7 +14,7 @@ terraform {
     }
     chainguard = {
       source  = "chainguard-dev/chainguard"
-      version = ">= 0.1.22"
+      version = ">= 0.1.24"
     }
     imagetest = {
       source  = "chainguard-dev/imagetest"