From fbe17c549f9e9929c165dda1e25f4f866add2966 Mon Sep 17 00:00:00 2001
From: Giles Bradshaw <giles.bradshaw@sigyl.com>
Date: Sun, 26 Apr 2020 13:02:57 +0100
Subject: [PATCH] .

---
 .drone.star                             | 44 +++----------------------
 drone-starlark/repos/print-secrets.star |  8 +++++
 2 files changed, 12 insertions(+), 40 deletions(-)

diff --git a/.drone.star b/.drone.star
index cfd66c0..8196162 100644
--- a/.drone.star
+++ b/.drone.star
@@ -1,45 +1,9 @@
 load("@this//:from-secret.star", "fromSecret")
-def environment(env):
-  return dict(
-    [(x.replace("-", "_").upper(), fromSecret(x)) for x in env]
-  )
-def map(fn, l):
-  return [fn(x) for x in l]
-def secretToEnvironment(secret):
-  return secret.replace("-", "_").upper()
-def echo(secret):
-  return 'echo "export {environment}=${environment}" >> ***filename*** # {secret}'.format(
-      secret = secret,
-      environment = secret.replace("-", "_").upper(),
-    )
-def echoSecret(secret):
-  return 'echo "export {environment}=???" >> ***filename*** # {secret}'.format(
-      secret = secret,
-      environment = secret.replace("-", "_").upper()
-    )
+load("@this//:print-secrets.star", "printSecrets")
+load("@this//:print-secrets.star", "environment")
+load("@this//:print-secrets.star", "export")
+load("@this//:map.star", "map")
 
-def export(secret):
-  return "export {toCaps}=${toCaps}".format(
-    toCaps = secretToEnvironment(secret),
-  )
-def printSecrets(filename, env, secretEnv): 
-  
-  return {
-    "name": "print secrets",
-    "image": "appleboy/drone-ssh",
-    "environment": environment(env),
-    "settings": {
-      "envs": [x.replace("-", "_") for x in env ],
-      "host": fromSecret("ssh-host"),
-      "port": fromSecret("ssh-port"),
-      "username": fromSecret("ssh-user"),
-      "password": fromSecret("ssh-password"),
-      "script": [x.replace("***filename***", filename) for x in [
-        "rm -f env-stack",
-      ] + map(echo, env) 
-      + map(echoSecret, secretEnv)]
-    }
-  }
 def wait(delay, name): 
   return {
     "name": name,
diff --git a/drone-starlark/repos/print-secrets.star b/drone-starlark/repos/print-secrets.star
index ddd076b..387440c 100644
--- a/drone-starlark/repos/print-secrets.star
+++ b/drone-starlark/repos/print-secrets.star
@@ -1,4 +1,12 @@
 load("@this//:map.star", "map")
+def environment(env):
+  return dict(
+    [(x.replace("-", "_").upper(), fromSecret(x)) for x in env]
+  )
+def map(fn, l):
+  return [fn(x) for x in l]
+def secretToEnvironment(secret):
+  return secret.replace("-", "_").upper()
 
 def echo(secret):
   return 'echo "export {environment}=${environment}" >> ***filename*** # {secret}'.format(