always validate before returning client

superfly · Aug 13, 2021 · 6c53a71 · 6c53a71
1 parent c5fa194
commit 6c53a71
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/cmd/fly_agent.go b/cmd/fly_agent.go
@@ -65,7 +65,7 @@ func runFlyAgentStart(cc *cmdctx.CmdContext) error {
 		c.Kill(ctx)
 	}
 
-	_, err = agent.Establish(ctx, api, true)
+	_, err = agent.Establish(ctx, api)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "can't start agent: %s", err)
 	}

diff --git a/cmd/ssh_terminal.go b/cmd/ssh_terminal.go
@@ -27,7 +27,7 @@ func runSSHConsole(cc *cmdctx.CmdContext) error {
 		return fmt.Errorf("get app: %w", err)
 	}
 
-	agentclient, err := agent.Establish(ctx, client, true)
+	agentclient, err := agent.Establish(ctx, client)
 	if err != nil {
 		return fmt.Errorf("can't establish agent: %s\n", err)
 	}

diff --git a/internal/build/imgsrc/docker.go b/internal/build/imgsrc/docker.go
@@ -205,7 +205,7 @@ func newRemoteDockerClient(ctx context.Context, apiClient *api.Client, appName s
 				return errors.Wrap(err, "error fetching target app")
 			}
 
-			agentclient, err := agent.Establish(errCtx, apiClient, true)
+			agentclient, err := agent.Establish(errCtx, apiClient)
 			if err != nil {
 				return errors.Wrap(err, "error establishing agent")
 			}

diff --git a/pkg/agent/agent.go b/pkg/agent/agent.go
@@ -508,11 +508,9 @@ func captureWireguardConnErr(err error, org string) {
 }
 
 /// Establish starts the daemon if necessary and returns a client
-func Establish(ctx context.Context, apiClient *api.Client, validate bool) (*Client, error) {
-	if validate {
-		if err := wireguard.PruneInvalidPeers(apiClient); err != nil {
-			return nil, err
-		}
+func Establish(ctx context.Context, apiClient *api.Client) (*Client, error) {
+	if err := wireguard.PruneInvalidPeers(apiClient); err != nil {
+		return nil, err
 	}
 
 	c, err := DefaultClient(apiClient)