Skip to content

Commit 5412b3c

Browse files
authored
Merge branch 'main' into fix/login-server-binding
2 parents 68fee14 + 80a65fd commit 5412b3c

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

cmd/configure.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ func configureCmdRun(cmd *cobra.Command, args []string) error {
7373
}
7474

7575
if err := viper.WriteConfigAs(configPath); err != nil {
76-
fmt.Errorf("Failed to write configuration: %v", err.Error())
76+
return fmt.Errorf("Failed to write configuration: %v", err.Error())
7777
}
7878

7979
fmt.Println("Updated configuration.")

cmd/token.go

+5-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,11 @@ func loginCmdRun(cmd *cobra.Command, args []string) error {
5252

5353
if clientID == "" || clientSecret == "" {
5454
println("No Client ID or Secret found in configuration. Triggering configuration now.")
55-
configureCmd.Run(cmd, args)
55+
err := configureCmd.RunE(cmd, args)
56+
if err != nil {
57+
return err
58+
}
59+
5660
clientID = viper.GetString("clientId")
5761
clientSecret = viper.GetString("clientSecret")
5862
}

0 commit comments

Comments
 (0)