vendor: github.com/moby/buildkit 5ae9b23c40a9 (master / v0.13.0-dev)

full diff:

- 36ef4d8c0d...f098008783
- d5c1d785b0...5ae9b23c40

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

vendor/github.com/moby/buildkit/solver/pb/json.go

@@ -0,0 +1,96 @@
+package pb
+
+import "encoding/json"
+
+func (m *Op) UnmarshalJSON(data []byte) error {
+	var v struct {
+		Inputs []*Input `json:"inputs,omitempty"`
+		Op     struct {
+			*Op_Exec
+			*Op_Source
+			*Op_File
+			*Op_Build
+			*Op_Merge
+			*Op_Diff
+		}
+		Platform    *Platform          `json:"platform,omitempty"`
+		Constraints *WorkerConstraints `json:"constraints,omitempty"`
+	}
+
+	if err := json.Unmarshal(data, &v); err != nil {
+		return err
+	}
+
+	m.Inputs = v.Inputs
+	switch {
+	case v.Op.Op_Exec != nil:
+		m.Op = v.Op.Op_Exec
+	case v.Op.Op_Source != nil:
+		m.Op = v.Op.Op_Source
+	case v.Op.Op_File != nil:
+		m.Op = v.Op.Op_File
+	case v.Op.Op_Build != nil:
+		m.Op = v.Op.Op_Build
+	case v.Op.Op_Merge != nil:
+		m.Op = v.Op.Op_Merge
+	case v.Op.Op_Diff != nil:
+		m.Op = v.Op.Op_Diff
+	}
+	m.Platform = v.Platform
+	m.Constraints = v.Constraints
+	return nil
+}
+
+func (m *FileAction) UnmarshalJSON(data []byte) error {
+	var v struct {
+		Input          InputIndex  `json:"input"`
+		SecondaryInput InputIndex  `json:"secondaryInput"`
+		Output         OutputIndex `json:"output"`
+		Action         struct {
+			*FileAction_Copy
+			*FileAction_Mkfile
+			*FileAction_Mkdir
+			*FileAction_Rm
+		}
+	}
+
+	if err := json.Unmarshal(data, &v); err != nil {
+		return err
+	}
+
+	m.Input = v.Input
+	m.SecondaryInput = v.SecondaryInput
+	m.Output = v.Output
+	switch {
+	case v.Action.FileAction_Copy != nil:
+		m.Action = v.Action.FileAction_Copy
+	case v.Action.FileAction_Mkfile != nil:
+		m.Action = v.Action.FileAction_Mkfile
+	case v.Action.FileAction_Mkdir != nil:
+		m.Action = v.Action.FileAction_Mkdir
+	case v.Action.FileAction_Rm != nil:
+		m.Action = v.Action.FileAction_Rm
+	}
+	return nil
+}
+
+func (m *UserOpt) UnmarshalJSON(data []byte) error {
+	var v struct {
+		User struct {
+			*UserOpt_ByName
+			*UserOpt_ByID
+		}
+	}
+
+	if err := json.Unmarshal(data, &v); err != nil {
+		return err
+	}
+
+	switch {
+	case v.User.UserOpt_ByName != nil:
+		m.User = v.User.UserOpt_ByName
+	case v.User.UserOpt_ByID != nil:
+		m.User = v.User.UserOpt_ByID
+	}
+	return nil
+}

vendor/github.com/moby/buildkit/solver/pb/ops.pb.go

@@ -151,6 +151,7 @@ func (CacheSharingOpt) EnumDescriptor() ([]byte, []int) {
 
 // Op represents a vertex of the LLB DAG.
 type Op struct {
+	// changes to this structure must be represented in json.go.
 	// inputs is a set of input edges.
 	Inputs []*Input `protobuf:"bytes,1,rep,name=inputs,proto3" json:"inputs,omitempty"`
 	// Types that are valid to be assigned to Op:
@@ -1961,6 +1962,7 @@ func (m *FileOp) GetActions() []*FileAction {
 }
 
 type FileAction struct {
+	// changes to this structure must be represented in json.go.
 	Input          InputIndex  `protobuf:"varint,1,opt,name=input,proto3,customtype=InputIndex" json:"input"`
 	SecondaryInput InputIndex  `protobuf:"varint,2,opt,name=secondaryInput,proto3,customtype=InputIndex" json:"secondaryInput"`
 	Output         OutputIndex `protobuf:"varint,3,opt,name=output,proto3,customtype=OutputIndex" json:"output"`
@@ -2482,6 +2484,8 @@ func (m *ChownOpt) GetGroup() *UserOpt {
 }
 
 type UserOpt struct {
+	// changes to this structure must be represented in json.go.
+	//
 	// Types that are valid to be assigned to User:
 	//
 	//	*UserOpt_ByName

vendor/github.com/moby/buildkit/solver/pb/ops.proto

@@ -10,6 +10,7 @@ option (gogoproto.stable_marshaler_all) = true;
 
 // Op represents a vertex of the LLB DAG.
 message Op {
+	// changes to this structure must be represented in json.go.
 	// inputs is a set of input edges.
 	repeated Input inputs = 1;
 	oneof op {
@@ -29,7 +30,7 @@ message Platform {
 	string Architecture = 1;
 	string OS = 2;
 	string Variant = 3;
-	string OSVersion = 4; // unused
+	string OSVersion = 4;
 	repeated string OSFeatures = 5; // unused
 }
 
@@ -288,6 +289,7 @@ message FileOp {
 }
 
 message FileAction {
+	// changes to this structure must be represented in json.go.
 	int64 input = 1 [(gogoproto.customtype) = "InputIndex", (gogoproto.nullable) = false]; // could be real input or target (target index + max input index)
 	int64 secondaryInput = 2 [(gogoproto.customtype) = "InputIndex", (gogoproto.nullable) = false]; // --//--
 	int64 output = 3 [(gogoproto.customtype) = "OutputIndex", (gogoproto.nullable) = false];
@@ -373,6 +375,7 @@ message ChownOpt {
 }
 
 message UserOpt {
+	// changes to this structure must be represented in json.go.
 	oneof user {
 		NamedUserOpt byName = 1;
 		uint32 byID = 2;

vendor/github.com/moby/buildkit/solver/pb/platform.go

@@ -5,23 +5,29 @@ import (
 )
 
 func (p *Platform) Spec() ocispecs.Platform {
-	return ocispecs.Platform{
+	result := ocispecs.Platform{
 		OS:           p.OS,
 		Architecture: p.Architecture,
 		Variant:      p.Variant,
 		OSVersion:    p.OSVersion,
-		OSFeatures:   p.OSFeatures,
 	}
+	if p.OSFeatures != nil {
+		result.OSFeatures = append([]string{}, p.OSFeatures...)
+	}
+	return result
 }
 
 func PlatformFromSpec(p ocispecs.Platform) Platform {
-	return Platform{
+	result := Platform{
 		OS:           p.OS,
 		Architecture: p.Architecture,
 		Variant:      p.Variant,
 		OSVersion:    p.OSVersion,
-		OSFeatures:   p.OSFeatures,
 	}
+	if p.OSFeatures != nil {
+		result.OSFeatures = append([]string{}, p.OSFeatures...)
+	}
+	return result
 }
 
 func ToSpecPlatforms(p []Platform) []ocispecs.Platform {