Moved tlsutil into helpers

2016-10-25 16:05:37 -07:00 · 2016-10-25 16:05:37 -07:00 · 7c61e115bd
parent 353e7fc7f1
commit 7c61e115bd
23 changed files with 7 additions and 7 deletions
--- a/client/client.go
+++ b/client/client.go
@ -27,9 +27,9 @@ import (
 	"github.com/hashicorp/nomad/client/stats"
 	"github.com/hashicorp/nomad/client/vaultclient"
 	"github.com/hashicorp/nomad/command/agent/consul"
+	"github.com/hashicorp/nomad/helper/tlsutil"
 	"github.com/hashicorp/nomad/nomad"
 	"github.com/hashicorp/nomad/nomad/structs"
-	"github.com/hashicorp/nomad/tlsutil"
 	vaultapi "github.com/hashicorp/vault/api"
 	"github.com/mitchellh/hashstructure"
 )
--- a/client/config/config.go
+++ b/client/config/config.go
@ -8,9 +8,9 @@ import (
 	"strings"
 	"time"

+	"github.com/hashicorp/nomad/helper/tlsutil"
 	"github.com/hashicorp/nomad/nomad/structs"
 	"github.com/hashicorp/nomad/nomad/structs/config"
-	"github.com/hashicorp/nomad/tlsutil"
 )

 var (
--- a/command/agent/http.go
+++ b/command/agent/http.go
@ -14,8 +14,8 @@ import (
 	"time"

 	"github.com/NYTimes/gziphandler"
+	"github.com/hashicorp/nomad/helper/tlsutil"
 	"github.com/hashicorp/nomad/nomad/structs"
-	"github.com/hashicorp/nomad/tlsutil"
 	"github.com/ugorji/go/codec"
 )

--- a/helper/tlsutil/config.go
+++ b/helper/tlsutil/config.go
--- a/helper/tlsutil/config_test.go
+++ b/helper/tlsutil/config_test.go
--- a/helper/tlsutil/test/ca/certindex
+++ b/helper/tlsutil/test/ca/certindex
--- a/helper/tlsutil/test/ca/myca.conf
+++ b/helper/tlsutil/test/ca/myca.conf
--- a/helper/tlsutil/test/ca/privkey.pem
+++ b/helper/tlsutil/test/ca/privkey.pem
--- a/helper/tlsutil/test/ca/root.cer
+++ b/helper/tlsutil/test/ca/root.cer
--- a/helper/tlsutil/test/ca/serialfile
+++ b/helper/tlsutil/test/ca/serialfile
--- a/helper/tlsutil/test/hostname/Alice.crt
+++ b/helper/tlsutil/test/hostname/Alice.crt
--- a/helper/tlsutil/test/hostname/Alice.key
+++ b/helper/tlsutil/test/hostname/Alice.key
--- a/helper/tlsutil/test/hostname/CertAuth.crt
+++ b/helper/tlsutil/test/hostname/CertAuth.crt
--- a/helper/tlsutil/test/key/ourdomain.cer
+++ b/helper/tlsutil/test/key/ourdomain.cer
--- a/helper/tlsutil/test/key/ourdomain.csr
+++ b/helper/tlsutil/test/key/ourdomain.csr
--- a/helper/tlsutil/test/key/ourdomain.key
+++ b/helper/tlsutil/test/key/ourdomain.key
--- a/helper/tlsutil/test/key/ssl-cert-snakeoil.key
+++ b/helper/tlsutil/test/key/ssl-cert-snakeoil.key
--- a/helper/tlsutil/test/key/ssl-cert-snakeoil.pem
+++ b/helper/tlsutil/test/key/ssl-cert-snakeoil.pem
--- a/helper/tlsutil/test/notes.txt
+++ b/helper/tlsutil/test/notes.txt
--- a/nomad/config.go
+++ b/nomad/config.go
@ -9,10 +9,10 @@ import (
 	"time"

 	"github.com/hashicorp/memberlist"
+	"github.com/hashicorp/nomad/helper/tlsutil"
 	"github.com/hashicorp/nomad/nomad/structs"
 	"github.com/hashicorp/nomad/nomad/structs/config"
 	"github.com/hashicorp/nomad/scheduler"
-	"github.com/hashicorp/nomad/tlsutil"
 	"github.com/hashicorp/raft"
 	"github.com/hashicorp/serf/serf"
 )
--- a/nomad/pool.go
+++ b/nomad/pool.go
@ -11,7 +11,7 @@ import (
 	"time"

 	"github.com/hashicorp/net-rpc-msgpackrpc"
-	"github.com/hashicorp/nomad/tlsutil"
+	"github.com/hashicorp/nomad/helper/tlsutil"
 	"github.com/hashicorp/yamux"
 )

--- a/nomad/raft_rpc.go
+++ b/nomad/raft_rpc.go
@ -6,7 +6,7 @@ import (
 	"sync"
 	"time"

-	"github.com/hashicorp/nomad/tlsutil"
+	"github.com/hashicorp/nomad/helper/tlsutil"
 )

 // RaftLayer implements the raft.StreamLayer interface,
--- a/nomad/server.go
+++ b/nomad/server.go
@ -20,9 +20,9 @@ import (
 	"github.com/hashicorp/consul/lib"
 	"github.com/hashicorp/go-multierror"
 	"github.com/hashicorp/nomad/command/agent/consul"
+	"github.com/hashicorp/nomad/helper/tlsutil"
 	"github.com/hashicorp/nomad/nomad/state"
 	"github.com/hashicorp/nomad/nomad/structs"
-	"github.com/hashicorp/nomad/tlsutil"
 	"github.com/hashicorp/raft"
 	"github.com/hashicorp/raft-boltdb"
 	"github.com/hashicorp/serf/serf"