From 6c859662340ad4e23cdb9ac6195225effac96184 Mon Sep 17 00:00:00 2001 From: CrazyMax Date: Mon, 16 Aug 2021 14:33:21 +0200 Subject: [PATCH] Change docker-image to image and reduce http to a single type Signed-off-by: CrazyMax --- exporter/containerimage/exptypes/types.go | 3 +-- solver/llbsolver/solver.go | 12 ++++-------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/exporter/containerimage/exptypes/types.go b/exporter/containerimage/exptypes/types.go index feae37dec7ec3..490980cf447be 100644 --- a/exporter/containerimage/exptypes/types.go +++ b/exporter/containerimage/exptypes/types.go @@ -36,8 +36,7 @@ type BuildInfo struct { type BuildInfoType string const ( - BuildInfoTypeImage BuildInfoType = "docker-image" + BuildInfoTypeImage BuildInfoType = "image" BuildInfoTypeGit BuildInfoType = "git" BuildInfoTypeHTTP BuildInfoType = "http" - BuildInfoTypeHTTPS BuildInfoType = "https" ) diff --git a/solver/llbsolver/solver.go b/solver/llbsolver/solver.go index 39f7b77f29ec7..ab3512602cba7 100644 --- a/solver/llbsolver/solver.go +++ b/solver/llbsolver/solver.go @@ -315,7 +315,7 @@ func mergeBuildInfo(ctx context.Context, res solver.ResultProxy, dtic []byte) ([ return nil, errors.Wrapf(err, "failed to parse %s", bi.Ref) } mbis[bi.Alias] = exptypes.BuildInfo{ - Type: source.DockerImageScheme, + Type: exptypes.BuildInfoTypeImage, Ref: reference.TagNameOnly(parsed).String(), Pin: di, } @@ -325,7 +325,7 @@ func mergeBuildInfo(ctx context.Context, res solver.ResultProxy, dtic []byte) ([ } if _, ok := mbis[sid.Reference.String()]; !ok { mbis[sid.Reference.String()] = exptypes.BuildInfo{ - Type: source.DockerImageScheme, + Type: exptypes.BuildInfoTypeImage, Ref: sid.Reference.String(), Pin: di, } @@ -340,19 +340,15 @@ func mergeBuildInfo(ctx context.Context, res solver.ResultProxy, dtic []byte) ([ } if _, ok := mbis[sref]; !ok { mbis[sref] = exptypes.BuildInfo{ - Type: source.GitScheme, + Type: exptypes.BuildInfoTypeGit, Ref: sref, Pin: di, } } case *source.HTTPIdentifier: - stype := source.HTTPScheme - if sid.TLS { - stype = source.HTTPSScheme - } if _, ok := mbis[sid.URL]; !ok { mbis[sid.URL] = exptypes.BuildInfo{ - Type: exptypes.BuildInfoType(stype), + Type: exptypes.BuildInfoTypeHTTP, Ref: sid.URL, Pin: di, }