Skip to content

Commit

Permalink
Import versioned ('v1' etc) style names explicitly
Browse files Browse the repository at this point in the history 
golang/go#29041

This is a slightly counterintuitive workaround for the above bug. The
alternative to this commit would be to disable goimports linting until the bug
is fixed. I think it's worth the workaround for the time being in exchange for
the value goimports linting brings.

Signed-off-by: Nic Cope <negz@rk0n.org>
  • Loading branch information
@negz
negz committed Mar 6, 2019
1 parent d88718a commit 15feeff
Show file tree
Hide file tree
Showing 26 changed files with 29 additions and 29 deletions.
2 changes: 1 addition & 1 deletion pkg/apis/aws/cache/v1alpha1/replication_group_types.go
View file
Expand Up @@ -20,7 +20,7 @@ import (
"strconv"
"strings"

"k8s.io/api/core/v1"
v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

corev1alpha1 "github.com/crossplaneio/crossplane/pkg/apis/core/v1alpha1"
Expand Down
2 changes: 1 addition & 1 deletion pkg/apis/aws/storage/v1alpha1/bucket_types.go
View file
Expand Up @@ -21,7 +21,7 @@ import (
"strconv"

"github.com/aws/aws-sdk-go-v2/service/s3"
"k8s.io/api/core/v1"
v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

corev1alpha1 "github.com/crossplaneio/crossplane/pkg/apis/core/v1alpha1"
Expand Down
2 changes: 1 addition & 1 deletion pkg/apis/aws/v1alpha1/types_test.go
View file
Expand Up @@ -22,7 +22,7 @@ import (

"github.com/onsi/gomega"
"golang.org/x/net/context"
"k8s.io/api/core/v1"
v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
"k8s.io/client-go/kubernetes/scheme"
Expand Down
2 changes: 1 addition & 1 deletion pkg/apis/azure/cache/v1alpha1/redis_types.go
View file
Expand Up @@ -21,7 +21,7 @@ import (
"strings"

"github.com/Azure/azure-sdk-for-go/services/redis/mgmt/2018-03-01/redis"
"k8s.io/api/core/v1"
v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

corev1alpha1 "github.com/crossplaneio/crossplane/pkg/apis/core/v1alpha1"
Expand Down
2 changes: 1 addition & 1 deletion pkg/apis/azure/database/v1alpha1/sql_types.go
View file
Expand Up @@ -21,7 +21,7 @@ import (

"github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-12-01/mysql"
"github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-12-01/postgresql"
"k8s.io/api/core/v1"
v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

corev1alpha1 "github.com/crossplaneio/crossplane/pkg/apis/core/v1alpha1"
Expand Down
2 changes: 1 addition & 1 deletion pkg/apis/azure/storage/v1alpha1/bucket_type.go
View file
Expand Up @@ -17,7 +17,7 @@ limitations under the License.
package v1alpha1

import (
"k8s.io/api/core/v1"
v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

corev1alpha1 "github.com/crossplaneio/crossplane/pkg/apis/core/v1alpha1"
Expand Down
2 changes: 1 addition & 1 deletion pkg/apis/azure/v1alpha1/types_test.go
View file
Expand Up @@ -22,7 +22,7 @@ import (
"testing"

"github.com/onsi/gomega"
"k8s.io/api/core/v1"
v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
"k8s.io/client-go/kubernetes/scheme"
Expand Down
2 changes: 1 addition & 1 deletion pkg/apis/gcp/cache/v1alpha1/cloudmemorystore_instance_types.go
View file
Expand Up @@ -21,7 +21,7 @@ import (
"strings"

redis "google.golang.org/genproto/googleapis/cloud/redis/v1"
"k8s.io/api/core/v1"
v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

corev1alpha1 "github.com/crossplaneio/crossplane/pkg/apis/core/v1alpha1"
Expand Down
2 changes: 1 addition & 1 deletion pkg/apis/gcp/database/v1alpha1/cloudsql_instance_types.go
View file
Expand Up @@ -19,7 +19,7 @@ package v1alpha1
import (
"strconv"

"k8s.io/api/core/v1"
v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

corev1alpha1 "github.com/crossplaneio/crossplane/pkg/apis/core/v1alpha1"
Expand Down
2 changes: 1 addition & 1 deletion pkg/apis/gcp/storage/v1alpha1/bucket_types.go
View file
Expand Up @@ -17,7 +17,7 @@ limitations under the License.
package v1alpha1

import (
"k8s.io/api/core/v1"
v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

corev1alpha1 "github.com/crossplaneio/crossplane/pkg/apis/core/v1alpha1"
Expand Down
2 changes: 1 addition & 1 deletion pkg/apis/gcp/v1alpha1/types_test.go
View file
Expand Up @@ -24,7 +24,7 @@ import (
"k8s.io/apimachinery/pkg/types"

"github.com/onsi/gomega"
"k8s.io/api/core/v1"
v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/kubernetes/scheme"
"k8s.io/client-go/rest"
Expand Down
2 changes: 1 addition & 1 deletion pkg/clients/azure/azure_test.go
View file
Expand Up @@ -22,7 +22,7 @@ import (

"github.com/Azure/go-autorest/autorest"
"github.com/onsi/gomega"
"k8s.io/api/core/v1"
v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/kubernetes/fake"

Expand Down
4 changes: 2 additions & 2 deletions pkg/clients/gcp/cloudsql.go
View file
Expand Up @@ -21,8 +21,8 @@ import (
"log"
"time"

"google.golang.org/api/sqladmin/v1beta4"
"k8s.io/api/core/v1"
sqladmin "google.golang.org/api/sqladmin/v1beta4"
v1 "k8s.io/api/core/v1"
"k8s.io/client-go/kubernetes"

corev1alpha1 "github.com/crossplaneio/crossplane/pkg/apis/core/v1alpha1"
Expand Down
2 changes: 1 addition & 1 deletion pkg/clients/gcp/gcp.go
View file
Expand Up @@ -27,7 +27,7 @@ import (
"golang.org/x/oauth2/google"
"google.golang.org/api/cloudresourcemanager/v1"
"google.golang.org/api/googleapi"
"k8s.io/api/core/v1"
v1 "k8s.io/api/core/v1"
"k8s.io/client-go/kubernetes"

gcpv1alpha1 "github.com/crossplaneio/crossplane/pkg/apis/gcp/v1alpha1"
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/aws/compute/eks.go
View file
Expand Up @@ -24,7 +24,7 @@ import (
"strings"

"github.com/ghodss/yaml"
"k8s.io/api/core/v1"
v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/errors"
apierrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/azure/compute/akscluster.go
View file
Expand Up @@ -22,7 +22,7 @@ import (
"log"

"github.com/google/uuid"
"k8s.io/api/core/v1"
v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/azure/compute/akscluster_test.go
View file
Expand Up @@ -25,7 +25,7 @@ import (
"github.com/Azure/azure-sdk-for-go/services/graphrbac/1.6/graphrbac"
"github.com/Azure/go-autorest/autorest/to"
"github.com/onsi/gomega"
"k8s.io/api/core/v1"
v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/wait"
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/azure/database/sqlserver.go
View file
Expand Up @@ -21,7 +21,7 @@ import (
"fmt"
"log"

"k8s.io/api/core/v1"
v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/azure/database/sqlserver_test.go
View file
Expand Up @@ -26,7 +26,7 @@ import (
"github.com/Azure/go-autorest/autorest"
azurerest "github.com/Azure/go-autorest/autorest/azure"
"github.com/onsi/gomega"
"k8s.io/api/core/v1"
v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/wait"
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/core/resource_controller_test.go
View file
Expand Up @@ -22,7 +22,7 @@ import (

. "github.com/onsi/gomega"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/types"
"k8s.io/client-go/kubernetes/fake"
Expand Down
4 changes: 2 additions & 2 deletions pkg/controller/gcp/database/cloudsql_instance.go
View file
Expand Up @@ -23,8 +23,8 @@ import (
"strings"
"time"

"google.golang.org/api/sqladmin/v1beta4"
"k8s.io/api/core/v1"
sqladmin "google.golang.org/api/sqladmin/v1beta4"
v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
apitypes "k8s.io/apimachinery/pkg/types"
Expand Down
4 changes: 2 additions & 2 deletions pkg/controller/gcp/database/cloudsql_instance_test.go
View file
Expand Up @@ -25,8 +25,8 @@ import (

"github.com/onsi/gomega"
"google.golang.org/api/googleapi"
"google.golang.org/api/sqladmin/v1beta4"
"k8s.io/api/core/v1"
sqladmin "google.golang.org/api/sqladmin/v1beta4"
v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/wait"
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/gcp/database/cloudsql_test.go
View file
Expand Up @@ -21,7 +21,7 @@ import (
"time"

sqladmin "google.golang.org/api/sqladmin/v1beta4"
"k8s.io/api/core/v1"
v1 "k8s.io/api/core/v1"
"k8s.io/client-go/kubernetes"

dbv1alpha1 "github.com/crossplaneio/crossplane/pkg/apis/gcp/database/v1alpha1"
Expand Down
2 changes: 1 addition & 1 deletion pkg/util/finalizer.go
View file
Expand Up @@ -16,7 +16,7 @@ limitations under the License.

package util

import "k8s.io/apimachinery/pkg/apis/meta/v1"
import v1 "k8s.io/apimachinery/pkg/apis/meta/v1"

// RemoveFinalizer - from the list of kubernetes object finalizers
func RemoveFinalizer(o v1.Object, finalizer string) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/util/finalizer_test.go
View file
Expand Up @@ -20,7 +20,7 @@ import (
"testing"

. "github.com/onsi/gomega"
"k8s.io/apimachinery/pkg/apis/meta/v1"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

func TestRemoveFinalizer(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/util/references.go
View file
Expand Up @@ -17,7 +17,7 @@ limitations under the License.
package util

import (
"k8s.io/api/core/v1"
v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/types"
)

Expand Down

0 comments on commit 15feeff

Please sign in to comment.