Merge pull request #336 from GoogleCloudPlatform/issue330_2

feat: add additional flags #330
GoogleCloudPlatform · Jan 3, 2025 · 83075f5 · 83075f5
2 parents 3f78e28 + 44956f0
commit 83075f5
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 23 deletions.
diff --git a/internal/cmd/integrations/create.go b/internal/cmd/integrations/create.go
@@ -41,7 +41,9 @@ var CreateCmd = &cobra.Command{
 		if basic && publish {
 			return fmt.Errorf("cannot combine basic and publish flags")
 		}
-
+		if configVarsFile != "" && configVarsJson != "" {
+			return fmt.Errorf("cannot use config-vars and config-vars-json flags together")
+		}
 		if !publish && (configVarsFile != "" || configVarsJson != "") {
 			return fmt.Errorf("cannot use config-vars and config-vars-json flags when publish is false")
 		}
@@ -63,20 +65,21 @@ var CreateCmd = &cobra.Command{
 		configVarsJson := cmd.Flag("config-vars-json").Value.String()
 		configVarsFile := cmd.Flag("config-vars").Value.String()
 
-		if configVarsJson == "" {
-			if configVarsFile != "" {
-				if _, err := os.Stat(configVarsFile); os.IsNotExist(err) {
-					return err
-				}
+		if configVarsFile != "" {
+			if _, err := os.Stat(configVarsFile); os.IsNotExist(err) {
+				return err
+			}
 
-				contents, err = os.ReadFile(configVarsFile)
-				if err != nil {
-					return err
-				}
+			contents, err = os.ReadFile(configVarsFile)
+			if err != nil {
+				return err
 			}
-		} else {
+		}
+
+		if configVarsJson != "" {
 			contents = []byte(configVarsJson)
 		}
+
 		if _, err := os.Stat(integrationFile); os.IsNotExist(err) {
 			return err
 		}
@@ -155,7 +158,7 @@ func init() {
 	CreateCmd.Flags().StringVarP(&configVars, "config-vars", "",
 		"", "Path to file containing config variables")
 	CreateCmd.Flags().StringVarP(&configVarsJson, "config-vars-json", "",
-		"", "Json string containing the config variables if both Json string and file is present Json string will only be used.")
+		"", "JSON string containing the config variables")
 
 	_ = CreateCmd.MarkFlagRequired("name")
 	_ = CreateCmd.MarkFlagRequired("file")

diff --git a/internal/cmd/integrations/publish.go b/internal/cmd/integrations/publish.go
@@ -39,8 +39,13 @@ var PublishVerCmd = &cobra.Command{
 		version := cmd.Flag("ver").Value.String()
 		userLabel := cmd.Flag("user-label").Value.String()
 		snapshot := cmd.Flag("snapshot").Value.String()
+		configVarsJson := cmd.Flag("config-vars-json").Value.String()
+		configVarsFile := cmd.Flag("config-vars").Value.String()
 		latest, _ := strconv.ParseBool(cmd.Flag("latest").Value.String())
 
+		if configVarsFile != "" && configVarsJson != "" {
+			return fmt.Errorf("cannot use config-vars and config-vars-json flags together")
+		}
 		if err = apiclient.SetRegion(cmdRegion.Value.String()); err != nil {
 			return err
 		}
@@ -63,18 +68,18 @@ var PublishVerCmd = &cobra.Command{
 		var contents []byte
 		var info string
 
-		if configVarsJson == "" {
-			if configVarsFile != "" {
-				if _, err := os.Stat(configVarsFile); os.IsNotExist(err) {
-					return err
-				}
+		if configVarsFile != "" {
+			if _, err := os.Stat(configVarsFile); os.IsNotExist(err) {
+				return err
+			}
 
-				contents, err = os.ReadFile(configVarsFile)
-				if err != nil {
-					return err
-				}
+			contents, err = os.ReadFile(configVarsFile)
+			if err != nil {
+				return err
 			}
-		} else {
+		}
+
+		if configVarsJson != "" {
 			contents = []byte(configVarsJson)
 		}
 
@@ -129,7 +134,7 @@ func init() {
 	PublishVerCmd.Flags().StringVarP(&configVars, "config-vars", "",
 		"", "Path to file containing config variables")
 	PublishVerCmd.Flags().StringVarP(&configVarsJson, "config-vars-json", "",
-		"", "Json string containing the config variables if both Json string and file is present Json string will only be used.")
+		"", "JSON string containing the config variables.")
 	PublishVerCmd.Flags().BoolVarP(&latest, "latest", "",
 		true, "Publishes the integeration version with the highest snapshot number in SNAPSHOT state; default is true")