Remove mapfs path from CSI plugin

[#159572356](https://www.pivotaltracker.com/story/show/159572356)

Signed-off-by: Maria Shaldibina <[email protected]>

Author: davewalter

voldiscoverers/csiplugin_discoverer.go

@@ -25,10 +25,9 @@ type csiPluginDiscoverer struct {
 	csiShim         csishim.Csi
 	osShim          osshim.Os
 	csiMountRootDir string
-	mapfsPath       string
 }
 
-func NewCsiPluginDiscoverer(logger lager.Logger, pluginRegistry volman.PluginRegistry, pluginPaths []string, csiMountRootDir string, mapfsPath string) volman.Discoverer {
+func NewCsiPluginDiscoverer(logger lager.Logger, pluginRegistry volman.PluginRegistry, pluginPaths []string, csiMountRootDir string) volman.Discoverer {
 	return &csiPluginDiscoverer{
 		logger:          logger,
 		pluginRegistry:  pluginRegistry,
@@ -38,11 +37,10 @@ func NewCsiPluginDiscoverer(logger lager.Logger, pluginRegistry volman.PluginReg
 		csiShim:         &csishim.CsiShim{},
 		osShim:          &osshim.OsShim{},
 		csiMountRootDir: csiMountRootDir,
-		mapfsPath:       mapfsPath,
 	}
 }
 
-func NewCsiPluginDiscovererWithShims(logger lager.Logger, pluginRegistry volman.PluginRegistry, pluginPaths []string, filepathShim filepathshim.Filepath, grpcShim grpcshim.Grpc, csiShim csishim.Csi, osShim osshim.Os, csiMountRootDir string, mapfsPath string) volman.Discoverer {
+func NewCsiPluginDiscovererWithShims(logger lager.Logger, pluginRegistry volman.PluginRegistry, pluginPaths []string, filepathShim filepathshim.Filepath, grpcShim grpcshim.Grpc, csiShim csishim.Csi, osShim osshim.Os, csiMountRootDir string) volman.Discoverer {
 	return &csiPluginDiscoverer{
 		logger:          logger,
 		pluginRegistry:  pluginRegistry,
@@ -52,7 +50,6 @@ func NewCsiPluginDiscovererWithShims(logger lager.Logger, pluginRegistry volman.
 		csiShim:         csiShim,
 		osShim:          osShim,
 		csiMountRootDir: csiMountRootDir,
-		mapfsPath:       mapfsPath,
 	}
 }
 
@@ -118,7 +115,7 @@ func (p *csiPluginDiscoverer) Discover(logger lager.Logger) (map[string]volman.P
 					continue
 				}
 
-				plugin := NewCsiPlugin(nodePlugin, pluginSpec, p.grpcShim, p.csiShim, p.osShim, p.csiMountRootDir, oshelper.NewOsHelper(), p.mapfsPath)
+				plugin := NewCsiPlugin(nodePlugin, pluginSpec, p.grpcShim, p.csiShim, p.osShim, p.csiMountRootDir, oshelper.NewOsHelper())
 				plugins[csiPluginName] = plugin
 			} else {
 				logger.Info("discovered-plugin-ignored", lager.Data{"address": pluginSpec.Address})

voldiscoverers/csiplugin_discoverer_test.go

@@ -42,7 +42,6 @@ var _ = Describe("CSIPluginDiscoverer", func() {
 		drivers                map[string]volman.Plugin
 		err                    error
 		volumesRootDir         string
-		mapfsPath              string
 	)
 
 	BeforeEach(func() {
@@ -56,14 +55,13 @@ var _ = Describe("CSIPluginDiscoverer", func() {
 		fakeIdentityPlugin = &csi_fake.FakeIdentityClient{}
 		pluginPaths = []string{firstPluginsDirectory}
 		volumesRootDir = "/var/vcap/data/mounts"
-		mapfsPath = "/var/vcap/packages/mapfs/bin/mapfs"
 
 		logger = lagertest.NewTestLogger("csi-plugin-discoverer-test")
 		registry = vollocal.NewPluginRegistry()
 	})
 
 	JustBeforeEach(func() {
-		discoverer = voldiscoverers.NewCsiPluginDiscovererWithShims(logger, registry, pluginPaths, &filepathshim.FilepathShim{}, fakeGrpc, fakeCsi, fakeOs, volumesRootDir, mapfsPath)
+		discoverer = voldiscoverers.NewCsiPluginDiscovererWithShims(logger, registry, pluginPaths, &filepathshim.FilepathShim{}, fakeGrpc, fakeCsi, fakeOs, volumesRootDir)
 	})
 
 	Describe("#Discover", func() {

vollocal/client_local.go

@@ -34,7 +34,6 @@ type DriverConfig struct {
 	CSIPaths        []string
 	SyncInterval    time.Duration
 	CSIMountRootDir string
-	MapfsPath       string
 }
 
 func NewDriverConfig() DriverConfig {
@@ -54,7 +53,7 @@ func NewServer(logger lager.Logger, metronClient loggingclient.IngressClient, co
 	registry := NewPluginRegistry()
 
 	dockerDiscoverer := voldiscoverers.NewDockerDriverDiscoverer(logger, registry, config.DriverPaths)
-	csiDiscoverer := voldiscoverers.NewCsiPluginDiscoverer(logger, registry, config.CSIPaths, config.CSIMountRootDir, config.MapfsPath)
+	csiDiscoverer := voldiscoverers.NewCsiPluginDiscoverer(logger, registry, config.CSIPaths, config.CSIMountRootDir)
 
 	syncer := NewSyncer(logger, registry, []volman.Discoverer{dockerDiscoverer, csiDiscoverer}, config.SyncInterval, clock)
 	purger := NewMountPurger(logger, registry)