Refactor into pkg and cmd dirs.

paxosglobal · May 29, 2018 · 7dcd14b · 7dcd14b
1 parent 0c3a4c5
commit 7dcd14b
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 10 deletions.
diff --git a/main.go → cmd/vault-plugin-secrets-kubernetes/main.go b/main.go → cmd/vault-plugin-secrets-kubernetes/main.go
@@ -6,6 +6,7 @@ import (
 
 	"github.com/hashicorp/vault/helper/pluginutil"
 	"github.com/hashicorp/vault/logical/plugin"
+	"github.com/paxos-bankchain/vault-plugin-secrets-kubernetes/pkg/backend"
 )
 
 func main() {
@@ -17,7 +18,7 @@ func main() {
 	tlsProviderFunc := pluginutil.VaultPluginTLSProvider(tlsConfig)
 
 	if err := plugin.Serve(&plugin.ServeOpts{
-		BackendFactoryFunc: Factory,
+		BackendFactoryFunc: backend.Factory,
 		TLSProviderFunc:    tlsProviderFunc,
 	}); err != nil {
 		log.Fatal(err)

diff --git a/backend.go → pkg/backend/backend.go b/backend.go → pkg/backend/backend.go
@@ -1,4 +1,4 @@
-package main
+package backend
 
 import (
 	"context"

diff --git a/backend_test.go → pkg/backend/backend_test.go b/backend_test.go → pkg/backend/backend_test.go
@@ -1,4 +1,4 @@
-package main
+package backend
 
 import (
 	"bytes"
@@ -79,7 +79,6 @@ func reviewToken(t *testing.T, url, token, bearer string) (int, authv1.TokenRevi
 			},
 		})
 	require.NoError(t, err, "err encoding json")
-	// fmt.Println("sending request: ", string(buf))
 	req, err := http.NewRequest(http.MethodPost, url, bytes.NewBuffer(buf))
 	require.NoError(t, err, "err creating http request")
 	req.Header.Add("Content-Type", "application/json")
@@ -93,7 +92,6 @@ func reviewToken(t *testing.T, url, token, bearer string) (int, authv1.TokenRevi
 	require.NoError(t, err, "err making http request")
 	defer resp.Body.Close()
 	body, err := ioutil.ReadAll(resp.Body)
-	// fmt.Println("received response: ", string(body))
 	var respReview authv1.TokenReview
 	decodeErr := json.Unmarshal(body, &respReview)
 	return resp.StatusCode, respReview.Status, decodeErr

diff --git a/path_roles.go → pkg/backend/path_roles.go b/path_roles.go → pkg/backend/path_roles.go
@@ -1,4 +1,4 @@
-package main
+package backend
 
 import (
 	"context"

diff --git a/path_token.go → pkg/backend/path_token.go b/path_token.go → pkg/backend/path_token.go
@@ -1,4 +1,4 @@
-package main
+package backend
 
 import (
 	"context"

diff --git a/path_tokenreviews.go → pkg/backend/path_tokenreviews.go b/path_tokenreviews.go → pkg/backend/path_tokenreviews.go
@@ -1,4 +1,4 @@
-package main
+package backend
 
 import (
 	"context"
@@ -94,7 +94,7 @@ func reviewResponseErr(code int, err string) (*logical.Response, error) {
 	})
 }
 
-// reviewResponseDeny packages an error response for Kubernetes.
+// reviewResponseDeny packages a deny response for Kubernetes.
 func reviewResponseDeny(reason string) (*logical.Response, error) {
 	// Deny. HTTP code is OK, because we're not actually denying the review request -
 	// just saying that the apiserver should deny the client.

diff --git a/secret_token.go → pkg/backend/secret_token.go b/secret_token.go → pkg/backend/secret_token.go
@@ -1,4 +1,4 @@
-package main
+package backend
 
 import (
 	"context"