Skip to content

Commit acadf1f

Browse files
committed
Import versioned ('v1' etc) style names explicitly
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 <[email protected]>
1 parent 4c8bb2a commit acadf1f

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

database/cloudsql_instance.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ import (
2323
"strings"
2424
"time"
2525

26-
"google.golang.org/api/sqladmin/v1beta4"
27-
"k8s.io/api/core/v1"
26+
sqladmin "google.golang.org/api/sqladmin/v1beta4"
27+
v1 "k8s.io/api/core/v1"
2828
"k8s.io/apimachinery/pkg/api/errors"
2929
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3030
apitypes "k8s.io/apimachinery/pkg/types"

database/cloudsql_instance_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ import (
2525

2626
"github.com/onsi/gomega"
2727
"google.golang.org/api/googleapi"
28-
"google.golang.org/api/sqladmin/v1beta4"
29-
"k8s.io/api/core/v1"
28+
sqladmin "google.golang.org/api/sqladmin/v1beta4"
29+
v1 "k8s.io/api/core/v1"
3030
"k8s.io/apimachinery/pkg/api/errors"
3131
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3232
"k8s.io/apimachinery/pkg/util/wait"

database/cloudsql_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"time"
2222

2323
sqladmin "google.golang.org/api/sqladmin/v1beta4"
24-
"k8s.io/api/core/v1"
24+
v1 "k8s.io/api/core/v1"
2525
"k8s.io/client-go/kubernetes"
2626

2727
dbv1alpha1 "github.com/crossplaneio/crossplane/pkg/apis/gcp/database/v1alpha1"

0 commit comments

Comments
 (0)