Fixed: should use make(map[string]string) instead (S1019)

kubernetes-sigs · Apr 4, 2020 · e714e0f · e714e0f
1 parent 8942cc1
commit e714e0f
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/pkg/csi/service/vanilla/controller.go b/pkg/csi/service/vanilla/controller.go
@@ -472,7 +472,7 @@ func (c *controller) ControllerPublishVolume(ctx context.Context, req *csi.Contr
 	}
 
 	log.Debugf("Found VirtualMachine for node:%q.", req.NodeId)
-	publishInfo := make(map[string]string, 0)
+	publishInfo := make(map[string]string)
 	// Check whether its a block or file volume
 	if common.IsFileVolumeRequest(ctx, []*csi.VolumeCapability{req.GetVolumeCapability()}) {
 		// File Volume

diff --git a/pkg/csi/service/vanilla/controller_test.go b/pkg/csi/service/vanilla/controller_test.go
@@ -295,7 +295,7 @@ func TestCreateVolumeWithStoragePolicy(t *testing.T) {
 	ct := getControllerTest(t)
 
 	// Create
-	params := make(map[string]string, 0)
+	params := make(map[string]string)
 	if v := os.Getenv("VSPHERE_DATASTORE_URL"); v != "" {
 		params[common.AttributeDatastoreURL] = v
 	}
@@ -400,7 +400,7 @@ func TestExtendVolume(t *testing.T) {
 	ct := getControllerTest(t)
 
 	// Create
-	params := make(map[string]string, 0)
+	params := make(map[string]string)
 	if v := os.Getenv("VSPHERE_DATASTORE_URL"); v != "" {
 		params[common.AttributeDatastoreURL] = v
 	}
@@ -521,7 +521,7 @@ func TestCompleteControllerFlow(t *testing.T) {
 	ct := getControllerTest(t)
 
 	// Create
-	params := make(map[string]string, 0)
+	params := make(map[string]string)
 	if v := os.Getenv("VSPHERE_DATASTORE_URL"); v != "" {
 		params[common.AttributeDatastoreURL] = v
 	}

diff --git a/pkg/csi/service/wcp/controller.go b/pkg/csi/service/wcp/controller.go
@@ -337,7 +337,7 @@ func (c *controller) ControllerPublishVolume(ctx context.Context, req *csi.Contr
 		return nil, status.Errorf(codes.Internal, msg)
 	}
 
-	publishInfo := make(map[string]string, 0)
+	publishInfo := make(map[string]string)
 	publishInfo[common.AttributeDiskType] = common.DiskTypeBlockVolume
 	publishInfo[common.AttributeFirstClassDiskUUID] = common.FormatDiskUUID(diskUUID)
 	resp := &csi.ControllerPublishVolumeResponse{

diff --git a/pkg/csi/service/wcp/controller_test.go b/pkg/csi/service/wcp/controller_test.go
@@ -233,7 +233,7 @@ func TestWCPCreateVolumeWithStoragePolicy(t *testing.T) {
 	ct := getControllerTest(t)
 
 	// Create
-	params := make(map[string]string, 0)
+	params := make(map[string]string)
 
 	profileID := os.Getenv("VSPHERE_STORAGE_POLICY_ID")
 	if profileID == "" {

diff --git a/pkg/csi/service/wcpguest/controller.go b/pkg/csi/service/wcpguest/controller.go
@@ -401,7 +401,7 @@ func (c *controller) ControllerPublishVolume(ctx context.Context, req *csi.Contr
 	}
 
 	//return PublishContext with diskUUID of the volume attached to node.
-	publishInfo := make(map[string]string, 0)
+	publishInfo := make(map[string]string)
 	publishInfo[common.AttributeDiskType] = common.DiskTypeBlockVolume
 	publishInfo[common.AttributeFirstClassDiskUUID] = common.FormatDiskUUID(diskUUID)
 	resp := &csi.ControllerPublishVolumeResponse{

diff --git a/pkg/csi/service/wcpguest/controller_test.go b/pkg/csi/service/wcpguest/controller_test.go
@@ -112,7 +112,7 @@ func TestGuestClusterControllerFlow(t *testing.T) {
 	ct := getControllerTest(t)
 
 	// Create
-	params := make(map[string]string, 0)
+	params := make(map[string]string)
 
 	params[common.AttributeSupervisorStorageClass] = testStorageClass
 	if v := os.Getenv("SUPERVISOR_STORAGE_CLASS"); v != "" {