mirror of
https://gitea.com/Lydanne/buildx.git
synced 2025-05-19 18:07:45 +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>
74 lines
1.8 KiB
Go
74 lines
1.8 KiB
Go
/*
|
|
*
|
|
* Copyright 2021 gRPC authors.
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*
|
|
*/
|
|
|
|
// Package pretty defines helper functions to pretty-print structs for logging.
|
|
package pretty
|
|
|
|
import (
|
|
"bytes"
|
|
"encoding/json"
|
|
"fmt"
|
|
|
|
"google.golang.org/protobuf/encoding/protojson"
|
|
"google.golang.org/protobuf/protoadapt"
|
|
)
|
|
|
|
const jsonIndent = " "
|
|
|
|
// ToJSON marshals the input into a json string.
|
|
//
|
|
// If marshal fails, it falls back to fmt.Sprintf("%+v").
|
|
func ToJSON(e any) string {
|
|
if ee, ok := e.(protoadapt.MessageV1); ok {
|
|
e = protoadapt.MessageV2Of(ee)
|
|
}
|
|
|
|
if ee, ok := e.(protoadapt.MessageV2); ok {
|
|
mm := protojson.MarshalOptions{
|
|
Indent: jsonIndent,
|
|
Multiline: true,
|
|
}
|
|
ret, err := mm.Marshal(ee)
|
|
if err != nil {
|
|
// This may fail for proto.Anys, e.g. for xDS v2, LDS, the v2
|
|
// messages are not imported, and this will fail because the message
|
|
// is not found.
|
|
return fmt.Sprintf("%+v", ee)
|
|
}
|
|
return string(ret)
|
|
}
|
|
|
|
ret, err := json.MarshalIndent(e, "", jsonIndent)
|
|
if err != nil {
|
|
return fmt.Sprintf("%+v", e)
|
|
}
|
|
return string(ret)
|
|
}
|
|
|
|
// FormatJSON formats the input json bytes with indentation.
|
|
//
|
|
// If Indent fails, it returns the unchanged input as string.
|
|
func FormatJSON(b []byte) string {
|
|
var out bytes.Buffer
|
|
err := json.Indent(&out, b, "", jsonIndent)
|
|
if err != nil {
|
|
return string(b)
|
|
}
|
|
return out.String()
|
|
}
|