Merge branch 'main' of github.com:coder/coder into spike/2436_better_fake_db_transaction_isolation

spikecurtis · spikecurtis · commit d7efec3bfb70 · 2022-06-17T13:00:48.000-07:00
diff --git a/Makefile b/Makefile
@@ -127,13 +127,17 @@ test-postgres-docker:
 		--env POSTGRES_USER=postgres \
 		--env POSTGRES_DB=postgres \
 		--env PGDATA=/tmp \
+		--tmpfs /tmp \
 		--publish 5432:5432 \
 		--name test-postgres-docker \
-		--restart unless-stopped \
+		--restart no \
 		--detach \
 		postgres:11 \
 		-c shared_buffers=1GB \
-		-c max_connections=1000
+		-c max_connections=1000 \
+		-c fsync=off \
+		-c synchronous_commit=off \
+		-c full_page_writes=off
 
 .PHONY: test-clean
 test-clean:
diff --git a/cli/templatecreate_test.go b/cli/templatecreate_test.go
@@ -1,6 +1,7 @@
 package cli_test
 
 import (
+	"io"
 	"os"
 	"testing"
 
@@ -197,6 +198,53 @@ func TestTemplateCreate(t *testing.T) {
 		require.EqualError(t, <-execDone, "Parameter value absent in parameter file for \"region\"!")
 		removeTmpDirUntilSuccess(t, tempDir)
 	})
+
+	t.Run("Recreate template with same name (create, delete, create)", func(t *testing.T) {
+		t.Parallel()
+		client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerD: true})
+		coderdtest.CreateFirstUser(t, client)
+
+		create := func() error {
+			source := clitest.CreateTemplateVersionSource(t, &echo.Responses{
+				Parse:     echo.ParseComplete,
+				Provision: provisionCompleteWithAgent,
+			})
+			args := []string{
+				"templates",
+				"create",
+				"my-template",
+				"--yes",
+				"--directory", source,
+				"--test.provisioner", string(database.ProvisionerTypeEcho),
+			}
+			cmd, root := clitest.New(t, args...)
+			clitest.SetupConfig(t, client, root)
+			cmd.SetOut(io.Discard)
+			cmd.SetErr(io.Discard)
+
+			return cmd.Execute()
+		}
+		del := func() error {
+			args := []string{
+				"templates",
+				"delete",
+				"my-template",
+			}
+			cmd, root := clitest.New(t, args...)
+			clitest.SetupConfig(t, client, root)
+			cmd.SetOut(io.Discard)
+			cmd.SetErr(io.Discard)
+
+			return cmd.Execute()
+		}
+
+		err := create()
+		require.NoError(t, err, "Template must be created without error")
+		err = del()
+		require.NoError(t, err, "Template must be deleted without error")
+		err = create()
+		require.NoError(t, err, "Template must be recreated without error")
+	})
 }
 
 func createTestParseResponse() []*proto.Parse_Response {
diff --git a/cli/templatedelete.go b/cli/templatedelete.go
@@ -76,7 +76,7 @@ func templateDelete() *cobra.Command {
 					return xerrors.Errorf("delete template %q: %w", template.Name, err)
 				}
 
-				_, _ = fmt.Fprintln(cmd.ErrOrStderr(), "Deleted template "+cliui.Styles.Code.Render(template.Name)+"!")
+				_, _ = fmt.Fprintln(cmd.OutOrStdout(), "Deleted template "+cliui.Styles.Code.Render(template.Name)+"!")
 			}
 
 			return nil
diff --git a/coderd/database/dump.sql b/coderd/database/dump.sql
diff --git a/coderd/database/migrations/000026_allow_template_name_re_use.down.sql b/coderd/database/migrations/000026_allow_template_name_re_use.down.sql
@@ -0,0 +1,5 @@
+DROP INDEX templates_organization_id_name_idx;
+CREATE UNIQUE INDEX templates_organization_id_name_idx ON templates USING btree (organization_id, name) WHERE deleted = false;
+CREATE UNIQUE INDEX idx_templates_name_lower ON templates USING btree (lower(name));
+
+ALTER TABLE ONLY templates ADD CONSTRAINT templates_organization_id_name_key UNIQUE (organization_id, name);
diff --git a/coderd/database/migrations/000026_allow_template_name_re_use.up.sql b/coderd/database/migrations/000026_allow_template_name_re_use.up.sql
@@ -0,0 +1,5 @@
+DROP INDEX idx_templates_name_lower;
+DROP INDEX templates_organization_id_name_idx;
+CREATE UNIQUE INDEX templates_organization_id_name_idx ON templates (organization_id, lower(name)) WHERE deleted = false;
+
+ALTER TABLE ONLY templates DROP CONSTRAINT templates_organization_id_name_key;

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ func templateDelete() *cobra.Command {`
`76`	`76`	`return xerrors.Errorf("delete template %q: %w", template.Name, err)`
`77`	`77`	`}`
`78`	`78`
`79`		`- _, _ = fmt.Fprintln(cmd.ErrOrStderr(), "Deleted template "+cliui.Styles.Code.Render(template.Name)+"!")`
	`79`	`+ _, _ = fmt.Fprintln(cmd.OutOrStdout(), "Deleted template "+cliui.Styles.Code.Render(template.Name)+"!")`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`return nil`