Update example generators to preserve their behavior.

kubernetes · Jan 19, 2018 · debc696 · debc696
1 parent 73da645
commit debc696
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 14 deletions.
diff --git a/examples/deepcopy-gen/generators/deepcopy.go b/examples/deepcopy-gen/generators/deepcopy.go
@@ -129,10 +129,6 @@ func Packages(context *generator.Context, arguments *args.GeneratorArgs) generat
 	inputs := sets.NewString(context.Inputs...)
 	packages := generator.Packages{}
 	header := append([]byte(fmt.Sprintf("// +build !%s\n\n", arguments.GeneratedBuildTag)), boilerplate...)
-	header = append(header, []byte(`
-	    // This file was autogenerated by deepcopy-gen. Do not edit it manually!
-
-		`)...)
 
 	boundingDirs := []string{}
 	if customArgs, ok := arguments.CustomArgs.(*CustomArgs); ok {

diff --git a/examples/deepcopy-gen/main.go b/examples/deepcopy-gen/main.go
@@ -69,6 +69,7 @@ func main() {
 
 	// Override defaults.
 	arguments.OutputFileBaseName = "deepcopy_generated"
+	arguments.GeneratedByCommentTemplate = "\n// This file was autogenerated by deepcopy-gen. Do not edit it manually!"
 
 	// Custom args.
 	customArgs := &generators.CustomArgs{}

diff --git a/examples/defaulter-gen/generators/defaulter.go b/examples/defaulter-gen/generators/defaulter.go
@@ -203,11 +203,6 @@ func Packages(context *generator.Context, arguments *args.GeneratorArgs) generat
 
 	packages := generator.Packages{}
 	header := append([]byte(fmt.Sprintf("// +build !%s\n\n", arguments.GeneratedBuildTag)), boilerplate...)
-	header = append(header, []byte(
-		`
-// This file was autogenerated by defaulter-gen. Do not edit it manually!
-
-`)...)
 
 	// Accumulate pre-existing default functions.
 	// TODO: This is too ad-hoc.  We need a better way.

diff --git a/examples/defaulter-gen/main.go b/examples/defaulter-gen/main.go
@@ -54,6 +54,7 @@ func main() {
 
 	// Override defaults.
 	arguments.OutputFileBaseName = "defaulter_generated"
+	arguments.GeneratedByCommentTemplate = "\n// This file was autogenerated by defaulter-gen. Do not edit it manually!"
 
 	// Custom args.
 	customArgs := &generators.CustomArgs{

diff --git a/examples/set-gen/generators/sets.go b/examples/set-gen/generators/sets.go
@@ -53,11 +53,7 @@ func Packages(_ *generator.Context, arguments *args.GeneratorArgs) generator.Pac
 	return generator.Packages{&generator.DefaultPackage{
 		PackageName: "sets",
 		PackagePath: arguments.OutputPackagePath,
-		HeaderText: append(boilerplate, []byte(
-			`
-// This file was autogenerated by set-gen. Do not edit it manually!
-
-`)...),
+		HeaderText: boilerplate,
 		PackageDocumentation: []byte(
 			`// Package sets has auto-generated set types.
 `),

diff --git a/examples/set-gen/main.go b/examples/set-gen/main.go
@@ -35,6 +35,10 @@ import (
 
 func main() {
 	arguments := args.Default()
+
+	// Override defaults.
+	arguments.GeneratedByCommentTemplate = "\n// This file was autogenerated by set-gen. Do not edit it manually!"
+
 	if err := arguments.Execute(
 		generators.NameSystems(),
 		generators.DefaultNameSystem(),