spindle/engines: extract common and errors packages #1314

+4 -4

spindle/engines/nixery/envs.go spindle/engines/common/envs.go

reviewed

··· 1 1 - package nixery 1 1 + package common 2 2 3 3 import ( 4 4 "fmt" ··· 6 6 7 7 type EnvVars []string 8 8 9 9 - // ConstructEnvs converts a tangled.Pipeline_Step_Environment_Elem.{Key,Value} 10 10 - // representation into a docker-friendly []string{"KEY=value", ...} slice. 9 9 + // ConstructEnvs converts a map[string]string representation into a 10 10 + // docker-friendly []string{"KEY=value", ...} slice. 11 11 func ConstructEnvs(envs map[string]string) EnvVars { 12 12 var dockerEnvs EnvVars 13 13 for k, v := range envs { ··· 25 25 // AddEnv adds a key=value string to the EnvVar. 26 26 func (ev *EnvVars) AddEnv(key, value string) { 27 27 *ev = append(*ev, fmt.Sprintf("%s=%s", key, value)) 28 28 - } 28 28 + }

+2 -2

spindle/engines/nixery/envs_test.go spindle/engines/common/envs_test.go

reviewed

··· 1 1 - package nixery 1 1 + package common 2 2 3 3 import ( 4 4 "testing" ··· 45 45 ev.AddEnv("BAZ", "qux") 46 46 want := EnvVars{"FOO=bar", "BAZ=qux"} 47 47 assert.ElementsMatch(t, want, ev) 48 48 - } 48 48 + }

+2 -2

spindle/engines/nixery/errors.go spindle/engines/errors/errors.go

reviewed

··· 1 1 - package nixery 1 1 + package errors 2 2 3 3 import "errors" 4 4 5 5 var ( 6 6 ErrOOMKilled = errors.New("oom killed") 7 7 - ) 7 7 + )

+5 -3

spindle/engines/nixery/engine.go

reviewed

··· 23 23 "tangled.org/core/log" 24 24 "tangled.org/core/spindle/config" 25 25 "tangled.org/core/spindle/engine" 26 26 + "tangled.org/core/spindle/engines/common" 27 27 + engineerrors "tangled.org/core/spindle/engines/errors" 26 28 "tangled.org/core/spindle/models" 27 29 "tangled.org/core/spindle/secrets" 28 30 ) ··· 332 334 333 335 func (e *Engine) RunStep(ctx context.Context, wid models.WorkflowId, w *models.Workflow, idx int, secrets []secrets.UnlockedSecret, wfLogger models.WorkflowLogger) error { 334 336 addl := w.Data.(addlFields) 335 335 - workflowEnvs := ConstructEnvs(w.Environment) 337 337 + workflowEnvs := common.ConstructEnvs(w.Environment) 336 338 // TODO(winter): should SetupWorkflow also have secret access? 337 339 // IMO yes, but probably worth thinking on. 338 340 for _, s := range secrets { ··· 347 349 default: 348 350 } 349 351 350 350 - envs := append(EnvVars(nil), workflowEnvs...) 352 352 + envs := append(common.EnvVars(nil), workflowEnvs...) 351 353 if nixStep, ok := step.(Step); ok { 352 354 for k, v := range nixStep.environment { 353 355 envs.AddEnv(k, v) ··· 409 411 e.l.Error("workflow failed!", "workflow_id", wid.String(), "exit_code", execInspectResp.ExitCode, "oom_killed", inspectResp.State.OOMKilled) 410 412 411 413 if inspectResp.State.OOMKilled { 412 412 - return ErrOOMKilled 414 414 + return engineerrors.ErrOOMKilled 413 415 } 414 416 return engine.ErrWorkflowFailed 415 417 }