Add a CLI flag to set the version of aws-sdk-go used by ack-generate

Author: a-hilaly

cmd/ack-generate/command/common.go

@@ -100,9 +100,33 @@ func cloneSDKRepo(srcPath string) (string, error) {
 	return clonePath, nil
 }
 
-// getSDKVersion parses the go.mod file and returns aws-sdk-go version
+// getSDKVersion returns the github.com/aws/aws-sdk-go version to use. It
+// first tries to get return version from the --aws-sdk-go-version flag, then
+// look for the service controller and local go.mod files.
 func getSDKVersion() (string, error) {
-	b, err := ioutil.ReadFile("./go.mod")
+	// First try to get the version from --aws-sdk-go-version flag
+	if optAWSSDKGoVersion != "" {
+		return optAWSSDKGoVersion, nil
+	}
+
+	// then, try to parse the service controller go.mod file
+	sdkVersion, err := getSDKVersionFromGoMod(filepath.Join(optOutputPath, "go.mod"))
+	if err == nil {
+		return sdkVersion, nil
+	}
+
+	// then try to parse a local go.mod
+	sdkVersion, err = getSDKVersionFromGoMod("go.mod")
+	if err != nil {
+		return "", err
+	}
+	return sdkVersion, nil
+}
+
+// getSDKVersionFromGoMod parses a given go.mod file and returns
+// the aws-sdk-go version in the required modules.
+func getSDKVersionFromGoMod(goModPath string) (string, error) {
+	b, err := ioutil.ReadFile(goModPath)
 	if err != nil {
 		return "", err
 	}

cmd/ack-generate/command/root.go

@@ -37,6 +37,7 @@ var (
 	defaultCacheDir        string
 	optCacheDir            string
 	optRefreshCache        bool
+	optAWSSDKGoVersion     string
 	defaultTemplatesDir    string
 	optTemplatesDir        string
 	defaultServicesDir     string
@@ -117,6 +118,9 @@ func init() {
 	rootCmd.PersistentFlags().StringVarP(
 		&optOutputPath, "output", "o", "", "Path to directory to output generated files.",
 	)
+	rootCmd.PersistentFlags().StringVar(
+		&optAWSSDKGoVersion, "aws-sdk-go-version", "", "Version of github.com/aws/aws-sdk-go used to generate apis and controllers files",
+	)
 }
 
 // Execute adds all child commands to the root command and sets flags

scripts/build-controller.sh

@@ -26,6 +26,7 @@ DEFAULT_ACK_GENERATE_BIN_PATH="$ROOT_DIR/bin/ack-generate"
 ACK_GENERATE_BIN_PATH=${ACK_GENERATE_BIN_PATH:-$DEFAULT_ACK_GENERATE_BIN_PATH}
 ACK_GENERATE_API_VERSION=${ACK_GENERATE_API_VERSION:-"v1alpha1"}
 ACK_GENERATE_CONFIG_PATH=${ACK_GENERATE_CONFIG_PATH:-""}
+AWS_SDK_GO_VERSION=${AWS_SDK_GO_VERSION:-""}
 DEFAULT_TEMPLATES_DIR="$ROOT_DIR/templates"
 TEMPLATES_DIR=${TEMPLATES_DIR:-$DEFAULT_TEMPLATES_DIR}
 
@@ -37,7 +38,7 @@ Usage:
 's3' 'sns' or 'sqs'
 
 Environment variables:
-  ACK_GENERATE_CACHE_DIR    Overrides the directory used for caching AWS API
+  ACK_GENERATE_CACHE_DIR:   Overrides the directory used for caching AWS API
                             models used by the ack-generate tool.
                             Default: $ACK_GENERATE_CACHE_DIR
   ACK_GENERATE_BIN_PATH:    Overrides the path to the the ack-generate binary.
@@ -51,6 +52,8 @@ Environment variables:
   ACK_GENERATE_CONFIG_PATH: Specify a path to the generator config YAML file to
                             instruct the code generator for the service.
                             Default: services/{SERVICE}/generator.yaml
+  AWS_SDK_GO_VERSION:       Overrides the version of github.com/aws/aws-sdk-go used
+                            by `ack-generate` to fetch the service API Specifications.
   TEMPLATES_DIR:            Overrides the directory containg ack-generate templates
                             Default: $TEMPLATES_DIR
   K8S_RBAC_ROLE_NAME:       Name of the Kubernetes Role to use when generating
@@ -120,6 +123,10 @@ if [ -n "$ACK_GENERATE_CONFIG_PATH" ]; then
     apis_args="$apis_args --generator-config-path $ACK_GENERATE_CONFIG_PATH"
 fi
 
+if [ -n "$AWS_SDK_GO_VERSION" ]; then
+    ag_args="$ag_args --aws-sdk-go-version $AWS_SDK_GO_VERSION"
+fi
+
 echo "Building Kubernetes API objects for $SERVICE"
 $ACK_GENERATE_BIN_PATH $apis_args
 if [ $? -ne 0 ]; then