github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-10 12:32:03 +00:00
Code Issues Projects Releases Wiki Activity

Type-assert gengo CustomArgs blindly

Browse Source 
If it does fail, it is catastophic.  Don't bother trying to handle it.
This commit is contained in:
Tim Hockin 2024-01-15 17:00:44 -08:00
parent 0ff7dd1943
commit 875566f997
No known key found for this signature in database
3 changed files with 14 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
staging/src/k8s.io/code-generator/cmd/client-gen/generators/client_generator.go
View File

@ -346,10 +346,8 @@ func GetTargets(context *generator.Context, arguments *args.GeneratorArgs) []gen
klog.Fatalf("Failed loading boilerplate: %v", err) klog.Fatalf("Failed loading boilerplate: %v", err)
} }
customArgs, ok := arguments.CustomArgs.(*clientgenargs.CustomArgs) customArgs := arguments.CustomArgs.(*clientgenargs.CustomArgs)
if !ok {
klog.Fatalf("cannot convert arguments.CustomArgs to clientgenargs.CustomArgs")
}
includedTypesOverrides := customArgs.IncludedTypesOverrides includedTypesOverrides := customArgs.IncludedTypesOverrides
if err := sanitizePackagePaths(context, customArgs); err != nil { if err := sanitizePackagePaths(context, customArgs); err != nil {

27
staging/src/k8s.io/code-generator/cmd/conversion-gen/generators/conversion.go
View File

@ -271,17 +271,17 @@ func GetTargets(context *generator.Context, arguments *args.GeneratorArgs) []gen
} }
} }
customArgs := arguments.CustomArgs.(*conversionargs.CustomArgs)
// Make sure explicit peer-packages are added. // Make sure explicit peer-packages are added.
if customArgs, ok := arguments.CustomArgs.(*conversionargs.CustomArgs); ok { peers := append(customArgs.BasePeerDirs, customArgs.ExtraPeerDirs...)
peers := append(customArgs.BasePeerDirs, customArgs.ExtraPeerDirs...) if expanded, err := context.FindPackages(peers...); err != nil {
if expanded, err := context.FindPackages(peers...); err != nil { klog.Fatalf("cannot find peer packages: %v", err)
klog.Fatalf("cannot find peer packages: %v", err) } else {
} else { otherPkgs = append(otherPkgs, expanded...)
otherPkgs = append(otherPkgs, expanded...) // for each pkg, add these extras, too
// for each pkg, add these extras, too for k := range pkgToPeers {
for k := range pkgToPeers { pkgToPeers[k] = append(pkgToPeers[k], expanded...)
pkgToPeers[k] = append(pkgToPeers[k], expanded...)
}
} }
} }
@ -303,11 +303,6 @@ func GetTargets(context *generator.Context, arguments *args.GeneratorArgs) []gen
getManualConversionFunctions(context, p, manualConversions) getManualConversionFunctions(context, p, manualConversions)
} }
skipUnsafe := false
if customArgs, ok := arguments.CustomArgs.(*conversionargs.CustomArgs); ok {
skipUnsafe = customArgs.SkipUnsafe
}
// We are generating conversions only for packages that are explicitly // We are generating conversions only for packages that are explicitly
// passed as InputDir. // passed as InputDir.
for _, i := range filteredInputs { for _, i := range filteredInputs {
@ -326,7 +321,7 @@ func GetTargets(context *generator.Context, arguments *args.GeneratorArgs) []gen
typesPkg = context.Universe[externalTypes] typesPkg = context.Universe[externalTypes]
unsafeEquality := TypesEqual(memoryEquivalentTypes) unsafeEquality := TypesEqual(memoryEquivalentTypes)
if skipUnsafe { if customArgs.SkipUnsafe {
unsafeEquality = noEquality{} unsafeEquality = noEquality{}
} }

5
staging/src/k8s.io/code-generator/cmd/informer-gen/generators/targets.go
View File

@ -99,10 +99,7 @@ func GetTargets(context *generator.Context, arguments *args.GeneratorArgs) []gen
klog.Fatalf("Failed loading boilerplate: %v", err) klog.Fatalf("Failed loading boilerplate: %v", err)
} }
customArgs, ok := arguments.CustomArgs.(*informergenargs.CustomArgs) customArgs := arguments.CustomArgs.(*informergenargs.CustomArgs)
if !ok {
klog.Fatalf("Wrong CustomArgs type: %T", arguments.CustomArgs)
}
internalVersionOutputDir := arguments.OutputBase internalVersionOutputDir := arguments.OutputBase
internalVersionOutputPkg := customArgs.OutputPackage internalVersionOutputPkg := customArgs.OutputPackage