From 984ec393aa9175869f21260d666f10bc3bbc0359 Mon Sep 17 00:00:00 2001
From: foosinn <stefan@f2o.io>
Date: Thu, 7 Oct 2021 14:55:27 +0200
Subject: [PATCH] use functions instead of aliases for vsink

---
 roles/base.nix | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/roles/base.nix b/roles/base.nix
index 39730da..0116cf5 100644
--- a/roles/base.nix
+++ b/roles/base.nix
@@ -85,6 +85,19 @@ in {
       alias vim="nvim"
       alias k="kubectl"
 
+      sink() {
+        VAULT_TOKEN=$(vault token lookup -format=json | jq -r .data.id) \
+        ENVIRONMENTS=staging \
+        ~/git/bitsbeats/vault-sink/sink
+      }
+      vsink() {
+        if ! grep -q /values.yaml .gitignore; then
+          echo refusing to sink with missing gitignore
+          return 1
+        fi
+        sink < ./helm/*/values.yaml > ./values.yaml
+      }
+
       for script in "$HOME"/dotfiles/bashrc/*.sh; do
           . "$script"
       done
@@ -103,8 +116,6 @@ in {
       less = "bat -p";
       ls = "ls --color=auto";
       vim = "nvim";
-      sink = "VAULT_TOKEN=$(vault token lookup -format=json | jq -r .data.id) ENVIRONMENTS=staging ~/git/bitsbeats/vault-sink/sink";
-      usink = "VAULT_TOKEN=$(vault token lookup -format=json | jq -r .data.id) ENVIRONMENTS=staging ~/git/bitsbeats/vault-sink/sink < ./helm/*/values.yaml > values.yaml";
     };
   };