encapsulate filepath, path, and container id logic

These generally depended on Job name and process name.

Renamed `bpm` package to `config`.

Renamed `Config` to `ProcessConfig`.

[finishes #147770663]

Signed-off-by: aram price <aprice@pivotal.io>

Author: jfmyers9

packages/bpm/spec

@@ -7,8 +7,8 @@ dependencies:
 
 files:
   - bpm/*.go # gosub
-  - bpm/bpm/*.go # gosub
   - bpm/commands/*.go # gosub
+  - bpm/config/*.go # gosub
   - bpm/models/*.go # gosub
   - bpm/presenters/*.go # gosub
   - bpm/runc/adapter/*.go # gosub

src/bpm/commands/pid.go

@@ -16,7 +16,7 @@
 package commands
 
 import (
-	"bpm/bpm"
+	"bpm/config"
 	"errors"
 	"fmt"
 
@@ -41,13 +41,13 @@ func pidPre(cmd *cobra.Command, args []string) error {
 }
 
 func pidForJob(cmd *cobra.Command, _ []string) error {
-	_, err := bpm.ParseConfig(configPath)
+	_, err := config.ParseProcessConfig(bpmCfg.ConfigPath())
 	if err != nil {
 		return fmt.Errorf("failed to get job: %s", err.Error())
 	}
 
 	runcLifecycle := newRuncLifecycle()
-	job, err := runcLifecycle.GetJob(jobName, processName)
+	job, err := runcLifecycle.GetJob(bpmCfg)
 	if err != nil {
 		return fmt.Errorf("failed to get job: %s", err.Error())
 	}

src/bpm/commands/root.go

@@ -16,15 +16,13 @@
 package commands
 
 import (
-	"bpm/bpm"
+	"bpm/config"
 	"bpm/runc/adapter"
 	"bpm/runc/client"
 	"bpm/runc/lifecycle"
 	"bpm/usertools"
 	"errors"
-	"fmt"
 	"os"
-	"path/filepath"
 
 	"golang.org/x/sys/unix"
 
@@ -35,8 +33,11 @@ import (
 	"github.com/spf13/cobra"
 )
 
-var jobName, processName, configPath string
-var logger lager.Logger
+var (
+	processName string
+	bpmCfg      *config.BPMConfig
+	logger      lager.Logger
+)
 
 var userFinder = usertools.NewUserFinder()
 
@@ -58,29 +59,24 @@ func validateInput(args []string) error {
 		return errors.New("must specify a job")
 	}
 
-	jobName = args[0]
+	jobName := args[0]
 
 	if processName == "" {
 		processName = jobName
 	}
 
-	configPath = filepath.Join(
-		bpm.BoshRoot(),
-		"jobs", jobName, "config", "bpm",
-		fmt.Sprintf("%s.yml", processName),
-	)
+	bpmCfg = config.NewBPMConfig(config.BoshRoot(), jobName, processName)
 
 	return nil
 }
 
 func setupBpmLogs(sessionName string) error {
-	bpmLogFileLocation := filepath.Join(bpm.BoshRoot(), "sys", "log", jobName, "bpm.log")
-	err := os.MkdirAll(filepath.Join(bpm.BoshRoot(), "sys", "log", jobName), 0750)
+	err := os.MkdirAll(bpmCfg.LogDir(), 0750)
 	if err != nil {
 		return err
 	}
 
-	logFile, err := os.OpenFile(bpmLogFileLocation, os.O_RDWR|os.O_CREATE|os.O_APPEND, 0600)
+	logFile, err := os.OpenFile(bpmCfg.BPMLog(), os.O_RDWR|os.O_CREATE|os.O_APPEND, 0600)
 	if err != nil {
 		return err
 	}
@@ -90,14 +86,14 @@ func setupBpmLogs(sessionName string) error {
 		return err
 	}
 
-	err = os.Chown(bpmLogFileLocation, int(usr.UID), int(usr.GID))
+	err = os.Chown(bpmCfg.BPMLog(), int(usr.UID), int(usr.GID))
 	if err != nil {
 		return err
 	}
 
 	logger, _ = lagerflags.NewFromConfig("bpm", lagerflags.DefaultLagerConfig())
 	logger.RegisterSink(lager.NewWriterSink(logFile, lager.INFO))
-	logger = logger.WithData(lager.Data{"job": jobName, "process": processName})
+	logger = logger.WithData(lager.Data{"job": bpmCfg.JobName(), "process": bpmCfg.ProcName()})
 	logger = logger.Session(sessionName)
 
 	return nil
@@ -108,15 +104,13 @@ func acquireLifecycleLock() error {
 	l.Info("starting")
 	defer l.Info("complete")
 
-	bpmPidDir := filepath.Join(bpm.BoshRoot(), "sys", "run", "bpm", jobName)
-	err := os.MkdirAll(bpmPidDir, 0700)
+	err := os.MkdirAll(bpmCfg.PidDir(), 0700)
 	if err != nil {
 		l.Error("failed-to-create-lock-dir", err)
 		return err
 	}
 
-	lockFile := filepath.Join(bpmPidDir, fmt.Sprintf("%s.lock", processName))
-	f, err := os.OpenFile(lockFile, os.O_CREATE|os.O_RDWR, 0600)
+	f, err := os.OpenFile(bpmCfg.LockFile(), os.O_CREATE|os.O_RDWR, 0600)
 	if err != nil {
 		l.Error("failed-to-create-lock-file", err)
 		return err
@@ -136,8 +130,7 @@ func releaseLifecycleLock() error {
 	l.Info("starting")
 	defer l.Info("complete")
 
-	lockFile := filepath.Join(bpm.BoshRoot(), "sys", "run", "bpm", jobName, fmt.Sprintf("%s.lock", processName))
-	err := os.RemoveAll(lockFile)
+	err := os.RemoveAll(bpmCfg.LockFile())
 	if err != nil {
 		l.Error("failed-to-remove-lock-file", err)
 		return err
@@ -147,7 +140,10 @@ func releaseLifecycleLock() error {
 }
 
 func newRuncLifecycle() *lifecycle.RuncLifecycle {
-	runcClient := client.NewRuncClient(bpm.RuncPath(), bpm.RuncRoot())
+	runcClient := client.NewRuncClient(
+		config.RuncPath(config.BoshRoot()),
+		config.RuncRoot(config.BoshRoot()),
+	)
 	runcAdapter := adapter.NewRuncAdapter()
 	clock := clock.NewClock()
 
@@ -157,6 +153,5 @@ func newRuncLifecycle() *lifecycle.RuncLifecycle {
 		userFinder,
 		lifecycle.NewCommandRunner(),
 		clock,
-		bpm.BoshRoot(),
 	)
 }

src/bpm/commands/shell.go

@@ -16,6 +16,8 @@
 package commands
 
 import (
+	"bpm/config"
+	"fmt"
 	"os"
 
 	"github.com/spf13/cobra"
@@ -39,8 +41,13 @@ func shellPre(cmd *cobra.Command, args []string) error {
 }
 
 func shell(cmd *cobra.Command, _ []string) error {
+	_, err := config.ParseProcessConfig(bpmCfg.ConfigPath())
+	if err != nil {
+		return fmt.Errorf("failed to get job: %s", err.Error())
+	}
+
 	cmd.SilenceUsage = true
 
 	runcLifecycle := newRuncLifecycle()
-	return runcLifecycle.OpenShell(jobName, processName, os.Stdin, cmd.OutOrStdout(), cmd.OutOrStderr())
+	return runcLifecycle.OpenShell(bpmCfg, os.Stdin, cmd.OutOrStdout(), cmd.OutOrStderr())
 }

src/bpm/commands/start.go

@@ -16,7 +16,7 @@
 package commands
 
 import (
-	"bpm/bpm"
+	"bpm/config"
 
 	"github.com/spf13/cobra"
 )
@@ -55,18 +55,19 @@ func start(cmd *cobra.Command, _ []string) error {
 	logger.Info("starting")
 	defer logger.Info("complete")
 
-	cfg, err := bpm.ParseConfig(configPath)
+	procCfg, err := config.ParseProcessConfig(bpmCfg.ConfigPath())
 	if err != nil {
 		logger.Error("failed-to-parse-config", err)
 		return err
 	}
 
 	runcLifecycle := newRuncLifecycle()
-	err = runcLifecycle.StartJob(jobName, processName, cfg)
+
+	err = runcLifecycle.StartJob(bpmCfg, procCfg)
 	if err != nil {
 		logger.Error("failed-to-start", err)
 
-		removeErr := runcLifecycle.RemoveJob(jobName, processName)
+		removeErr := runcLifecycle.RemoveJob(bpmCfg)
 		if removeErr != nil {
 			logger.Error("failed-to-cleanup", removeErr)
 		}

src/bpm/commands/stop.go

@@ -16,7 +16,7 @@
 package commands
 
 import (
-	"bpm/bpm"
+	"bpm/config"
 	"fmt"
 	"time"
 
@@ -59,13 +59,13 @@ func stop(cmd *cobra.Command, _ []string) error {
 	logger.Info("starting")
 	defer logger.Info("complete")
 
-	_, err := bpm.ParseConfig(configPath)
+	_, err := config.ParseProcessConfig(bpmCfg.ConfigPath())
 	if err != nil {
 		return fmt.Errorf("failed to get job: %s", err.Error())
 	}
 
 	runcLifecycle := newRuncLifecycle()
-	job, err := runcLifecycle.GetJob(jobName, processName)
+	job, err := runcLifecycle.GetJob(bpmCfg)
 	if err != nil {
 		logger.Error("failed-to-get-job", err)
 		return err
@@ -76,10 +76,10 @@ func stop(cmd *cobra.Command, _ []string) error {
 		return nil
 	}
 
-	err = runcLifecycle.StopJob(logger, jobName, processName, DefaultStopTimeout)
+	err = runcLifecycle.StopJob(logger, bpmCfg, DefaultStopTimeout)
 	if err != nil {
 		logger.Error("failed-to-stop", err)
 	}
 
-	return runcLifecycle.RemoveJob(jobName, processName)
+	return runcLifecycle.RemoveJob(bpmCfg)
 }

src/bpm/commands/trace.go

@@ -16,7 +16,7 @@
 package commands
 
 import (
-	"bpm/bpm"
+	"bpm/config"
 	"errors"
 	"fmt"
 	"os"
@@ -54,13 +54,13 @@ func tracePre(cmd *cobra.Command, args []string) error {
 }
 
 func trace(cmd *cobra.Command, _ []string) error {
-	_, err := bpm.ParseConfig(configPath)
+	_, err := config.ParseProcessConfig(bpmCfg.ConfigPath())
 	if err != nil {
 		return fmt.Errorf("failed to get job: %s", err.Error())
 	}
 
 	runcLifecycle := newRuncLifecycle()
-	job, err := runcLifecycle.GetJob(jobName, processName)
+	job, err := runcLifecycle.GetJob(bpmCfg)
 	if err != nil {
 		return fmt.Errorf("failed to get job: %s", err.Error())
 	}