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) {

‎components/content-service/cmd/root.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,14 @@ import (
1212
"io/ioutil"
1313
"os"
1414

15-
"github.com/gitpod-io/gitpod/common-go/log"
16-
"github.com/gitpod-io/gitpod/common-go/tracing"
17-
"github.com/gitpod-io/gitpod/content-service/pkg/storage"
1815
"github.com/spf13/cobra"
1916
"golang.org/x/xerrors"
2017
"google.golang.org/grpc"
2118
"google.golang.org/grpc/credentials"
19+
20+
"github.com/gitpod-io/gitpod/common-go/log"
21+
"github.com/gitpod-io/gitpod/common-go/tracing"
22+
"github.com/gitpod-io/gitpod/content-service/pkg/storage"
2223
)
2324

2425
var (

‎components/content-service/cmd/run.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,6 @@ import (
1212
"syscall"
1313
"time"
1414

15-
"github.com/gitpod-io/gitpod/content-service/api"
16-
"github.com/gitpod-io/gitpod/content-service/pkg/service"
17-
18-
"github.com/gitpod-io/gitpod/common-go/log"
19-
"github.com/gitpod-io/gitpod/common-go/pprof"
2015
grpc_middleware "github.com/grpc-ecosystem/go-grpc-middleware"
2116
grpc_opentracing "github.com/grpc-ecosystem/go-grpc-middleware/tracing/opentracing"
2217
grpc_prometheus "github.com/grpc-ecosystem/go-grpc-prometheus"
@@ -26,6 +21,11 @@ import (
2621
"github.com/spf13/cobra"
2722
"google.golang.org/grpc"
2823
"google.golang.org/grpc/keepalive"
24+
25+
"github.com/gitpod-io/gitpod/common-go/log"
26+
"github.com/gitpod-io/gitpod/common-go/pprof"
27+
"github.com/gitpod-io/gitpod/content-service/api"
28+
"github.com/gitpod-io/gitpod/content-service/pkg/service"
2929
)
3030

3131
// runCmd starts the content service

‎components/content-service/pkg/archive/tar.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,11 @@ import (
1414
"sort"
1515
"time"
1616

17-
"github.com/gitpod-io/gitpod/common-go/log"
18-
"github.com/gitpod-io/gitpod/common-go/tracing"
1917
"github.com/opentracing/opentracing-go"
2018
"golang.org/x/xerrors"
19+
20+
"github.com/gitpod-io/gitpod/common-go/log"
21+
"github.com/gitpod-io/gitpod/common-go/tracing"
2122
)
2223

2324
// TarConfig configures tarbal creation/extraction

‎components/content-service/pkg/executor/executor.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,11 @@ import (
99
"encoding/json"
1010
"io"
1111

12+
"github.com/golang/protobuf/jsonpb"
13+
1214
csapi "github.com/gitpod-io/gitpod/content-service/api"
1315
"github.com/gitpod-io/gitpod/content-service/pkg/initializer"
1416
"github.com/gitpod-io/gitpod/content-service/pkg/storage"
15-
"github.com/golang/protobuf/jsonpb"
1617
)
1718

1819
type config struct {

‎components/content-service/pkg/git/git.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ import (
1414
"path/filepath"
1515
"strings"
1616

17+
"github.com/opentracing/opentracing-go"
18+
"golang.org/x/xerrors"
19+
1720
"github.com/gitpod-io/gitpod/common-go/log"
1821
"github.com/gitpod-io/gitpod/common-go/tracing"
1922
csapi "github.com/gitpod-io/gitpod/content-service/api"
20-
21-
"github.com/opentracing/opentracing-go"
22-
"golang.org/x/xerrors"
2323
)
2424

2525
const (

‎components/content-service/pkg/git/porcelain.go

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

77
import (
88
"bufio"
9-
"golang.org/x/xerrors"
109
"io"
1110
"strings"
11+
12+
"golang.org/x/xerrors"
1213
)
1314

1415
const (

‎components/content-service/pkg/initializer/git.go

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

11+
"github.com/opentracing/opentracing-go"
1112
"golang.org/x/xerrors"
1213

1314
"github.com/gitpod-io/gitpod/common-go/log"
1415
"github.com/gitpod-io/gitpod/common-go/tracing"
1516
csapi "github.com/gitpod-io/gitpod/content-service/api"
1617
"github.com/gitpod-io/gitpod/content-service/pkg/archive"
1718
"github.com/gitpod-io/gitpod/content-service/pkg/git"
18-
"github.com/opentracing/opentracing-go"
1919
)
2020

2121
// CloneTargetMode is the target state in which we want to leave a GitInitializer

‎components/content-service/pkg/initializer/initializer.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,17 @@ import (
1515
"strings"
1616
"time"
1717

18+
"github.com/opentracing/opentracing-go"
19+
"golang.org/x/xerrors"
20+
"google.golang.org/grpc/codes"
21+
"google.golang.org/grpc/status"
22+
1823
"github.com/gitpod-io/gitpod/common-go/log"
1924
"github.com/gitpod-io/gitpod/common-go/tracing"
2025
csapi "github.com/gitpod-io/gitpod/content-service/api"
2126
"github.com/gitpod-io/gitpod/content-service/pkg/archive"
2227
"github.com/gitpod-io/gitpod/content-service/pkg/git"
2328
"github.com/gitpod-io/gitpod/content-service/pkg/storage"
24-
"github.com/opentracing/opentracing-go"
25-
"golang.org/x/xerrors"
26-
"google.golang.org/grpc/codes"
27-
"google.golang.org/grpc/status"
2829
)
2930

3031
const (

‎components/content-service/pkg/initializer/prebuild.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,15 @@ import (
1212
"path/filepath"
1313
"strings"
1414

15+
"github.com/opentracing/opentracing-go"
16+
tracelog "github.com/opentracing/opentracing-go/log"
1517
"golang.org/x/xerrors"
1618

1719
"github.com/gitpod-io/gitpod/common-go/log"
1820
"github.com/gitpod-io/gitpod/common-go/tracing"
1921
csapi "github.com/gitpod-io/gitpod/content-service/api"
2022
"github.com/gitpod-io/gitpod/content-service/pkg/archive"
2123
"github.com/gitpod-io/gitpod/content-service/pkg/git"
22-
23-
"github.com/opentracing/opentracing-go"
24-
tracelog "github.com/opentracing/opentracing-go/log"
2524
)
2625

2726
// PrebuildInitializer first tries to restore the snapshot/prebuild and if that succeeds performs Git operations.

‎components/content-service/pkg/initializer/snapshot.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,13 @@ package initializer
77
import (
88
"context"
99

10+
"github.com/opentracing/opentracing-go"
11+
"golang.org/x/xerrors"
12+
1013
"github.com/gitpod-io/gitpod/common-go/tracing"
1114
csapi "github.com/gitpod-io/gitpod/content-service/api"
1215
"github.com/gitpod-io/gitpod/content-service/pkg/archive"
1316
"github.com/gitpod-io/gitpod/content-service/pkg/storage"
14-
"github.com/opentracing/opentracing-go"
15-
"golang.org/x/xerrors"
1617
)
1718

1819
// SnapshotInitializer downloads a snapshot from a remote storage

‎components/content-service/pkg/layer/provider.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,16 @@ import (
1414
"net/http"
1515
"strings"
1616

17+
"github.com/opencontainers/go-digest"
18+
"github.com/opentracing/opentracing-go"
19+
"golang.org/x/xerrors"
20+
1721
"github.com/gitpod-io/gitpod/common-go/log"
1822
"github.com/gitpod-io/gitpod/common-go/tracing"
1923
csapi "github.com/gitpod-io/gitpod/content-service/api"
2024
"github.com/gitpod-io/gitpod/content-service/pkg/executor"
2125
"github.com/gitpod-io/gitpod/content-service/pkg/initializer"
2226
"github.com/gitpod-io/gitpod/content-service/pkg/storage"
23-
24-
"github.com/opencontainers/go-digest"
25-
"github.com/opentracing/opentracing-go"
26-
"golang.org/x/xerrors"
2727
)
2828

2929
const (

‎components/content-service/pkg/layer/provider_test.go

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

19-
csapi "github.com/gitpod-io/gitpod/content-service/api"
20-
"github.com/gitpod-io/gitpod/content-service/pkg/storage"
2119
"github.com/google/go-cmp/cmp"
2220
"github.com/opencontainers/go-digest"
2321
ociv1 "github.com/opencontainers/image-spec/specs-go/v1"
22+
23+
csapi "github.com/gitpod-io/gitpod/content-service/api"
24+
"github.com/gitpod-io/gitpod/content-service/pkg/storage"
2425
)
2526

2627
const (

‎components/content-service/pkg/service/service.go

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

11+
"github.com/opentracing/opentracing-go"
12+
"google.golang.org/grpc/codes"
13+
"google.golang.org/grpc/status"
14+
1115
"github.com/gitpod-io/gitpod/common-go/log"
1216
"github.com/gitpod-io/gitpod/common-go/tracing"
1317
"github.com/gitpod-io/gitpod/content-service/api"
1418
"github.com/gitpod-io/gitpod/content-service/pkg/storage"
15-
"github.com/opentracing/opentracing-go"
16-
"google.golang.org/grpc/codes"
17-
"google.golang.org/grpc/status"
1819
)
1920

2021
// ContentService implements ContentServiceServer

‎components/content-service/pkg/storage/gcloud.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,6 @@ import (
1919
"sync"
2020
"time"
2121

22-
"github.com/gitpod-io/gitpod/common-go/log"
23-
"github.com/gitpod-io/gitpod/common-go/tracing"
24-
"github.com/gitpod-io/gitpod/content-service/pkg/archive"
25-
"github.com/opentracing/opentracing-go"
26-
2722
"cloud.google.com/go/storage"
2823
gcpstorage "cloud.google.com/go/storage"
2924
validation "github.com/go-ozzo/ozzo-validation"
@@ -32,6 +27,11 @@ import (
3227
"google.golang.org/api/googleapi"
3328
"google.golang.org/api/iterator"
3429
"google.golang.org/api/option"
30+
31+
"github.com/gitpod-io/gitpod/common-go/log"
32+
"github.com/gitpod-io/gitpod/common-go/tracing"
33+
"github.com/gitpod-io/gitpod/content-service/pkg/archive"
34+
"github.com/opentracing/opentracing-go"
3535
)
3636

3737
var _ DirectAccess = &DirectGCPStorage{}

‎components/content-service/pkg/storage/gcloud_test.go

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

12-
"github.com/gitpod-io/gitpod/content-service/pkg/archive"
1312
"golang.org/x/xerrors"
13+
14+
"github.com/gitpod-io/gitpod/content-service/pkg/archive"
1415
)
1516

1617
func TestObjectAccessToNonExistentObj(t *testing.T) {

0 commit comments

Comments
 (0)