From d00baa1128e7e8d7e397a7d3b20dac11ce562e06 Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Mon, 31 Jan 2022 11:38:50 +0100
Subject: [PATCH] fix(synapse): update questions.yaml to beter reflect
 values.yaml

---
 charts/incubator/synapse/Chart.yaml     |   2 +-
 charts/incubator/synapse/questions.yaml | 116 ++++++++++++------------
 charts/incubator/synapse/values.yaml    |   5 -
 3 files changed, 59 insertions(+), 64 deletions(-)

diff --git a/charts/incubator/synapse/Chart.yaml b/charts/incubator/synapse/Chart.yaml
index 96995db724c..efbefa1d57c 100644
--- a/charts/incubator/synapse/Chart.yaml
+++ b/charts/incubator/synapse/Chart.yaml
@@ -24,7 +24,7 @@ maintainers:
 name: synapse
 sources: []
 type: application
-version: 0.0.3
+version: 0.0.4
 annotations:
   truecharts.org/catagories: |
     - cloud
diff --git a/charts/incubator/synapse/questions.yaml b/charts/incubator/synapse/questions.yaml
index 782f9f310e5..5eb2fb0cb67 100644
--- a/charts/incubator/synapse/questions.yaml
+++ b/charts/incubator/synapse/questions.yaml
@@ -107,42 +107,44 @@ questions:
           schema:
             type: boolean
             default: false
-        - variable: from
-          label: "From: "
-          schema:
-            type: string
-            default: "Matrix <matrix@example.com>"
-        - variable: riotUrl
-          label: "Riot URL"
-          schema:
-            type: string
-            default: ""
-        - variable: host
-          label: "Host"
-          schema:
-            type: string
-            default: ""
-        - variable: port
-          label: "Port"
-          schema:
-            type: int
-            default: 25
-        - variable: username
-          label: "Username"
-          schema:
-            type: string
-            default: ""
-        - variable: password
-          label: "Password"
-          schema:
-            type: string
-            default: ""
-            private: true
-        - variable: requireTransportSecurity
-          label: "Require Transport Security"
-          schema:
-            type: boolean
-            default: true
+            show_subquestions_if: true
+            subquestions:
+              - variable: from
+                label: "From: "
+                schema:
+                  type: string
+                  default: "Matrix <matrix@example.com>"
+              - variable: riotUrl
+                label: "Riot URL"
+                schema:
+                  type: string
+                  default: ""
+              - variable: host
+                label: "Host"
+                schema:
+                  type: string
+                  default: ""
+              - variable: port
+                label: "Port"
+                schema:
+                  type: int
+                  default: 25
+              - variable: username
+                label: "Username"
+                schema:
+                  type: string
+                  default: ""
+              - variable: password
+                label: "Password"
+                schema:
+                  type: string
+                  default: ""
+                  private: true
+              - variable: requireTransportSecurity
+                label: "Require Transport Security"
+                schema:
+                  type: boolean
+                  default: true
 
   - variable: matrix
     group: "Container Configuration"
@@ -156,11 +158,13 @@ questions:
           schema:
             type: boolean
             default: false
-        - variable: disabledMessage
-          label: "Disabled Message"
-          schema:
-            type: string
-            default: ""
+            show_subquestions_if: true
+            subquestions:
+              - variable: disabledMessage
+                label: "Disabled Message"
+                schema:
+                  type: string
+                  default: ""
         - variable: serverName
           label: "Server Name"
           schema:
@@ -259,17 +263,19 @@ questions:
                 schema:
                   type: boolean
                   default: false
-              - variable: maxPixels
-                label: "Max Pixels"
-                schema:
-                  type: string
-                  default: "32M"
-              - variable: sharedSecret
-                label: "Shared Secret"
-                schema:
-                  type: string
-                  default: ""
-                  private: true
+                  show_subquestions_if: true
+                  subquestions:
+                    - variable: maxPixels
+                      label: "Max Pixels"
+                      schema:
+                        type: string
+                        default: "32M"
+                    - variable: sharedSecret
+                      label: "Shared Secret"
+                      schema:
+                        type: string
+                        default: ""
+                        private: true
       # TODO: required3PIDs
       # TODO: autoJoinRooms
         - variable: security
@@ -278,12 +284,6 @@ questions:
             additional_attrs: true
             type: dict
             attrs:
-              - variable: macaroonSecretKey
-                label: "Macaroon Secret Key"
-                schema:
-                  type: string
-                  default: ""
-                  private: true
               - variable: surpressKeyServerWarning
                 label: "Surpress Key Server Warning"
                 schema:
diff --git a/charts/incubator/synapse/values.yaml b/charts/incubator/synapse/values.yaml
index b37a22f83d5..261c9b1daec 100644
--- a/charts/incubator/synapse/values.yaml
+++ b/charts/incubator/synapse/values.yaml
@@ -211,11 +211,6 @@ matrix:
   retentionPeriod: 7d
 
   security:
-    # a secret which is used to sign access tokens. If none is specified,
-    # the registration_shared_secret is used, if one is given; otherwise,
-    # a secret key is derived from the signing key.
-    #
-    # macaroonSecretKey: <PRIVATE STRING>
 
     # This disables the warning that is emitted when the
     # trustedKeyServers include 'matrix.org'. See below.