coder · kylecarbs · Jun 22, 2023 · Jun 21, 2023 · Jun 21, 2023 · Jun 21, 2023
diff --git a/.gitignore b/.gitignore
@@ -27,6 +27,7 @@ site/storybook-static/
 site/test-results/*
 site/e2e/test-results/*
 site/e2e/states/*.json
+site/e2e/.auth.json
 site/playwright-report/*
 site/.swc
 site/dist/

diff --git a/.prettierignore b/.prettierignore
@@ -30,6 +30,7 @@ site/storybook-static/
 site/test-results/*
 site/e2e/test-results/*
 site/e2e/states/*.json
+site/e2e/.auth.json
 site/playwright-report/*
 site/.swc
 site/dist/
@@ -74,3 +75,6 @@ helm/templates/*.yaml
 
 # Testdata shouldn't be formatted.
 scripts/apitypings/testdata/**/*.ts
+
+# Generated files shouldn't be formatted.
+site/e2e/provisionerGenerated.ts
diff --git a/.prettierignore.include b/.prettierignore.include
@@ -8,3 +8,6 @@ helm/templates/*.yaml
 
 # Testdata shouldn't be formatted.
 scripts/apitypings/testdata/**/*.ts
+
+# Generated files shouldn't be formatted.
+site/e2e/provisionerGenerated.ts
diff --git a/cli/server.go b/cli/server.go
@@ -821,7 +821,7 @@ func (r *RootCmd) Server(newAPI func(context.Context, *coderd.Options) (*coderd.
 			for i := int64(0); i < cfg.Provisioner.Daemons.Value(); i++ {
 				daemonCacheDir := filepath.Join(cacheDir, fmt.Sprintf("provisioner-%d", i))
 				daemon, err := newProvisionerDaemon(
-					ctx, coderAPI, provisionerdMetrics, logger, cfg, daemonCacheDir, errCh, false, &provisionerdWaitGroup,
+					ctx, coderAPI, provisionerdMetrics, logger, cfg, daemonCacheDir, errCh, &provisionerdWaitGroup,
 				)
 				if err != nil {
 					return xerrors.Errorf("create provisioner daemon: %w", err)
@@ -1177,7 +1177,6 @@ func newProvisionerDaemon(
 	cfg *codersdk.DeploymentValues,
 	cacheDir string,
 	errCh chan error,
-	dev bool,
 	wg *sync.WaitGroup,
 ) (srv *provisionerd.Server, err error) {
 	ctx, cancel := context.WithCancel(ctx)
@@ -1192,53 +1191,14 @@ func newProvisionerDaemon(
 		return nil, xerrors.Errorf("mkdir %q: %w", cacheDir, err)
 	}
 
-	tfDir := filepath.Join(cacheDir, "tf")
-	err = os.MkdirAll(tfDir, 0o700)
-	if err != nil {
-		return nil, xerrors.Errorf("mkdir terraform dir: %w", err)
-	}
-
-	tracer := coderAPI.TracerProvider.Tracer(tracing.TracerName)
-	terraformClient, terraformServer := provisionersdk.MemTransportPipe()
-	wg.Add(1)
-	go func() {
-		defer wg.Done()
-		<-ctx.Done()
-		_ = terraformClient.Close()
-		_ = terraformServer.Close()
-	}()
-	wg.Add(1)
-	go func() {
-		defer wg.Done()
-		defer cancel()
-
-		err := terraform.Serve(ctx, &terraform.ServeOptions{
-			ServeOptions: &provisionersdk.ServeOptions{
-				Listener: terraformServer,
-			},
-			CachePath: tfDir,
-			Logger:    logger,
-			Tracer:    tracer,
-		})
-		if err != nil && !xerrors.Is(err, context.Canceled) {
-			select {
-			case errCh <- err:
-			default:
-			}
-		}
-	}()
-
 	workDir := filepath.Join(cacheDir, "work")
 	err = os.MkdirAll(workDir, 0o700)
 	if err != nil {
 		return nil, xerrors.Errorf("mkdir work dir: %w", err)
 	}
 
-	provisioners := provisionerd.Provisioners{
-		string(database.ProvisionerTypeTerraform): sdkproto.NewDRPCProvisionerClient(terraformClient),
-	}
-	// include echo provisioner when in dev mode
-	if dev {
+	provisioners := provisionerd.Provisioners{}
+	if cfg.Provisioner.DaemonsEcho {
 		echoClient, echoServer := provisionersdk.MemTransportPipe()
 		wg.Add(1)
 		go func() {
@@ -1261,7 +1221,46 @@ func newProvisionerDaemon(
 			}
 		}()
 		provisioners[string(database.ProvisionerTypeEcho)] = sdkproto.NewDRPCProvisionerClient(echoClient)
+	} else {
+		tfDir := filepath.Join(cacheDir, "tf")
+		err = os.MkdirAll(tfDir, 0o700)
+		if err != nil {
+			return nil, xerrors.Errorf("mkdir terraform dir: %w", err)
+		}
+
+		tracer := coderAPI.TracerProvider.Tracer(tracing.TracerName)
+		terraformClient, terraformServer := provisionersdk.MemTransportPipe()
+		wg.Add(1)
+		go func() {
+			defer wg.Done()
+			<-ctx.Done()
+			_ = terraformClient.Close()
+			_ = terraformServer.Close()
+		}()
+		wg.Add(1)
+		go func() {
+			defer wg.Done()
+			defer cancel()
+
+			err := terraform.Serve(ctx, &terraform.ServeOptions{
+				ServeOptions: &provisionersdk.ServeOptions{
+					Listener: terraformServer,
+				},
+				CachePath: tfDir,
+				Logger:    logger,
+				Tracer:    tracer,
+			})
+			if err != nil && !xerrors.Is(err, context.Canceled) {
+				select {
+				case errCh <- err:
+				default:
+				}
+			}
+		}()
+
+		provisioners[string(database.ProvisionerTypeTerraform)] = sdkproto.NewDRPCProvisionerClient(terraformClient)
 	}
+
 	debounce := time.Second
 	return provisionerd.New(func(ctx context.Context) (proto.DRPCProvisionerDaemonClient, error) {
 		// This debounces calls to listen every second. Read the comment

diff --git a/cli/testdata/server-config.yaml.golden b/cli/testdata/server-config.yaml.golden
@@ -288,6 +288,10 @@ provisioning:
   # state for a long time, consider increasing this.
   # (default: 3, type: int)
   daemons: 3
+  # Whether to use echo provisioner daemons instead of Terraform. This is for E2E
+  # tests.
+  # (default: false, type: bool)
+  daemonsEcho: false
   # Time to wait before polling for a new job.
   # (default: 1s, type: duration)
   daemonPollInterval: 1s

diff --git a/coderd/apidoc/docs.go b/coderd/apidoc/docs.go
diff --git a/coderd/apidoc/swagger.json b/coderd/apidoc/swagger.json
diff --git a/codersdk/deployment.go b/codersdk/deployment.go
@@ -310,6 +310,7 @@ type GitAuthConfig struct {
 
 type ProvisionerConfig struct {
 	Daemons             clibase.Int64    `json:"daemons" typescript:",notnull"`
+	DaemonsEcho         clibase.Bool     `json:"daemons_echo" typescript:",notnull"`
 	DaemonPollInterval  clibase.Duration `json:"daemon_poll_interval" typescript:",notnull"`
 	DaemonPollJitter    clibase.Duration `json:"daemon_poll_jitter" typescript:",notnull"`
 	ForceCancelInterval clibase.Duration `json:"force_cancel_interval" typescript:",notnull"`
@@ -1093,6 +1094,17 @@ when required by your organization's security policy.`,
 			Group:       &deploymentGroupProvisioning,
 			YAML:        "daemons",
 		},
+		{
+			Name:        "Echo Provisioner",
+			Description: "Whether to use echo provisioner daemons instead of Terraform. This is for E2E tests.",
+			Flag:        "provisioner-daemons-echo",
+			Env:         "CODER_PROVISIONER_DAEMONS_ECHO",
+			Hidden:      true,
+			Default:     "false",
+			Value:       &c.Provisioner.DaemonsEcho,
+			Group:       &deploymentGroupProvisioning,
+			YAML:        "daemonsEcho",
+		},
 		{
 			Name:        "Poll Interval",
 			Description: "Time to wait before polling for a new job.",

diff --git a/docs/api/general.md b/docs/api/general.md
@@ -283,6 +283,7 @@ curl -X GET http://coder-server:8080/api/v2/deployment/config \
       "daemon_poll_interval": 0,
       "daemon_poll_jitter": 0,
       "daemons": 0,
+      "daemons_echo": true,
       "force_cancel_interval": 0
     },
     "proxy_health_status_interval": 0,

diff --git a/docs/api/schemas.md b/docs/api/schemas.md
@@ -1960,6 +1960,7 @@ AuthorizationObject can represent a "set" of objects, such as: all workspaces in
       "daemon_poll_interval": 0,
       "daemon_poll_jitter": 0,
       "daemons": 0,
+      "daemons_echo": true,
       "force_cancel_interval": 0
     },
     "proxy_health_status_interval": 0,
@@ -2289,6 +2290,7 @@ AuthorizationObject can represent a "set" of objects, such as: all workspaces in
     "daemon_poll_interval": 0,
     "daemon_poll_jitter": 0,
     "daemons": 0,
+    "daemons_echo": true,
     "force_cancel_interval": 0
   },
   "proxy_health_status_interval": 0,
@@ -3125,6 +3127,7 @@ AuthorizationObject can represent a "set" of objects, such as: all workspaces in
   "daemon_poll_interval": 0,
   "daemon_poll_jitter": 0,
   "daemons": 0,
+  "daemons_echo": true,
   "force_cancel_interval": 0
 }
 ```
@@ -3136,6 +3139,7 @@ AuthorizationObject can represent a "set" of objects, such as: all workspaces in
 | `daemon_poll_interval`  | integer | false    |              |             |
 | `daemon_poll_jitter`    | integer | false    |              |             |
 | `daemons`               | integer | false    |              |             |
+| `daemons_echo`          | boolean | false    |              |             |
 | `force_cancel_interval` | integer | false    |              |             |
 
 ## codersdk.ProvisionerDaemon

diff --git a/examples/templates/docker/main.tf b/examples/templates/docker/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     coder = {
       source  = "coder/coder"
-      version = "~> 0.7.0"
+      version = "~> 0.8.3"
     }
     docker = {
       source  = "kreuzwerker/docker"

diff --git a/site/.eslintignore b/site/.eslintignore
@@ -30,6 +30,7 @@ storybook-static/
 test-results/*
 e2e/test-results/*
 e2e/states/*.json
+e2e/.auth.json
 playwright-report/*
 .swc
 dist/
@@ -74,3 +75,6 @@ stats/
 
 # Testdata shouldn't be formatted.
 ../scripts/apitypings/testdata/**/*.ts
+
+# Generated files shouldn't be formatted.
+e2e/provisionerGenerated.ts
diff --git a/site/.prettierignore b/site/.prettierignore
@@ -30,6 +30,7 @@ storybook-static/
 test-results/*
 e2e/test-results/*
 e2e/states/*.json
+e2e/.auth.json
 playwright-report/*
 .swc
 dist/
@@ -74,3 +75,6 @@ stats/
 
 # Testdata shouldn't be formatted.
 ../scripts/apitypings/testdata/**/*.ts
+
+# Generated files shouldn't be formatted.
+e2e/provisionerGenerated.ts
diff --git a/site/e2e/global.setup.ts b/site/e2e/global.setup.ts
@@ -0,0 +1,18 @@
+import { test, expect } from "@playwright/test"
+import * as constants from "./constants"
+import { STORAGE_STATE } from "./playwright.config"
+import { Language } from "../src/components/CreateUserForm/CreateUserForm"
+
+test("create first user", async ({ page }) => {
+  await page.goto("/", { waitUntil: "networkidle" })
+
+  await page.getByLabel(Language.usernameLabel).fill(constants.username)
+  await page.getByLabel(Language.emailLabel).fill(constants.email)
+  await page.getByLabel(Language.passwordLabel).fill(constants.password)
+  await page.getByTestId("trial").click()
+  await page.getByTestId("create").click()
+
+  await expect(page).toHaveURL("/workspaces")
+
+  await page.context().storageState({ path: STORAGE_STATE })
+})
diff --git a/site/e2e/globalSetup.ts b/site/e2e/globalSetup.ts