Merge pull request kubernetes-sigs#1293 from camilamacedo86/lint-mali…

…gned

enable maligned lint check

cmd/init_project.go

@@ -68,21 +68,22 @@ kubebuilder init --domain example.org --license apache2 --owner "The Kubernetes
 }
 
 type projectOptions struct {
-
-	// flags
-	fetchDeps          bool
-	skipGoVersionCheck bool
-
 	boilerplate project.Boilerplate
 	project     project.Project
 
+	// final result
+	scaffolder scaffold.ProjectScaffolder
+
 	// deprecated flags
-	dep     bool
 	depFlag *flag.Flag
 	depArgs []string
 
-	// final result
-	scaffolder scaffold.ProjectScaffolder
+	// flags
+	fetchDeps          bool
+	skipGoVersionCheck bool
+
+	// deprecated flags
+	dep bool
 }
 
 func (o *projectOptions) bindCmdlineFlags(cmd *cobra.Command) {

pkg/scaffold/resource/resource.go

@@ -26,9 +26,6 @@ import (
 
 // Resource contains the information required to scaffold files for a resource.
 type Resource struct {
-	// Namespaced is true if the resource is namespaced
-	Namespaced bool
-
 	// Group is the API Group.  Does not contain the domain.
 	Group string
 
@@ -50,6 +47,9 @@ type Resource struct {
 
 	// CreateExampleReconcileBody will create a Deployment in the Reconcile example
 	CreateExampleReconcileBody bool
+
+	// Namespaced is true if the resource is namespaced
+	Namespaced bool
 }
 
 // Validate checks the Resource values to make sure they are valid.

pkg/scaffold/scaffold.go

@@ -50,22 +50,22 @@ type Scaffold struct {
 	// Boilerplate is the contents of the boilerplate file for code generation
 	Boilerplate string
 
-	BoilerplateOptional bool
-
 	// Project is the project
 	Project input.ProjectFile
 
-	ProjectOptional bool
-
 	// ProjectPath is the relative path to the project root
 	ProjectPath string
 
 	GetWriter func(path string) (io.Writer, error)
 
-	FileExists func(path string) bool
-
 	// Plugins is the list of plugins we should allow to transform our generated scaffolding
 	Plugins []Plugin
+
+	FileExists func(path string) bool
+
+	BoilerplateOptional bool
+
+	ProjectOptional bool
 }
 
 // Plugin is the interface that a plugin must implement

scripts/verify.sh

@@ -35,9 +35,9 @@ golangci-lint run --disable-all \
     --enable=goimports \
     --enable=gocyclo \
     --enable=goconst \
+    --enable=maligned \
 
 ##todo(camilamacedo86): The following checks requires fixes in the code
 # --enable=golint
 # --enable=lll
 # --enable=gosec
-# --enable=maligned