epoch: refactor frontend attribute parsing

Signed-off-by: Justin Chadwell <me@jedevc.com>
moby · Dec 8, 2022 · 50c2083 · 50c2083
1 parent 2fe41bc
commit 50c2083
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 6 deletions.
diff --git a/control/control.go b/control/control.go
@@ -295,12 +295,12 @@ func (c *Controller) Solve(ctx context.Context, req *controlapi.SolveRequest) (*
 	}
 
 	// if SOURCE_DATE_EPOCH is set, enable it for the exporter
-	if epochVal, ok := req.FrontendAttrs["build-arg:SOURCE_DATE_EPOCH"]; ok {
+	if v, ok := epoch.ParseBuildArgs(req.FrontendAttrs); ok {
 		if _, ok := req.ExporterAttrs[epoch.KeySourceDateEpoch]; !ok {
 			if req.ExporterAttrs == nil {
 				req.ExporterAttrs = make(map[string]string)
 			}
-			req.ExporterAttrs[epoch.KeySourceDateEpoch] = epochVal
+			req.ExporterAttrs[epoch.KeySourceDateEpoch] = v
 		}
 	}
 

diff --git a/exporter/containerimage/opts.go b/exporter/containerimage/opts.go
@@ -45,7 +45,7 @@ func (c *ImageCommitOpts) Load(opt map[string]string) (map[string]string, error)
 	}
 	opt = toStringMap(optb)
 
-	c.Epoch, opt, err = epoch.ParseAttr(opt)
+	c.Epoch, opt, err = epoch.ParseExporterAttrs(opt)
 	if err != nil {
 		return nil, err
 	}

diff --git a/exporter/local/export.go b/exporter/local/export.go
@@ -41,7 +41,7 @@ func New(opt Opt) (exporter.Exporter, error) {
 }
 
 func (e *localExporter) Resolve(ctx context.Context, opt map[string]string) (exporter.ExporterInstance, error) {
-	tm, _, err := epoch.ParseAttr(opt)
+	tm, _, err := epoch.ParseExporterAttrs(opt)
 	if err != nil {
 		return nil, err
 	}

diff --git a/exporter/tar/export.go b/exporter/tar/export.go
@@ -48,7 +48,7 @@ func New(opt Opt) (exporter.Exporter, error) {
 func (e *localExporter) Resolve(ctx context.Context, opt map[string]string) (exporter.ExporterInstance, error) {
 	li := &localExporterInstance{localExporter: e}
 
-	tm, _, err := epoch.ParseAttr(opt)
+	tm, _, err := epoch.ParseExporterAttrs(opt)
 	if err != nil {
 		return nil, err
 	}

diff --git a/exporter/util/epoch/parse.go b/exporter/util/epoch/parse.go
@@ -10,10 +10,17 @@ import (
 )
 
 const (
+	frontendSourceDateEpochArg = "build-arg:SOURCE_DATE_EPOCH"
+
 	KeySourceDateEpoch = "source-date-epoch"
 )
 
-func ParseAttr(opt map[string]string) (*time.Time, map[string]string, error) {
+func ParseBuildArgs(opt map[string]string) (string, bool) {
+	v, ok := opt[frontendSourceDateEpochArg]
+	return v, ok
+}
+
+func ParseExporterAttrs(opt map[string]string) (*time.Time, map[string]string, error) {
 	rest := make(map[string]string, len(opt))
 
 	var tm *time.Time