From cb9eb3ef9da3d810ed7778b93393996be73be75c Mon Sep 17 00:00:00 2001
From: Nicolas Ochem <nicolas.ochem@gmail.com>
Date: Fri, 20 May 2022 19:09:26 -0700
Subject: [PATCH] make unsafe disclaimer removal work with mkchain

by default helm changes Y into true. But we want the env var to be
actually Y, so we have to overload the PyYAML class to allow quoted
strings.
---
 mkchain/tqchain/mkchain.py | 35 ++++++++++++++++++++++++++++++++---
 1 file changed, 32 insertions(+), 3 deletions(-)

diff --git a/mkchain/tqchain/mkchain.py b/mkchain/tqchain/mkchain.py
index 0137c2dc8..3506e3587 100644
--- a/mkchain/tqchain/mkchain.py
+++ b/mkchain/tqchain/mkchain.py
@@ -5,6 +5,25 @@
 
 import yaml
 
+
+# https://stackoverflow.com/a/52424865/207209
+class MyDumper(yaml.Dumper):  # your force-indent dumper
+    def increase_indent(self, flow=False, indentless=False):
+        return super(MyDumper, self).increase_indent(flow, False)
+
+
+class QuotedString(str):  # just subclass the built-in str
+    pass
+
+
+def quoted_scalar(dumper, data):  # a representer to force quotations on scalars
+    return dumper.represent_scalar("tag:yaml.org,2002:str", data, style='"')
+
+
+# add the QuotedString custom type with a forced quotation representer to your dumper
+MyDumper.add_representer(QuotedString, quoted_scalar)
+# end https://stackoverflow.com/a/52424865/207209
+
 from tqchain.keys import gen_key, get_genesis_vanity_chain_id, set_use_docker
 
 from ._version import get_versions
@@ -163,7 +182,10 @@ def main():
         "archive_tarball_url": None,
         "rolling_tarball_url": None,
         "node_globals": {
-            "env": {"all": {"TEZOS_CLIENT_UNSAFE_DISABLE_DISCLAIMER": "Y"}}
+            # Needs a quotedstring otherwise helm interprets "Y" as true and it does not work
+            "env": {
+                "all": {"TEZOS_CLIENT_UNSAFE_DISABLE_DISCLAIMER": QuotedString("Y")}
+            }
         },
     }
 
@@ -291,7 +313,9 @@ def main():
     }
 
     with open(f"{files_path}_values.yaml", "w") as yaml_file:
-        yaml.dump(creation_constants, yaml_file)
+        yaml.dump(
+            creation_constants, yaml_file, Dumper=MyDumper, default_flow_style=False
+        )
         print(f"Wrote chain creation constants to {files_path}_values.yaml")
 
     # If there is a Zerotier configuration, create an invite file.
@@ -320,7 +344,12 @@ def main():
             print(
                 f"Wrote chain invitation constants to {files_path}_invite_values.yaml"
             )
-            yaml.dump(invitation_constants, yaml_file)
+            yaml.dump(
+                invitation_constants,
+                yaml_file,
+                Dumper=MyDumper,
+                default_flow_style=False,
+            )
 
 
 if __name__ == "__main__":