Skip to content

Commit ecf041a

Browse files
committed
cmd/ie/commands/to-bash: Propagate error instead of exiting
Signed-off-by: Jose Blanquicet <josebl@microsoft.com>
1 parent 459ffe3 commit ecf041a

1 file changed

Lines changed: 4 additions & 22 deletions

File tree

cmd/ie/commands/to-bash.go

Lines changed: 4 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import (
88

99
"github.com/Azure/InnovationEngine/internal/engine"
1010
"github.com/Azure/InnovationEngine/internal/engine/environments"
11-
"github.com/Azure/InnovationEngine/internal/logging"
1211
"github.com/spf13/cobra"
1312
)
1413

@@ -22,8 +21,7 @@ var toBashCommand = &cobra.Command{
2221
RunE: func(cmd *cobra.Command, args []string) error {
2322
markdownFile := args[0]
2423
if markdownFile == "" {
25-
logging.GlobalLogger.Errorf("Error: No markdown file specified.")
26-
return errors.New("error: No markdown file specified")
24+
return errors.New("no markdown file specified")
2725
}
2826

2927
environment, _ := cmd.Flags().GetString("environment")
@@ -34,16 +32,7 @@ var toBashCommand = &cobra.Command{
3432
for _, environmentVariable := range environmentVariables {
3533
keyValuePair := strings.SplitN(environmentVariable, "=", 2)
3634
if len(keyValuePair) != 2 {
37-
logging.GlobalLogger.Errorf(
38-
"Error: Invalid environment variable format: %s",
39-
environmentVariable,
40-
)
41-
fmt.Printf("Error: Invalid environment variable format: %s", environmentVariable)
42-
cmd.Help()
43-
return fmt.Errorf(
44-
"error: Invalid environment variable format, %s",
45-
environmentVariable,
46-
)
35+
return fmt.Errorf("invalid environment variable format: %s", environmentVariable)
4736
}
4837

4938
cliEnvironmentVariables[keyValuePair[0]] = keyValuePair[1]
@@ -54,23 +43,17 @@ var toBashCommand = &cobra.Command{
5443
markdownFile,
5544
[]string{"bash", "azurecli", "azurecli-interactive", "terraform"},
5645
cliEnvironmentVariables)
57-
5846
if err != nil {
59-
logging.GlobalLogger.Errorf("Error creating scenario: %s", err)
60-
fmt.Printf("Error creating scenario: %s", err)
61-
return err
47+
return fmt.Errorf("creating scenario: %w", err)
6248
}
6349

6450
// If within cloudshell, we need to wrap the script in a json object to
6551
// communicate it to the portal.
6652
if environments.IsAzureEnvironment(environment) {
6753
script := AzureScript{Script: scenario.ToShellScript()}
6854
scriptJson, err := json.Marshal(script)
69-
7055
if err != nil {
71-
logging.GlobalLogger.Errorf("Error converting to json: %s", err)
72-
fmt.Printf("Error converting to json: %s", err)
73-
return err
56+
return fmt.Errorf("converting to json: %w", err)
7457
}
7558

7659
fmt.Printf("ie_us%sie_ue\n", scriptJson)
@@ -79,7 +62,6 @@ var toBashCommand = &cobra.Command{
7962
}
8063

8164
return nil
82-
8365
},
8466
}
8567

0 commit comments

Comments
 (0)