Skip to content
This repository has been archived by the owner on May 3, 2022. It is now read-only.

Commit

Permalink
Make linter happy with the import order
Browse files Browse the repository at this point in the history
  • Loading branch information
@radu-matei
radu-matei committed Apr 4, 2019
1 parent b2378a4 commit 2611762
Show file tree
Hide file tree
Showing 23 changed files with 40 additions and 33 deletions.
17 changes: 9 additions & 8 deletions cmd/duffle/build.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,15 @@ import (
"path/filepath"

"github.com/deislabs/cnab-go/bundle"
"github.com/docker/cli/cli/command"
cliconfig "github.com/docker/cli/cli/config"
dockerdebug "github.com/docker/cli/cli/debug"
dockerflags "github.com/docker/cli/cli/flags"
"github.com/docker/cli/opts"
"github.com/docker/go-connections/tlsconfig"
"github.com/spf13/cobra"
"github.com/spf13/pflag"

"github.com/deislabs/duffle/pkg/builder"
"github.com/deislabs/duffle/pkg/crypto/digest"
"github.com/deislabs/duffle/pkg/duffle/home"
Expand All @@ -20,14 +29,6 @@ import (
"github.com/deislabs/duffle/pkg/ohai"
"github.com/deislabs/duffle/pkg/repo"
"github.com/deislabs/duffle/pkg/signature"
"github.com/docker/cli/cli/command"
cliconfig "github.com/docker/cli/cli/config"
dockerdebug "github.com/docker/cli/cli/debug"
dockerflags "github.com/docker/cli/cli/flags"
"github.com/docker/cli/opts"
"github.com/docker/go-connections/tlsconfig"
"github.com/spf13/cobra"
"github.com/spf13/pflag"
)

const buildDesc = `
Expand Down
2 changes: 1 addition & 1 deletion cmd/duffle/bundle_sign.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (
"os"
"path/filepath"

"github.com/deislabs/cnab-go/bundle"
"github.com/spf13/cobra"

"github.com/deislabs/cnab-go/bundle"
"github.com/deislabs/duffle/pkg/crypto/digest"
"github.com/deislabs/duffle/pkg/duffle/home"
"github.com/deislabs/duffle/pkg/signature"
Expand Down
4 changes: 2 additions & 2 deletions cmd/duffle/claims_show_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (
"testing"

"github.com/deislabs/cnab-go/bundle"
"github.com/deislabs/duffle/pkg/claim"

"github.com/stretchr/testify/assert"

"github.com/deislabs/duffle/pkg/claim"
)

func TestDisplayClaim(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions cmd/duffle/claims_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
"testing"

"github.com/deislabs/cnab-go/bundle"
"github.com/deislabs/duffle/pkg/claim"

"github.com/stretchr/testify/assert"

"github.com/deislabs/duffle/pkg/claim"
)

func TestMockClaimStore(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion cmd/duffle/credential_generate.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ import (
"sort"
"strings"

"github.com/deislabs/cnab-go/bundle"
"github.com/spf13/cobra"
survey "gopkg.in/AlecAivazis/survey.v1"
yaml "gopkg.in/yaml.v2"

"github.com/deislabs/cnab-go/bundle"
"github.com/deislabs/duffle/pkg/credentials"
"github.com/deislabs/duffle/pkg/duffle/home"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/duffle/install.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ import (
"path/filepath"
"strings"

"github.com/deislabs/cnab-go/bundle"
"github.com/spf13/cobra"
"github.com/spf13/viper"

"github.com/deislabs/duffle/pkg/action"
"github.com/deislabs/cnab-go/bundle"
"github.com/deislabs/duffle/pkg/claim"
"github.com/deislabs/duffle/pkg/duffle/home"
"github.com/deislabs/duffle/pkg/repo"
Expand Down
2 changes: 1 addition & 1 deletion cmd/duffle/install_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (
"path/filepath"
"testing"

"github.com/deislabs/cnab-go/bundle"
"github.com/stretchr/testify/assert"

"github.com/deislabs/cnab-go/bundle"
"github.com/deislabs/duffle/pkg/duffle/home"
)

Expand Down
5 changes: 2 additions & 3 deletions cmd/duffle/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,14 @@ import (
"runtime"
"strings"

"github.com/deislabs/duffle/pkg/signature"

"github.com/deislabs/cnab-go/bundle"
"github.com/spf13/cobra"

"github.com/deislabs/cnab-go/bundle"
"github.com/deislabs/duffle/pkg/claim"
"github.com/deislabs/duffle/pkg/credentials"
"github.com/deislabs/duffle/pkg/driver"
"github.com/deislabs/duffle/pkg/duffle/home"
"github.com/deislabs/duffle/pkg/signature"
"github.com/deislabs/duffle/pkg/utils/crud"
)

Expand Down
3 changes: 1 addition & 2 deletions cmd/duffle/main_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,10 @@ import (
"testing"

"github.com/deislabs/cnab-go/bundle"
"github.com/deislabs/duffle/pkg/credentials"

"github.com/ghodss/yaml"
"github.com/stretchr/testify/assert"

"github.com/deislabs/duffle/pkg/credentials"
"github.com/deislabs/duffle/pkg/duffle/home"
)

Expand Down
5 changes: 3 additions & 2 deletions cmd/duffle/pull.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,11 @@ import (
"strings"

"github.com/deislabs/cnab-go/bundle"
"github.com/deislabs/duffle/pkg/loader"
"github.com/deislabs/duffle/pkg/reference"
"github.com/docker/cnab-to-oci/remotes"
"github.com/spf13/cobra"

"github.com/deislabs/duffle/pkg/loader"
"github.com/deislabs/duffle/pkg/reference"
)

var ErrNotSigned = errors.New("bundle is not signed")
Expand Down
5 changes: 3 additions & 2 deletions cmd/duffle/push.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,11 @@ import (
"os"

sdkBundle "github.com/deislabs/cnab-go/bundle"
"github.com/deislabs/duffle/pkg/reference"
"github.com/docker/cli/cli/config"
"github.com/docker/cnab-to-oci/remotes"
"github.com/spf13/cobra"

"github.com/deislabs/duffle/pkg/reference"
)

type pushOptions struct {
Expand All @@ -24,7 +25,7 @@ type pushOptions struct {
}

func newPushCmd(out io.Writer) *cobra.Command {
const usage = `Pushes a CNAB bundle to a repository.`
// const usage = `Pushes a CNAB bundle to a repository.`

var opts pushOptions
cmd := &cobra.Command{
Expand Down
1 change: 1 addition & 0 deletions cmd/duffle/root_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (
"testing"

"github.com/deislabs/cnab-go/bundle"

"github.com/deislabs/duffle/pkg/version"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/duffle/search.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ import (
"net/url"
"strings"

"github.com/deislabs/cnab-go/bundle"
"github.com/renstrom/fuzzysearch/fuzzy"
log "github.com/sirupsen/logrus"
"github.com/spf13/cobra"

"github.com/deislabs/cnab-go/bundle"
"github.com/deislabs/duffle/pkg/repo/remote"
)

Expand Down
1 change: 1 addition & 0 deletions cmd/duffle/upgrade_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"testing"

"github.com/deislabs/cnab-go/bundle"

"github.com/deislabs/duffle/pkg/claim"
)

Expand Down
1 change: 1 addition & 0 deletions pkg/action/action.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"strings"

"github.com/deislabs/cnab-go/bundle"

"github.com/deislabs/duffle/pkg/claim"
"github.com/deislabs/duffle/pkg/credentials"
"github.com/deislabs/duffle/pkg/driver"
Expand Down
4 changes: 2 additions & 2 deletions pkg/action/action_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ import (
"time"

"github.com/deislabs/cnab-go/bundle"
"github.com/stretchr/testify/assert"

"github.com/deislabs/duffle/pkg/claim"
"github.com/deislabs/duffle/pkg/credentials"
"github.com/deislabs/duffle/pkg/driver"

"github.com/stretchr/testify/assert"
)

type mockFailingDriver struct {
Expand Down
4 changes: 2 additions & 2 deletions pkg/action/run_custom_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ import (
"time"

"github.com/deislabs/cnab-go/bundle"
"github.com/stretchr/testify/assert"

"github.com/deislabs/duffle/pkg/claim"
"github.com/deislabs/duffle/pkg/driver"

"github.com/stretchr/testify/assert"
)

func TestRunCustom(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/builder/builder.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import (
"time"

"github.com/Masterminds/semver"
"github.com/deislabs/cnab-go/bundle"
"github.com/pkg/errors"

"github.com/deislabs/cnab-go/bundle"
"github.com/deislabs/duffle/pkg/duffle/manifest"
"github.com/deislabs/duffle/pkg/imagebuilder"
)
Expand Down
1 change: 1 addition & 0 deletions pkg/builder/builder_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"testing"

"github.com/deislabs/cnab-go/bundle"

"github.com/deislabs/duffle/pkg/duffle/manifest"
"github.com/deislabs/duffle/pkg/imagebuilder"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/claim/claimstore_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import (
"testing"
"time"

"github.com/deislabs/cnab-go/bundle"
"github.com/stretchr/testify/assert"

"github.com/deislabs/cnab-go/bundle"
"github.com/deislabs/duffle/pkg/utils/crud"
)

Expand Down
1 change: 1 addition & 0 deletions pkg/loader/loader.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package loader

import (
"github.com/deislabs/cnab-go/bundle"

"github.com/deislabs/duffle/pkg/signature"
)

Expand Down
1 change: 1 addition & 0 deletions pkg/loader/secure_loader.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package loader

import (
"github.com/deislabs/cnab-go/bundle"

"github.com/deislabs/duffle/pkg/signature"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/packager/export.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ import (
"strings"
"time"

"github.com/deislabs/cnab-go/bundle"
"github.com/docker/docker/api/types"
"github.com/docker/docker/client"
"github.com/docker/docker/pkg/archive"

"github.com/deislabs/cnab-go/bundle"
"github.com/deislabs/duffle/pkg/loader"
)

Expand Down

0 comments on commit 2611762

Please sign in to comment.