fix how we check in the TUI if bitwarden credentials are required (#103)

* fix how we check in the TUI if bitwarden credentials are required

* update alpha version

* updating poetry lock

* fix argo_cd typo

* updates docker container pull for bweso

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name          = "smol_k8s_lab"
-version       = "2.0.0a2"
+version       = "2.0.0a3"
 description   = "Bootstrap simple projects on Kubernetes with kind, k3d, and k3s. this is an alpha release"
 authors       = ["Jesse Hitch <[email protected]>",
                  "Max Roby <[email protected]>"]

smol_k8s_lab/__init__.py

@@ -151,7 +151,7 @@ def main(config: str = "",
         # if we're using bitwarden, unlock the vault
         pw_mngr = USR_CFG['smol_k8s_lab']['local_password_manager']
         using_bw_pw_manager = pw_mngr['enabled'] and pw_mngr['name'] == 'bitwarden'
-        using_bweso = USR_CFG['apps']['bitwarden_eso_provider']['enabled']
+        using_bweso = SECRETS['global_external_secrets']
 
         if using_bw_pw_manager or using_bweso:
             # get bitwarden credentials from the env if there are any
@@ -216,7 +216,7 @@ def main(config: str = "",
                     apps.pop('ingress_nginx'),
                     apps['cert_manager'],
                     argo_enabled,
-                    apps['argocd']['argo']['directory_recursion'],
+                    apps['argo_cd']['argo']['directory_recursion'],
                     SECRETS,
                     bw)
 

smol_k8s_lab/k8s_apps/secrets_management/external_secrets_operator.py

@@ -47,7 +47,7 @@ def setup_bweso_provider(k8s_obj: K8s, distro: str, bitwarden: BwCLI = None) ->
                            "BW_HOST": bitwarden.host})
 
     if distro == 'kind':
-        image = "docker.io/jessebot/bweso:v0.5.0"
+        image = "docker.io/jessebot/bweso:v0.4.0"
         cmds = [f"docker pull --platform=linux/amd64 {image}",
                 f"kind load docker-image {image} --name smol-k8s-lab-kind"]
         subproc(cmds)

smol_k8s_lab/tui/confirm_screen.py

@@ -180,21 +180,14 @@ def confirm_or_back_button(self, event: Button.Pressed) -> None:
         """
         if event.button.id == "confirm-button":
             # First, check if we need bitwarden credentials before proceeding
-
-            # this is the official small-hack repo
-            repo = "https://github.com/small-hack/argocd-apps"
             pw_mngr = self.smol_k8s_cfg['local_password_manager']
-            bweso = self.apps['bitwarden_eso_provider']
-
-
+            secrets_provider = self.cfg['apps_global_config']['external_secrets']
+
             # if local_password_manager is enabled, and is bitwarden
             local_bitwarden = pw_mngr['enabled'] and pw_mngr['name'] == "bitwarden"
 
-            # check if bweso is enabled and we're using the default repo
-            official_bweso = bweso['enabled'] and bweso['argo']['repo'] == repo
-
             # if local password manager is bitwarden/enabled or we're using bweso
-            if local_bitwarden or official_bweso:
+            if local_bitwarden or secrets_provider == 'bitwarden':
                 self.get_bitwarden_credentials()
             else:
                 self.append_sensitive_values()