Merge pull request #44 from SMI/envs-2

refactor configs to envs and support loading vars/vault

.meta/ansible-managed-in-templates

@@ -7,6 +7,8 @@ def main() -> int:
     rc = 0
 
     for arg in sys.argv[1:]:
+        if arg.endswith("vault.yaml"):
+            continue
         with open(arg) as f:
             if needle in f.read():
                 continue

.pre-commit-config.yaml

@@ -16,7 +16,6 @@ repos:
       - id: check-executables-have-shebangs
       - id: check-merge-conflict
       - id: check-shebang-scripts-are-executable
-      - id: check-xml
       - id: check-yaml
       - id: detect-private-key
       - id: end-of-file-fixer

roles/bin/tasks/main.yaml

@@ -1,13 +1,11 @@
 ---
 - name: Ensure bin dir exists
-  become: true
   ansible.builtin.file:
     name: "{{ bin_bin_dir }}"
     state: directory
     mode: u=rwx,g=rx,o=rx
 
 - name: Template service scripts to bin
-  become: true
   ansible.builtin.template:
     src: "{{ item }}"
     dest: "{{ bin_bin_dir }}/"

roles/bin/templates/bin/_smi_wrapper.py

@@ -47,15 +47,15 @@ def init() -> tuple[argparse.Namespace, list[str], dict[str, str], str]:
 
     assert "SMI_ENV" in os.environ, "SMI_ENV must be set"
     smi_env = os.environ["SMI_ENV"]
-    env_dir = f"{INSTALL_DIR}/configs/{smi_env}"
+    env_dir = f"{INSTALL_DIR}/envs/{smi_env}"
     assert os.path.isdir(env_dir), f"{env_dir} does not exist"
     env = {**os.environ, **_env_from(f"{env_dir}/env.bash")}
 
     if wrapper_args.verbose:
         for var in sorted(x for x in env if x.startswith("SMI_")):
             print(f"{var}={env[var]}")
 
-    config_dir = f"{INSTALL_DIR}/configs/{smi_env}"
+    config_dir = f"{INSTALL_DIR}/envs/{smi_env}"
 
     return (wrapper_args, remaining_argv, env, config_dir)