Merge pull request fluxcd#2765 from dinosk/issues/2657-fluxctl-sync-e…

…rror-message Add detailed error message in fluxctl sync
jstevans · Jan 29, 2020 · ed1f54f · ed1f54f
2 parents fd6e2da + f42ab00
commit ed1f54f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/cmd/fluxctl/sync_cmd.go b/cmd/fluxctl/sync_cmd.go
@@ -46,7 +46,10 @@ func (opts *syncOpts) RunE(cmd *cobra.Command, args []string) error {
 	case git.RepoReady:
 		break
 	default:
-		return fmt.Errorf("git repository %s is not ready to sync (status: %s)", gitConfig.Remote.URL, string(gitConfig.Status))
+		if gitConfig.Error != "" {
+			return fmt.Errorf("git repository %s is not ready to sync\n\nFull error message: %v", gitConfig.Remote.URL, gitConfig.Error)
+		}
+		return fmt.Errorf("git repository %s is not ready to sync", gitConfig.Remote.URL)
 	}
 
 	fmt.Fprintf(cmd.OutOrStderr(), "Synchronizing with %s\n", gitConfig.Remote.URL)

diff --git a/pkg/api/v6/api.go b/pkg/api/v6/api.go
@@ -58,6 +58,7 @@ type GitConfig struct {
 	Remote       GitRemoteConfig   `json:"remote"`
 	PublicSSHKey ssh.PublicKey     `json:"publicSSHKey"`
 	Status       git.GitRepoStatus `json:"status"`
+	Error        string            `json:"errors"`
 }
 
 type Deprecated interface {

diff --git a/pkg/daemon/daemon.go b/pkg/daemon/daemon.go
@@ -624,7 +624,12 @@ func (d *Daemon) GitRepoConfig(ctx context.Context, regenerate bool) (v6.GitConf
 	origin := d.Repo.Origin()
 	// Sanitize the URL before sharing it
 	origin.URL = origin.SafeURL()
-	status, _ := d.Repo.Status()
+	status, err := d.Repo.Status()
+	gitConfigError := ""
+	if err != nil {
+		gitConfigError = err.Error()
+	}
+
 	path := ""
 	if len(d.GitConfig.Paths) > 0 {
 		path = strings.Join(d.GitConfig.Paths, ",")
@@ -637,6 +642,7 @@ func (d *Daemon) GitRepoConfig(ctx context.Context, regenerate bool) (v6.GitConf
 		},
 		PublicSSHKey: publicSSHKey,
 		Status:       status,
+		Error:        gitConfigError,
 	}, nil
 }