fix: some nits

Author: yyy1000

pkg/cli/alpha/generate.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2022 The Kubernetes Authors.
+Copyright 2023 The Kubernetes Authors.
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
@@ -25,7 +25,7 @@ func NewScaffoldCommand() *cobra.Command {
 	opts := rescaffold.MigrateOptions{}
 	scaffoldCmd := &cobra.Command{
 		Use:   "generate",
-		Short: "Re-scaffold an existing kuberbuilder project",
+		Short: "Re-scaffold an existing Kuberbuilder project",
 		Long: `It's an experimental feature that has the purpose of re-scaffolding the whole project from the scratch using the current version of KubeBuilder binary available.
 # make sure the PROJECT file is in the 'input-dir' argument, the default is the current directory.
 $ kubebuilder alpha generate --input-dir="./test" --output-dir="./my-output"
@@ -41,7 +41,7 @@ Then we will re-scaffold the project by Kubebuilder in the directory specified b
 		},
 	}
 	scaffoldCmd.Flags().StringVar(&opts.InputDir, "input-dir", "",
-		"path to a kubebuilder project file if not in the current working directory")
+		"path to a Kubebuilder project file if not in the current working directory")
 	scaffoldCmd.Flags().StringVar(&opts.OutputDir, "output-dir", rescaffold.DefaultOutputDir,
 		"path to output the scaffolding. defaults a directory in the current working directory")
 

pkg/rescaffold/migrate.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2022 The Kubernetes Authors.
+Copyright 2023 The Kubernetes Authors.
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
@@ -34,8 +34,8 @@ type MigrateOptions struct {
 const DefaultOutputDir = "output-dir"
 
 func (opts *MigrateOptions) Rescaffold() error {
-	store := yaml.New(machinery.Filesystem{FS: afero.NewOsFs()})
-	if err := store.LoadFrom(opts.InputDir); err != nil {
+	config := yaml.New(machinery.Filesystem{FS: afero.NewOsFs()})
+	if err := config.LoadFrom(opts.InputDir); err != nil {
 		log.Fatal(err)
 		os.Exit(1)
 	}
@@ -49,7 +49,7 @@ func (opts *MigrateOptions) Rescaffold() error {
 		log.Fatal(err)
 	}
 	// init project with plugins
-	if err := kubebuilderInit(store); err != nil {
+	if err := kubebuilderInit(config); err != nil {
 		log.Fatal(err)
 	}
 	return nil
@@ -74,9 +74,9 @@ func (opts *MigrateOptions) Validate() error {
 	return err
 }
 
-func getInputPath(cwd string, inputPath string) (string, error) {
+func getInputPath(currentWorkingDirectory  string, inputPath string) (string, error) {
 	if inputPath == "" {
-		inputPath = cwd
+		inputPath = currentWorkingDirectory 
 	}
 	projectPath := fmt.Sprintf("%s/%s", inputPath, yaml.DefaultPath)
 	if _, err := os.Stat(projectPath); os.IsNotExist(err) {
@@ -85,9 +85,9 @@ func getInputPath(cwd string, inputPath string) (string, error) {
 	return projectPath, nil
 }
 
-func getOutputPath(cwd, outputPath string) string {
+func getOutputPath(currentWorkingDirectory , outputPath string) string {
 	if outputPath == DefaultOutputDir {
-		outputPath = fmt.Sprintf("%s/%s", cwd, outputPath)
+		outputPath = fmt.Sprintf("%s/%s", currentWorkingDirectory , outputPath)
 	}
 	return outputPath
 }