Merge b6cb2b0 into e7dc0fd

appid/appid.go

@@ -1,10 +1,10 @@
 package appid
 
 import (
-	"code.google.com/p/gogoprotobuf/proto"
 	"errors"
 	"fmt"
 	"github.com/cloudfoundry/loggregatorlib/logmessage"
+	"github.com/gogo/protobuf/proto"
 	"net/url"
 )
 

emitter/emit.go

@@ -1,10 +1,10 @@
 package emitter
 
 import (
-	"code.google.com/p/gogoprotobuf/proto"
 	"github.com/cloudfoundry/gosteno"
 	"github.com/cloudfoundry/loggregatorlib/loggregatorclient"
 	"github.com/cloudfoundry/loggregatorlib/logmessage"
+	"github.com/gogo/protobuf/proto"
 	//	"regexp"
 	"strings"
 	"time"

emitter/emit_test.go

@@ -1,10 +1,10 @@
 package emitter_test
 
 import (
-	"code.google.com/p/gogoprotobuf/proto"
 	. "github.com/cloudfoundry/loggregatorlib/emitter"
 	"github.com/cloudfoundry/loggregatorlib/logmessage"
 	"github.com/cloudfoundry/loggregatorlib/logmessage/testhelpers"
+	"github.com/gogo/protobuf/proto"
 	"strings"
 
 	"github.com/cloudfoundry/loggregatorlib/loggregatorclient/fake"

logmessage/dump.go

@@ -2,8 +2,8 @@ package logmessage
 
 import (
 	"bytes"
-	"code.google.com/p/gogoprotobuf/proto"
 	"encoding/binary"
+	"github.com/gogo/protobuf/proto"
 )
 
 func DumpMessage(msg Message, buffer *bytes.Buffer) {

logmessage/message.go

@@ -1,9 +1,9 @@
 package logmessage
 
 import (
-	"code.google.com/p/gogoprotobuf/proto"
 	"errors"
 	"github.com/cloudfoundry/loggregatorlib/signature"
+	"github.com/gogo/protobuf/proto"
 	"time"
 )
 

logmessage/message_test.go

@@ -1,7 +1,7 @@
 package logmessage
 
 import (
-	"code.google.com/p/gogoprotobuf/proto"
+	"github.com/gogo/protobuf/proto"
 	"github.com/stretchr/testify/assert"
 	"testing"
 	"time"

logmessage/testhelpers/logmessage_testhelper.go

@@ -1,8 +1,8 @@
 package testhelpers
 
 import (
-	"code.google.com/p/gogoprotobuf/proto"
 	"github.com/cloudfoundry/loggregatorlib/logmessage"
+	"github.com/gogo/protobuf/proto"
 	"github.com/stretchr/testify/assert"
 	"testing"
 	"time"

signature/symmetric_test.go

@@ -19,7 +19,7 @@ var _ = Describe("Encryption", func() {
 		Expect(decrypted).To(Equal(message))
 		Expect(encrypted).NotTo(Equal(message))
 	})
-		
+
 	It("encrypts and decrypts with a 'short' key", func() {
 		key := "short key"
 		encrypted, err := Encrypt(key, message)
@@ -31,7 +31,7 @@ var _ = Describe("Encryption", func() {
 		Expect(decrypted).To(Equal(message))
 		Expect(encrypted).NotTo(Equal(message))
 	})
-		
+
 	It("fails to decrypt with the wrong key", func() {
 		key := "short key"
 		encrypted, err := Encrypt(key, message)
@@ -40,7 +40,7 @@ var _ = Describe("Encryption", func() {
 		_, err = Decrypt("wrong key", encrypted)
 		Expect(err).To(HaveOccurred())
 	})
-		
+
 	It("is non-deterministic", func() {
 		key := "aaaaaaaaaaaaaaaa"
 		encrypted1, err := Encrypt(key, message)
@@ -51,11 +51,11 @@ var _ = Describe("Encryption", func() {
 
 		Expect(encrypted1).NotTo(Equal(encrypted2))
 	})
-		
+
 	It("correctly computes a digest", func() {
 		Expect(DigestBytes([]byte("some-key"))).To(Equal([]byte{0x68, 0x2f, 0x66, 0x97, 0xfa, 0x93, 0xec, 0xa6, 0xc8, 0x1, 0xa2, 0x32, 0x51, 0x9a, 0x9, 0xe3, 0xfe, 0xc, 0x5c, 0x33, 0x94, 0x65, 0xee, 0x53, 0xc3, 0xf9, 0xed, 0xf9, 0x2f, 0xd0, 0x1f, 0x35}))
 	})
-		
+
 	It("deterministically computes the actual encryption key", func() {
 		key := "12345"
 		Expect(getEncryptionKey(key)).To(Equal([]byte{0x59, 0x94, 0x47, 0x1a, 0xbb, 0x1, 0x11, 0x2a, 0xfc, 0xc1, 0x81, 0x59, 0xf6, 0xcc, 0x74, 0xb4}))