Skip to content

Commit a6a095b

Browse files
mafredrimafredri
committed
Rename to ConnectionTimeoutSeconds and TroubleshootingURL initialism
1 parent 0e395e2 commit a6a095b

File tree

15 files changed

+247
-245
lines changed

15 files changed

+247
-245
lines changed

‎cli/ssh_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ func TestSSH(t *testing.T) {
112112
client, workspace, _ := setupWorkspaceForAgent(t, func(a []*proto.Agent) []*proto.Agent {
113113
// Unfortunately, one second is the lowest
114114
// we can go because 0 disables the feature.
115-
a[0].ConnectionTimeout = 1
115+
a[0].ConnectionTimeoutSeconds = 1
116116
a[0].TroubleshootingUrl = wantURL
117117
return a
118118
})

‎coderd/database/databasefake/databasefake.go

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2363,22 +2363,22 @@ func (q *fakeQuerier) InsertWorkspaceAgent(_ context.Context, arg database.Inser
23632363
defer q.mutex.Unlock()
23642364

23652365
agent := database.WorkspaceAgent{
2366-
ID: arg.ID,
2367-
CreatedAt: arg.CreatedAt,
2368-
UpdatedAt: arg.UpdatedAt,
2369-
ResourceID: arg.ResourceID,
2370-
AuthToken: arg.AuthToken,
2371-
AuthInstanceID: arg.AuthInstanceID,
2372-
EnvironmentVariables: arg.EnvironmentVariables,
2373-
Name: arg.Name,
2374-
Architecture: arg.Architecture,
2375-
OperatingSystem: arg.OperatingSystem,
2376-
Directory: arg.Directory,
2377-
StartupScript: arg.StartupScript,
2378-
InstanceMetadata: arg.InstanceMetadata,
2379-
ResourceMetadata: arg.ResourceMetadata,
2380-
ConnectionTimeout: arg.ConnectionTimeout,
2381-
TroubleshootingUrl: arg.TroubleshootingUrl,
2366+
ID: arg.ID,
2367+
CreatedAt: arg.CreatedAt,
2368+
UpdatedAt: arg.UpdatedAt,
2369+
ResourceID: arg.ResourceID,
2370+
AuthToken: arg.AuthToken,
2371+
AuthInstanceID: arg.AuthInstanceID,
2372+
EnvironmentVariables: arg.EnvironmentVariables,
2373+
Name: arg.Name,
2374+
Architecture: arg.Architecture,
2375+
OperatingSystem: arg.OperatingSystem,
2376+
Directory: arg.Directory,
2377+
StartupScript: arg.StartupScript,
2378+
InstanceMetadata: arg.InstanceMetadata,
2379+
ResourceMetadata: arg.ResourceMetadata,
2380+
ConnectionTimeoutSeconds: arg.ConnectionTimeoutSeconds,
2381+
TroubleshootingURL: arg.TroubleshootingURL,
23822382
}
23832383

23842384
q.provisionerJobAgents = append(q.provisionerJobAgents, agent)

‎coderd/database/dump.sql

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/migrations/000072_add_agent_connection_timeout_and_troubleshooting_url.up.sql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
BEGIN;
22

33
ALTER TABLE workspace_agents
4-
ADD COLUMN connection_timeout integer NOT NULL DEFAULT 0;
4+
ADD COLUMN connection_timeout_seconds integer NOT NULL DEFAULT 0;
55

6-
COMMENT ON COLUMN workspace_agents.connection_timeout IS 'Connection timeout in seconds, 0 means disabled.';
6+
COMMENT ON COLUMN workspace_agents.connection_timeout_seconds IS 'Connection timeout in seconds, 0 means disabled.';
77

88
ALTER TABLE workspace_agents
99
ADD COLUMN troubleshooting_url text NOT NULL DEFAULT '';

‎coderd/database/models.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/queries.sql.go

Lines changed: 37 additions & 37 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/queries/workspaceagents.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ INSERT INTO
5454
directory,
5555
instance_metadata,
5656
resource_metadata,
57-
connection_timeout,
57+
connection_timeout_seconds,
5858
troubleshooting_url
5959
)
6060
VALUES

‎coderd/database/sqlc.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,3 +47,4 @@ rename:
4747
jwt: JWT
4848
user_acl: UserACL
4949
group_acl: GroupACL
50+
troubleshooting_url: TroubleshootingURL

‎coderd/provisionerdserver/provisionerdserver.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -723,8 +723,8 @@ func InsertWorkspaceResource(ctx context.Context, db database.Store, jobID uuid.
723723
String: prAgent.StartupScript,
724724
Valid: prAgent.StartupScript != "",
725725
},
726-
ConnectionTimeout: prAgent.GetConnectionTimeout(),
727-
TroubleshootingUrl: prAgent.GetTroubleshootingUrl(),
726+
ConnectionTimeoutSeconds: prAgent.GetConnectionTimeoutSeconds(),
727+
TroubleshootingURL: prAgent.GetTroubleshootingUrl(),
728728
})
729729
if err != nil {
730730
return xerrors.Errorf("insert agent: %w", err)

‎coderd/workspaceagents.go

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -669,21 +669,21 @@ func convertWorkspaceAgent(derpMap *tailcfg.DERPMap, coordinator tailnet.Coordin
669669
}
670670
}
671671
workspaceAgent := codersdk.WorkspaceAgent{
672-
ID: dbAgent.ID,
673-
CreatedAt: dbAgent.CreatedAt,
674-
UpdatedAt: dbAgent.UpdatedAt,
675-
ResourceID: dbAgent.ResourceID,
676-
InstanceID: dbAgent.AuthInstanceID.String,
677-
Name: dbAgent.Name,
678-
Architecture: dbAgent.Architecture,
679-
OperatingSystem: dbAgent.OperatingSystem,
680-
StartupScript: dbAgent.StartupScript.String,
681-
Version: dbAgent.Version,
682-
EnvironmentVariables: envs,
683-
Directory: dbAgent.Directory,
684-
Apps: apps,
685-
ConnectionTimeout: dbAgent.ConnectionTimeout,
686-
TroubleshootingURL: dbAgent.TroubleshootingUrl,
672+
ID: dbAgent.ID,
673+
CreatedAt: dbAgent.CreatedAt,
674+
UpdatedAt: dbAgent.UpdatedAt,
675+
ResourceID: dbAgent.ResourceID,
676+
InstanceID: dbAgent.AuthInstanceID.String,
677+
Name: dbAgent.Name,
678+
Architecture: dbAgent.Architecture,
679+
OperatingSystem: dbAgent.OperatingSystem,
680+
StartupScript: dbAgent.StartupScript.String,
681+
Version: dbAgent.Version,
682+
EnvironmentVariables: envs,
683+
Directory: dbAgent.Directory,
684+
Apps: apps,
685+
ConnectionTimeoutSeconds: dbAgent.ConnectionTimeoutSeconds,
686+
TroubleshootingURL: dbAgent.TroubleshootingURL,
687687
}
688688
node := coordinator.Node(dbAgent.ID)
689689
if node != nil {
@@ -721,7 +721,7 @@ func convertWorkspaceAgent(derpMap *tailcfg.DERPMap, coordinator tailnet.Coordin
721721
workspaceAgent.DisconnectedAt = &dbAgent.DisconnectedAt.Time
722722
}
723723

724-
connectionTimeout := time.Duration(dbAgent.ConnectionTimeout) * time.Second
724+
connectionTimeout := time.Duration(dbAgent.ConnectionTimeoutSeconds) * time.Second
725725
switch {
726726
case !dbAgent.FirstConnectedAt.Valid:
727727
switch {

0 commit comments

Comments
 (0)