From df0a2f865e21cdeb4de5dc086cd5c83a986ba052 Mon Sep 17 00:00:00 2001
From: David Desmarais-Michaud <desmarais.michaud.david@gmail.com>
Date: Thu, 21 Mar 2024 15:48:48 -0400
Subject: [PATCH] fix(PL-2554): fix chart default values

---
 chart/templates/secret.yaml                       |  1 +
 .../expected.yaml                                 |  3 ---
 chart/tests/with-github-app/expected.yaml         |  3 ---
 chart/tests/with-github-token/expected.yaml       |  3 ---
 chart/values.yaml                                 | 15 ++++++++-------
 5 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/chart/templates/secret.yaml b/chart/templates/secret.yaml
index c259733..20b201f 100644
--- a/chart/templates/secret.yaml
+++ b/chart/templates/secret.yaml
@@ -1,4 +1,5 @@
 {{- and (required ".Values.env.PLUGIN_TOKEN is required" .Values.env.PLUGIN_TOKEN) "" -}}
+{{- and (required ".Values.env.CATALOG_URL is required" .Values.env.CATALOG_URL) "" -}}
 {{- if eq .Values.secretType "secret" }}
 apiVersion: v1
 kind: Secret
diff --git a/chart/tests/with-github-app-and-sealed-secrets/expected.yaml b/chart/tests/with-github-app-and-sealed-secrets/expected.yaml
index 10da6e9..e30014c 100644
--- a/chart/tests/with-github-app-and-sealed-secrets/expected.yaml
+++ b/chart/tests/with-github-app-and-sealed-secrets/expected.yaml
@@ -103,12 +103,9 @@ metadata:
 spec:
   encryptedData:
     CATALOG_DIR: /tmp/catalog
-    CATALOG_REVISION: ""
     CATALOG_URL: https://github.com/example/foobar.git
     GH_APP_ID: "123456"
     GH_APP_INSTALLATION_ID: "789101112"
-    GH_TOKEN: ""
-    GH_USER: ""
     GRACE_PERIOD: 10s
     PLUGIN_TOKEN: '@very!l0ngands3curet0ken'
     PORT: :8080
diff --git a/chart/tests/with-github-app/expected.yaml b/chart/tests/with-github-app/expected.yaml
index 951bca2..5463ff4 100644
--- a/chart/tests/with-github-app/expected.yaml
+++ b/chart/tests/with-github-app/expected.yaml
@@ -6,12 +6,9 @@ metadata:
   name: my-release-joy-generator-config
 stringData:
   CATALOG_DIR: /tmp/catalog
-  CATALOG_REVISION: ""
   CATALOG_URL: https://github.com/example/foobar.git
   GH_APP_ID: "123"
   GH_APP_INSTALLATION_ID: "666"
-  GH_TOKEN: ""
-  GH_USER: ""
   GRACE_PERIOD: 10s
   PLUGIN_TOKEN: '@very!l0ngands3curet0ken'
   PORT: :8080
diff --git a/chart/tests/with-github-token/expected.yaml b/chart/tests/with-github-token/expected.yaml
index c06604a..708f5ee 100644
--- a/chart/tests/with-github-token/expected.yaml
+++ b/chart/tests/with-github-token/expected.yaml
@@ -6,10 +6,7 @@ metadata:
   name: my-release-joy-generator-config
 stringData:
   CATALOG_DIR: /tmp/catalog
-  CATALOG_REVISION: ""
   CATALOG_URL: https://github.com/example/foobar.git
-  GH_APP_ID: ""
-  GH_APP_INSTALLATION_ID: ""
   GH_TOKEN: "12312312312312"
   GH_USER: username
   GRACE_PERIOD: 10s
diff --git a/chart/values.yaml b/chart/values.yaml
index 48c6503..56e223d 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -5,14 +5,15 @@
 env:
   PORT: :8080
   GRACE_PERIOD: 10s
-  PLUGIN_TOKEN: ""
-  CATALOG_URL: ""
   CATALOG_DIR: /tmp/catalog
-  CATALOG_REVISION: ""
-  GH_USER: ""
-  GH_TOKEN: ""
-  GH_APP_ID: ""
-  GH_APP_INSTALLATION_ID: ""
+
+  # PLUGIN_TOKEN: ""
+  # CATALOG_URL: ""
+  # CATALOG_REVISION: ""
+  # GH_USER: ""
+  # GH_TOKEN: ""
+  # GH_APP_ID: ""
+  # GH_APP_INSTALLATION_ID: ""
 
 # Configuration settings for the joy-generator instance
 applicationConfig: