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

Commit 2611762

Browse files
author
Radu Matei
committed
Make linter happy with the import order
1 parent b2378a4 commit 2611762

23 files changed

+40
-33
lines changed

cmd/duffle/build.go

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,15 @@ import (
1010
"path/filepath"
1111

1212
"github.com/deislabs/cnab-go/bundle"
13+
"github.com/docker/cli/cli/command"
14+
cliconfig "github.com/docker/cli/cli/config"
15+
dockerdebug "github.com/docker/cli/cli/debug"
16+
dockerflags "github.com/docker/cli/cli/flags"
17+
"github.com/docker/cli/opts"
18+
"github.com/docker/go-connections/tlsconfig"
19+
"github.com/spf13/cobra"
20+
"github.com/spf13/pflag"
21+
1322
"github.com/deislabs/duffle/pkg/builder"
1423
"github.com/deislabs/duffle/pkg/crypto/digest"
1524
"github.com/deislabs/duffle/pkg/duffle/home"
@@ -20,14 +29,6 @@ import (
2029
"github.com/deislabs/duffle/pkg/ohai"
2130
"github.com/deislabs/duffle/pkg/repo"
2231
"github.com/deislabs/duffle/pkg/signature"
23-
"github.com/docker/cli/cli/command"
24-
cliconfig "github.com/docker/cli/cli/config"
25-
dockerdebug "github.com/docker/cli/cli/debug"
26-
dockerflags "github.com/docker/cli/cli/flags"
27-
"github.com/docker/cli/opts"
28-
"github.com/docker/go-connections/tlsconfig"
29-
"github.com/spf13/cobra"
30-
"github.com/spf13/pflag"
3132
)
3233

3334
const buildDesc = `

cmd/duffle/bundle_sign.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ import (
88
"os"
99
"path/filepath"
1010

11+
"github.com/deislabs/cnab-go/bundle"
1112
"github.com/spf13/cobra"
1213

13-
"github.com/deislabs/cnab-go/bundle"
1414
"github.com/deislabs/duffle/pkg/crypto/digest"
1515
"github.com/deislabs/duffle/pkg/duffle/home"
1616
"github.com/deislabs/duffle/pkg/signature"

cmd/duffle/claims_show_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ import (
66
"testing"
77

88
"github.com/deislabs/cnab-go/bundle"
9-
"github.com/deislabs/duffle/pkg/claim"
10-
119
"github.com/stretchr/testify/assert"
10+
11+
"github.com/deislabs/duffle/pkg/claim"
1212
)
1313

1414
func TestDisplayClaim(t *testing.T) {

cmd/duffle/claims_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import (
55
"testing"
66

77
"github.com/deislabs/cnab-go/bundle"
8-
"github.com/deislabs/duffle/pkg/claim"
9-
108
"github.com/stretchr/testify/assert"
9+
10+
"github.com/deislabs/duffle/pkg/claim"
1111
)
1212

1313
func TestMockClaimStore(t *testing.T) {

cmd/duffle/credential_generate.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ import (
99
"sort"
1010
"strings"
1111

12+
"github.com/deislabs/cnab-go/bundle"
1213
"github.com/spf13/cobra"
1314
survey "gopkg.in/AlecAivazis/survey.v1"
1415
yaml "gopkg.in/yaml.v2"
1516

16-
"github.com/deislabs/cnab-go/bundle"
1717
"github.com/deislabs/duffle/pkg/credentials"
1818
"github.com/deislabs/duffle/pkg/duffle/home"
1919
)

cmd/duffle/install.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ import (
77
"path/filepath"
88
"strings"
99

10+
"github.com/deislabs/cnab-go/bundle"
1011
"github.com/spf13/cobra"
1112
"github.com/spf13/viper"
1213

1314
"github.com/deislabs/duffle/pkg/action"
14-
"github.com/deislabs/cnab-go/bundle"
1515
"github.com/deislabs/duffle/pkg/claim"
1616
"github.com/deislabs/duffle/pkg/duffle/home"
1717
"github.com/deislabs/duffle/pkg/repo"

cmd/duffle/install_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ import (
66
"path/filepath"
77
"testing"
88

9+
"github.com/deislabs/cnab-go/bundle"
910
"github.com/stretchr/testify/assert"
1011

11-
"github.com/deislabs/cnab-go/bundle"
1212
"github.com/deislabs/duffle/pkg/duffle/home"
1313
)
1414

cmd/duffle/main.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,14 @@ import (
88
"runtime"
99
"strings"
1010

11-
"github.com/deislabs/duffle/pkg/signature"
12-
11+
"github.com/deislabs/cnab-go/bundle"
1312
"github.com/spf13/cobra"
1413

15-
"github.com/deislabs/cnab-go/bundle"
1614
"github.com/deislabs/duffle/pkg/claim"
1715
"github.com/deislabs/duffle/pkg/credentials"
1816
"github.com/deislabs/duffle/pkg/driver"
1917
"github.com/deislabs/duffle/pkg/duffle/home"
18+
"github.com/deislabs/duffle/pkg/signature"
2019
"github.com/deislabs/duffle/pkg/utils/crud"
2120
)
2221

cmd/duffle/main_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,10 @@ import (
77
"testing"
88

99
"github.com/deislabs/cnab-go/bundle"
10-
"github.com/deislabs/duffle/pkg/credentials"
11-
1210
"github.com/ghodss/yaml"
1311
"github.com/stretchr/testify/assert"
1412

13+
"github.com/deislabs/duffle/pkg/credentials"
1514
"github.com/deislabs/duffle/pkg/duffle/home"
1615
)
1716

cmd/duffle/pull.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,11 @@ import (
1111
"strings"
1212

1313
"github.com/deislabs/cnab-go/bundle"
14-
"github.com/deislabs/duffle/pkg/loader"
15-
"github.com/deislabs/duffle/pkg/reference"
1614
"github.com/docker/cnab-to-oci/remotes"
1715
"github.com/spf13/cobra"
16+
17+
"github.com/deislabs/duffle/pkg/loader"
18+
"github.com/deislabs/duffle/pkg/reference"
1819
)
1920

2021
var ErrNotSigned = errors.New("bundle is not signed")

0 commit comments

Comments
 (0)