Merge branch 'main' into mafredri/fix-ssh-exit

mafredri · web-flow · commit 659eb5cbe27d · 2023-11-24T13:51:09.000+02:00
diff --git a/agent/agentssh/agentssh_test.go b/agent/agentssh/agentssh_test.go
@@ -216,7 +216,7 @@ func TestNewServer_Signal(t *testing.T) {
 		}
 		require.NoError(t, sc.Err())
 
-		err = sess.Signal(ssh.SIGINT)
+		err = sess.Signal(ssh.SIGKILL)
 		require.NoError(t, err)
 
 		// Assumption, signal propagates and the command exists, closing stdout.
@@ -295,7 +295,7 @@ func TestNewServer_Signal(t *testing.T) {
 		}
 		require.NoError(t, sc.Err())
 
-		err = sess.Signal(ssh.SIGINT)
+		err = sess.Signal(ssh.SIGKILL)
 		require.NoError(t, err)
 
 		// Assumption, signal propagates and the command exists, closing stdout.
diff --git a/coderd/healthcheck/derphealth/derp.go b/coderd/healthcheck/derphealth/derp.go
@@ -166,6 +166,7 @@ func (r *RegionReport) Run(ctx context.Context) {
 	r.Healthy = true
 	r.Severity = health.SeverityOK
 	r.NodeReports = []*NodeReport{}
+	r.Warnings = []string{}
 
 	wg := &sync.WaitGroup{}
 	var unhealthyNodes int // atomic.Int64 is not mandatory as we depend on RegionReport mutex.
@@ -262,6 +263,7 @@ func (r *NodeReport) Run(ctx context.Context) {
 	r.Severity = health.SeverityOK
 	r.ClientLogs = [][]string{}
 	r.ClientErrs = [][]string{}
+	r.Warnings = []string{}
 
 	wg := &sync.WaitGroup{}
 
diff --git a/coderd/healthcheck/derphealth/derp_test.go b/coderd/healthcheck/derphealth/derp_test.go
@@ -68,6 +68,8 @@ func TestDERP(t *testing.T) {
 			for _, node := range region.NodeReports {
 				assert.True(t, node.Healthy)
 				assert.True(t, node.CanExchangeMessages)
+				assert.Empty(t, node.Warnings)
+				assert.NotNil(t, node.Warnings)
 				assert.NotEmpty(t, node.RoundTripPing)
 				assert.Len(t, node.ClientLogs, 2)
 				assert.Len(t, node.ClientLogs[0], 3)
@@ -128,6 +130,8 @@ func TestDERP(t *testing.T) {
 		for _, region := range report.Regions {
 			assert.True(t, region.Healthy)
 			assert.True(t, region.NodeReports[0].Healthy)
+			assert.Empty(t, region.NodeReports[0].Warnings)
+			assert.NotNil(t, region.NodeReports[0].Warnings)
 			assert.Equal(t, health.SeverityOK, region.NodeReports[0].Severity)
 			assert.False(t, region.NodeReports[1].Healthy)
 			assert.Equal(t, health.SeverityError, region.NodeReports[1].Severity)

Original file line number	Diff line number	Diff line change
`@@ -216,7 +216,7 @@ func TestNewServer_Signal(t *testing.T) {`
`216`	`216`	`}`
`217`	`217`	`require.NoError(t, sc.Err())`
`218`	`218`
`219`		`- err = sess.Signal(ssh.SIGINT)`
	`219`	`+ err = sess.Signal(ssh.SIGKILL)`
`220`	`220`	`require.NoError(t, err)`
`221`	`221`
`222`	`222`	`// Assumption, signal propagates and the command exists, closing stdout.`
`@@ -295,7 +295,7 @@ func TestNewServer_Signal(t *testing.T) {`
`295`	`295`	`}`
`296`	`296`	`require.NoError(t, sc.Err())`
`297`	`297`
`298`		`- err = sess.Signal(ssh.SIGINT)`
	`298`	`+ err = sess.Signal(ssh.SIGKILL)`
`299`	`299`	`require.NoError(t, err)`
`300`	`300`
`301`	`301`	`// Assumption, signal propagates and the command exists, closing stdout.`