Bumping k8s dependencies to 1.13
This commit is contained in:
5
vendor/github.com/gogo/protobuf/plugin/embedcheck/embedcheck.go
generated
vendored
5
vendor/github.com/gogo/protobuf/plugin/embedcheck/embedcheck.go
generated
vendored
@@ -47,9 +47,10 @@ package embedcheck
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"os"
|
||||
|
||||
"github.com/gogo/protobuf/gogoproto"
|
||||
"github.com/gogo/protobuf/protoc-gen-gogo/generator"
|
||||
"os"
|
||||
)
|
||||
|
||||
type plugin struct {
|
||||
@@ -163,7 +164,7 @@ func (p *plugin) checkOverwrite(message *generator.Descriptor, enablers map[stri
|
||||
desc := p.ObjectNamed(field.GetTypeName())
|
||||
msg := desc.(*generator.Descriptor)
|
||||
for errStr, enabled := range enablers {
|
||||
if enabled(msg.File(), msg.DescriptorProto) {
|
||||
if enabled(msg.File().FileDescriptorProto, msg.DescriptorProto) {
|
||||
fmt.Fprintf(os.Stderr, "WARNING: found non-%v %v with embedded %v %v\n", names, ccTypeName, errStr, fieldname)
|
||||
}
|
||||
}
|
||||
|
2
vendor/github.com/gogo/protobuf/plugin/gostring/gostring.go
generated
vendored
2
vendor/github.com/gogo/protobuf/plugin/gostring/gostring.go
generated
vendored
@@ -157,7 +157,7 @@ func (p *gostring) Generate(file *generator.FileDescriptor) {
|
||||
continue
|
||||
}
|
||||
p.atleastOne = true
|
||||
packageName := file.PackageName()
|
||||
packageName := file.GoPackageName()
|
||||
|
||||
ccTypeName := generator.CamelCaseSlice(message.TypeName())
|
||||
p.P(`func (this *`, ccTypeName, `) GoString() string {`)
|
||||
|
2
vendor/github.com/gogo/protobuf/plugin/populate/populate.go
generated
vendored
2
vendor/github.com/gogo/protobuf/plugin/populate/populate.go
generated
vendored
@@ -534,7 +534,7 @@ func (p *plugin) Generate(file *generator.FileDescriptor) {
|
||||
p.P(`func NewPopulated`, ccTypeName, `(r randy`, p.localName, `, easy bool) *`, ccTypeName, ` {`)
|
||||
p.In()
|
||||
p.P(`this := &`, ccTypeName, `{}`)
|
||||
if gogoproto.IsUnion(message.File(), message.DescriptorProto) && len(message.Field) > 0 {
|
||||
if gogoproto.IsUnion(message.File().FileDescriptorProto, message.DescriptorProto) && len(message.Field) > 0 {
|
||||
p.P(`fieldNum := r.Intn(`, fmt.Sprintf("%d", ranTotal), `)`)
|
||||
p.P(`switch fieldNum {`)
|
||||
k := 0
|
||||
|
2
vendor/github.com/gogo/protobuf/plugin/union/union.go
generated
vendored
2
vendor/github.com/gogo/protobuf/plugin/union/union.go
generated
vendored
@@ -184,7 +184,7 @@ func (p *union) Generate(file *generator.FileDescriptor) {
|
||||
goTyp, _ := p.GoType(message, field)
|
||||
obj := p.ObjectNamed(field.GetTypeName()).(*generator.Descriptor)
|
||||
|
||||
if gogoproto.IsUnion(obj.File(), obj.DescriptorProto) {
|
||||
if gogoproto.IsUnion(obj.File().FileDescriptorProto, obj.DescriptorProto) {
|
||||
p.P(`this.`, fieldname, ` = new(`, generator.GoTypeToName(goTyp), `)`)
|
||||
p.P(`if set := this.`, fieldname, `.SetValue(value); set {`)
|
||||
p.In()
|
||||
|
Reference in New Issue
Block a user