From 95193f91214dc484f71453a3d72a8d6a245d3ce8 Mon Sep 17 00:00:00 2001 From: Ivan Pedrazas Date: Sun, 12 Feb 2017 00:17:30 +0000 Subject: [PATCH] remove envvars secrets --- .drone.yml | 2 +- .drone.yml.sig | 2 +- plugin.go | 35 +---------------------------------- 3 files changed, 3 insertions(+), 36 deletions(-) diff --git a/.drone.yml b/.drone.yml index 61ef51a..81d7063 100644 --- a/.drone.yml +++ b/.drone.yml @@ -20,7 +20,7 @@ pipeline: commands: - docker login -u="${QUAY_USERNAME}" -p="${QUAY_PASSWORD}" quay.io - docker build -t image . - - docker tag image quay.io/ipedrazas/drone-helm:latest + # - docker tag image quay.io/ipedrazas/drone-helm:latest - docker tag image quay.io/ipedrazas/drone-helm:${TAG} - docker push quay.io/ipedrazas/drone-helm # when: diff --git a/.drone.yml.sig b/.drone.yml.sig index e8820b1..81f6da6 100644 --- a/.drone.yml.sig +++ b/.drone.yml.sig @@ -1 +1 @@ -eyJhbGciOiJIUzI1NiJ9.d29ya3NwYWNlOgogIGJhc2U6IC9nbwoKcGlwZWxpbmU6CiAgdGVzdDoKICAgIGltYWdlOiBnb2xhbmc6MS42CiAgICBlbnZpcm9ubWVudDoKICAgICAgLSBDR09fRU5BQkxFRD0wCiAgICBjb21tYW5kczoKICAgICAgLSBnbyBnZXQKICAgICAgLSBnbyB0ZXN0IC1jb3ZlciAtY292ZXJwcm9maWxlPWNvdmVyYWdlLm91dAogICAgICAtIGdvIGJ1aWxkIC1sZGZsYWdzICItcyAtdyAtWCBtYWluLmJ1aWxkPSREUk9ORV9CVUlMRF9OVU1CRVIiIC1hIC10YWdzIG5ldGdvCgoKICBidWlsZF9kb2NrZXJfaW1hZ2U6CiAgICBpbWFnZTogZG9ja2VyOjEuMTIKICAgIGVudmlyb25tZW50OgogICAgICAtIERPQ0tFUl9IT1NUPXRjcDovLzEyNy4wLjAuMToyMzc1CiAgICAgIC0gVEFHPSR7RFJPTkVfQlJBTkNIfS0ke0RST05FX0NPTU1JVF9TSEE6MDo3fQogICAgY29tbWFuZHM6CiAgICAgIC0gZG9ja2VyIGxvZ2luIC11PSIke1FVQVlfVVNFUk5BTUV9IiAtcD0iJHtRVUFZX1BBU1NXT1JEfSIgcXVheS5pbwogICAgICAtIGRvY2tlciBidWlsZCAtdCBpbWFnZSAuCiAgICAgIC0gZG9ja2VyIHRhZyBpbWFnZSBxdWF5LmlvL2lwZWRyYXphcy9kcm9uZS1oZWxtOmxhdGVzdAogICAgICAtIGRvY2tlciB0YWcgaW1hZ2UgcXVheS5pby9pcGVkcmF6YXMvZHJvbmUtaGVsbToke1RBR30KICAgICAgLSBkb2NrZXIgcHVzaCBxdWF5LmlvL2lwZWRyYXphcy9kcm9uZS1oZWxtCiAgICAjIHdoZW46CiAgICAjICBldmVudDogW3B1c2hdCiAgICAjICBicmFuY2g6IFttYXN0ZXJdCgogIHNsYWNrOgogICAgaW1hZ2U6IHBsdWdpbnMvc2xhY2sKICAgIGNoYW5uZWw6IGRlcGxveXMKICAgIHVzZXJuYW1lOiBkcm9uZQogICAgdGVtcGxhdGU6ID4KICAgICAge3sgYnVpbGQuYXV0aG9yIH19IGZpbmlzaGVkIGJ1aWxkaW5nICAqPGh0dHA6Ly9kcm9uZS5zb2hvaG91c2VkaWdpdGFsLmNvbS9Tb2hvSG91c2Uve3sgcmVwby5uYW1lIH19L3t7IGJ1aWxkLm51bWJlciB9fXx7eyBidWlsZC5icmFuY2ggfX0gKHt7IGJ1aWxkLm51bWJlciB9fSk-KiBvZiB7eyByZXBvLm5hbWUgfX0gIHdpdGggYSB7eyBidWlsZC5zdGF0dXMgfX0gc3RhdHVzCgoKc2VydmljZXM6CiAgZGluZDoKICAgIGltYWdlOiBkb2NrZXI6MS4xMi1kaW5kCiAgICBwcml2aWxlZ2VkOiB0cnVlCiAgICBjb21tYW5kOgogICAgICAtICItcyIKICAgICAgLSAib3ZlcmxheSIKCnBsdWdpbjoKICBuYW1lOiBkcm9uZS1oZWxtCiAgZGVzYzogRXhlY3V0ZSBoZWxtIHRvCiAgdHlwZTogZGVwbG95CiAgaW1hZ2U6IHF1YXkuaW8vaXBlZHJhemFzL2Ryb25lLWhlbG0KICBsYWJlbHM6CiAgICAtIGRlcGxveQogICAgLSBrdWJlcm5ldGVzCiAgICAtIGhlbG0K.nz2rmjaaS7HNnfIWBGe2eMgX1oTsKucMWndsgHB8IuU \ No newline at end of file +eyJhbGciOiJIUzI1NiJ9.d29ya3NwYWNlOgogIGJhc2U6IC9nbwoKcGlwZWxpbmU6CiAgdGVzdDoKICAgIGltYWdlOiBnb2xhbmc6MS42CiAgICBlbnZpcm9ubWVudDoKICAgICAgLSBDR09fRU5BQkxFRD0wCiAgICBjb21tYW5kczoKICAgICAgLSBnbyBnZXQKICAgICAgLSBnbyB0ZXN0IC1jb3ZlciAtY292ZXJwcm9maWxlPWNvdmVyYWdlLm91dAogICAgICAtIGdvIGJ1aWxkIC1sZGZsYWdzICItcyAtdyAtWCBtYWluLmJ1aWxkPSREUk9ORV9CVUlMRF9OVU1CRVIiIC1hIC10YWdzIG5ldGdvCgoKICBidWlsZF9kb2NrZXJfaW1hZ2U6CiAgICBpbWFnZTogZG9ja2VyOjEuMTIKICAgIGVudmlyb25tZW50OgogICAgICAtIERPQ0tFUl9IT1NUPXRjcDovLzEyNy4wLjAuMToyMzc1CiAgICAgIC0gVEFHPSR7RFJPTkVfQlJBTkNIfS0ke0RST05FX0NPTU1JVF9TSEE6MDo3fQogICAgY29tbWFuZHM6CiAgICAgIC0gZG9ja2VyIGxvZ2luIC11PSIke1FVQVlfVVNFUk5BTUV9IiAtcD0iJHtRVUFZX1BBU1NXT1JEfSIgcXVheS5pbwogICAgICAtIGRvY2tlciBidWlsZCAtdCBpbWFnZSAuCiAgICAgICMgLSBkb2NrZXIgdGFnIGltYWdlIHF1YXkuaW8vaXBlZHJhemFzL2Ryb25lLWhlbG06bGF0ZXN0CiAgICAgIC0gZG9ja2VyIHRhZyBpbWFnZSBxdWF5LmlvL2lwZWRyYXphcy9kcm9uZS1oZWxtOiR7VEFHfQogICAgICAtIGRvY2tlciBwdXNoIHF1YXkuaW8vaXBlZHJhemFzL2Ryb25lLWhlbG0KICAgICMgd2hlbjoKICAgICMgIGV2ZW50OiBbcHVzaF0KICAgICMgIGJyYW5jaDogW21hc3Rlcl0KCiAgc2xhY2s6CiAgICBpbWFnZTogcGx1Z2lucy9zbGFjawogICAgY2hhbm5lbDogZGVwbG95cwogICAgdXNlcm5hbWU6IGRyb25lCiAgICB0ZW1wbGF0ZTogPgogICAgICB7eyBidWlsZC5hdXRob3IgfX0gZmluaXNoZWQgYnVpbGRpbmcgICo8aHR0cDovL2Ryb25lLnNvaG9ob3VzZWRpZ2l0YWwuY29tL1NvaG9Ib3VzZS97eyByZXBvLm5hbWUgfX0ve3sgYnVpbGQubnVtYmVyIH19fHt7IGJ1aWxkLmJyYW5jaCB9fSAoe3sgYnVpbGQubnVtYmVyIH19KT4qIG9mIHt7IHJlcG8ubmFtZSB9fSAgd2l0aCBhIHt7IGJ1aWxkLnN0YXR1cyB9fSBzdGF0dXMKCgpzZXJ2aWNlczoKICBkaW5kOgogICAgaW1hZ2U6IGRvY2tlcjoxLjEyLWRpbmQKICAgIHByaXZpbGVnZWQ6IHRydWUKICAgIGNvbW1hbmQ6CiAgICAgIC0gIi1zIgogICAgICAtICJvdmVybGF5IgoKcGx1Z2luOgogIG5hbWU6IGRyb25lLWhlbG0KICBkZXNjOiBFeGVjdXRlIGhlbG0gdG8KICB0eXBlOiBkZXBsb3kKICBpbWFnZTogcXVheS5pby9pcGVkcmF6YXMvZHJvbmUtaGVsbQogIGxhYmVsczoKICAgIC0gZGVwbG95CiAgICAtIGt1YmVybmV0ZXMKICAgIC0gaGVsbQo.0Iy83mRnXUfgUp0truytDq8Vvvc0qo2GpGEoWzdS2XI \ No newline at end of file diff --git a/plugin.go b/plugin.go index f0bc4c0..f75822a 100644 --- a/plugin.go +++ b/plugin.go @@ -102,7 +102,7 @@ func doHelmInit(p *Plugin) []string { // Exec default method func (p *Plugin) Exec() error { - resolveSecrets(p) + // resolveSecrets(p) if p.Config.APIServer == "" { return fmt.Errorf("Error: API Server is needed to deploy.") } @@ -151,39 +151,6 @@ func runCommand(params []string) error { return err } -func resolveSecrets(p *Plugin) { - p.Config.Values = resolveEnvVar(p.Config.Values, p.Config.Prefix) - p.Config.APIServer = resolveEnvVar("${API_SERVER}", p.Config.Prefix) - p.Config.Token = resolveEnvVar("${KUBERNETES_TOKEN}", p.Config.Prefix) -} - -// getEnvVars will return [${TAG} {TAG} TAG] -func getEnvVars(envvars string) [][]string { - re := regexp.MustCompile(`\$(\{?(\w+)\}?)\.?`) - extracted := re.FindAllStringSubmatch(envvars, -1) - return extracted -} - -func resolveEnvVar(key string, prefix string) string { - envvars := getEnvVars(key) - return replaceEnvvars(envvars, prefix, key) -} - -func replaceEnvvars(envvars [][]string, prefix string, s string) string { - for _, envvar := range envvars { - envvarName := envvar[0] - envvarKey := envvar[2] - envval := os.Getenv(prefix + "_" + envvarKey) - if envval == "" { - envval = os.Getenv(envvarKey) - } - if strings.Contains(s, envvarName) { - s = strings.Replace(s, envvarName, envval, -1) - } - } - return s -} - func (p *Plugin) debug() { fmt.Println(p) // debug env vars