Only enable connection timeouts when set to non-zero

mafredri · mafredri · commit 5281fb5cac2b · 2022-11-08T14:00:26.000Z
diff --git a/cli/ssh_test.go b/cli/ssh_test.go
@@ -110,7 +110,8 @@ func TestSSH(t *testing.T) {
 
 		wantURL := "https://example.com/troubleshoot"
 		client, workspace, _ := setupWorkspaceForAgent(t, func(a []*proto.Agent) []*proto.Agent {
-			// One second is the lowest we can go.
+			// Unfortunately, one second is the lowest
+			// we can go because 0 disables the feature.
 			a[0].ConnectionTimeout = 1
 			a[0].TroubleshootingUrl = wantURL
 			return a
diff --git a/coderd/database/dump.sql b/coderd/database/dump.sql
diff --git a/coderd/database/migrations/000072_add_agent_connection_timeout_and_troubleshooting_url.up.sql b/coderd/database/migrations/000072_add_agent_connection_timeout_and_troubleshooting_url.up.sql
@@ -1,10 +1,13 @@
 BEGIN;
 
--- Default value same as in terraform-provider-coder.
 ALTER TABLE workspace_agents
-	ADD COLUMN connection_timeout integer NOT NULL DEFAULT 120;
+	ADD COLUMN connection_timeout integer NOT NULL DEFAULT 0;
+
+COMMENT ON COLUMN workspace_agents.connection_timeout IS 'Connection timeout in seconds, 0 means disabled.';
 
 ALTER TABLE workspace_agents
 	ADD COLUMN troubleshooting_url text NOT NULL DEFAULT '';
 
+COMMENT ON COLUMN workspace_agents.troubleshooting_url IS 'URL for troubleshooting the agent.';
+
 COMMIT;
diff --git a/coderd/provisionerdaemons.go b/coderd/provisionerdaemons.go
@@ -791,11 +791,6 @@ func insertWorkspaceResource(ctx context.Context, db database.Store, jobID uuid.
 				return xerrors.Errorf("invalid auth token format; must be uuid: %w", err)
 			}
 		}
-		// TODO(mafredri): Keep this backwards compatibility with old provider?
-		connectionTimeout := prAgent.GetConnectionTimeout()
-		if connectionTimeout == 0 {
-			connectionTimeout = 120
-		}
 
 		agentID := uuid.New()
 		dbAgent, err := db.InsertWorkspaceAgent(ctx, database.InsertWorkspaceAgentParams{
@@ -814,7 +809,7 @@ func insertWorkspaceResource(ctx context.Context, db database.Store, jobID uuid.
 				String: prAgent.StartupScript,
 				Valid:  prAgent.StartupScript != "",
 			},
-			ConnectionTimeout:  connectionTimeout,
+			ConnectionTimeout:  prAgent.GetConnectionTimeout(),
 			TroubleshootingUrl: prAgent.GetTroubleshootingUrl(),
 		})
 		if err != nil {
diff --git a/coderd/workspaceagents.go b/coderd/workspaceagents.go
@@ -720,11 +720,10 @@ func convertWorkspaceAgent(derpMap *tailcfg.DERPMap, coordinator tailnet.Coordin
 	}
 
 	connectionTimeout := time.Duration(dbAgent.ConnectionTimeout) * time.Second
-
 	switch {
 	case !dbAgent.FirstConnectedAt.Valid:
 		switch {
-		case database.Now().Sub(dbAgent.CreatedAt) > connectionTimeout:
+		case connectionTimeout > 0 && database.Now().Sub(dbAgent.CreatedAt) > connectionTimeout:
 			// If the agent took too long to connect the first time,
 			// mark it as timed out.
 			workspaceAgent.Status = codersdk.WorkspaceAgentTimeout
