move Secretenv from Meta to InitMessage

Signed-off-by: Alex Suraci <[email protected]>

Author: vito

frontend/gateway/gateway.go

@@ -1300,7 +1300,7 @@ func (lbf *llbBridgeForwarder) ExecProcess(srv pb.LLBBridge_ExecProcessServer) e
 				proc, err := ctr.Start(initCtx, gwclient.StartRequest{
 					Args:                      init.Meta.Args,
 					Env:                       init.Meta.Env,
-					SecretEnv:                 init.Meta.Secretenv,
+					SecretEnv:                 init.Secretenv,
 					User:                      init.Meta.User,
 					Cwd:                       init.Meta.Cwd,
 					Tty:                       init.Tty,

frontend/gateway/grpcclient/client.go

@@ -824,14 +824,14 @@ func (ctr *container) Start(ctx context.Context, req client.StartRequest) (clien
 	init := &pb.InitMessage{
 		ContainerID: ctr.id,
 		Meta: &opspb.Meta{
-			Args:      req.Args,
-			Env:       req.Env,
-			Cwd:       req.Cwd,
-			User:      req.User,
-			Secretenv: req.SecretEnv,
+			Args: req.Args,
+			Env:  req.Env,
+			Cwd:  req.Cwd,
+			User: req.User,
 		},
-		Tty:      req.Tty,
-		Security: req.SecurityMode,
+		Tty:       req.Tty,
+		Security:  req.SecurityMode,
+		Secretenv: req.SecretEnv,
 	}
 	init.Meta.RemoveMountStubsRecursive = req.RemoveMountStubsRecursive
 	if req.Stdin != nil {

frontend/gateway/pb/gateway.pb.go

@@ -38,7 +38,7 @@ service LLBBridge {
 	rpc ExecProcess(stream ExecMessage) returns (stream ExecMessage);
 
 	// apicaps:CapGatewayWarnings
-	rpc Warn(WarnRequest) returns (WarnResponse); 
+	rpc Warn(WarnRequest) returns (WarnResponse);
 }
 
 message Result {
@@ -138,7 +138,7 @@ message SolveRequest {
 	// 4 was removed in BuildKit v0.11.0.
 	bool allowResultReturn = 5;
 	bool allowResultArrayRef = 6;
-	
+
 	// apicaps.CapSolveInlineReturn deprecated
 	bool Final = 10;
 	bytes ExporterAttr = 11;
@@ -165,7 +165,7 @@ message SolveResponse {
 	string ref = 1; // can be used by readfile request
 	// deprecated
 /*	bytes ExporterAttr = 2;*/
-	
+
 	// these fields are returned when allowMapReturn was set
 	Result result = 3;
 }
@@ -256,7 +256,7 @@ message ExecMessage {
 		// InitMessage sent from client to server will start a new process in a
 		// container
 		InitMessage Init = 2;
-		// FdMessage used from client to server for input (stdin) and 
+		// FdMessage used from client to server for input (stdin) and
 		// from server to client for output (stdout, stderr)
 		FdMessage File = 3;
 		// ResizeMessage used from client to server for terminal resize events
@@ -281,6 +281,7 @@ message InitMessage{
 	repeated uint32 Fds = 3;
 	bool Tty = 4;
 	pb.SecurityMode Security = 5;
+	repeated pb.SecretEnv secretenv = 6;
 }
 
 message ExitMessage {

frontend/gateway/pb/gateway.proto

@@ -64,7 +64,6 @@ message Meta {
 	repeated Ulimit ulimit = 9;
 	string cgroupParent = 10;
 	bool removeMountStubsRecursive = 11;
-	repeated SecretEnv secretenv = 12;
 }
 
 message HostIP {