Skip to content

Commit 9c42ca5

Browse files
authored
Run goimports (#19)
Order imports into: - standard library - dependencies - internal modules
1 parent 87cfa44 commit 9c42ca5

41 files changed

Lines changed: 99 additions & 68 deletions

Some content is hidden

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

internal/apiclient/client.go

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

13-
"github.com/dependabot/proxy/internal/config"
14-
"github.com/dependabot/proxy/internal/logging"
1513
"github.com/elazarl/goproxy"
1614
"github.com/lestrrat-go/backoff"
1715
circuit "github.com/rubyist/circuitbreaker"
1816
"github.com/sirupsen/logrus"
1917
"golang.org/x/sync/semaphore"
18+
19+
"github.com/dependabot/proxy/internal/config"
20+
"github.com/dependabot/proxy/internal/logging"
2021
)
2122

2223
const (

internal/apiclient/client_test.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,13 @@ import (
1414
"testing"
1515
"time"
1616

17-
"github.com/dependabot/proxy/internal/config"
18-
1917
"github.com/elazarl/goproxy"
20-
21-
"github.com/dependabot/proxy/internal/apiclient"
2218
"github.com/lestrrat-go/backoff"
2319
"github.com/stretchr/testify/assert"
2420
"github.com/stretchr/testify/require"
21+
22+
"github.com/dependabot/proxy/internal/apiclient"
23+
"github.com/dependabot/proxy/internal/config"
2524
)
2625

2726
const (

internal/cache/handlers.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,11 @@ import (
1515
"sort"
1616
"sync"
1717

18-
"github.com/dependabot/proxy/internal/ctxdata"
1918
"github.com/elazarl/goproxy"
2019
"github.com/sirupsen/logrus"
2120
"gopkg.in/yaml.v3"
21+
22+
"github.com/dependabot/proxy/internal/ctxdata"
2223
)
2324

2425
// DB contains the metadata of the disk cache

internal/cache/handlers_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import (
44
"bytes"
55
"context"
66
"errors"
7-
"github.com/elazarl/goproxy"
87
"io"
98
"io/ioutil"
109
"net/http"
@@ -16,6 +15,8 @@ import (
1615
"strings"
1716
"testing"
1817
"time"
18+
19+
"github.com/elazarl/goproxy"
1920
)
2021

2122
// None of these tests should make network calls

internal/dialer/dialer.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@ import (
44
"context"
55
"errors"
66
"fmt"
7-
"github.com/rs/dnscache"
87
"net"
98
"syscall"
9+
10+
"github.com/rs/dnscache"
1011
)
1112

1213
// ErrForbiddenRequest is returned when a request is made to a blocked IP.

internal/handlers/azdo_api.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ import (
44
"net/http"
55
"strings"
66

7-
"github.com/dependabot/proxy/internal/helpers"
8-
"github.com/dependabot/proxy/internal/logging"
7+
"github.com/elazarl/goproxy"
98

109
"github.com/dependabot/proxy/internal/config"
11-
"github.com/elazarl/goproxy"
10+
"github.com/dependabot/proxy/internal/helpers"
11+
"github.com/dependabot/proxy/internal/logging"
1212
)
1313

1414
// AzureDevOpsAPIHandler handles requests destined for the Azure DevOps API, adding auth

internal/handlers/azdo_api_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@ import (
55
"net/http/httptest"
66
"testing"
77

8-
"github.com/dependabot/proxy/internal/config"
98
"github.com/stretchr/testify/assert"
9+
10+
"github.com/dependabot/proxy/internal/config"
1011
)
1112

1213
func TestAzureDevOpsAPIHandler(t *testing.T) {

internal/handlers/cargo_registry.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ import (
44
"net/http"
55
"sync"
66

7+
"github.com/elazarl/goproxy"
8+
"github.com/sirupsen/logrus"
9+
10+
"github.com/dependabot/proxy/internal/config"
711
"github.com/dependabot/proxy/internal/helpers"
812
"github.com/dependabot/proxy/internal/logging"
913
"github.com/dependabot/proxy/internal/oidc"
10-
11-
"github.com/dependabot/proxy/internal/config"
12-
"github.com/elazarl/goproxy"
13-
"github.com/sirupsen/logrus"
1414
)
1515

1616
// CargoRegistryHandler handles requests to cargo registries using the sparse protocol.

internal/handlers/composer.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,12 @@ import (
44
"net/http"
55
"sync"
66

7+
"github.com/elazarl/goproxy"
8+
79
"github.com/dependabot/proxy/internal/config"
810
"github.com/dependabot/proxy/internal/helpers"
911
"github.com/dependabot/proxy/internal/logging"
1012
"github.com/dependabot/proxy/internal/oidc"
11-
"github.com/elazarl/goproxy"
1213
)
1314

1415
// ComposerHandler handles requests to PHP registries, adding auth.

internal/handlers/dependabot_api.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@ import (
66
"net/url"
77
"strings"
88

9-
"github.com/dependabot/proxy/internal/config"
109
"github.com/elazarl/goproxy"
10+
11+
"github.com/dependabot/proxy/internal/config"
1112
)
1213

1314
// DependabotAPIHandler injects the job token into requests to the Dependabot API

0 commit comments

Comments
 (0)