Merge pull request #69708 from mcrute/fix-aws-imports

Fix AWS volume and cloud provider import order

pkg/cloudprovider/providers/aws/aws.go

@@ -22,13 +22,12 @@ import (
 	"fmt"
 	"io"
 	"net"
+	"path"
 	"strconv"
 	"strings"
 	"sync"
 	"time"
 
-	gcfg "gopkg.in/gcfg.v1"
-
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/awserr"
 	"github.com/aws/aws-sdk-go/aws/credentials"
@@ -44,10 +43,7 @@ import (
 	"github.com/aws/aws-sdk-go/service/kms"
 	"github.com/aws/aws-sdk-go/service/sts"
 	"github.com/golang/glog"
-	clientset "k8s.io/client-go/kubernetes"
-	"k8s.io/client-go/tools/record"
-
-	"path"
+	gcfg "gopkg.in/gcfg.v1"
 
 	"k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
@@ -55,8 +51,10 @@ import (
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/apimachinery/pkg/util/wait"
+	clientset "k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/kubernetes/scheme"
 	v1core "k8s.io/client-go/kubernetes/typed/core/v1"
+	"k8s.io/client-go/tools/record"
 	cloudprovider "k8s.io/cloud-provider"
 	"k8s.io/kubernetes/pkg/api/v1/service"
 	"k8s.io/kubernetes/pkg/controller"

pkg/cloudprovider/providers/aws/aws_fakes.go

@@ -25,7 +25,6 @@ import (
 	"github.com/aws/aws-sdk-go/service/elb"
 	"github.com/aws/aws-sdk-go/service/elbv2"
 	"github.com/aws/aws-sdk-go/service/kms"
-
 	"github.com/golang/glog"
 )
 

pkg/cloudprovider/providers/aws/aws_loadbalancer.go

@@ -29,6 +29,7 @@ import (
 	"github.com/aws/aws-sdk-go/service/elb"
 	"github.com/aws/aws-sdk-go/service/elbv2"
 	"github.com/golang/glog"
+
 	"k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/util/sets"

pkg/cloudprovider/providers/aws/aws_loadbalancer_test.go

@@ -17,8 +17,9 @@ limitations under the License.
 package aws
 
 import (
-	"github.com/aws/aws-sdk-go/aws"
 	"testing"
+
+	"github.com/aws/aws-sdk-go/aws"
 )
 
 func TestElbProtocolsAreEqual(t *testing.T) {

pkg/cloudprovider/providers/aws/aws_routes.go

@@ -23,6 +23,7 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/golang/glog"
+
 	cloudprovider "k8s.io/cloud-provider"
 )
 

pkg/cloudprovider/providers/aws/aws_test.go

@@ -27,14 +27,14 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/aws/aws-sdk-go/service/elb"
-	"k8s.io/api/core/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/util/sets"
-
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
+
+	"k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
+	"k8s.io/apimachinery/pkg/util/sets"
 	kubeletapis "k8s.io/kubernetes/pkg/kubelet/apis"
 )
 

pkg/cloudprovider/providers/aws/aws_utils.go

@@ -18,6 +18,7 @@ package aws
 
 import (
 	"github.com/aws/aws-sdk-go/aws"
+
 	"k8s.io/apimachinery/pkg/util/sets"
 )
 

pkg/cloudprovider/providers/aws/instances.go

@@ -19,15 +19,16 @@ package aws
 import (
 	"fmt"
 	"net/url"
+	"regexp"
 	"strings"
+	"sync"
+	"time"
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/golang/glog"
+
 	"k8s.io/api/core/v1"
-	"regexp"
-	"sync"
-	"time"
 )
 
 // awsInstanceRegMatch represents Regex Match for AWS instance.

pkg/cloudprovider/providers/aws/instances_test.go

@@ -17,12 +17,14 @@ limitations under the License.
 package aws
 
 import (
+	"testing"
+	"time"
+
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/stretchr/testify/assert"
+
 	"k8s.io/api/core/v1"
-	"testing"
-	"time"
 )
 
 func TestMapToAWSInstanceIDs(t *testing.T) {

pkg/cloudprovider/providers/aws/regions.go

@@ -17,10 +17,12 @@ limitations under the License.
 package aws
 
 import (
+	"sync"
+
 	"github.com/golang/glog"
+
 	"k8s.io/apimachinery/pkg/util/sets"
 	awscredentialprovider "k8s.io/kubernetes/pkg/credentialprovider/aws"
-	"sync"
 )
 
 // wellKnownRegions is the complete list of regions known to the AWS cloudprovider

pkg/cloudprovider/providers/aws/tags.go

@@ -18,12 +18,12 @@ package aws
 
 import (
 	"fmt"
-
 	"strings"
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/golang/glog"
+
 	"k8s.io/apimachinery/pkg/util/wait"
 )
 

pkg/cloudprovider/providers/aws/tags_test.go

@@ -17,9 +17,10 @@ limitations under the License.
 package aws
 
 import (
+	"testing"
+
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"testing"
 )
 
 func TestFilterTags(t *testing.T) {

pkg/cloudprovider/providers/aws/volumes.go

@@ -25,6 +25,7 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/golang/glog"
+
 	"k8s.io/apimachinery/pkg/types"
 )
 

pkg/credentialprovider/aws/aws_credentials.go

@@ -27,6 +27,7 @@ import (
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/ecr"
 	"github.com/golang/glog"
+
 	"k8s.io/kubernetes/pkg/credentialprovider"
 )
 

pkg/volume/awsebs/attacher.go

@@ -24,6 +24,7 @@ import (
 	"time"
 
 	"github.com/golang/glog"
+
 	"k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/kubernetes/pkg/cloudprovider/providers/aws"

pkg/volume/awsebs/attacher_test.go

@@ -20,14 +20,14 @@ import (
 	"errors"
 	"testing"
 
+	"github.com/golang/glog"
+
 	"k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/api/resource"
+	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/kubernetes/pkg/cloudprovider/providers/aws"
 	"k8s.io/kubernetes/pkg/volume"
 	volumetest "k8s.io/kubernetes/pkg/volume/testing"
-
-	"github.com/golang/glog"
-	"k8s.io/apimachinery/pkg/api/resource"
-	"k8s.io/apimachinery/pkg/types"
 )
 
 func TestGetVolumeName_Volume(t *testing.T) {

pkg/volume/awsebs/aws_ebs.go

@@ -26,6 +26,7 @@ import (
 	"strings"
 
 	"github.com/golang/glog"
+
 	"k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

pkg/volume/awsebs/aws_ebs_block.go

@@ -23,6 +23,7 @@ import (
 	"strings"
 
 	"github.com/golang/glog"
+
 	"k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/kubernetes/pkg/cloudprovider/providers/aws"

pkg/volume/awsebs/aws_util.go

@@ -25,6 +25,7 @@ import (
 	"time"
 
 	"github.com/golang/glog"
+
 	"k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
 	"k8s.io/apimachinery/pkg/util/sets"