Skip to content

Commit 2b6a56b

Browse files
aledbfaledbf
committed
Update go imports
1 parent dc4f2b9 commit 2b6a56b

File tree

211 files changed

+613
-496
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

211 files changed

+613
-496
lines changed

‎components/blobserve/cmd/root.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,11 @@ import (
1010
"io/ioutil"
1111
"os"
1212

13+
"github.com/spf13/cobra"
14+
1315
"github.com/gitpod-io/gitpod/blobserve/pkg/blobserve"
1416
"github.com/gitpod-io/gitpod/common-go/log"
1517
"github.com/gitpod-io/gitpod/common-go/tracing"
16-
"github.com/spf13/cobra"
1718
)
1819

1920
var (

‎components/blobserve/cmd/run.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,13 @@ import (
1414
"github.com/containerd/containerd/remotes"
1515
"github.com/containerd/containerd/remotes/docker"
1616
"github.com/docker/cli/cli/config/configfile"
17-
"github.com/gitpod-io/gitpod/blobserve/pkg/blobserve"
18-
"github.com/gitpod-io/gitpod/common-go/log"
19-
"github.com/gitpod-io/gitpod/common-go/pprof"
2017
"github.com/prometheus/client_golang/prometheus"
2118
"github.com/prometheus/client_golang/prometheus/promhttp"
2219
"github.com/spf13/cobra"
20+
21+
"github.com/gitpod-io/gitpod/blobserve/pkg/blobserve"
22+
"github.com/gitpod-io/gitpod/common-go/log"
23+
"github.com/gitpod-io/gitpod/common-go/pprof"
2324
)
2425

2526
var jsonLog bool

‎components/blobserve/pkg/blobserve/blobserve.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,10 @@ import (
1414

1515
"github.com/containerd/containerd/errdefs"
1616
"github.com/containerd/containerd/remotes"
17+
"github.com/gorilla/mux"
18+
1719
"github.com/gitpod-io/gitpod/common-go/log"
1820
"github.com/gitpod-io/gitpod/common-go/util"
19-
"github.com/gorilla/mux"
2021
)
2122

2223
// ResolverProvider provides new resolver

‎components/blobserve/pkg/blobserve/blobspace.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,9 @@ import (
1919
"time"
2020

2121
"github.com/containerd/containerd/errdefs"
22-
"github.com/gitpod-io/gitpod/common-go/log"
2322
"golang.org/x/xerrors"
23+
24+
"github.com/gitpod-io/gitpod/common-go/log"
2425
)
2526

2627
type blobspace interface {

‎components/blobserve/pkg/blobserve/refstore.go

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

1313
"github.com/containerd/containerd/errdefs"
1414
"github.com/containerd/containerd/remotes"
15-
"github.com/gitpod-io/gitpod/common-go/log"
16-
"github.com/gitpod-io/gitpod/registry-facade/pkg/registry"
1715
ociv1 "github.com/opencontainers/image-spec/specs-go/v1"
1816
"golang.org/x/xerrors"
17+
18+
"github.com/gitpod-io/gitpod/common-go/log"
19+
"github.com/gitpod-io/gitpod/registry-facade/pkg/registry"
1920
)
2021

2122
const (

‎components/common-go/grpc/ratelimit.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,12 @@ import (
88
"context"
99
"time"
1010

11-
"github.com/gitpod-io/gitpod/common-go/util"
1211
"golang.org/x/time/rate"
1312
"google.golang.org/grpc"
1413
"google.golang.org/grpc/codes"
1514
"google.golang.org/grpc/status"
15+
16+
"github.com/gitpod-io/gitpod/common-go/util"
1617
)
1718

1819
// RateLimit configures the reate limit for a function

‎components/common-go/kubernetes/kubernetes.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ import (
1616
"fmt"
1717
"math"
1818

19-
"github.com/gitpod-io/gitpod/common-go/log"
2019
"github.com/sirupsen/logrus"
21-
2220
corev1 "k8s.io/api/core/v1"
2321
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2422
"k8s.io/client-go/util/flowcontrol"
23+
24+
"github.com/gitpod-io/gitpod/common-go/log"
2525
)
2626

2727
const (

‎components/common-go/log/export.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@ package log
66

77
import (
88
"context"
9-
"github.com/sirupsen/logrus"
109
"time"
10+
11+
"github.com/sirupsen/logrus"
1112
)
1213

1314
// WithError creates an entry from the standard logger and adds an error to it, using the value defined in ErrorKey as key.

‎components/common-go/tracing/tracing.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,15 @@ import (
1111
"fmt"
1212
"io"
1313

14-
"github.com/gitpod-io/gitpod/common-go/log"
1514
"github.com/golang/protobuf/jsonpb"
1615
proto "github.com/golang/protobuf/proto"
1716
"github.com/opentracing/opentracing-go"
1817
tracelog "github.com/opentracing/opentracing-go/log"
1918
"github.com/sirupsen/logrus"
2019
jaeger "github.com/uber/jaeger-client-go"
2120
jaegercfg "github.com/uber/jaeger-client-go/config"
21+
22+
"github.com/gitpod-io/gitpod/common-go/log"
2223
)
2324

2425
type tracingOptions struct {

‎components/common-go/util/duration_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@ import (
1010
"testing"
1111
"time"
1212

13-
"github.com/gitpod-io/gitpod/common-go/util"
1413
"github.com/google/go-cmp/cmp"
14+
15+
"github.com/gitpod-io/gitpod/common-go/util"
1516
)
1617

1718
func TestUnmarshalJSON(t *testing.T) {

0 commit comments

Comments
 (0)