Add helper to retrieve origin

The origins hash table is inside the commonContext structure which is
shared by all Contexts. This mostly works correctly as most origins are
not specific to the recipe that's executed but to either the run or the
progress of a run. Such as "filesystem" or "artifacts".

However this is not the case for the "recipe" origin. To resolve that
add a helper function which returns the current context RecipeDir and
otherwise simply the respective value in the common Origins table.

Signed-off-by: Sjoerd Simons <[email protected]>

action.go

@@ -45,6 +45,15 @@ type DebosContext struct {
 	Architecture    string
 }
 
+func (c *DebosContext) Origin(o string) (string, bool) {
+  if o == "recipe" {
+    return c.RecipeDir, true
+  } else {
+    path, found := c.Origins[o];
+    return path, found
+  }
+}
+
 type Action interface {
 	/* FIXME verify should probably be prepare or somesuch */
 	Verify(context *DebosContext) error

actions/overlay_action.go

@@ -52,7 +52,7 @@ func (overlay *OverlayAction) Run(context *debos.DebosContext) error {
 	//Trying to get a filename from exports first
 	if len(overlay.Origin) > 0 {
 		var found bool
-		if origin, found = context.Origins[overlay.Origin]; !found {
+		if origin, found = context.Origin(overlay.Origin); !found {
 			return fmt.Errorf("Origin not found '%s'", overlay.Origin)
 		}
 	}

actions/raw_action.go

@@ -85,7 +85,7 @@ func (raw *RawAction) Verify(context *debos.DebosContext) error {
 
 func (raw *RawAction) Run(context *debos.DebosContext) error {
 	raw.LogStart()
-	origin, found := context.Origins[raw.Origin]
+	origin, found := context.Origin(raw.Origin)
 	if !found {
 		return fmt.Errorf("Origin `%s` doesn't exist\n", raw.Origin)
 	}

actions/unpack_action.go

@@ -73,7 +73,7 @@ func (pf *UnpackAction) Run(context *debos.DebosContext) error {
 	if len(pf.Origin) > 0 {
 		var found bool
 		//Trying to get a filename from origins first
-		origin, found = context.Origins[pf.Origin]
+		origin, found = context.Origin(pf.Origin)
 		if !found {
 			return fmt.Errorf("Origin not found '%s'", pf.Origin)
 		}