Remove unused functions and functionality

Author: jfmyers9

src/bpm/config/bpm_config.go

@@ -103,12 +103,8 @@ func (c *BPMConfig) JobDir() string {
 	return filepath.Join(c.boshRoot, "jobs", c.jobName)
 }
 
-func (c *BPMConfig) ConfigDir() string {
-	return filepath.Join(c.JobDir(), "config")
-}
-
 func (c *BPMConfig) JobConfig() string {
-	return filepath.Join(c.ConfigDir(), "bpm.yml")
+	return filepath.Join(c.JobDir(), "config", "bpm.yml")
 }
 
 func (c *BPMConfig) BPMLog() string {
@@ -123,7 +119,7 @@ func (c *BPMConfig) RootFSPath() string {
 	return filepath.Join(c.BundlePath(), "rootfs")
 }
 
-func (c *BPMConfig) ContainerID(encoded bool) string {
+func (c *BPMConfig) ContainerID() string {
 	var containerID string
 
 	if c.jobName == c.procName {
@@ -132,15 +128,11 @@ func (c *BPMConfig) ContainerID(encoded bool) string {
 		containerID = fmt.Sprintf("%s.%s", c.jobName, c.procName)
 	}
 
-	if encoded {
-		containerID = Encode(containerID)
-	}
-
-	return containerID
+	// runc spec only allows `^[\w+-\.]+$`
+	// https://github.com/opencontainers/runc/blob/master/libcontainer/factory_linux.go
+	return Encode(containerID)
 }
 
-// runc spec only allows `^[\w+-\.]+$`
-// https://github.com/opencontainers/runc/blob/master/libcontainer/factory_linux.go
 func Encode(containerID string) string {
 	enc := base32.StdEncoding
 	enc = enc.WithPadding('-')

src/bpm/config/bpm_config_test.go

@@ -49,31 +49,21 @@ var _ = Describe("Config", func() {
 					bpmCfg = config.NewBPMConfig("", "foo", "foo")
 				})
 
-				It("encodes when passed true", func() {
-					encoded := bpmCfg.ContainerID(true)
+				It("encodes", func() {
+					encoded := bpmCfg.ContainerID()
 					Expect(encoded).To(Equal("MZXW6---"))
 				})
-
-				It("doesn't encode when passed false", func() {
-					plain := bpmCfg.ContainerID(false)
-					Expect(plain).To(Equal("foo"))
-				})
 			})
 
 			Context("when the job name and process name are not the same", func() {
 				BeforeEach(func() {
 					bpmCfg = config.NewBPMConfig("", "foo", "bar")
 				})
 
-				It("encodes when passed the true", func() {
-					encoded := bpmCfg.ContainerID(true)
+				It("encodes", func() {
+					encoded := bpmCfg.ContainerID()
 					Expect(encoded).To(Equal("MZXW6LTCMFZA----"))
 				})
-
-				It("doesn't encode when passed false", func() {
-					encoded := bpmCfg.ContainerID(false)
-					Expect(encoded).To(Equal("foo.bar"))
-				})
 			})
 		})
 	})

src/bpm/runc/lifecycle/lifecycle.go

@@ -145,7 +145,7 @@ func (j *RuncLifecycle) StartProcess(logger lager.Logger, bpmCfg *config.BPMConf
 	return j.runcClient.RunContainer(
 		bpmCfg.PidFile(),
 		bpmCfg.BundlePath(),
-		bpmCfg.ContainerID(true),
+		bpmCfg.ContainerID(),
 		stdout,
 		stderr,
 	)
@@ -156,7 +156,7 @@ func (j *RuncLifecycle) StartProcess(logger lager.Logger, bpmCfg *config.BPMConf
 // - nil,nil if the process is not running and there is no other error
 // - nil,error if there is any other error getting the process beyond it not running
 func (j *RuncLifecycle) GetProcess(cfg *config.BPMConfig) (*models.Process, error) {
-	container, err := j.runcClient.ContainerState(cfg.ContainerID(true))
+	container, err := j.runcClient.ContainerState(cfg.ContainerID())
 	if err != nil {
 		return nil, err
 	}
@@ -173,7 +173,7 @@ func (j *RuncLifecycle) GetProcess(cfg *config.BPMConfig) (*models.Process, erro
 }
 
 func (j *RuncLifecycle) OpenShell(cfg *config.BPMConfig, stdin io.Reader, stdout, stderr io.Writer) error {
-	return j.runcClient.Exec(cfg.ContainerID(true), "/bin/bash", stdin, stdout, stderr)
+	return j.runcClient.Exec(cfg.ContainerID(), "/bin/bash", stdin, stdout, stderr)
 }
 
 func (j *RuncLifecycle) ListProcesses() ([]*models.Process, error) {
@@ -195,12 +195,12 @@ func (j *RuncLifecycle) ListProcesses() ([]*models.Process, error) {
 }
 
 func (j *RuncLifecycle) StopProcess(logger lager.Logger, cfg *config.BPMConfig, exitTimeout time.Duration) error {
-	err := j.runcClient.SignalContainer(cfg.ContainerID(true), client.Term)
+	err := j.runcClient.SignalContainer(cfg.ContainerID(), client.Term)
 	if err != nil {
 		return err
 	}
 
-	state, err := j.runcClient.ContainerState(cfg.ContainerID(true))
+	state, err := j.runcClient.ContainerState(cfg.ContainerID())
 	if err != nil {
 		logger.Error("failed-to-fetch-state", err)
 	} else {
@@ -216,7 +216,7 @@ func (j *RuncLifecycle) StopProcess(logger lager.Logger, cfg *config.BPMConfig,
 	for {
 		select {
 		case <-stateTicker.C():
-			state, err = j.runcClient.ContainerState(cfg.ContainerID(true))
+			state, err = j.runcClient.ContainerState(cfg.ContainerID())
 			if err != nil {
 				logger.Error("failed-to-fetch-state", err)
 			} else {
@@ -225,7 +225,7 @@ func (j *RuncLifecycle) StopProcess(logger lager.Logger, cfg *config.BPMConfig,
 				}
 			}
 		case <-timeout.C():
-			err := j.runcClient.SignalContainer(cfg.ContainerID(true), client.Quit)
+			err := j.runcClient.SignalContainer(cfg.ContainerID(), client.Quit)
 			if err != nil {
 				logger.Error("failed-to-sigquit", err)
 			}
@@ -237,7 +237,7 @@ func (j *RuncLifecycle) StopProcess(logger lager.Logger, cfg *config.BPMConfig,
 }
 
 func (j *RuncLifecycle) RemoveProcess(cfg *config.BPMConfig) error {
-	err := j.runcClient.DeleteContainer(cfg.ContainerID(true))
+	err := j.runcClient.DeleteContainer(cfg.ContainerID())
 	if err != nil {
 		return err
 	}