Skip to content

K
k3s
Commit 958a9339 authored by Mehdy Bohlool's avatar Mehdy Bohlool
Browse files
Options

Fix Proto Generator to not assign types to packages they don't belong to

The wrong type assignment resulted in wrong imports
parent 8f92b8e2
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 1 deletion
staging/src/k8s.io/code-generator/cmd/go-to-protobuf/protobuf/namer.go
View file @ 958a9339
...@@ -116,7 +116,10 @@ func assignGoTypeToProtoPackage(p *protobufPackage, t *types.Type, local, global ...@@ -116,7 +116,10 @@ func assignGoTypeToProtoPackage(p *protobufPackage, t *types.Type, local, global
} }
return return
} }
global[t.Name] = p if t.Name.Package == p.PackagePath {
// Associate types only to their own package
global[t.Name] = p
}
if _, ok := local[t.Name]; ok { if _, ok := local[t.Name]; ok {
return return
} }
......
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