Replace and correct imports in integration tests

.cloudbuild.sh

@@ -3,7 +3,7 @@
 . release-tools/prow.sh
 
 # Extract tag-n-hash value from GIT_TAG (form vYYYYMMDD-tag-n-hash) for REV value.
-REV=v$(echo $GIT_TAG | cut -f3- -d 'v')
+REV=v$(echo "$GIT_TAG" | cut -f3- -d 'v')
 
-run_with_go "${CSI_PROW_GO_VERSION_BUILD}" make build REV=${REV}
-cp bin/csi-proxy.exe bin/csi-proxy-${PULL_BASE_REF}.exe
+run_with_go "${CSI_PROW_GO_VERSION_BUILD}" make build REV="${REV}"
+cp bin/csi-proxy.exe bin/csi-proxy-"${PULL_BASE_REF}".exe

cmd/csi-proxy/version.go

@@ -14,5 +14,5 @@ limitations under the License.
 package main
 
 var (
-	version string = "Unknown"
+	version = "Unknown"
 )

integrationtests/apigroups/server/dummy/server.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 
 	"github.com/kubernetes-csi/csi-proxy/client/apiversion"
-	internal "github.com/kubernetes-csi/csi-proxy/integrationtests/apigroups/server/dummy/internal"
+	"github.com/kubernetes-csi/csi-proxy/integrationtests/apigroups/server/dummy/internal"
 )
 
 // Server is the internal server for the dummy API group.

integrationtests/iscsi_test.go

@@ -5,12 +5,12 @@ import (
 	"fmt"
 	"testing"
 
-	disk_api "github.com/kubernetes-csi/csi-proxy/client/api/disk/v1"
-	iscsi_api "github.com/kubernetes-csi/csi-proxy/client/api/iscsi/v1alpha2"
-	system_api "github.com/kubernetes-csi/csi-proxy/client/api/system/v1alpha1"
-	disk_client "github.com/kubernetes-csi/csi-proxy/client/groups/disk/v1"
-	iscsi_client "github.com/kubernetes-csi/csi-proxy/client/groups/iscsi/v1alpha2"
-	system_client "github.com/kubernetes-csi/csi-proxy/client/groups/system/v1alpha1"
+	diskApi "github.com/kubernetes-csi/csi-proxy/client/api/disk/v1"
+	iscsiApi "github.com/kubernetes-csi/csi-proxy/client/api/iscsi/v1alpha2"
+	systemApi "github.com/kubernetes-csi/csi-proxy/client/api/system/v1alpha1"
+	diskClient "github.com/kubernetes-csi/csi-proxy/client/groups/disk/v1"
+	iscsiClient "github.com/kubernetes-csi/csi-proxy/client/groups/iscsi/v1alpha2"
+	systemClient "github.com/kubernetes-csi/csi-proxy/client/groups/system/v1alpha1"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
@@ -56,62 +56,62 @@ func e2e_test(t *testing.T) {
 
 	defer requireCleanup(t)
 
-	iscsi, err := iscsi_client.NewClient()
+	iscsi, err := iscsiClient.NewClient()
 	require.Nil(t, err)
 
 	defer func() { assert.NoError(t, iscsi.Close()) }()
 
-	disk, err := disk_client.NewClient()
+	disk, err := diskClient.NewClient()
 	require.Nil(t, err)
 
 	defer func() { assert.NoError(t, disk.Close()) }()
 
-	system, err := system_client.NewClient()
+	system, err := systemClient.NewClient()
 	require.Nil(t, err)
 
 	defer func() { assert.NoError(t, system.Close()) }()
 
-	startReq := &system_api.StartServiceRequest{Name: "MSiSCSI"}
+	startReq := &systemApi.StartServiceRequest{Name: "MSiSCSI"}
 	_, err = system.StartService(context.TODO(), startReq)
 	require.NoError(t, err)
 
-	tp := &iscsi_api.TargetPortal{
+	tp := &iscsiApi.TargetPortal{
 		TargetAddress: config.Ip,
 		TargetPort:    defaultIscsiPort,
 	}
 
-	addTpReq := &iscsi_api.AddTargetPortalRequest{
+	addTpReq := &iscsiApi.AddTargetPortalRequest{
 		TargetPortal: tp,
 	}
 	_, err = iscsi.AddTargetPortal(context.Background(), addTpReq)
 	assert.Nil(t, err)
 
-	discReq := &iscsi_api.DiscoverTargetPortalRequest{TargetPortal: tp}
+	discReq := &iscsiApi.DiscoverTargetPortalRequest{TargetPortal: tp}
 	discResp, err := iscsi.DiscoverTargetPortal(context.TODO(), discReq)
 	if assert.Nil(t, err) {
 		assert.Contains(t, discResp.Iqns, config.Iqn)
 	}
 
-	connectReq := &iscsi_api.ConnectTargetRequest{TargetPortal: tp, Iqn: config.Iqn}
+	connectReq := &iscsiApi.ConnectTargetRequest{TargetPortal: tp, Iqn: config.Iqn}
 	_, err = iscsi.ConnectTarget(context.TODO(), connectReq)
 	assert.Nil(t, err)
 
-	tgtDisksReq := &iscsi_api.GetTargetDisksRequest{TargetPortal: tp, Iqn: config.Iqn}
+	tgtDisksReq := &iscsiApi.GetTargetDisksRequest{TargetPortal: tp, Iqn: config.Iqn}
 	tgtDisksResp, err := iscsi.GetTargetDisks(context.TODO(), tgtDisksReq)
 	require.Nil(t, err)
 	require.Len(t, tgtDisksResp.DiskIDs, 1)
 
 	diskId := tgtDisksResp.DiskIDs[0]
 
-	attachReq := &disk_api.SetAttachStateRequest{DiskID: diskId, IsOnline: true}
+	attachReq := &diskApi.SetAttachStateRequest{DiskID: diskId, IsOnline: true}
 	_, err = disk.SetAttachState(context.TODO(), attachReq)
 	require.Nil(t, err)
 
-	partReq := &disk_api.PartitionDiskRequest{DiskID: diskId}
+	partReq := &diskApi.PartitionDiskRequest{DiskID: diskId}
 	_, err = disk.PartitionDisk(context.TODO(), partReq)
 	assert.Nil(t, err)
 
-	detachReq := &disk_api.SetAttachStateRequest{DiskID: diskId, IsOnline: false}
+	detachReq := &diskApi.SetAttachStateRequest{DiskID: diskId, IsOnline: false}
 	_, err = disk.SetAttachState(context.TODO(), detachReq)
 	assert.Nil(t, err)
 }
@@ -122,42 +122,42 @@ func targetTest(t *testing.T) {
 
 	defer requireCleanup(t)
 
-	client, err := iscsi_client.NewClient()
+	client, err := iscsiClient.NewClient()
 	require.Nil(t, err)
 
 	defer func() { assert.NoError(t, client.Close()) }()
 
-	system, err := system_client.NewClient()
+	system, err := systemClient.NewClient()
 	require.Nil(t, err)
 
 	defer func() { assert.NoError(t, system.Close()) }()
 
-	startReq := &system_api.StartServiceRequest{Name: "MSiSCSI"}
+	startReq := &systemApi.StartServiceRequest{Name: "MSiSCSI"}
 	_, err = system.StartService(context.TODO(), startReq)
 	require.NoError(t, err)
 
-	tp := &iscsi_api.TargetPortal{
+	tp := &iscsiApi.TargetPortal{
 		TargetAddress: config.Ip,
 		TargetPort:    defaultIscsiPort,
 	}
 
-	addTpReq := &iscsi_api.AddTargetPortalRequest{
+	addTpReq := &iscsiApi.AddTargetPortalRequest{
 		TargetPortal: tp,
 	}
 	_, err = client.AddTargetPortal(context.Background(), addTpReq)
 	assert.Nil(t, err)
 
-	discReq := &iscsi_api.DiscoverTargetPortalRequest{TargetPortal: tp}
+	discReq := &iscsiApi.DiscoverTargetPortalRequest{TargetPortal: tp}
 	discResp, err := client.DiscoverTargetPortal(context.TODO(), discReq)
 	if assert.Nil(t, err) {
 		assert.Contains(t, discResp.Iqns, config.Iqn)
 	}
 
-	connectReq := &iscsi_api.ConnectTargetRequest{TargetPortal: tp, Iqn: config.Iqn}
+	connectReq := &iscsiApi.ConnectTargetRequest{TargetPortal: tp, Iqn: config.Iqn}
 	_, err = client.ConnectTarget(context.TODO(), connectReq)
 	assert.Nil(t, err)
 
-	disconReq := &iscsi_api.DisconnectTargetRequest{TargetPortal: tp, Iqn: config.Iqn}
+	disconReq := &iscsiApi.DisconnectTargetRequest{TargetPortal: tp, Iqn: config.Iqn}
 	_, err = client.DisconnectTarget(context.TODO(), disconReq)
 	assert.Nil(t, err)
 }
@@ -175,48 +175,48 @@ func targetChapTest(t *testing.T) {
 	err = setChap(targetName, username, password)
 	require.NoError(t, err)
 
-	client, err := iscsi_client.NewClient()
+	client, err := iscsiClient.NewClient()
 	require.Nil(t, err)
 
 	defer func() { assert.NoError(t, client.Close()) }()
 
-	system, err := system_client.NewClient()
+	system, err := systemClient.NewClient()
 	require.Nil(t, err)
 
 	defer func() { assert.NoError(t, system.Close()) }()
 
-	startReq := &system_api.StartServiceRequest{Name: "MSiSCSI"}
+	startReq := &systemApi.StartServiceRequest{Name: "MSiSCSI"}
 	_, err = system.StartService(context.TODO(), startReq)
 	require.NoError(t, err)
 
-	tp := &iscsi_api.TargetPortal{
+	tp := &iscsiApi.TargetPortal{
 		TargetAddress: config.Ip,
 		TargetPort:    defaultIscsiPort,
 	}
 
-	addTpReq := &iscsi_api.AddTargetPortalRequest{
+	addTpReq := &iscsiApi.AddTargetPortalRequest{
 		TargetPortal: tp,
 	}
 	_, err = client.AddTargetPortal(context.Background(), addTpReq)
 	assert.Nil(t, err)
 
-	discReq := &iscsi_api.DiscoverTargetPortalRequest{TargetPortal: tp}
+	discReq := &iscsiApi.DiscoverTargetPortalRequest{TargetPortal: tp}
 	discResp, err := client.DiscoverTargetPortal(context.TODO(), discReq)
 	if assert.Nil(t, err) {
 		assert.Contains(t, discResp.Iqns, config.Iqn)
 	}
 
-	connectReq := &iscsi_api.ConnectTargetRequest{
+	connectReq := &iscsiApi.ConnectTargetRequest{
 		TargetPortal: tp,
 		Iqn:          config.Iqn,
 		ChapUsername: username,
 		ChapSecret:   password,
-		AuthType:     iscsi_api.AuthenticationType_ONE_WAY_CHAP,
+		AuthType:     iscsiApi.AuthenticationType_ONE_WAY_CHAP,
 	}
 	_, err = client.ConnectTarget(context.TODO(), connectReq)
 	assert.Nil(t, err)
 
-	disconReq := &iscsi_api.DisconnectTargetRequest{TargetPortal: tp, Iqn: config.Iqn}
+	disconReq := &iscsiApi.DisconnectTargetRequest{TargetPortal: tp, Iqn: config.Iqn}
 	_, err = client.DisconnectTarget(context.TODO(), disconReq)
 	assert.Nil(t, err)
 }
@@ -238,30 +238,30 @@ func targetMutualChapTest(t *testing.T) {
 	err = setReverseChap(targetName, reverse_password)
 	require.NoError(t, err)
 
-	client, err := iscsi_client.NewClient()
+	client, err := iscsiClient.NewClient()
 	require.Nil(t, err)
 
 	defer func() { assert.NoError(t, client.Close()) }()
 
-	system, err := system_client.NewClient()
+	system, err := systemClient.NewClient()
 	require.Nil(t, err)
 
 	defer func() { assert.NoError(t, system.Close()) }()
 
 	{
-		req := &system_api.StartServiceRequest{Name: "MSiSCSI"}
+		req := &systemApi.StartServiceRequest{Name: "MSiSCSI"}
 		resp, err := system.StartService(context.TODO(), req)
 		require.NoError(t, err)
 		assert.NotNil(t, resp)
 	}
 
-	tp := &iscsi_api.TargetPortal{
+	tp := &iscsiApi.TargetPortal{
 		TargetAddress: config.Ip,
 		TargetPort:    defaultIscsiPort,
 	}
 
 	{
-		req := &iscsi_api.AddTargetPortalRequest{
+		req := &iscsiApi.AddTargetPortalRequest{
 			TargetPortal: tp,
 		}
 		resp, err := client.AddTargetPortal(context.Background(), req)
@@ -270,7 +270,7 @@ func targetMutualChapTest(t *testing.T) {
 	}
 
 	{
-		req := &iscsi_api.DiscoverTargetPortalRequest{TargetPortal: tp}
+		req := &iscsiApi.DiscoverTargetPortalRequest{TargetPortal: tp}
 		resp, err := client.DiscoverTargetPortal(context.TODO(), req)
 		if assert.Nil(t, err) && assert.NotNil(t, resp) {
 			assert.Contains(t, resp.Iqns, config.Iqn)
@@ -279,25 +279,25 @@ func targetMutualChapTest(t *testing.T) {
 
 	{
 		// Try using a wrong initiator password and expect error on connection
-		req := &iscsi_api.SetMutualChapSecretRequest{MutualChapSecret: "made-up-pass"}
+		req := &iscsiApi.SetMutualChapSecretRequest{MutualChapSecret: "made-up-pass"}
 		resp, err := client.SetMutualChapSecret(context.TODO(), req)
 		require.NoError(t, err)
 		assert.NotNil(t, resp)
 	}
 
-	connectReq := &iscsi_api.ConnectTargetRequest{
+	connectReq := &iscsiApi.ConnectTargetRequest{
 		TargetPortal: tp,
 		Iqn:          config.Iqn,
 		ChapUsername: username,
 		ChapSecret:   password,
-		AuthType:     iscsi_api.AuthenticationType_MUTUAL_CHAP,
+		AuthType:     iscsiApi.AuthenticationType_MUTUAL_CHAP,
 	}
 
 	_, err = client.ConnectTarget(context.TODO(), connectReq)
 	assert.NotNil(t, err)
 
 	{
-		req := &iscsi_api.SetMutualChapSecretRequest{MutualChapSecret: reverse_password}
+		req := &iscsiApi.SetMutualChapSecretRequest{MutualChapSecret: reverse_password}
 		resp, err := client.SetMutualChapSecret(context.TODO(), req)
 		require.NoError(t, err)
 		assert.NotNil(t, resp)
@@ -307,7 +307,7 @@ func targetMutualChapTest(t *testing.T) {
 	assert.Nil(t, err)
 
 	{
-		req := &iscsi_api.DisconnectTargetRequest{TargetPortal: tp, Iqn: config.Iqn}
+		req := &iscsiApi.DisconnectTargetRequest{TargetPortal: tp, Iqn: config.Iqn}
 		resp, err := client.DisconnectTarget(context.TODO(), req)
 		assert.Nil(t, err)
 		assert.NotNil(t, resp)
@@ -320,34 +320,34 @@ func targetPortalTest(t *testing.T, port uint32) {
 
 	defer requireCleanup(t)
 
-	client, err := iscsi_client.NewClient()
+	client, err := iscsiClient.NewClient()
 	require.Nil(t, err)
 
 	defer func() { assert.NoError(t, client.Close()) }()
 
-	system, err := system_client.NewClient()
+	system, err := systemClient.NewClient()
 	require.Nil(t, err)
 
 	defer func() { assert.NoError(t, system.Close()) }()
 
-	startReq := &system_api.StartServiceRequest{Name: "MSiSCSI"}
+	startReq := &systemApi.StartServiceRequest{Name: "MSiSCSI"}
 	_, err = system.StartService(context.TODO(), startReq)
 	require.NoError(t, err)
 
-	tp := &iscsi_api.TargetPortal{
+	tp := &iscsiApi.TargetPortal{
 		TargetAddress: config.Ip,
 		TargetPort:    port,
 	}
 
-	listReq := &iscsi_api.ListTargetPortalsRequest{}
+	listReq := &iscsiApi.ListTargetPortalsRequest{}
 
 	listResp, err := client.ListTargetPortals(context.Background(), listReq)
 	if assert.Nil(t, err) {
 		assert.Len(t, listResp.TargetPortals, 0,
 			"Expect no registered target portals")
 	}
 
-	addTpReq := &iscsi_api.AddTargetPortalRequest{TargetPortal: tp}
+	addTpReq := &iscsiApi.AddTargetPortalRequest{TargetPortal: tp}
 	_, err = client.AddTargetPortal(context.Background(), addTpReq)
 	assert.Nil(t, err)
 
@@ -364,7 +364,7 @@ func targetPortalTest(t *testing.T, port uint32) {
 		assert.Equal(t, gotListResp.TargetPortals[0].TargetAddress, tp.TargetAddress)
 	}
 
-	remReq := &iscsi_api.RemoveTargetPortalRequest{
+	remReq := &iscsiApi.RemoveTargetPortalRequest{
 		TargetPortal: tp,
 	}
 	_, err = client.RemoveTargetPortal(context.Background(), remReq)

integrationtests/smb_test.go

@@ -20,7 +20,7 @@ import (
 
 const letterset = "abcdefghijklmnopqrstuvwxyz" + "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 
-var seededRand *rand.Rand = rand.New(rand.NewSource(time.Now().UnixNano()))
+var seededRand = rand.New(rand.NewSource(time.Now().UnixNano()))
 
 func stringWithCharset(length int, charset string) string {
 	b := make([]byte, length)

internal/server/server.go

@@ -39,9 +39,9 @@ func NewServer(apiGroups ...srvtypes.APIGroup) *Server {
 // others).
 // If passed a listeningChan, it will close it when it's started listening.
 func (s *Server) Start(listeningChan chan interface{}) []error {
-	doneChan, errors := s.startListening()
-	if len(errors) != 0 {
-		return errors
+	doneChan, ListenErr := s.startListening()
+	if len(ListenErr) != 0 {
+		return ListenErr
 	}
 	defer close(doneChan)
 
@@ -62,9 +62,9 @@ func (s *Server) startListening() (chan *versionedAPIDone, []error) {
 	}
 	s.started = true
 
-	listeners, errors := s.createListeners()
-	if len(errors) != 0 {
-		return nil, errors
+	listeners, ListenErr := s.createListeners()
+	if len(ListenErr) != 0 {
+		return nil, ListenErr
 	}
 
 	return s.createAndStartGRPCServers(listeners), nil