[OCTRL-701] Changes following PR review.

Author: claireguyot

coconut/cmd/environment_create.go

@@ -50,6 +50,8 @@ Examples:
  * `+"`coconut env create -w github.com/AliceO2Group/MyConfRepo/myworkflow`"+` - loads a workflow from a specific git repository, HEAD of master branch
  * `+"`coconut env create -w myworkflow@rev`"+` - loads a workflow from default repository, on branch, tag or revision `+"`rev`"+`
  * `+"`coconut env create -w github.com/AliceO2Group/MyConfRepo/myworkflow@rev`"+` - loads a workflow from a specific git repository, on branch, tag or revision `+"`rev`"+`
+ * `+"`coconut env create -c /home/myrepo/myconfigfile.json`"+`
+ * `+"`coconut env create -c consul:///o2/runtime/COG-v1/TECHNICAL -w readout-dataflow@myBranch -e '{\"hosts\":\"[\\\"my-test-machine\\\"]\"}'`"+`
 
 For more information on the %s workflow configuration system, see documentation for the `+"`coconut repository`"+` command.`, product.PRETTY_SHORTNAME, product.PRETTY_SHORTNAME),
 	Run: control.WrapCall(control.CreateEnvironment),
@@ -59,8 +61,8 @@ func init() {
 	environmentCmd.AddCommand(environmentCreateCmd)
 
 	environmentCreateCmd.Flags().StringP("configuration", "c", "", "high-level configuration payload to be loaded for the new environment")
-	environmentCreateCmd.MarkFlagRequired("configuration")
 	environmentCreateCmd.Flags().StringP("workflow-template", "w", "", "workflow to be loaded in the new environment")
+
 	environmentCreateCmd.Flags().BoolP("auto", "a", false, "create an autorun environment")
 	environmentCreateCmd.Flags().BoolP("public", "p", true, "control public rights of the environment")
 

coconut/control/control.go

@@ -265,42 +265,53 @@ func CreateEnvironment(cxt context.Context, rpc *coconut.RpcClient, cmd *cobra.C
 		err = errors.New("cannot get configuration payload value")
 		return
 	}
-	if len(configPayload) == 0 {
-		err = errors.New("cannot create environment with empty configuration payload")
-		return
-	}
-	configPayloadDoc, err := os.ReadFile(configPayload)
+	userWfPath, err := cmd.Flags().GetString("workflow-template")
 	if err != nil {
-		err = errors.New("cannot read configuration payload file")
+		err = errors.New("cannot get workflow template value")
 		return
 	}
-	payloadData := new(ConfigurationPayload)
-	err = json.Unmarshal(configPayloadDoc, &payloadData)
-	if err != nil {
-		err = errors.New("cannot unmarshal configuration payload")
+	if cmd.Flags().Changed("configuration") && len(configPayload) == 0 && cmd.Flags().Changed("workflow-template") && len(userWfPath) == 0 {
+		err = errors.New("no configuration payload or workflow template provided")
 		return
 	}
 
+	payloadData := new(ConfigurationPayload)
 	var wfPath string
-	userWfPath, err := cmd.Flags().GetString("workflow-template")
-	if err != nil {
-		return
-	}
-	if cmd.Flags().Changed("workflow-template") && len(userWfPath) == 0 {
-		if len(payloadData.Workflow) > 0 {
-			wfPath = payloadData.Workflow
+	if cmd.Flags().Changed("configuration") && len(configPayload) > 0 {
+		configPayloadDoc, err := os.ReadFile(configPayload)
+		if err != nil {
+			err = errors.New("cannot read configuration payload file")
+			return err
+		}
+		err = json.Unmarshal(configPayloadDoc, &payloadData)
+		if err != nil {
+			err = errors.New("cannot unmarshal configuration payload")
+			return err
+		}
+
+		if cmd.Flags().Changed("workflow-template") && len(userWfPath) == 0 {
+			if len(payloadData.Workflow) > 0 {
+				wfPath = payloadData.Workflow
+			} else {
+				err = errors.New("empty workflow template provided")
+				return err
+			}
+		} else if cmd.Flags().Changed("workflow-template") && len(userWfPath) > 0 {
+			wfPath = userWfPath
 		} else {
-			err = errors.New("empty workflow template provided")
-			return
+			if len(payloadData.Workflow) > 0 {
+				wfPath = payloadData.Workflow
+			} else {
+				err = errors.New("no workflow template provided in config file")
+				return err
+			}
 		}
-	} else if cmd.Flags().Changed("workflow-template") && len(userWfPath) > 0 {
-		wfPath = userWfPath
 	} else {
-		if len(payloadData.Workflow) > 0 {
-			wfPath = payloadData.Workflow
+		if cmd.Flags().Changed("workflow-template") && len(userWfPath) > 0 {
+			wfPath = userWfPath
 		} else {
-			err = errors.New("no workflow template provided in config file")
-			return
+			err = errors.New("empty workflow template provided")
+			return err
 		}
 	}
 
@@ -325,9 +336,11 @@ func CreateEnvironment(cxt context.Context, rpc *coconut.RpcClient, cmd *cobra.C
 	for k, v := range userExtraVarsMap {
 		extraVarsMap[k] = v
 	}
-	for k, v := range payloadData.Vars {
-		if _, exists := extraVarsMap[k]; !exists {
-			extraVarsMap[k] = v
+	if cmd.Flags().Changed("configuration") && len(configPayload) > 0 {
+		for k, v := range payloadData.Vars {
+			if _, exists := extraVarsMap[k]; !exists {
+				extraVarsMap[k] = v
+			}
 		}
 	}