Merge pull request #137 from humblec/cnew-2

Remove redundant alias import and replace few function names in ISCSI server
kubernetes-csi · May 14, 2021 · c249530 · c249530
2 parents fa20ff1 + cad55de
commit c249530
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 15 deletions.
diff --git a/integrationtests/apigroups/server/dummy/internal/v1alpha1/conversion.go b/integrationtests/apigroups/server/dummy/internal/v1alpha1/conversion.go
@@ -5,7 +5,7 @@ import (
 	"math"
 
 	pb "github.com/kubernetes-csi/csi-proxy/integrationtests/apigroups/api/dummy/v1alpha1"
-	internal "github.com/kubernetes-csi/csi-proxy/integrationtests/apigroups/server/dummy/internal"
+	"github.com/kubernetes-csi/csi-proxy/integrationtests/apigroups/server/dummy/internal"
 )
 
 func convert_pb_ComputeDoubleRequest_To_internal_ComputeDoubleRequest(in *pb.ComputeDoubleRequest, out *internal.ComputeDoubleRequest) error {

diff --git a/integrationtests/disk_test.go b/integrationtests/disk_test.go
@@ -9,7 +9,7 @@ import (
 	"testing"
 	"time"
 
-	v1beta3 "github.com/kubernetes-csi/csi-proxy/client/api/disk/v1beta3"
+	"github.com/kubernetes-csi/csi-proxy/client/api/disk/v1beta3"
 	v1beta3client "github.com/kubernetes-csi/csi-proxy/client/groups/disk/v1beta3"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"

diff --git a/integrationtests/filesystem_test.go b/integrationtests/filesystem_test.go
@@ -11,7 +11,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	v1beta2 "github.com/kubernetes-csi/csi-proxy/client/api/filesystem/v1beta2"
+	"github.com/kubernetes-csi/csi-proxy/client/api/filesystem/v1beta2"
 	v1beta2client "github.com/kubernetes-csi/csi-proxy/client/groups/filesystem/v1beta2"
 )
 

diff --git a/integrationtests/iscsi_test.go b/integrationtests/iscsi_test.go
@@ -46,12 +46,12 @@ func TestIscsiAPIGroup(t *testing.T) {
 	})
 
 	t.Run("Full flow", func(t *testing.T) {
-		e2e_test(t)
+		e2eTest(t)
 	})
 
 }
 
-func e2e_test(t *testing.T) {
+func e2eTest(t *testing.T) {
 	config, err := setupEnv("e2e")
 	require.NoError(t, err)
 

diff --git a/internal/server/disk/internal/v1alpha1/conversion.go b/internal/server/disk/internal/v1alpha1/conversion.go
@@ -3,8 +3,8 @@ package v1alpha1
 // Add manual conversion functions here to override automatic conversion functions
 
 import (
-	v1alpha1 "github.com/kubernetes-csi/csi-proxy/client/api/disk/v1alpha1"
-	internal "github.com/kubernetes-csi/csi-proxy/internal/server/disk/internal"
+	"github.com/kubernetes-csi/csi-proxy/client/api/disk/v1alpha1"
+	"github.com/kubernetes-csi/csi-proxy/internal/server/disk/internal"
 )
 
 func Convert_internal_ListDiskLocationsResponse_To_v1alpha1_ListDiskLocationsResponse(in *internal.ListDiskLocationsResponse, out *v1alpha1.ListDiskLocationsResponse) error {

diff --git a/internal/server/disk/internal/v1beta1/conversion.go b/internal/server/disk/internal/v1beta1/conversion.go
@@ -3,8 +3,8 @@ package v1beta1
 // Add manual conversion functions here to override automatic conversion functions
 
 import (
-	v1beta1 "github.com/kubernetes-csi/csi-proxy/client/api/disk/v1beta1"
-	internal "github.com/kubernetes-csi/csi-proxy/internal/server/disk/internal"
+	"github.com/kubernetes-csi/csi-proxy/client/api/disk/v1beta1"
+	"github.com/kubernetes-csi/csi-proxy/internal/server/disk/internal"
 )
 
 func Convert_internal_ListDiskLocationsResponse_To_v1beta1_ListDiskLocationsResponse(in *internal.ListDiskLocationsResponse, out *v1beta1.ListDiskLocationsResponse) error {

diff --git a/internal/server/disk/internal/v1beta2/conversion.go b/internal/server/disk/internal/v1beta2/conversion.go
@@ -3,8 +3,8 @@ package v1beta2
 // Add manual conversion functions here to override automatic conversion functions
 
 import (
-	v1beta2 "github.com/kubernetes-csi/csi-proxy/client/api/disk/v1beta2"
-	internal "github.com/kubernetes-csi/csi-proxy/internal/server/disk/internal"
+	"github.com/kubernetes-csi/csi-proxy/client/api/disk/v1beta2"
+	"github.com/kubernetes-csi/csi-proxy/internal/server/disk/internal"
 )
 
 func Convert_internal_ListDiskLocationsResponse_To_v1beta2_ListDiskLocationsResponse(in *internal.ListDiskLocationsResponse, out *v1beta2.ListDiskLocationsResponse) error {

diff --git a/internal/server/disk/internal/v1beta3/conversion.go b/internal/server/disk/internal/v1beta3/conversion.go
@@ -3,8 +3,8 @@ package v1beta3
 // Add manual conversion functions here to override automatic conversion functions
 
 import (
-	v1beta3 "github.com/kubernetes-csi/csi-proxy/client/api/disk/v1beta3"
-	internal "github.com/kubernetes-csi/csi-proxy/internal/server/disk/internal"
+	"github.com/kubernetes-csi/csi-proxy/client/api/disk/v1beta3"
+	"github.com/kubernetes-csi/csi-proxy/internal/server/disk/internal"
 )
 
 func Convert_internal_ListDiskLocationsResponse_To_v1beta3_ListDiskLocationsResponse(in *internal.ListDiskLocationsResponse, out *v1beta3.ListDiskLocationsResponse) error {

diff --git a/internal/server/volume/internal/v1beta1/conversion.go b/internal/server/volume/internal/v1beta1/conversion.go
@@ -3,8 +3,8 @@ package v1beta1
 // Add manual conversion functions here to override automatic conversion functions
 
 import (
-	v1beta1 "github.com/kubernetes-csi/csi-proxy/client/api/volume/v1beta1"
-	internal "github.com/kubernetes-csi/csi-proxy/internal/server/volume/internal"
+	"github.com/kubernetes-csi/csi-proxy/client/api/volume/v1beta1"
+	"github.com/kubernetes-csi/csi-proxy/internal/server/volume/internal"
 )
 
 func Convert_internal_VolumeStatsResponse_To_v1beta1_VolumeStatsResponse(in *internal.VolumeStatsResponse, out *v1beta1.VolumeStatsResponse) error {