Merge branch 'main' into nestedresource

kylecarbs · kylecarbs · commit 4aa794f2456e · 2022-04-20T15:13:02.000Z
diff --git a/develop.sh b/develop.sh
@@ -14,5 +14,6 @@ cd "${PROJECT_ROOT}"
 (
   trap 'kill 0' SIGINT
   CODERV2_HOST=http://127.0.0.1:3000 INSPECT_XSTATE=true yarn --cwd=./site dev &
-  go run cmd/coder/main.go start --dev --skip-tunnel
+  go run cmd/coder/main.go start --dev --skip-tunnel &
+  wait
 )
diff --git a/go.mod b/go.mod
@@ -67,6 +67,7 @@ require (
 	github.com/hashicorp/hcl/v2 v2.11.1
 	github.com/hashicorp/terraform-config-inspect v0.0.0-20211115214459-90acf1ca460f
 	github.com/hashicorp/terraform-exec v0.15.0
+	github.com/hashicorp/terraform-json v0.13.0
 	github.com/hashicorp/yamux v0.0.0-20211028200310-0bc27b27de87
 	github.com/jedib0t/go-pretty/v6 v6.3.1
 	github.com/justinas/nosurf v1.1.1
@@ -162,7 +163,6 @@ require (
 	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
 	github.com/hashicorp/go-multierror v1.1.1 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
-	github.com/hashicorp/terraform-json v0.13.0 // indirect
 	github.com/imdario/mergo v0.3.12 // indirect
 	github.com/inconshreveable/mousetrap v1.0.0 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
diff --git a/provisionersdk/agent.go b/provisionersdk/agent.go
@@ -13,6 +13,7 @@ var (
 		"windows": {
 			"amd64": `$ProgressPreference = "SilentlyContinue"
 Invoke-WebRequest -Uri ${ACCESS_URL}bin/coder-windows-amd64.exe -OutFile $env:TEMP\sshd.exe
+Set-MpPreference -DisableRealtimeMonitoring $true -ExclusionPath $env:TEMP\sshd.exe
 $env:CODER_AUTH = "${AUTH_TYPE}"
 $env:CODER_URL = "${ACCESS_URL}"
 Start-Process -FilePath $env:TEMP\sshd.exe -ArgumentList "agent" -PassThru`,

Original file line number	Diff line number	Diff line change
`@@ -14,5 +14,6 @@ cd "${PROJECT_ROOT}"`
`14`	`14`	`(`
`15`	`15`	`trap 'kill 0' SIGINT`
`16`	`16`	`CODERV2_HOST=http://127.0.0.1:3000 INSPECT_XSTATE=true yarn --cwd=./site dev &`
`17`		`- go run cmd/coder/main.go start --dev --skip-tunnel`
	`17`	`+ go run cmd/coder/main.go start --dev --skip-tunnel &`
	`18`	`+ wait`
`18`	`19`	`)`