fixup! Support for passing through raw buildkit policies

jedevc · jedevc · commit 972f40a83b03 · 2023-05-02T12:33:53.000+01:00
Signed-off-by: Justin Chadwell &lt;me@jedevc.com&gt;
diff --git a/build/build.go b/build/build.go
@@ -429,6 +429,7 @@ func toSolveOpt(ctx context.Context, node builder.Node, multiDriver bool, opt Op
 		CacheExports:        cacheTo,
 		CacheImports:        cacheFrom,
 		AllowedEntitlements: opt.Allow,
+		SourcePolicy:        opt.SourcePolicy,
 	}
 
 	if opt.CgroupParent != "" {
@@ -476,13 +477,6 @@ func toSolveOpt(ctx context.Context, node builder.Node, multiDriver bool, opt Op
 		}
 	}
 
-	if so.SourcePolicy == nil {
-		so.SourcePolicy, err = ReadSourcePolicy()
-		if err != nil {
-			return nil, nil, err
-		}
-	}
-
 	switch len(opt.Exports) {
 	case 1:
 		// valid
diff --git a/controller/build/build.go b/controller/build/build.go
@@ -136,6 +136,8 @@ func RunBuild(ctx context.Context, dockerCli command.Cli, in controllerapi.Build
 
 	opts.Attests = controllerapi.CreateAttestations(in.Attests)
 
+	opts.SourcePolicy = in.SourcePolicy
+
 	allow, err := buildflags.ParseEntitlements(in.Allow)
 	if err != nil {
 		return nil, nil, err

Original file line number	Diff line number	Diff line change
`@@ -429,6 +429,7 @@ func toSolveOpt(ctx context.Context, node builder.Node, multiDriver bool, opt Op`
`429`	`429`	`CacheExports: cacheTo,`
`430`	`430`	`CacheImports: cacheFrom,`
`431`	`431`	`AllowedEntitlements: opt.Allow,`
	`432`	`+ SourcePolicy: opt.SourcePolicy,`
`432`	`433`	`}`
`433`	`434`
`434`	`435`	`if opt.CgroupParent != "" {`
`@@ -476,13 +477,6 @@ func toSolveOpt(ctx context.Context, node builder.Node, multiDriver bool, opt Op`
`476`	`477`	`}`
`477`	`478`	`}`
`478`	`479`
`479`		`- if so.SourcePolicy == nil {`
`480`		`- so.SourcePolicy, err = ReadSourcePolicy()`
`481`		`- if err != nil {`
`482`		`- return nil, nil, err`
`483`		`- }`
`484`		`- }`
`485`		`-`
`486`	`480`	`switch len(opt.Exports) {`
`487`	`481`	`case 1:`
`488`	`482`	`// valid`