Merge pull request #221 from koding/adapt-uuid

kite: adapt code to latest go.uuid version

Author: rjeczalik

Gopkg.lock

@@ -85,8 +85,8 @@
   name = "github.com/mitchellh/cli"
 
 [[constraint]]
+  branch = "master"
   name = "github.com/satori/go.uuid"
-  version = "1.1.0"
 
 [[constraint]]
   branch = "master"

Gopkg.toml

@@ -171,7 +171,7 @@ func NewWithConfig(name, version string, cfg *config.Config) *Kite {
 		panic("kite: version must be 3-digits semantic version")
 	}
 
-	kiteID := uuid.NewV4()
+	kiteID := uuid.Must(uuid.NewV4())
 
 	l, setlevel := newLogger(name)
 

kite.go

@@ -96,7 +96,7 @@ func TestContext(t *testing.T) {
 	}
 
 	if !reflect.DeepEqual(got, want) {
-		t.Fatalf("got %v, want %v")
+		t.Fatalf("got %v, want %v", got, want)
 	}
 }
 

kite_test.go

@@ -36,7 +36,7 @@ func (k *KiteKey) id() string {
 	if k.ID != "" {
 		return k.ID
 	}
-	return uuid.NewV4().String()
+	return uuid.Must(uuid.NewV4()).String()
 }
 
 func (k *KiteKey) issuer() string {

kitetest/kitetest.go

@@ -12,7 +12,7 @@ func BenchmarkPostgres(b *testing.B) {
 	kon.SetStorage(NewPostgres(nil, kon.Kite.Log))
 
 	newKite := func() *protocol.Kite {
-		id := uuid.NewV4()
+		id := uuid.Must(uuid.NewV4())
 		return &protocol.Kite{
 			Username:    "bench-user",
 			Environment: "bench-env",
@@ -53,7 +53,7 @@ func BenchmarkEtcdAdd(b *testing.B) {
 	kon.SetStorage(NewEtcd(nil, kon.Kite.Log))
 
 	newKite := func() *protocol.Kite {
-		id := uuid.NewV4()
+		id := uuid.Must(uuid.NewV4())
 		return &protocol.Kite{
 			Username:    "bench-user",
 			Environment: "bench-env",

kontrol/bench_test.go

@@ -283,7 +283,10 @@ func (k *Kontrol) AddKeyPair(id, public, private string) error {
 	}
 
 	if id == "" {
-		i := uuid.NewV4()
+		i, err := uuid.NewV4()
+		if err != nil {
+			return err
+		}
 		id = i.String()
 	}
 
@@ -358,12 +361,16 @@ func (k *Kontrol) InitializeSelf() error {
 }
 
 func (k *Kontrol) registerUser(username, publicKey, privateKey string) (kiteKey string, err error) {
+	id, err := uuid.NewV4()
+	if err != nil {
+		return "", err
+	}
 	claims := &kitekey.KiteClaims{
 		StandardClaims: jwt.StandardClaims{
 			Issuer:   k.Kite.Kite().Username,
 			Subject:  username,
 			IssuedAt: time.Now().Add(-k.tokenLeeway()).UTC().Unix(),
-			Id:       uuid.NewV4().String(),
+			Id:       id.String(),
 		},
 		KontrolURL: k.Kite.Config.KontrolURL,
 		KontrolKey: strings.TrimSpace(publicKey),
@@ -400,12 +407,17 @@ func (k *Kontrol) registerSelf() {
 		// to generate its kitekey or no kitekey is defined,
 		// use a dummy entry in order to register the kontrol.
 		keyPair = &KeyPair{
-			ID:      uuid.NewV4().String(),
 			Public:  "kontrol-self",
 			Private: "kontrol-self",
 		}
 
-		if err := k.keyPair.AddKey(keyPair); err != nil {
+		if id, err := uuid.NewV4(); err == nil {
+			keyPair.ID = id.String()
+
+			if err := k.keyPair.AddKey(keyPair); err != nil {
+				k.log.Error("%s", err)
+			}
+		} else {
 			k.log.Error("%s", err)
 		}
 	}
@@ -562,6 +574,11 @@ func (k *Kontrol) generateToken(tok *token) (string, error) {
 		return "", err
 	}
 
+	id, err := uuid.NewV4()
+	if err != nil {
+		return "", err
+	}
+
 	now := time.Now().UTC()
 
 	claims := &kitekey.KiteClaims{
@@ -571,7 +588,7 @@ func (k *Kontrol) generateToken(tok *token) (string, error) {
 			Audience:  tok.audience,
 			ExpiresAt: now.Add(k.tokenTTL()).Add(k.tokenLeeway()).UTC().Unix(),
 			IssuedAt:  now.Add(-k.tokenLeeway()).UTC().Unix(),
-			Id:        uuid.NewV4().String(),
+			Id:        id.String(),
 		},
 	}
 

kontrol/kontrol.go

@@ -36,7 +36,7 @@ func init() {
 
 func TestUpdateKeys(t *testing.T) {
 	if storage := os.Getenv("KONTROL_STORAGE"); storage != "postgres" {
-		t.Skip("skipping TestUpdateKeys for storage %q: not implemented", storage)
+		t.Skipf("skipping TestUpdateKeys for storage %q: not implemented", storage)
 	}
 
 	kon, conf := startKontrol(testkeys.PrivateThird, testkeys.PublicThird, 5501)
@@ -661,10 +661,10 @@ func TestGetQueryKey(t *testing.T) {
 
 func TestKontrolMultiKey(t *testing.T) {
 	if storage := os.Getenv("KONTROL_STORAGE"); storage != "postgres" {
-		t.Skip("%q storage does not currently implement soft key pair deletes", storage)
+		t.Skipf("%q storage does not currently implement soft key pair deletes", storage)
 	}
 
-	i := uuid.NewV4()
+	i := uuid.Must(uuid.NewV4())
 	secondID := i.String()
 
 	// add so we can use it as key

kontrol/kontrol_test.go

@@ -34,7 +34,7 @@ func NewKiteKeyWithKeyPair(private, public string) *jwt.Token {
 // NewToken creates new JWT token for the gien username. It embedds the given
 // public key as kontrolKey and signs the token with the private one.
 func NewToken(username, private, public string) *jwt.Token {
-	tknID := uuid.NewV4()
+	tknID := uuid.Must(uuid.NewV4())
 
 	hostname, err := os.Hostname()
 	if err != nil {