feat: show env

Author: Gunther Klessinger

environ

@@ -8,7 +8,6 @@ NAME="company"
 #
 # For others use py:...
 DNS_API_TOKEN="py:keyval"
-GITOPS_TOKEN="py:keyval"
 HCLOUD_TOKEN="py:keyval"
 HCLOUD_TOKEN_WRITE="py:keyval"
 
@@ -27,4 +26,4 @@ GITOPS_HOST="py:keyval"
 GITOPS_OWNER="company"
 GITOPS_PATH="clusters/staging"
 GITOPS_REPO="k8s"
-GITOPS_TOKEN=""
+GITOPS_TOKEN="py:keyval"

justfile

@@ -6,7 +6,7 @@ set export
 set unstable
 set script-interpreter := ['uv', 'run']
 alias c := create-cluster
-alias cfg := render-config
+alias cfg := pyhk3-config
 alias t := test
 alias p := pyhk3
 alias pf := port-forward
@@ -24,11 +24,10 @@ do *ARGS:
 ssh *ARGS:
   just p do ssh {{ARGS}}
 
-render-config:
+pyhk3-config *ARGS:
   just p hk3s render_config
-  
-port-forward:
-  just p do port_forward
+  just p do show_env {{ARGS}}
+
 
 [confirm('Sure to destroy all servers of the cluster?')]
 rm:
@@ -49,8 +48,17 @@ create-cluster:
 download-kubectl:
   just p do download_kubectl
 
+# enables a port-forward to proxy, so that kubectl, when downloaded, can be used
+port-forward:
+  just p do port_forward
+
+
+install-gitops:
+  just p gitops install
+
+
 test:
-  just render-config
+  just pyhk3-config
   uv run pytest ./tests/test_setup.py
 
 publish:

keyval.py

@@ -11,12 +11,11 @@
     sec = {}
 
 
+DNS_API_TOKEN = sec.get('DNS_API_TOKEN', '...')
 DOMAIN = sec.get('DOMAIN', 'cluster.company.net')
 EMAIL = sec.get('EMAIL', '[email protected]')
 FN_SSH_KEY = sec.get('FN_SSH_KEY', '~/.ssh/hetzner-cluster')
 GITOPS_HOST = sec.get('GITOPS_HOST', 'gitlab.company.com')
-
-DNS_API_TOKEN = sec.get('DNS_API_TOKEN', '...')
 GITOPS_TOKEN = sec.get('GITOPS_TOKEN', '...')
 HCLOUD_TOKEN = sec.get('HCLOUD_TOKEN', '...')
 HCLOUD_TOKEN_WRITE = sec.get('HCLOUD_TOKEN_WRITE', '...')

src/pyhk3/cli.py

@@ -4,10 +4,22 @@
 from inspect import signature as sig
 from functools import partial
 from .create import create, hk3s
+from .gitops import gitops
 from .do import do, recover
 from rich.console import Console
 from rich.tree import Tree
 
+
+class pyhk3:
+    """main class"""
+
+    create = create
+    do = do
+    recover = recover
+    hk3s = hk3s
+    gitops = gitops
+
+
 console = Console()
 
 
@@ -20,8 +32,10 @@ def tc(cls):
     return f'{B(cls.__name__)} {D(cls)}'
 
 
-def tv(fnc):
-    return f'{fnc.__name__} {D(fnc)}'
+def tv(fnc, name='xxx'):
+    n = fnc.__name__
+    n = '' if n == name else n
+    return f'{n} {D(fnc)}'
 
 
 def cls_help(cls, inittree=None):
@@ -33,7 +47,7 @@ def cls_help(cls, inittree=None):
             cls_help(v, tr)
             continue
         if not isinstance(v, list):
-            tree.add(f'{B(k)} {tv(v)}')
+            tree.add(f'{B(k)} {tv(v, name=k)}')
             continue
         tr = tree.add(B(k))
         for m in v:
@@ -43,13 +57,6 @@ def cls_help(cls, inittree=None):
         sys.exit(0)
 
 
-class pyhk3:
-    create = create
-    do = do
-    recover = recover
-    hk3s = hk3s
-
-
 def create_partial(funcs, args, argv, x):
     """the last func in a argv list may have arguments which we map here to a partial of that func"""
     args.pop(0)

src/pyhk3/do.py

@@ -1,5 +1,6 @@
 import yaml
-
+from .defaults import envdefaults
+from .tools import env
 from .create import hk3s, tools, local
 from .hapi import by_name, hapi, ips, need_env
 from .tools import die, log, shw, ssh
@@ -57,8 +58,19 @@ def hk3sconfig():
         shw(hk3s.recover_config)
 
 
+def show_env(match=''):
+    for k in sorted(envdefaults.__dict__):
+        if k[0] != '_' and match in k.lower():
+            kl = k.lower()
+            v = env(k)
+            if 'token' in kl or 'secret' in kl or 'pass' in kl:
+                v = v[:4] + '*' * min(50, (len(v) - 4))
+            print(f'{k}={v}')
+
+
 class do:
     ssh = run_remote
     delete = delete
     download_kubectl = local.download_kubectl
     port_forward = port_forward
+    show_env = show_env

src/pyhk3/gitops.py

@@ -0,0 +1,7 @@
+def install():
+    breakpoint()  # FIXME BREAKPOINT
+    print('gitops install')
+
+
+class gitops:
+    install = install

src/pyhk3/tools.py

@@ -83,7 +83,8 @@ def env(key, dflt=None):
         v = getattr(envdefaults, key, dflt)
     if str(v).startswith('py:'):
         v = pyval(key, v[3:], dflt)
-    elif str(v).startswith('pass:'):
+    # not elif, pyval may return pass:...
+    if str(v).startswith('pass:'):
         x = _secrets.get(v, nil)
         if x == nil:
             x = run(['pass', 'show', v[5:]], capture_output=True, text=True) or dflt