Use one shared optOutputPath for both API and Controller sub commands

Author: a-hilaly

cmd/ack-generate/command/apis.go

@@ -35,10 +35,9 @@ const (
 )
 
 var (
-	optGenVersion     string
-	optAPIsInputPath  string
-	optAPIsOutputPath string
-	apisVersionPath   string
+	optGenVersion    string
+	optAPIsInputPath string
+	apisVersionPath  string
 )
 
 // apiCmd is the command that generates service API types
@@ -52,9 +51,6 @@ func init() {
 	apisCmd.PersistentFlags().StringVar(
 		&optGenVersion, "version", "v1alpha1", "the resource API Version to use when generating API infrastructure and type definitions",
 	)
-	apisCmd.PersistentFlags().StringVarP(
-		&optAPIsOutputPath, "output", "o", "", "path to directory for service controller to create generated files. Defaults to "+optServicesDir+"/$service",
-	)
 	rootCmd.AddCommand(apisCmd)
 }
 
@@ -65,8 +61,8 @@ func generateAPIs(cmd *cobra.Command, args []string) error {
 		return fmt.Errorf("please specify the service alias for the AWS service API to generate")
 	}
 	svcAlias := strings.ToLower(args[0])
-	if optAPIsOutputPath == "" {
-		optAPIsOutputPath = filepath.Join(optServicesDir, svcAlias)
+	if optOutputPath == "" {
+		optOutputPath = filepath.Join(optServicesDir, svcAlias)
 	}
 	if err := ensureSDKRepo(optCacheDir); err != nil {
 		return err
@@ -98,7 +94,7 @@ func generateAPIs(cmd *cobra.Command, args []string) error {
 		return err
 	}
 
-	apisVersionPath = filepath.Join(optAPIsOutputPath, "apis", optGenVersion)
+	apisVersionPath = filepath.Join(optOutputPath, "apis", optGenVersion)
 	for path, contents := range ts.Executed() {
 		if optDryRun {
 			fmt.Printf("============================= %s ======================================\n", path)

cmd/ack-generate/command/controller.go

@@ -32,10 +32,9 @@ import (
 )
 
 var (
-	optControllerOutputPath string
-	cmdControllerPath       string
-	pkgResourcePath         string
-	latestAPIVersion        string
+	cmdControllerPath string
+	pkgResourcePath   string
+	latestAPIVersion  string
 )
 
 var controllerCmd = &cobra.Command{
@@ -45,9 +44,6 @@ var controllerCmd = &cobra.Command{
 }
 
 func init() {
-	controllerCmd.PersistentFlags().StringVarP(
-		&optControllerOutputPath, "output", "o", "", "path to root directory to create generated files. Defaults to "+optServicesDir+"/$service",
-	)
 	rootCmd.AddCommand(controllerCmd)
 }
 
@@ -57,8 +53,8 @@ func generateController(cmd *cobra.Command, args []string) error {
 		return fmt.Errorf("please specify the service alias for the AWS service API to generate")
 	}
 	svcAlias := strings.ToLower(args[0])
-	if optControllerOutputPath == "" {
-		optControllerOutputPath = filepath.Join(optServicesDir, svcAlias)
+	if optOutputPath == "" {
+		optOutputPath = filepath.Join(optServicesDir, svcAlias)
 	}
 
 	if err := ensureSDKRepo(optCacheDir); err != nil {
@@ -101,7 +97,7 @@ func generateController(cmd *cobra.Command, args []string) error {
 			fmt.Println(strings.TrimSpace(contents.String()))
 			continue
 		}
-		outPath := filepath.Join(optControllerOutputPath, path)
+		outPath := filepath.Join(optOutputPath, path)
 		outDir := filepath.Dir(outPath)
 		if _, err := ensureDir(outDir); err != nil {
 			return err
@@ -117,7 +113,7 @@ func generateController(cmd *cobra.Command, args []string) error {
 // latest Kubernetes API version for CRDs exposed by the generated service
 // controller.
 func getLatestAPIVersion() (string, error) {
-	apisPath := filepath.Join(optControllerOutputPath, "apis")
+	apisPath := filepath.Join(optOutputPath, "apis")
 	versions := []string{}
 	subdirs, err := ioutil.ReadDir(apisPath)
 	if err != nil {

cmd/ack-generate/command/root.go

@@ -44,6 +44,7 @@ var (
 	optDryRun              bool
 	sdkDir                 string
 	optGeneratorConfigPath string
+	optOutputPath          string
 )
 
 var rootCmd = &cobra.Command{
@@ -113,6 +114,9 @@ func init() {
 	rootCmd.PersistentFlags().StringVar(
 		&optGeneratorConfigPath, "generator-config-path", "", "Path to file containing instructions for code generation to use",
 	)
+	rootCmd.PersistentFlags().StringVarP(
+		&optOutputPath, "output", "o", "", "Path to directory to output generated files.",
+	)
 }
 
 // Execute adds all child commands to the root command and sets flags