Renaming kube-config env var.

otaviof · Apr 13, 2019 · 371ad72 · 371ad72
1 parent 085687b
commit 371ad72
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -14,7 +14,7 @@ before_script:
 script:
   - export VAULT_HANDLER_VAULT_ROLE_ID=$(grep ROLE_ID .env |awk -F '"' '{print $2}')
   - export VAULT_HANDLER_VAULT_SECRET_ID=$(grep SECRET_ID .env |awk -F '"' '{print $2}')
-  - export KUBE_CONFIG="$(kind get kubeconfig-path --name="kind")"
+  - export KUBECONFIG="$(kind get kubeconfig-path --name="kind")"
   - make bootstrap
   - make
   - make test

diff --git a/pkg/vault-handler/handler_test.go b/pkg/vault-handler/handler_test.go
@@ -54,7 +54,7 @@ func TestHandlerAuthenticateAppRole(t *testing.T) {
 		VaultSecretID: os.Getenv("VAULT_HANDLER_VAULT_SECRET_ID"),
 		InputDir:      inputDir,
 		OutputDir:     outputDir,
-		KubeConfig:    os.Getenv("KUBE_CONFIG"),
+		KubeConfig:    os.Getenv("KUBECONFIG"),
 		Namespace:     "default",
 	}
 	err = config.Validate()

diff --git a/pkg/vault-handler/kubernetes_test.go b/pkg/vault-handler/kubernetes_test.go
@@ -1,17 +1,18 @@
 package vaulthandler
 
 import (
-	"github.com/stretchr/testify/assert"
 	"os"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
 var kube *Kubernetes
 
 func TestKubernetesNew(t *testing.T) {
 	var err error
 
-	kubeConfig := os.Getenv("KUBE_CONFIG")
+	kubeConfig := os.Getenv("KUBECONFIG")
 	t.Logf("Test kube-config: '%s'", kubeConfig)
 	kube, err = NewKubernetes(kubeConfig, "", "default", false)
 

diff --git a/test/e2e/vault_handler_test.go b/test/e2e/vault_handler_test.go
@@ -6,9 +6,10 @@ import (
 	"os"
 	"testing"
 
-	vh "github.com/otaviof/vault-handler/pkg/vault-handler"
 	log "github.com/sirupsen/logrus"
 	"github.com/stretchr/testify/assert"
+
+	vh "github.com/otaviof/vault-handler/pkg/vault-handler"
 )
 
 var manifestFiles = []string{"../mock/manifest-1.yaml", "../mock/manifest-2.yaml"}
@@ -19,7 +20,7 @@ var config = &vh.Config{
 	OutputDir:     "/tmp",
 	VaultRoleID:   os.Getenv("VAULT_HANDLER_VAULT_ROLE_ID"),
 	VaultSecretID: os.Getenv("VAULT_HANDLER_VAULT_SECRET_ID"),
-	KubeConfig:    os.Getenv("KUBE_CONFIG"),
+	KubeConfig:    os.Getenv("KUBECONFIG"),
 	Context:       "",
 	Namespace:     "default",
 	InCluster:     false,