Fix migration and experimental

kylecarbs · kylecarbs · commit 435348ddcc3c · 2022-10-17T23:14:25.000Z
diff --git a/cli/root.go b/cli/root.go
@@ -609,7 +609,8 @@ func (h *headerTransport) RoundTrip(req *http.Request) (*http.Response, error) {
 
 // ExperimentalEnabled returns if the experimental feature flag is enabled.
 func ExperimentalEnabled(cmd *cobra.Command) bool {
-	return cliflag.IsSetBool(cmd, varExperimental)
+	enabled, _ := cmd.Flags().GetBool(varExperimental)
+	return enabled
 }
 
 // EnsureExperimental will ensure that the experimental feature flag is set if the given flag is set.
diff --git a/coderd/database/dump.sql b/coderd/database/dump.sql
diff --git a/coderd/database/migrations/000059_file_id.up.sql b/coderd/database/migrations/000059_file_id.up.sql
@@ -14,9 +14,6 @@ BEGIN;
 -- Drop the primary key on hash.
 ALTER TABLE files DROP CONSTRAINT files_pkey;
 
--- This extension is required by gen_random_uuid
-CREATE EXTENSION IF NOT EXISTS pgcrypto;
-
 -- Add an 'id' column and designate it the primary key.
 ALTER TABLE files ADD COLUMN
 	id uuid NOT NULL PRIMARY KEY DEFAULT gen_random_uuid ();
diff --git a/tailnet/coordinator.go b/tailnet/coordinator.go
@@ -1,6 +1,7 @@
 package tailnet
 
 import (
+	"context"
 	"encoding/json"
 	"errors"
 	"io"
@@ -289,7 +290,7 @@ func (c *coordinator) ServeAgent(conn net.Conn, id uuid.UUID) error {
 	for {
 		err := c.handleNextAgentMessage(id, decoder)
 		if err != nil {
-			if errors.Is(err, io.EOF) {
+			if errors.Is(err, io.EOF) || errors.Is(err, context.Canceled) {
 				return nil
 			}
 			return xerrors.Errorf("handle next agent message: %w", err)

Original file line number	Diff line number	Diff line change
`@@ -609,7 +609,8 @@ func (h headerTransport) RoundTrip(req http.Request) (*http.Response, error) {`
`609`	`609`
`610`	`610`	`// ExperimentalEnabled returns if the experimental feature flag is enabled.`
`611`	`611`	`func ExperimentalEnabled(cmd *cobra.Command) bool {`
`612`		`- return cliflag.IsSetBool(cmd, varExperimental)`
	`612`	`+ enabled, _ := cmd.Flags().GetBool(varExperimental)`
	`613`	`+ return enabled`
`613`	`614`	`}`
`614`	`615`
`615`	`616`	`// EnsureExperimental will ensure that the experimental feature flag is set if the given flag is set.`