diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 6d207b74d1..e708ccb234 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -130,7 +130,7 @@ "Rev": "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75" }, { - "ImportPath": "github.com/jfrazelle/go/canonical/json", + "ImportPath": "github.com/docker/go/canonical/json", "Comment": "v1.5.1-1-1-gbaf439e", "Rev": "baf439e6c161bd2106346fc8022b74ac2444e311" }, diff --git a/Godeps/_workspace/src/github.com/jfrazelle/go/canonical/json/decode.go b/Godeps/_workspace/src/github.com/docker/go/canonical/json/decode.go similarity index 100% rename from Godeps/_workspace/src/github.com/jfrazelle/go/canonical/json/decode.go rename to Godeps/_workspace/src/github.com/docker/go/canonical/json/decode.go diff --git a/Godeps/_workspace/src/github.com/jfrazelle/go/canonical/json/encode.go b/Godeps/_workspace/src/github.com/docker/go/canonical/json/encode.go similarity index 100% rename from Godeps/_workspace/src/github.com/jfrazelle/go/canonical/json/encode.go rename to Godeps/_workspace/src/github.com/docker/go/canonical/json/encode.go diff --git a/Godeps/_workspace/src/github.com/jfrazelle/go/canonical/json/fold.go b/Godeps/_workspace/src/github.com/docker/go/canonical/json/fold.go similarity index 100% rename from Godeps/_workspace/src/github.com/jfrazelle/go/canonical/json/fold.go rename to Godeps/_workspace/src/github.com/docker/go/canonical/json/fold.go diff --git a/Godeps/_workspace/src/github.com/jfrazelle/go/canonical/json/indent.go b/Godeps/_workspace/src/github.com/docker/go/canonical/json/indent.go similarity index 100% rename from Godeps/_workspace/src/github.com/jfrazelle/go/canonical/json/indent.go rename to Godeps/_workspace/src/github.com/docker/go/canonical/json/indent.go diff --git a/Godeps/_workspace/src/github.com/jfrazelle/go/canonical/json/scanner.go b/Godeps/_workspace/src/github.com/docker/go/canonical/json/scanner.go similarity index 100% rename from Godeps/_workspace/src/github.com/jfrazelle/go/canonical/json/scanner.go rename to Godeps/_workspace/src/github.com/docker/go/canonical/json/scanner.go diff --git a/Godeps/_workspace/src/github.com/jfrazelle/go/canonical/json/stream.go b/Godeps/_workspace/src/github.com/docker/go/canonical/json/stream.go similarity index 100% rename from Godeps/_workspace/src/github.com/jfrazelle/go/canonical/json/stream.go rename to Godeps/_workspace/src/github.com/docker/go/canonical/json/stream.go diff --git a/Godeps/_workspace/src/github.com/jfrazelle/go/canonical/json/tags.go b/Godeps/_workspace/src/github.com/docker/go/canonical/json/tags.go similarity index 100% rename from Godeps/_workspace/src/github.com/jfrazelle/go/canonical/json/tags.go rename to Godeps/_workspace/src/github.com/docker/go/canonical/json/tags.go diff --git a/client/client_test.go b/client/client_test.go index 3e966a71da..428915f110 100644 --- a/client/client_test.go +++ b/client/client_test.go @@ -18,7 +18,7 @@ import ( "github.com/Sirupsen/logrus" ctxu "github.com/docker/distribution/context" - "github.com/jfrazelle/go/canonical/json" + "github.com/docker/go/canonical/json" "github.com/stretchr/testify/assert" "golang.org/x/net/context" diff --git a/cmd/notary/keys_test.go b/cmd/notary/keys_test.go index 111778cce0..a71ffdbd0a 100644 --- a/cmd/notary/keys_test.go +++ b/cmd/notary/keys_test.go @@ -11,11 +11,11 @@ import ( "strings" "testing" + "github.com/docker/go/canonical/json" "github.com/docker/notary/client" "github.com/docker/notary/passphrase" "github.com/docker/notary/trustmanager" "github.com/docker/notary/tuf/data" - "github.com/jfrazelle/go/canonical/json" "github.com/spf13/cobra" "github.com/spf13/viper" "github.com/stretchr/testify/assert" diff --git a/server/timestamp/timestamp.go b/server/timestamp/timestamp.go index 4fb25ce485..c3aaf99718 100644 --- a/server/timestamp/timestamp.go +++ b/server/timestamp/timestamp.go @@ -3,9 +3,9 @@ package timestamp import ( "bytes" + "github.com/docker/go/canonical/json" "github.com/docker/notary/tuf/data" "github.com/docker/notary/tuf/signed" - "github.com/jfrazelle/go/canonical/json" "github.com/Sirupsen/logrus" "github.com/docker/notary/server/storage" diff --git a/tuf/data/keys.go b/tuf/data/keys.go index 1c2c60e92a..9f94d5552f 100644 --- a/tuf/data/keys.go +++ b/tuf/data/keys.go @@ -14,7 +14,7 @@ import ( "github.com/Sirupsen/logrus" "github.com/agl/ed25519" - "github.com/jfrazelle/go/canonical/json" + "github.com/docker/go/canonical/json" ) // PublicKey is the necessary interface for public keys diff --git a/tuf/data/root.go b/tuf/data/root.go index e555cbd2f5..bd479206fd 100644 --- a/tuf/data/root.go +++ b/tuf/data/root.go @@ -3,7 +3,7 @@ package data import ( "time" - "github.com/jfrazelle/go/canonical/json" + "github.com/docker/go/canonical/json" ) // SignedRoot is a fully unpacked root.json diff --git a/tuf/data/root_test.go b/tuf/data/root_test.go index bdcf3fe786..f4f19224d2 100644 --- a/tuf/data/root_test.go +++ b/tuf/data/root_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - cjson "github.com/jfrazelle/go/canonical/json" + cjson "github.com/docker/go/canonical/json" "github.com/stretchr/testify/require" ) diff --git a/tuf/data/serializer.go b/tuf/data/serializer.go index 91fa1bc93e..5c33d129b4 100644 --- a/tuf/data/serializer.go +++ b/tuf/data/serializer.go @@ -1,6 +1,6 @@ package data -import "github.com/jfrazelle/go/canonical/json" +import "github.com/docker/go/canonical/json" // Serializer is an interface that can marshal and unmarshal TUF data. This // is expected to be a canonical JSON marshaller diff --git a/tuf/data/snapshot.go b/tuf/data/snapshot.go index ca23d20ff9..f13951ca83 100644 --- a/tuf/data/snapshot.go +++ b/tuf/data/snapshot.go @@ -5,7 +5,7 @@ import ( "time" "github.com/Sirupsen/logrus" - "github.com/jfrazelle/go/canonical/json" + "github.com/docker/go/canonical/json" ) // SignedSnapshot is a fully unpacked snapshot.json diff --git a/tuf/data/targets.go b/tuf/data/targets.go index 61265ca054..a538d6afa5 100644 --- a/tuf/data/targets.go +++ b/tuf/data/targets.go @@ -5,7 +5,7 @@ import ( "encoding/hex" "errors" - "github.com/jfrazelle/go/canonical/json" + "github.com/docker/go/canonical/json" ) // SignedTargets is a fully unpacked targets.json, or target delegation diff --git a/tuf/data/timestamp.go b/tuf/data/timestamp.go index da5367ab47..f68252ca5b 100644 --- a/tuf/data/timestamp.go +++ b/tuf/data/timestamp.go @@ -4,7 +4,7 @@ import ( "bytes" "time" - "github.com/jfrazelle/go/canonical/json" + "github.com/docker/go/canonical/json" ) // SignedTimestamp is a fully unpacked timestamp.json diff --git a/tuf/data/types.go b/tuf/data/types.go index 61a311664f..6459b8e664 100644 --- a/tuf/data/types.go +++ b/tuf/data/types.go @@ -11,7 +11,7 @@ import ( "time" "github.com/Sirupsen/logrus" - "github.com/jfrazelle/go/canonical/json" + "github.com/docker/go/canonical/json" ) // SigAlgorithm for types of signatures diff --git a/tuf/data/types_test.go b/tuf/data/types_test.go index 119348f3c1..644894a81f 100644 --- a/tuf/data/types_test.go +++ b/tuf/data/types_test.go @@ -5,7 +5,7 @@ import ( "encoding/hex" "testing" - "github.com/jfrazelle/go/canonical/json" + "github.com/docker/go/canonical/json" "github.com/stretchr/testify/assert" ) diff --git a/tuf/signed/verify.go b/tuf/signed/verify.go index 3c1646f81f..9548e4e53d 100644 --- a/tuf/signed/verify.go +++ b/tuf/signed/verify.go @@ -6,9 +6,9 @@ import ( "time" "github.com/Sirupsen/logrus" + "github.com/docker/go/canonical/json" "github.com/docker/notary/tuf/data" "github.com/docker/notary/tuf/keys" - "github.com/jfrazelle/go/canonical/json" ) // Various basic signing errors diff --git a/tuf/signed/verify_test.go b/tuf/signed/verify_test.go index 4c7bbc270b..21fa94f9e3 100644 --- a/tuf/signed/verify_test.go +++ b/tuf/signed/verify_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "github.com/jfrazelle/go/canonical/json" + "github.com/docker/go/canonical/json" "github.com/stretchr/testify/assert" "github.com/docker/notary/tuf/data" diff --git a/tuf/store/httpstore_test.go b/tuf/store/httpstore_test.go index 49c88c3629..1b682eca1b 100644 --- a/tuf/store/httpstore_test.go +++ b/tuf/store/httpstore_test.go @@ -14,10 +14,10 @@ import ( "github.com/stretchr/testify/assert" + "github.com/docker/go/canonical/json" "github.com/docker/notary/tuf/data" "github.com/docker/notary/tuf/signed" "github.com/docker/notary/tuf/validation" - "github.com/jfrazelle/go/canonical/json" ) const testRoot = `{"signed":{"_type":"Root","consistent_snapshot":false,"expires":"2025-07-17T16:19:21.101698314-07:00","keys":{"1ca15c7f4b2b0c6efce202a545e7267152da28ab7c91590b3b60bdb4da723aad":{"keytype":"ecdsa","keyval":{"private":null,"public":"MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEb0720c99Cj6ZmuDlznEZ52NA6YpeY9Sj45z51XvPnG63Bi2RSBezMJlPzbSfP39mXKXqOJyT+z9BZhi3FVWczg=="}},"b1d6813b55442ecbfb1f4b40eb1fcdb4290e53434cfc9ba2da24c26c9143873b":{"keytype":"ecdsa-x509","keyval":{"private":null,"public":"LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUJVekNCKzZBREFnRUNBaEFCWDNKLzkzaW8zbHcrZUsvNFhvSHhNQW9HQ0NxR1NNNDlCQU1DTUJFeER6QU4KQmdOVkJBTVRCbVY0Y0dseVpUQWVGdzB4TlRBM01qQXlNekU1TVRkYUZ3MHlOVEEzTVRjeU16RTVNVGRhTUJFeApEekFOQmdOVkJBTVRCbVY0Y0dseVpUQlpNQk1HQnlxR1NNNDlBZ0VHQ0NxR1NNNDlBd0VIQTBJQUJFTDhOTFhQCitreUJZYzhYY0FTMXB2S2l5MXRQUDlCZHJ1dEdrWlR3Z0dEYTM1THMzSUFXaWlrUmlPbGRuWmxVVEE5cG5JekoKOFlRQThhTjQ1TDQvUlplak5UQXpNQTRHQTFVZER3RUIvd1FFQXdJQW9EQVRCZ05WSFNVRUREQUtCZ2dyQmdFRgpCUWNEQXpBTUJnTlZIUk1CQWY4RUFqQUFNQW9HQ0NxR1NNNDlCQU1DQTBjQU1FUUNJRVJ1ZUVURG5xMlRqRFBmClhGRStqUFJqMEtqdXdEOG9HSmtoVGpMUDAycjhBaUI5cUNyL2ZqSXpJZ1NQcTJVSXZqR0hlYmZOYXh1QlpZZUUKYW8xNjd6dHNYZz09Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K"}},"fbddae7f25a6c23ca735b017206a849d4c89304a4d8de4dcc4b3d6f3eb22ce3b":{"keytype":"ecdsa","keyval":{"private":null,"public":"MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE/xS5fBHK2HKmlGcvAr06vwPITvmxWP4P3CMDCgY25iSaIiM21OiXA1/Uvo3Pa3xh5G3cwCtDvi+4FpflW2iB/w=="}},"fd75751f010c3442e23b3e3e99a1442a112f2f21038603cb8609d8b17c9e912a":{"keytype":"ed25519","keyval":{"private":null,"public":"rc+glN01m+q8jmX8SolGsjTfk6NMhUQTWyj10hjmne0="}}},"roles":{"root":{"keyids":["b1d6813b55442ecbfb1f4b40eb1fcdb4290e53434cfc9ba2da24c26c9143873b"],"threshold":1},"snapshot":{"keyids":["1ca15c7f4b2b0c6efce202a545e7267152da28ab7c91590b3b60bdb4da723aad"],"threshold":1},"targets":{"keyids":["fbddae7f25a6c23ca735b017206a849d4c89304a4d8de4dcc4b3d6f3eb22ce3b"],"threshold":1},"timestamp":{"keyids":["fd75751f010c3442e23b3e3e99a1442a112f2f21038603cb8609d8b17c9e912a"],"threshold":1}},"version":2},"signatures":[{"keyid":"b1d6813b55442ecbfb1f4b40eb1fcdb4290e53434cfc9ba2da24c26c9143873b","method":"ecdsa","sig":"A2lNVwxHBnD9ViFtRre8r5oG6VvcvJnC6gdvvxv/Jyag40q/fNMjllCqyHrb+6z8XDZcrTTDsFU1R3/e+92d1A=="}]}` diff --git a/tuf/testutils/repo.go b/tuf/testutils/repo.go index f1484cd3bc..b601319ac9 100644 --- a/tuf/testutils/repo.go +++ b/tuf/testutils/repo.go @@ -5,13 +5,13 @@ import ( "sort" "time" + "github.com/docker/go/canonical/json" "github.com/docker/notary/cryptoservice" "github.com/docker/notary/passphrase" "github.com/docker/notary/trustmanager" "github.com/docker/notary/tuf/data" "github.com/docker/notary/tuf/utils" fuzz "github.com/google/gofuzz" - "github.com/jfrazelle/go/canonical/json" tuf "github.com/docker/notary/tuf" "github.com/docker/notary/tuf/keys" diff --git a/tuf/testutils/swizzler.go b/tuf/testutils/swizzler.go index eccf7b299b..91a0c780e1 100644 --- a/tuf/testutils/swizzler.go +++ b/tuf/testutils/swizzler.go @@ -5,13 +5,13 @@ import ( "path" "time" + "github.com/docker/go/canonical/json" "github.com/docker/notary/cryptoservice" "github.com/docker/notary/passphrase" "github.com/docker/notary/trustmanager" "github.com/docker/notary/tuf/data" "github.com/docker/notary/tuf/signed" "github.com/docker/notary/tuf/store" - "github.com/jfrazelle/go/canonical/json" ) const (