Remove optGenVersion from api path for goimports (#430)

bobh66 · web-flow · commit 2c79531620df · 2023-03-20T23:39:24.000+01:00
`ack-generate crossplane` fails if there is no `apis/_service_/v1alpha1 directory`. The code includes optGenVersion in the apiPath for goimports which causes an error when the directory doesn't exist.

Removing optGenVersion from the apiPath causes `goimports` to run on all files/directorys under `apis/&lt;service&gt;`

Signed-off-by: Bob Haddleton &lt;bob.haddleton@nokia.com&gt;

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
diff --git a/cmd/ack-generate/command/crossplane.go b/cmd/ack-generate/command/crossplane.go
@@ -87,7 +87,7 @@ func generateCrossplane(_ *cobra.Command, args []string) error {
 			return err
 		}
 	}
-	apiPath := filepath.Join(optOutputPath, "apis", svcAlias, optGenVersion)
+	apiPath := filepath.Join(optOutputPath, "apis", svcAlias)
 	controllerPath := filepath.Join(optOutputPath, "pkg", "controller", svcAlias)
 	// TODO(muvaf): goimports don't allow to be included as a library. Make sure
 	// goimports binary exists.

Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ func generateCrossplane(_ *cobra.Command, args []string) error {`
`87`	`87`	`return err`
`88`	`88`	`}`
`89`	`89`	`}`
`90`		`- apiPath := filepath.Join(optOutputPath, "apis", svcAlias, optGenVersion)`
	`90`	`+ apiPath := filepath.Join(optOutputPath, "apis", svcAlias)`
`91`	`91`	`controllerPath := filepath.Join(optOutputPath, "pkg", "controller", svcAlias)`
`92`	`92`	`// TODO(muvaf): goimports don't allow to be included as a library. Make sure`
`93`	`93`	`// goimports binary exists.`