feat: Add UI for awaiting agent connections #578

kylecarbs · 2022-03-27T00:07:03Z

No description provided.

This adds a stage property to logs, and refactors the job logs cliui. It also adds tests to the cliui for build logs!

codecov · 2022-03-27T00:13:20Z

Codecov Report

Merging #578 (342b03d) into main (620c889) will increase coverage by 0.54%.
The diff coverage is 72.64%.

@@            Coverage Diff             @@
##             main     #578      +/-   ##
==========================================
+ Coverage   63.67%   64.22%   +0.54%     
==========================================
  Files         197      198       +1     
  Lines       11543    11622      +79     
  Branches       85       85              
==========================================
+ Hits         7350     7464     +114     
+ Misses       3413     3362      -51     
- Partials      780      796      +16

Flag	Coverage Δ
unittest-go-	`63.40% <71.22%> (+0.44%)`	⬆️
unittest-go-macos-latest	`59.12% <51.41%> (+0.65%)`	⬆️
unittest-go-ubuntu-latest	`62.09% <72.64%> (+0.53%)`	⬆️
unittest-go-windows-2022	`58.32% <52.83%> (+0.55%)`	⬆️
unittest-js	`63.32% <ø> (ø)`

Impacted Files	Coverage Δ
cli/start.go	`66.15% <ø> (ø)`
coderd/coderd.go	`96.47% <ø> (ø)`
cli/cliui/select.go	`61.22% <59.57%> (+15.51%)`	⬆️
provisioner/terraform/provision.go	`68.82% <62.90%> (-3.47%)`	⬇️
cli/ssh.go	`43.33% <77.27%> (+38.20%)`	⬆️
coderd/provisionerdaemons.go	`59.52% <80.00%> (-2.89%)`	⬇️
cli/cliui/agent.go	`82.14% <82.14%> (ø)`
agent/conn.go	`68.96% <100.00%> (+3.58%)`	⬆️
cli/root.go	`76.84% <100.00%> (ø)`
cli/workspaceagent.go	`78.16% <100.00%> (ø)`
... and 24 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 620c889...342b03d. Read the comment docs.

This adds a stage property to logs, and refactors the job logs cliui. It also adds tests to the cliui for build logs!

misskniss · 2022-03-28T04:41:17Z

@kylecarbs can this be closed or does it still need to be done?

kylecarbs · 2022-03-28T13:53:48Z

Needs to be done or else no SSH!

coadler · 2022-03-28T21:44:27Z

coderd/coderdtest/coderdtest.go

@@ -258,6 +258,7 @@ func AwaitWorkspaceAgents(t *testing.T, client *codersdk.Client, build uuid.UUID
 			if resource.Agent == nil {
 				continue
 			}
+			// fmt.Printf("resources: %+v\n", resource.Agent)


Looks like a debug line

coadler · 2022-03-28T21:50:55Z

examples/gcp-windows/main.tf

-  sensitive = true
-}
+variable "service_account" {
+  description = <<EOT


IMO I mostly see these with <<EOF rather than EOT

I agree. Zero-clue why I did EOT

Emyrk

Some nits and comments.

Emyrk · 2022-03-28T22:26:21Z

cli/cliui/agent.go

+		case <-timer.C:
+		}
+		message := "Don't panic, your workspace is booting up!"
+		if resource.Agent.Status == codersdk.WorkspaceAgentDisconnected {


This will fail --race because there is another for loop in the main thread touching this.

We should use atomic or just a mutex to protect that

Good point. I didn't even have a test for this, and now I shall add one.

Emyrk · 2022-03-28T22:28:42Z

cli/cliui/select.go

 	"github.com/spf13/cobra"
 )

+func init() {


I don't know this survey stuff. Not looking to understand this atm lol

All of the libraries are questionable in their own rights tbh

Emyrk · 2022-03-28T22:31:43Z

cli/ssh.go

@@ -24,6 +25,12 @@ func workspaceSSH() *cobra.Command {
 			if err != nil {
 				return err
 			}
+			if workspace.LatestBuild.Job.CompletedAt == nil {
+				err = cliui.WorkspaceBuild(cmd, client, workspace.LatestBuild.ID, workspace.CreatedAt)


Should we log some message that their workspace was offline and is being restarted? I feel like this being a silent side effect could be confusing.

Yeah, I need to revamp the SSH command.

Emyrk · 2022-03-28T22:32:23Z

cli/ssh.go

 			}

-			conn, err := client.DialWorkspaceAgent(cmd.Context(), resource.ID, nil, nil)
+			conn, err := client.DialWorkspaceAgent(cmd.Context(), resource.ID, []webrtc.ICEServer{{
+				URLs: []string{"stun:stun.l.google.com:19302"},


For customers with more restrictive firewalls, can they use TURN?

This won't be hardcoded for long. Just a temporary hack!

Emyrk · 2022-03-28T22:33:44Z

cli/cliui/agent.go

+	WarnInterval  time.Duration
+}
+
+func Agent(cmd *cobra.Command, opts AgentOptions) error {


Can we comment what this function is doing? With lack of returns except error, it's a bit unclear.

Yup, certainly should.

cmd/cliui/main.go

Emyrk · 2022-03-28T22:35:31Z

coderd/provisionerdaemons.go

+	return &proto.UpdateJobResponse{
+		Canceled: job.CanceledAt.Valid,
+	}, nil


😨 this is a big function. I see it's mostly boiler plate fields, but still

It's ~140 lines, not that bad!

Emyrk · 2022-03-28T22:36:23Z

provisioner/terraform/provision.go

@@ -209,7 +208,7 @@ func (t *terraform) Provision(stream proto.DRPCProvisioner_ProvisionStream) erro
 		case <-stream.Context().Done():
 			return
 		case <-shutdown.Done():
-			_ = cmd.Process.Signal(os.Kill)
+			_ = cmd.Process.Signal(os.Interrupt)


nice of you to be less aggressive 😄. I'm sure that PID will appreciate it

hahahahah that it will

feat: Add stage to build logs

7ed283c

This adds a stage property to logs, and refactors the job logs cliui. It also adds tests to the cliui for build logs!

kylecarbs self-assigned this Mar 27, 2022

kylecarbs force-pushed the ssh branch 3 times, most recently from 0bda974 to 8f0f57e Compare March 27, 2022 01:48

feat: Add stage to build logs

048f29a

This adds a stage property to logs, and refactors the job logs cliui. It also adds tests to the cliui for build logs!

kylecarbs force-pushed the nicerlogs branch from 7ed283c to 048f29a Compare March 27, 2022 01:59

feat: Add config-ssh and tests for resiliency

2152758

kylecarbs force-pushed the ssh branch from 8f0f57e to 2152758 Compare March 27, 2022 02:00

kylecarbs and others added 5 commits March 27, 2022 02:06

Merge branch 'nicerlogs' into ssh

e774dd7

Rename "Echo" test to "ImmediateExit"

172d4fe

Fix Terraform resource agent association

82f60db

Fix logs post-cancel

6bff973

Fix select on Windows

3654022

kylecarbs mentioned this pull request Mar 28, 2022

coder projects init selector doesn't work #486

Closed

kylecarbs added 3 commits March 28, 2022 14:24

Remove terraform init logs

aef12e1

Move timer into it's own loop

15cae15

Fix race condition in provisioner jobs

fb9fbb6

Base automatically changed from nicerlogs to main March 28, 2022 18:43

Merge branch 'main' into ssh

c91b3cc

kylecarbs changed the title ~~feat: Add config-ssh and tests for resiliency~~ feat: Add UI for awaiting agent connections Mar 28, 2022

kylecarbs requested review from coadler and Emyrk March 28, 2022 20:19

coadler approved these changes Mar 28, 2022

View reviewed changes

Emyrk approved these changes Mar 28, 2022

View reviewed changes

kylecarbs added 2 commits March 28, 2022 23:13

Merge branch 'main' into ssh

9ad326b

Fix requested changes

342b03d

kylecarbs force-pushed the ssh branch from a81243c to 342b03d Compare March 29, 2022 00:06

kylecarbs merged commit 82dfd6c into main Mar 29, 2022

kylecarbs deleted the ssh branch March 29, 2022 00:19

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: Add UI for awaiting agent connections #578

feat: Add UI for awaiting agent connections #578

kylecarbs commented Mar 27, 2022

codecov bot commented Mar 27, 2022 •

edited

misskniss commented Mar 28, 2022

kylecarbs commented Mar 28, 2022

coadler Mar 28, 2022

coadler Mar 28, 2022

kylecarbs Mar 28, 2022

Emyrk left a comment

Emyrk Mar 28, 2022

kylecarbs Mar 28, 2022

Emyrk Mar 28, 2022

kylecarbs Mar 28, 2022

Emyrk Mar 28, 2022

kylecarbs Mar 28, 2022

Emyrk Mar 28, 2022

kylecarbs Mar 28, 2022

Emyrk Mar 28, 2022

kylecarbs Mar 28, 2022

Emyrk Mar 28, 2022

kylecarbs Mar 28, 2022

Emyrk Mar 28, 2022

kylecarbs Mar 28, 2022

feat: Add UI for awaiting agent connections #578

feat: Add UI for awaiting agent connections #578

Conversation

kylecarbs commented Mar 27, 2022

codecov bot commented Mar 27, 2022 • edited

Codecov Report

misskniss commented Mar 28, 2022

kylecarbs commented Mar 28, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Emyrk left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

codecov bot commented Mar 27, 2022 •

edited