🐛 fix copyright info when has not owner set

kubernetes-sigs · Oct 28, 2020 · 0bcb9c8 · 0bcb9c8
1 parent 67f91f7
commit 0bcb9c8
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 20 deletions.
diff --git a/pkg/plugin/v2/scaffolds/internal/templates/boilerplate.go b/pkg/plugin/v2/scaffolds/internal/templates/boilerplate.go
@@ -37,8 +37,8 @@ type Boilerplate struct {
 	// Owner is the copyright owner - e.g. "The Kubernetes Authors"
 	Owner string
 
-	// Year is the copyright year
-	Year string
+	// Copyright is copyright info used in the templates
+	Copyright string
 }
 
 // SetTemplateDefaults implements input.Template
@@ -47,8 +47,10 @@ func (f *Boilerplate) SetTemplateDefaults() error {
 		f.Path = filepath.Join("hack", "boilerplate.go.txt")
 	}
 
-	if f.Year == "" {
-		f.Year = fmt.Sprintf("%v", time.Now().Year())
+	if f.Owner != "" {
+		f.Copyright = fmt.Sprintf("Copyright %v %v.", time.Now().Year(), f.Owner)
+	} else {
+		f.Copyright = fmt.Sprintf("Copyright %v.", time.Now().Year())
 	}
 
 	// Boilerplate given
@@ -69,9 +71,7 @@ func (f *Boilerplate) SetTemplateDefaults() error {
 }
 
 const apache = `/*
-{{ if .Owner -}}
-Copyright {{ .Year }} {{ .Owner }}.
-{{- end }}
+{{ .Copyright }}
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -87,7 +87,5 @@ limitations under the License.
 */`
 
 const none = `/*
-{{ if .Owner -}}
-Copyright {{ .Year }} {{ .Owner }}.
-{{- end }}
+{{ .Copyright }}
 */`
diff --git a/pkg/plugin/v3/scaffolds/internal/templates/config/hack/boilerplate.go b/pkg/plugin/v3/scaffolds/internal/templates/config/hack/boilerplate.go
@@ -37,8 +37,8 @@ type Boilerplate struct {
 	// Owner is the copyright owner - e.g. "The Kubernetes Authors"
 	Owner string
 
-	// Year is the copyright year
-	Year string
+	// Copyright is copyright info used in the templates
+	Copyright string
 }
 
 // SetTemplateDefaults implements input.Template
@@ -47,8 +47,10 @@ func (f *Boilerplate) SetTemplateDefaults() error {
 		f.Path = filepath.Join("hack", "boilerplate.go.txt")
 	}
 
-	if f.Year == "" {
-		f.Year = fmt.Sprintf("%v", time.Now().Year())
+	if f.Owner != "" {
+		f.Copyright = fmt.Sprintf("Copyright %v %v.", time.Now().Year(), f.Owner)
+	} else {
+		f.Copyright = fmt.Sprintf("Copyright %v.", time.Now().Year())
 	}
 
 	// Boilerplate given
@@ -69,9 +71,7 @@ func (f *Boilerplate) SetTemplateDefaults() error {
 }
 
 const apache = `/*
-{{ if .Owner -}}
-Copyright {{ .Year }} {{ .Owner }}.
-{{- end }}
+{{ .Copyright }}
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -87,7 +87,5 @@ limitations under the License.
 */`
 
 const none = `/*
-{{ if .Owner -}}
-Copyright {{ .Year }} {{ .Owner }}.
-{{- end }}
+{{ .Copyright }}
 */`