Merge pull request #87 from JoshVanL/utils-to-util

Renames package utils -> util

Author: jetstack-bot

main.go

@@ -6,11 +6,11 @@ import (
 	"os"
 
 	"github.com/jetstack/kube-oidc-proxy/cmd"
-	"github.com/jetstack/kube-oidc-proxy/pkg/utils"
+	"github.com/jetstack/kube-oidc-proxy/pkg/util"
 )
 
 func main() {
-	stopCh := utils.SignalHandler()
+	stopCh := util.SignalHandler()
 	cmd := cmd.NewRunCommand(stopCh)
 
 	if err := cmd.Execute(); err != nil {

pkg/e2e/e2e.go

@@ -26,7 +26,7 @@ import (
 	_ "k8s.io/client-go/plugin/pkg/client/auth/oidc"
 
 	"github.com/jetstack/kube-oidc-proxy/pkg/e2e/issuer"
-	"github.com/jetstack/kube-oidc-proxy/pkg/utils"
+	"github.com/jetstack/kube-oidc-proxy/pkg/util"
 )
 
 type E2E struct {
@@ -141,7 +141,7 @@ func (e *E2E) newIssuerProxyPair() (*http.Transport, error) {
 	}
 	e.issuer = issuer
 
-	proxyCertPath, proxyKeyPath, _, proxyCert, err := utils.NewTLSSelfSignedCertKey(pairTmpDir, "")
+	proxyCertPath, proxyKeyPath, _, proxyCert, err := util.NewTLSSelfSignedCertKey(pairTmpDir, "")
 	if err != nil {
 		return nil, fmt.Errorf("failed to create key pair: %s", err)
 	}
@@ -167,7 +167,7 @@ func (e *E2E) newIssuerProxyPair() (*http.Transport, error) {
 		},
 	}
 
-	proxyPort, err := utils.FreePort()
+	proxyPort, err := util.FreePort()
 	if err != nil {
 		return nil, err
 	}

pkg/e2e/e2e_test.go

@@ -19,7 +19,7 @@ import (
 	"sigs.k8s.io/kind/pkg/cluster"
 	"sigs.k8s.io/kind/pkg/cluster/config"
 
-	"github.com/jetstack/kube-oidc-proxy/pkg/utils"
+	"github.com/jetstack/kube-oidc-proxy/pkg/util"
 )
 
 const (
@@ -186,7 +186,7 @@ func waitOnCoreDNS(kubeclient *kubernetes.Clientset) error {
 	}
 
 	for _, pod := range pods.Items {
-		err := utils.WaitForPodReady(kubeclient, pod.Name, pod.Namespace)
+		err := util.WaitForPodReady(kubeclient, pod.Name, pod.Namespace)
 		if err != nil {
 			return fmt.Errorf("failed to wait for dns pods to become ready: %s", err)
 		}

pkg/e2e/issuer/issuer.go

@@ -8,7 +8,7 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/jetstack/kube-oidc-proxy/pkg/utils"
+	"github.com/jetstack/kube-oidc-proxy/pkg/util"
 	"k8s.io/klog"
 )
 
@@ -27,13 +27,13 @@ func New(tlsDir string) *Issuer {
 }
 
 func (i *Issuer) Run() error {
-	listenPort, err := utils.FreePort()
+	listenPort, err := util.FreePort()
 	if err != nil {
 		return err
 	}
 	i.listenPort = listenPort
 
-	certPath, keyPath, sk, _, err := utils.NewTLSSelfSignedCertKey(i.tlsDir, "oidc-issuer")
+	certPath, keyPath, sk, _, err := util.NewTLSSelfSignedCertKey(i.tlsDir, "oidc-issuer")
 	if err != nil {
 		return fmt.Errorf("failed to create issuer key pair: %s", err)
 	}

pkg/e2e/upgrade_test.go

@@ -21,7 +21,7 @@ import (
 	"k8s.io/client-go/tools/remotecommand"
 	"k8s.io/client-go/transport/spdy"
 
-	"github.com/jetstack/kube-oidc-proxy/pkg/utils"
+	"github.com/jetstack/kube-oidc-proxy/pkg/util"
 )
 
 const (
@@ -119,7 +119,7 @@ func Test_Upgrade(t *testing.T) {
 	}
 
 	// wait for our echo server to become ready
-	err = utils.WaitForPodReady(e2eSuite.kubeclient,
+	err = util.WaitForPodReady(e2eSuite.kubeclient,
 		"echoserver", namespaceUpgradeTest)
 	if err != nil {
 		t.Fatal(err)
@@ -182,7 +182,7 @@ func Test_Upgrade(t *testing.T) {
 	portOut := &bytes.Buffer{}
 	portErr := &bytes.Buffer{}
 
-	freePort, err := utils.FreePort()
+	freePort, err := util.FreePort()
 	if err != nil {
 		t.Fatal(err)
 	}

pkg/probe/probe_test.go

@@ -7,11 +7,11 @@ import (
 	"testing"
 	"time"
 
-	"github.com/jetstack/kube-oidc-proxy/pkg/utils"
+	"github.com/jetstack/kube-oidc-proxy/pkg/util"
 )
 
 func Test_Check(t *testing.T) {
-	port, err := utils.FreePort()
+	port, err := util.FreePort()
 	if err != nil {
 		t.Fatalf("unexpected error: %s", err)
 	}

pkg/utils/cert.go renamed to pkg/util/cert.go

@@ -1,5 +1,5 @@
 // Copyright Jetstack Ltd. See LICENSE for details.
-package utils
+package util
 
 import (
 	"crypto/rsa"

pkg/utils/pods.go renamed to pkg/util/pods.go

@@ -1,5 +1,5 @@
 // Copyright Jetstack Ltd. See LICENSE for details.
-package utils
+package util
 
 import (
 	"fmt"

pkg/utils/port.go renamed to pkg/util/port.go

@@ -1,5 +1,5 @@
 // Copyright Jetstack Ltd. See LICENSE for details.
-package utils
+package util
 
 import (
 	"net"

pkg/utils/signals.go renamed to pkg/util/signals.go

@@ -1,5 +1,5 @@
 // Copyright Jetstack Ltd. See LICENSE for details.
-package utils
+package util
 
 import (
 	"os"