Format imports based on package location

api/apiclient.go

@@ -25,7 +25,6 @@ import (
 	"github.com/gorilla/websocket"
 	"github.com/juju/clock"
 	"github.com/juju/errors"
-	jujuhttp "github.com/juju/juju/internal/http"
 	"github.com/juju/names/v5"
 	"github.com/juju/utils/v4"
 	"github.com/juju/utils/v4/parallel"
@@ -35,6 +34,7 @@ import (
 	"github.com/juju/juju/core/facades"
 	coremacaroon "github.com/juju/juju/core/macaroon"
 	"github.com/juju/juju/core/network"
+	jujuhttp "github.com/juju/juju/internal/http"
 	internallogger "github.com/juju/juju/internal/logger"
 	jujuproxy "github.com/juju/juju/internal/proxy"
 	proxy "github.com/juju/juju/internal/proxy/config"

api/package_test.go

@@ -56,6 +56,7 @@ func (*ImportSuite) TestImports(c *gc.C) {
 		"domain/secretbackend/errors",
 		"environs/envcontext",
 		"internal/feature",
+		"internal/http",
 		"internal/logger",
 		"internal/proxy",
 		"internal/proxy/config",

apiserver/facades/controller/charmdownloader/charmdownloader.go

@@ -10,12 +10,12 @@ import (
 	"github.com/juju/charm/v13"
 	"github.com/juju/clock"
 	"github.com/juju/errors"
-	"github.com/juju/juju/internal/http"
 	"github.com/juju/names/v5"
 
 	apiservererrors "github.com/juju/juju/apiserver/errors"
 	corelogger "github.com/juju/juju/core/logger"
 	"github.com/juju/juju/internal/charm/services"
+	"github.com/juju/juju/internal/http"
 	"github.com/juju/juju/rpc/params"
 	"github.com/juju/juju/state/watcher"
 )

apiserver/pubsub_test.go

@@ -12,7 +12,6 @@ import (
 	"time"
 
 	"github.com/gorilla/websocket"
-	jujuhttp "github.com/juju/juju/internal/http"
 	"github.com/juju/loggo/v2"
 	"github.com/juju/names/v5"
 	"github.com/juju/pubsub/v2"
@@ -24,6 +23,7 @@ import (
 	"github.com/juju/juju/core/permission"
 	"github.com/juju/juju/domain/access/service"
 	"github.com/juju/juju/internal/auth"
+	jujuhttp "github.com/juju/juju/internal/http"
 	jujutesting "github.com/juju/juju/juju/testing"
 	"github.com/juju/juju/rpc/params"
 	"github.com/juju/juju/state"

apiserver/registration_test.go

@@ -14,7 +14,6 @@ import (
 	"strings"
 
 	"github.com/juju/errors"
-	jujuhttp "github.com/juju/juju/internal/http"
 	jc "github.com/juju/testing/checkers"
 	"github.com/juju/testing/httptesting"
 	"go.uber.org/mock/gomock"
@@ -29,6 +28,7 @@ import (
 	"github.com/juju/juju/domain/access/service"
 	"github.com/juju/juju/environs"
 	"github.com/juju/juju/internal/auth"
+	jujuhttp "github.com/juju/juju/internal/http"
 	jujutesting "github.com/juju/juju/juju/testing"
 	"github.com/juju/juju/rpc/params"
 	"github.com/juju/juju/state/stateenvirons"

apiserver/server_test.go

@@ -12,7 +12,6 @@ import (
 
 	"github.com/gorilla/websocket"
 	jujuerrors "github.com/juju/errors"
-	jujuhttp "github.com/juju/juju/internal/http"
 	"github.com/juju/loggo/v2"
 	"github.com/juju/names/v5"
 	jc "github.com/juju/testing/checkers"
@@ -27,6 +26,7 @@ import (
 	apitesting "github.com/juju/juju/apiserver/testing"
 	"github.com/juju/juju/core/network"
 	"github.com/juju/juju/core/permission"
+	jujuhttp "github.com/juju/juju/internal/http"
 	jujutesting "github.com/juju/juju/juju/testing"
 	"github.com/juju/juju/rpc/params"
 	"github.com/juju/juju/state"

apiserver/testing/fakeapi.go

@@ -13,13 +13,13 @@ import (
 
 	"github.com/bmizerany/pat"
 	"github.com/gorilla/websocket"
-	jujuhttp "github.com/juju/juju/internal/http"
 
 	apiservererrors "github.com/juju/juju/apiserver/errors"
 	"github.com/juju/juju/apiserver/observer"
 	"github.com/juju/juju/apiserver/observer/fakeobserver"
 	apiwebsocket "github.com/juju/juju/apiserver/websocket"
 	"github.com/juju/juju/core/trace"
+	jujuhttp "github.com/juju/juju/internal/http"
 	"github.com/juju/juju/internal/rpcreflect"
 	"github.com/juju/juju/rpc"
 	"github.com/juju/juju/rpc/jsoncodec"

apiserver/testing/http.go

@@ -7,11 +7,11 @@ import (
 	"io"
 	"net/http"
 
-	jujuhttp "github.com/juju/juju/internal/http"
 	jc "github.com/juju/testing/checkers"
 	"github.com/juju/testing/httptesting"
 	gc "gopkg.in/check.v1"
 
+	jujuhttp "github.com/juju/juju/internal/http"
 	"github.com/juju/juju/rpc/params"
 	jujuversion "github.com/juju/juju/version"
 )

apiserver/tools.go

@@ -16,7 +16,6 @@ import (
 
 	"github.com/im7mortal/kmutex"
 	"github.com/juju/errors"
-	jujuhttp "github.com/juju/juju/internal/http"
 	"github.com/juju/version/v2"
 
 	"github.com/juju/juju/apiserver/common"
@@ -25,6 +24,7 @@ import (
 	"github.com/juju/juju/environs"
 	"github.com/juju/juju/environs/simplestreams"
 	envtools "github.com/juju/juju/environs/tools"
+	jujuhttp "github.com/juju/juju/internal/http"
 	"github.com/juju/juju/internal/tools"
 	"github.com/juju/juju/rpc/params"
 	"github.com/juju/juju/state"

apiserver/tools_integration_test.go

@@ -14,7 +14,6 @@ import (
 	"github.com/go-macaroon-bakery/macaroon-bakery/v3/bakery"
 	"github.com/go-macaroon-bakery/macaroon-bakery/v3/httpbakery"
 	"github.com/juju/errors"
-	jujuhttp "github.com/juju/juju/internal/http"
 	"github.com/juju/names/v5"
 	jc "github.com/juju/testing/checkers"
 	gc "gopkg.in/check.v1"
@@ -24,6 +23,7 @@ import (
 	"github.com/juju/juju/core/permission"
 	"github.com/juju/juju/domain/access/service"
 	"github.com/juju/juju/internal/auth"
+	jujuhttp "github.com/juju/juju/internal/http"
 	jujutesting "github.com/juju/juju/juju/testing"
 	"github.com/juju/juju/rpc/params"
 	"github.com/juju/juju/testing/factory"

cmd/containeragent/initialize/package_test.go

@@ -86,6 +86,7 @@ func (*importSuite) TestImports(c *gc.C) {
 		"internal/charmhub/path",
 		"internal/charmhub/transport",
 		"internal/feature",
+		"internal/http",
 		"internal/logger",
 		"internal/mongo",
 		"internal/network",

cmd/juju/controller/register.go

@@ -25,7 +25,6 @@ import (
 	"github.com/juju/collections/set"
 	"github.com/juju/errors"
 	"github.com/juju/gnuflag"
-	jujuhttp "github.com/juju/juju/internal/http"
 	"github.com/juju/names/v5"
 	"golang.org/x/crypto/nacl/secretbox"
 	"golang.org/x/crypto/ssh/terminal"
@@ -39,6 +38,7 @@ import (
 	"github.com/juju/juju/cmd/modelcmd"
 	corelogger "github.com/juju/juju/core/logger"
 	"github.com/juju/juju/core/permission"
+	jujuhttp "github.com/juju/juju/internal/http"
 	"github.com/juju/juju/internal/proxy/factory"
 	"github.com/juju/juju/jujuclient"
 	"github.com/juju/juju/rpc/params"

environs/simplestreams/datasource.go

@@ -14,11 +14,11 @@ import (
 
 	"github.com/juju/clock"
 	"github.com/juju/errors"
-	jujuhttp "github.com/juju/juju/internal/http"
 	"github.com/juju/retry"
 	"github.com/juju/utils/v4"
 
 	corelogger "github.com/juju/juju/core/logger"
+	jujuhttp "github.com/juju/juju/internal/http"
 )
 
 // A DataSource retrieves simplestreams metadata.

environs/simplestreams/testing/testing.go

@@ -12,11 +12,11 @@ import (
 	"net/http"
 	"strings"
 
-	jujuhttp "github.com/juju/juju/internal/http"
 	jc "github.com/juju/testing/checkers"
 	gc "gopkg.in/check.v1"
 
 	"github.com/juju/juju/environs/simplestreams"
+	jujuhttp "github.com/juju/juju/internal/http"
 	"github.com/juju/juju/testing"
 )
 

environs/sync/sync.go

@@ -11,14 +11,14 @@ import (
 	"path/filepath"
 
 	"github.com/juju/errors"
-	"github.com/juju/juju/internal/http"
 	"github.com/juju/utils/v4"
 	"github.com/juju/version/v2"
 
 	"github.com/juju/juju/environs/filestorage"
 	"github.com/juju/juju/environs/simplestreams"
 	"github.com/juju/juju/environs/storage"
 	envtools "github.com/juju/juju/environs/tools"
+	"github.com/juju/juju/internal/http"
 	internallogger "github.com/juju/juju/internal/logger"
 	coretools "github.com/juju/juju/internal/tools"
 	"github.com/juju/juju/juju/keys"

environs/sync/sync_test.go

@@ -16,7 +16,6 @@ import (
 	"path/filepath"
 
 	"github.com/juju/errors"
-	jujuhttp "github.com/juju/juju/internal/http"
 	jujutesting "github.com/juju/testing"
 	jc "github.com/juju/testing/checkers"
 	"github.com/juju/utils/v4/tar"
@@ -35,6 +34,7 @@ import (
 	envtesting "github.com/juju/juju/environs/testing"
 	envtools "github.com/juju/juju/environs/tools"
 	toolstesting "github.com/juju/juju/environs/tools/testing"
+	jujuhttp "github.com/juju/juju/internal/http"
 	coretools "github.com/juju/juju/internal/tools"
 	"github.com/juju/juju/juju/names"
 	coretesting "github.com/juju/juju/testing"

environs/testing/tools.go

@@ -13,7 +13,6 @@ import (
 	"strings"
 
 	"github.com/juju/collections/set"
-	"github.com/juju/juju/internal/http"
 	jc "github.com/juju/testing/checkers"
 	"github.com/juju/version/v2"
 	gc "gopkg.in/check.v1"
@@ -27,6 +26,7 @@ import (
 	sstesting "github.com/juju/juju/environs/simplestreams/testing"
 	"github.com/juju/juju/environs/storage"
 	envtools "github.com/juju/juju/environs/tools"
+	"github.com/juju/juju/internal/http"
 	coretools "github.com/juju/juju/internal/tools"
 	"github.com/juju/juju/juju/names"
 	coretesting "github.com/juju/juju/testing"

internal/charmhub/http.go

@@ -16,12 +16,12 @@ import (
 
 	"github.com/juju/clock"
 	"github.com/juju/errors"
-	jujuhttp "github.com/juju/juju/internal/http"
 	"github.com/juju/retry"
 	"gopkg.in/httprequest.v1"
 
 	corelogger "github.com/juju/juju/core/logger"
 	"github.com/juju/juju/internal/charmhub/path"
+	jujuhttp "github.com/juju/juju/internal/http"
 	"github.com/juju/juju/version"
 )
 

internal/charmhub/http_test.go

@@ -14,11 +14,12 @@ import (
 	"time"
 
 	"github.com/juju/errors"
-	jujuhttp "github.com/juju/juju/internal/http"
 	"github.com/juju/testing"
 	jc "github.com/juju/testing/checkers"
 	"go.uber.org/mock/gomock"
 	gc "gopkg.in/check.v1"
+
+	jujuhttp "github.com/juju/juju/internal/http"
 )
 
 type APIRequesterSuite struct {

internal/http/middleware.go

@@ -12,10 +12,11 @@ import (
 
 	"github.com/juju/clock"
 	"github.com/juju/errors"
-	"github.com/juju/juju/core/logger"
 	"github.com/juju/loggo/v2"
 	"github.com/juju/retry"
 	"golang.org/x/net/http/httpproxy"
+
+	"github.com/juju/juju/core/logger"
 )
 
 // FileProtocolMiddleware registers support for file:// URLs on the given transport.

internal/mongo/open.go

@@ -13,10 +13,11 @@ import (
 	"time"
 
 	"github.com/juju/errors"
-	"github.com/juju/juju/internal/http"
 	"github.com/juju/mgo/v3"
 	"github.com/juju/names/v5"
 	"github.com/juju/utils/v4/cert"
+
+	"github.com/juju/juju/internal/http"
 )
 
 // SocketTimeout should be long enough that even a slow mongo server

internal/provider/ec2/environ.go

@@ -23,7 +23,6 @@ import (
 	"github.com/juju/clock"
 	"github.com/juju/collections/set"
 	"github.com/juju/errors"
-	jujuhttp "github.com/juju/juju/internal/http"
 	"github.com/juju/names/v5"
 	"github.com/juju/retry"
 	"github.com/juju/version/v2"
@@ -49,6 +48,7 @@ import (
 	"github.com/juju/juju/environs/tags"
 	"github.com/juju/juju/internal/cloudconfig/instancecfg"
 	"github.com/juju/juju/internal/cloudconfig/providerinit"
+	jujuhttp "github.com/juju/juju/internal/http"
 	"github.com/juju/juju/internal/provider/common"
 	"github.com/juju/juju/internal/storage"
 )

internal/provider/gce/environ.go

@@ -4,14 +4,12 @@
 package gce
 
 import (
-	"context"
 	stdcontext "context"
 	"strings"
 	"sync"
 	"time"
 
 	"github.com/juju/errors"
-	jujuhttp "github.com/juju/juju/internal/http"
 	"google.golang.org/api/compute/v1"
 
 	jujucloud "github.com/juju/juju/cloud"
@@ -25,6 +23,7 @@ import (
 	"github.com/juju/juju/environs/envcontext"
 	"github.com/juju/juju/environs/instances"
 	"github.com/juju/juju/environs/simplestreams"
+	jujuhttp "github.com/juju/juju/internal/http"
 	"github.com/juju/juju/internal/provider/common"
 	"github.com/juju/juju/internal/provider/gce/google"
 )
@@ -200,7 +199,7 @@ func (env *environ) Region() (simplestreams.CloudSpec, error) {
 }
 
 // SetConfig updates the env's configuration.
-func (env *environ) SetConfig(ctx context.Context, cfg *config.Config) error {
+func (env *environ) SetConfig(ctx stdcontext.Context, cfg *config.Config) error {
 	env.lock.Lock()
 	defer env.lock.Unlock()
 

internal/provider/gce/google/auth.go

@@ -7,12 +7,13 @@ import (
 	"context"
 
 	"github.com/juju/errors"
-	jujuhttp "github.com/juju/juju/internal/http"
 	"golang.org/x/oauth2/google"
 	"golang.org/x/oauth2/jwt"
 	"google.golang.org/api/compute/v1"
 	"google.golang.org/api/option"
 	transporthttp "google.golang.org/api/transport/http"
+
+	jujuhttp "github.com/juju/juju/internal/http"
 )
 
 var scopes = []string{

internal/provider/gce/google/auth_test.go

@@ -6,9 +6,10 @@ package google
 import (
 	"context"
 
-	jujuhttp "github.com/juju/juju/internal/http"
 	jc "github.com/juju/testing/checkers"
 	gc "gopkg.in/check.v1"
+
+	jujuhttp "github.com/juju/juju/internal/http"
 )
 
 type authSuite struct {

internal/provider/gce/google/config.go

@@ -9,6 +9,7 @@ import (
 	"net/mail"
 
 	"github.com/juju/errors"
+
 	jujuhttp "github.com/juju/juju/internal/http"
 )
 

internal/provider/gce/google/config_connection_test.go

@@ -4,10 +4,10 @@
 package google_test
 
 import (
-	jujuhttp "github.com/juju/juju/internal/http"
 	jc "github.com/juju/testing/checkers"
 	gc "gopkg.in/check.v1"
 
+	jujuhttp "github.com/juju/juju/internal/http"
 	"github.com/juju/juju/internal/provider/gce/google"
 )