go fmt was complaining about import order after my sed replacement

Signed-off-by: David Lawrence <david.lawrence@docker.com> (github: endophage)
This commit is contained in:
David Lawrence 2015-10-27 16:45:55 -07:00
parent 21ee24bc30
commit fa70a79ed7
6 changed files with 6 additions and 6 deletions

View File

@ -17,8 +17,8 @@ import (
"github.com/docker/notary/server/handlers" "github.com/docker/notary/server/handlers"
"github.com/docker/notary/server/storage" "github.com/docker/notary/server/storage"
"github.com/docker/notary/trustmanager" "github.com/docker/notary/trustmanager"
"github.com/docker/notary/utils"
"github.com/docker/notary/tuf/data" "github.com/docker/notary/tuf/data"
"github.com/docker/notary/utils"
"github.com/gorilla/mux" "github.com/gorilla/mux"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"golang.org/x/net/context" "golang.org/x/net/context"

View File

@ -20,9 +20,9 @@ import (
"github.com/docker/notary/cryptoservice" "github.com/docker/notary/cryptoservice"
"github.com/docker/notary/signer" "github.com/docker/notary/signer"
"github.com/docker/notary/signer/api" "github.com/docker/notary/signer/api"
"github.com/docker/notary/tuf/data"
"github.com/docker/notary/utils" "github.com/docker/notary/utils"
"github.com/docker/notary/version" "github.com/docker/notary/version"
"github.com/docker/notary/tuf/data"
_ "github.com/go-sql-driver/mysql" _ "github.com/go-sql-driver/mysql"
"github.com/miekg/pkcs11" "github.com/miekg/pkcs11"
"github.com/spf13/viper" "github.com/spf13/viper"

View File

@ -7,8 +7,8 @@ import (
"github.com/docker/notary/pkg/passphrase" "github.com/docker/notary/pkg/passphrase"
"github.com/docker/notary/trustmanager" "github.com/docker/notary/trustmanager"
jose "github.com/dvsekhvalnov/jose2go"
"github.com/docker/notary/tuf/data" "github.com/docker/notary/tuf/data"
jose "github.com/dvsekhvalnov/jose2go"
"github.com/jinzhu/gorm" "github.com/jinzhu/gorm"
) )

View File

@ -7,8 +7,8 @@ import (
"github.com/Sirupsen/logrus" "github.com/Sirupsen/logrus"
pb "github.com/docker/notary/proto" pb "github.com/docker/notary/proto"
"github.com/docker/notary/utils"
"github.com/docker/notary/tuf/data" "github.com/docker/notary/tuf/data"
"github.com/docker/notary/utils"
"golang.org/x/net/context" "golang.org/x/net/context"
"google.golang.org/grpc" "google.golang.org/grpc"
"google.golang.org/grpc/codes" "google.golang.org/grpc/codes"

View File

@ -154,7 +154,7 @@ func TestMultiSign(t *testing.T) {
t.Fatalf("Incorrect number of signatures: %d", len(testData.Signatures)) t.Fatalf("Incorrect number of signatures: %d", len(testData.Signatures))
} }
keyIDs := map[string]struct{}{testKeyID1: struct{}{}, testKeyID2: struct{}{}} keyIDs := map[string]struct{}{testKeyID1: {}, testKeyID2: {}}
for _, sig := range testData.Signatures { for _, sig := range testData.Signatures {
if _, ok := keyIDs[sig.KeyID]; !ok { if _, ok := keyIDs[sig.KeyID]; !ok {
t.Fatalf("Got a signature we didn't expect: %s", sig.KeyID) t.Fatalf("Got a signature we didn't expect: %s", sig.KeyID)

View File

@ -162,7 +162,7 @@ func Test(t *testing.T) {
} }
if run.roles == nil { if run.roles == nil {
run.roles = map[string]*data.Role{ run.roles = map[string]*data.Role{
"root": &data.Role{ "root": {
RootRole: data.RootRole{ RootRole: data.RootRole{
KeyIDs: []string{run.keys[0].ID()}, KeyIDs: []string{run.keys[0].ID()},
Threshold: 1, Threshold: 1,