mirror of
https://gitea.com/Lydanne/buildx.git
synced 2025-11-01 00:23:56 +08:00
b35a0f4718
Removes gogo/protobuf from buildx and updates to a version of moby/buildkit where gogo is removed. This also changes how the proto files are generated. This is because newer versions of protobuf are more strict about name conflicts. If two files have the same name (even if they are relative paths) and are used in different protoc commands, they'll conflict in the registry. Since protobuf file generation doesn't work very well with `paths=source_relative`, this removes the `go:generate` expression and just relies on the dockerfile to perform the generation. Signed-off-by: Jonathan A. Sternberg <jonathan.sternberg@docker.com>
97 lines
2.0 KiB
Go
97 lines
2.0 KiB
Go
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 = int64(v.Input)
|
|
m.SecondaryInput = int64(v.SecondaryInput)
|
|
m.Output = int64(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
|
|
}
|