rebase branch with master

config/example_test.go

@@ -3,8 +3,6 @@ package config_test
 import (
 	"context"
 	"fmt"
-	"github.com/awslabs/smithy-go/middleware"
-	smithyhttp "github.com/awslabs/smithy-go/transport/http"
 	"log"
 	"net/http"
 	"path/filepath"

config/resolve_credentials_test.go

@@ -3,8 +3,6 @@ package config
 import (
 	"context"
 	"fmt"
-	"github.com/aws/aws-sdk-go-v2/internal/awstesting"
-	"github.com/awslabs/smithy-go/middleware"
 	"net/http"
 	"net/http/httptest"
 	"os"
@@ -16,7 +14,9 @@ import (
 	"time"
 
 	"github.com/aws/aws-sdk-go-v2/aws"
+	"github.com/aws/aws-sdk-go-v2/internal/awstesting"
 	"github.com/aws/aws-sdk-go-v2/service/sts"
+	"github.com/aws/smithy-go/middleware"
 )
 
 func swapECSContainerURI(path string) func() {

config/resolve_test.go

@@ -3,7 +3,6 @@ package config
 import (
 	"bytes"
 	"context"
-	"github.com/awslabs/smithy-go/logging"
 	"io/ioutil"
 	"net/http"
 	"testing"
@@ -13,6 +12,7 @@ import (
 	"github.com/aws/aws-sdk-go-v2/credentials"
 	"github.com/aws/aws-sdk-go-v2/internal/awstesting"
 	"github.com/aws/aws-sdk-go-v2/internal/awstesting/unit"
+	"github.com/aws/smithy-go/logging"
 )
 
 func TestResolveCustomCABundle(t *testing.T) {

config/shared_config.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"github.com/awslabs/smithy-go/logging"
 	"os"
 	"path/filepath"
 	"runtime"
@@ -13,6 +12,7 @@ import (
 
 	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/internal/ini"
+	"github.com/aws/smithy-go/logging"
 )
 
 const (

config/shared_config_test.go

@@ -4,15 +4,16 @@ import (
 	"bytes"
 	"context"
 	"fmt"
-	"github.com/aws/aws-sdk-go-v2/aws"
-	"github.com/aws/aws-sdk-go-v2/internal/ini"
-	"github.com/awslabs/smithy-go/logging"
-	"github.com/awslabs/smithy-go/ptr"
 	"path/filepath"
 	"reflect"
 	"strconv"
 	"strings"
 	"testing"
+
+	"github.com/aws/aws-sdk-go-v2/aws"
+	"github.com/aws/aws-sdk-go-v2/internal/ini"
+	"github.com/aws/smithy-go/logging"
+	"github.com/aws/smithy-go/ptr"
 )
 
 var _ regionProvider = (*SharedConfig)(nil)