Use loadModel instead of loadModelWithLatestAPIVersion for crossplane (#240)

getLatestAPIVersion doesn't seem to work correctly with crossplane, and
opgGenVersion is already used to find the configuration path for
resources, so just use that instead.

Issue #, if available:

Description of changes:

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

Author: EdgeJ

cmd/ack-generate/command/common.go

@@ -221,13 +221,14 @@ func loadModelWithLatestAPIVersion(svcAlias string) (*ackmodel.Model, error) {
 	if err != nil {
 		return nil, err
 	}
-	return loadModel(svcAlias, latestAPIVersion)
+	return loadModel(svcAlias, latestAPIVersion, "", ackgenerate.DefaultConfig)
 }
 
 // loadModel finds the AWS SDK for a given service alias and creates a new model
 // with the given API version.
-func loadModel(svcAlias string, apiVersion string) (*ackmodel.Model, error) {
-	cfg, err := ackgenconfig.New(optGeneratorConfigPath, ackgenerate.DefaultConfig)
+func loadModel(svcAlias string, apiVersion string, apiGroup string, defaultCfg ackgenconfig.Config) (*ackmodel.Model, error) {
+
+	cfg, err := ackgenconfig.New(optGeneratorConfigPath, defaultCfg)
 	if err != nil {
 		return nil, err
 	}
@@ -250,6 +251,11 @@ func loadModel(svcAlias string, apiVersion string) (*ackmodel.Model, error) {
 			return nil, fmt.Errorf("service %s not found", svcAlias)
 		}
 	}
+
+	if apiGroup != "" {
+		sdkAPI.APIGroupSuffix = apiGroup
+	}
+
 	m, err := ackmodel.New(
 		sdkAPI, svcAlias, apiVersion, cfg,
 	)

cmd/ack-generate/command/crossplane.go

@@ -42,16 +42,15 @@ func generateCrossplane(_ *cobra.Command, args []string) error {
 	if len(args) != 1 {
 		return fmt.Errorf("please specify the service alias for the AWS service API to generate")
 	}
+
 	ctx, cancel := contextWithSigterm(context.Background())
 	defer cancel()
 	if err := ensureSDKRepo(ctx, optCacheDir, optRefreshCache); err != nil {
 		return err
 	}
 	svcAlias := strings.ToLower(args[0])
 	optGeneratorConfigPath = filepath.Join(optOutputPath, "apis", svcAlias, optGenVersion, "generator-config.yaml")
-	m, err := loadModelWithLatestAPIVersion(
-		svcAlias,
-	)
+	m, err := loadModel(svcAlias, optGenVersion, "aws.crossplane.io", cpgenerate.DefaultConfig)
 	if err != nil {
 		return err
 	}

cmd/ack-generate/command/release.go

@@ -73,7 +73,7 @@ func generateRelease(cmd *cobra.Command, args []string) error {
 	if err := ensureSDKRepo(ctx, optCacheDir, optRefreshCache); err != nil {
 		return err
 	}
-	m, err := loadModel(svcAlias, "")
+	m, err := loadModel(svcAlias, "", "", ackgenerate.DefaultConfig)
 	if err != nil {
 		return err
 	}

templates/crossplane/README.md

@@ -4,7 +4,8 @@ This folder includes the templates to generate AWS Crossplane Provider. Run the
 following to generate:
 
 ```console
-go run -tags codegen cmd/ack-generate/main.go crossplane apis ecr --output <directory for provider>
+go run -tags codegen cmd/ack-generate/main.go crossplane <resource name> \
+    --output <directory for provider>
 ```
 
 See [Contributing New Resource Using ACK](https://github.com/crossplane/provider-aws/blob/master/CODE_GENERATION.md)