Merge pull request #74 from ClarkSource/secret-provider

Author: AFriemann

default.nix

@@ -1,11 +1,55 @@
 with import <nixpkgs> {};
 
-pkgs.mkShell {
+let
+  simple_tools = python3.pkgs.buildPythonPackage rec {
+    pname = "simple_tools";
+    version = "0.2.0.post2";
+
+    src = python3.pkgs.fetchPypi {
+      inherit pname version;
+      sha256 = "16xxpsngv76fzsxji1714m7b6b74wk459sjs8p15nj8h4xy0b7b9";
+    };
+
+    doCheck = false;
+
+    meta = {
+      homepage = "https://github.com/afriemann/simple_tools/";
+      description = "A collection of various snippets and tools that come up regularly.";
+    };
+  };
+
+  k8t = with python3.pkgs; buildPythonApplication rec {
+    pname = "k8t";
+    version = "dev";
+
+    src = ./.;
+
+    # No tests included
+    doCheck = false;
+
+    nativeBuildInputs = [
+      git
+    ];
+
+    propagatedBuildInputs = [
+      jinja2
+      coloredlogs
+      boto3
+      pyyaml
+      click
+      simple_tools
+    ];
+
+    meta = with lib; {
+      homepage = "https://github.com/clarksource/k8t";
+      license = licenses.isc;
+    };
+  };
+in with python3.pkgs; pkgs.mkShell {
   buildInputs = [
+    k8t
+    setuptools
     pre-commit
+    tox
   ];
-
-  shellHook = ''
-    export PATH="$PATH:$HOME/.yarn/bin"
-  '';
 }

k8t/cli.py

@@ -111,18 +111,23 @@ def cli_validate(method, value_files, cli_values, cname, ename, directory):
 @click.option("--value", "cli_values", type=(str, str), multiple=True, metavar="<KEY VALUE>", help="Additional value(s) to include.")
 @click.option("--cluster", "-c", "cname", help="Cluster context to use.")
 @click.option("--environment", "-e", "ename", help="Deployment environment to use.")
+@click.option("--secret-provider", help="Secret provider override.")
 @click.argument("directory", type=click.Path(dir_okay=True, file_okay=False, exists=True), default=os.getcwd())
 @requires_project_directory
-def cli_gen(method, value_files, cli_values, cname, ename, directory):  # pylint: disable=redefined-outer-name,too-many-arguments
+def cli_gen(method, value_files, cli_values, cname, ename, secret_provider, directory):  # pylint: disable=redefined-outer-name,too-many-arguments
     vals = deep_merge(  # pylint: disable=redefined-outer-name
         values.load_all(directory, cname, ename, method),
         *(load_yaml(p) for p in value_files),
         dict(cli_values),
         envvalues(),
         method=method,
     )
+
     config.CONFIG = config.load_all(directory, cname, ename, method)
 
+    if secret_provider is not None:
+        config.CONFIG['secrets']['provider'] = secret_provider
+
     eng = build(directory, cname, ename)
 
     templates = eng.list_templates()  # pylint: disable=redefined-outer-name

k8t/filters.py

@@ -83,6 +83,7 @@ def hashf(value, method="sha256"):
 
 def get_secret(key: str, length: int = None) -> str:
     provider_name = config.CONFIG.get("secrets", {}).get("provider")
+
     if not provider_name:
         raise RuntimeError("Secrets provider not configured.")