Refactor

integration-test/integration_test.go

@@ -3,12 +3,10 @@ package integration
 import (
 	"context"
 	"io/ioutil"
-	"log"
 	"net/http"
 	"os"
 	"strings"
 	"testing"
-	"text/template"
 	"time"
 
 	"github.com/int128/kubelogin/cli"
@@ -27,7 +25,7 @@ func Test(t *testing.T) {
 		Handler: NewAuthHandler(conf.Issuer),
 	}
 	defer authServer.Shutdown(context.Background())
-	kubeconfig := createKubeconfig(t, conf)
+	kubeconfig := createKubeconfig(t, conf.Issuer)
 	defer os.Remove(kubeconfig)
 
 	go func() {
@@ -61,21 +59,3 @@ func Test(t *testing.T) {
 		t.Errorf("kubeconfig wants refresh-token but %s", string(b))
 	}
 }
-
-func createKubeconfig(t *testing.T, conf configuration) string {
-	t.Helper()
-	f, err := ioutil.TempFile("", "kubeconfig")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer f.Close()
-	tpl, err := template.ParseFiles("testdata/kubeconfig.yaml")
-	if err != nil {
-		t.Fatal(err)
-	}
-	if err := tpl.Execute(f, conf); err != nil {
-		t.Fatal(err)
-	}
-	log.Printf("Created %s", f.Name())
-	return f.Name()
-}

integration-test/kubeconfig.go

@@ -0,0 +1,26 @@
+package integration
+
+import (
+	"html/template"
+	"io/ioutil"
+	"log"
+	"testing"
+)
+
+func createKubeconfig(t *testing.T, issuer string) string {
+	t.Helper()
+	f, err := ioutil.TempFile("", "kubeconfig")
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer f.Close()
+	tpl, err := template.ParseFiles("testdata/kubeconfig.yaml")
+	if err != nil {
+		t.Fatal(err)
+	}
+	if err := tpl.Execute(f, struct{ Issuer string }{issuer}); err != nil {
+		t.Fatal(err)
+	}
+	log.Printf("Created %s", f.Name())
+	return f.Name()
+}