Skip to content

K
k3s
Commit ff998ab5 authored by k8s-merge-robot's avatar k8s-merge-robot Committed by GitHub
Browse files
Options

Merge pull request #28810 from smarterclayton/keep_proto_name

Automatic merge from submit-queue Allow proto tag to define field name When we introduce a new field for backwards compatibility, we may want to specify a different protobuf field name (one that matches JSON) than the automatic transformation applied to the struct field. This allows an API field to define the name of its protobuf tag. @wojtek-t hit this while adding protobuf to OpenShift - we have fields we keep for backward compatibility that need to be assigned a field by name. Has no impact on existing (already tagged) fields.
parents 12483d90 68bfba29
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 0 deletions
cmd/libs/go2idl/go-to-protobuf/protobuf/generator.go
View file @ ff998ab5
...@@ -589,6 +589,8 @@ func protobufTagToField(tag string, field *protoField, m types.Member, t *types. ...@@ -589,6 +589,8 @@ func protobufTagToField(tag string, field *protoField, m types.Member, t *types.
return fmt.Errorf("member %q of %q malformed 'protobuf' tag, tag %d should be key=value, got %q\n", m.Name, t.Name, i+4, extra) return fmt.Errorf("member %q of %q malformed 'protobuf' tag, tag %d should be key=value, got %q\n", m.Name, t.Name, i+4, extra)
} }
switch parts[0] { switch parts[0] {
case "name":
protoExtra[parts[0]] = parts[1]
case "casttype", "castkey", "castvalue": case "casttype", "castkey", "castvalue":
parts[0] = fmt.Sprintf("(gogoproto.%s)", parts[0]) parts[0] = fmt.Sprintf("(gogoproto.%s)", parts[0])
protoExtra[parts[0]] = parts[1] protoExtra[parts[0]] = parts[1]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment