Merge branch 'main' into projectversionresources

coder · kylecarbs · Feb 8, 2022 · Feb 6, 2022 · Feb 7, 2022 · Feb 7, 2022
commit c07224e868ce80ce5ed6cfe9cf21bfa3501ff55d
diff --git a/codersdk/provisioners_test.go b/codersdk/provisioners_test.go
@@ -70,7 +70,7 @@ func TestProvisionerJobLogs(t *testing.T) {
 		workspace := coderdtest.CreateWorkspace(t, client, "", project.ID)
 		history, err := client.CreateWorkspaceHistory(context.Background(), "", workspace.Name, coderd.CreateWorkspaceHistoryRequest{
 			ProjectVersionID: version.ID,
-			Transition:       database.WorkspaceTransitionCreate,
+			Transition:       database.WorkspaceTransitionStart,
 		})
 		require.NoError(t, err)
 		_, err = client.ProvisionerJobLogs(context.Background(), history.Provision.ID)
@@ -112,7 +112,7 @@ func TestFollowProvisionerJobLogsAfter(t *testing.T) {
 		after := database.Now()
 		history, err := client.CreateWorkspaceHistory(context.Background(), "", workspace.Name, coderd.CreateWorkspaceHistoryRequest{
 			ProjectVersionID: version.ID,
-			Transition:       database.WorkspaceTransitionCreate,
+			Transition:       database.WorkspaceTransitionStart,
 		})
 		require.NoError(t, err)
 		logs, err := client.FollowProvisionerJobLogsAfter(context.Background(), history.Provision.ID, after)

diff --git a/codersdk/workspaces_test.go b/codersdk/workspaces_test.go
@@ -157,76 +157,3 @@ func TestCreateWorkspaceHistory(t *testing.T) {
 		require.NoError(t, err)
 	})
 }
-
-func TestWorkspaceHistoryLogs(t *testing.T) {
-	t.Parallel()
-	t.Run("Error", func(t *testing.T) {
-		t.Parallel()
-		client := coderdtest.New(t)
-		_, err := client.WorkspaceHistoryLogs(context.Background(), "", "", "")
-		require.Error(t, err)
-	})
-
-	t.Run("List", func(t *testing.T) {
-		t.Parallel()
-		client := coderdtest.New(t)
-		user := coderdtest.CreateInitialUser(t, client)
-		_ = coderdtest.NewProvisionerDaemon(t, client)
-		project := coderdtest.CreateProject(t, client, user.Organization)
-		version := coderdtest.CreateProjectVersion(t, client, user.Organization, project.Name, nil)
-		coderdtest.AwaitProjectVersionImported(t, client, user.Organization, project.Name, version.Name)
-		workspace := coderdtest.CreateWorkspace(t, client, "", project.ID)
-		history, err := client.CreateWorkspaceHistory(context.Background(), "", workspace.Name, coderd.CreateWorkspaceHistoryRequest{
-			ProjectVersionID: version.ID,
-			Transition:       database.WorkspaceTransitionStart,
-		})
-		require.NoError(t, err)
-		_, err = client.WorkspaceHistoryLogs(context.Background(), "", workspace.Name, history.Name)
-		require.NoError(t, err)
-	})
-}
-
-func TestFollowWorkspaceHistoryLogsAfter(t *testing.T) {
-	t.Parallel()
-	t.Run("Error", func(t *testing.T) {
-		t.Parallel()
-		client := coderdtest.New(t)
-		_, err := client.FollowWorkspaceHistoryLogsAfter(context.Background(), "", "", "", time.Time{})
-		require.Error(t, err)
-	})
-
-	t.Run("Stream", func(t *testing.T) {
-		t.Parallel()
-		client := coderdtest.New(t)
-		user := coderdtest.CreateInitialUser(t, client)
-		_ = coderdtest.NewProvisionerDaemon(t, client)
-		project := coderdtest.CreateProject(t, client, user.Organization)
-		version := coderdtest.CreateProjectVersion(t, client, user.Organization, project.Name, &echo.Responses{
-			Parse: echo.ParseComplete,
-			Provision: []*proto.Provision_Response{{
-				Type: &proto.Provision_Response_Log{
-					Log: &proto.Log{
-						Output: "hello",
-					},
-				},
-			}, {
-				Type: &proto.Provision_Response_Complete{
-					Complete: &proto.Provision_Complete{},
-				},
-			}},
-		})
-		coderdtest.AwaitProjectVersionImported(t, client, user.Organization, project.Name, version.Name)
-		workspace := coderdtest.CreateWorkspace(t, client, "", project.ID)
-		history, err := client.CreateWorkspaceHistory(context.Background(), "", workspace.Name, coderd.CreateWorkspaceHistoryRequest{
-			ProjectVersionID: version.ID,
-			Transition:       database.WorkspaceTransitionStart,
-		})
-		require.NoError(t, err)
-		logs, err := client.FollowWorkspaceHistoryLogsAfter(context.Background(), "", workspace.Name, history.Name, time.Time{})
-		require.NoError(t, err)
-		_, ok := <-logs
-		require.True(t, ok)
-		_, ok = <-logs
-		require.False(t, ok)
-	})
-}
diff --git a/database/databasefake/databasefake.go b/database/databasefake/databasefake.go
@@ -19,17 +19,17 @@ func New() database.Store {
 		organizationMembers: make([]database.OrganizationMember, 0),
 		users:               make([]database.User, 0),
 
+		files:                   make([]database.File, 0),
 		parameterValue:          make([]database.ParameterValue, 0),
 		project:                 make([]database.Project, 0),
 		projectVersion:          make([]database.ProjectVersion, 0),
-		projectVersionLog:       make([]database.ProjectVersionLog, 0),
 		projectVersionParameter: make([]database.ProjectVersionParameter, 0),
 		provisionerDaemons:      make([]database.ProvisionerDaemon, 0),
 		provisionerJobs:         make([]database.ProvisionerJob, 0),
+		provisionerJobLog:       make([]database.ProvisionerJobLog, 0),
 		workspace:               make([]database.Workspace, 0),
 		workspaceResource:       make([]database.WorkspaceResource, 0),
 		workspaceHistory:        make([]database.WorkspaceHistory, 0),
-		workspaceHistoryLog:     make([]database.WorkspaceHistoryLog, 0),
 		workspaceAgent:          make([]database.WorkspaceAgent, 0),
 	}
 }
@@ -45,17 +45,17 @@ type fakeQuerier struct {
 	users               []database.User
 
 	// New tables
+	files                   []database.File
 	parameterValue          []database.ParameterValue
 	project                 []database.Project
 	projectVersion          []database.ProjectVersion
-	projectVersionLog       []database.ProjectVersionLog
 	projectVersionParameter []database.ProjectVersionParameter
 	provisionerDaemons      []database.ProvisionerDaemon
 	provisionerJobs         []database.ProvisionerJob
+	provisionerJobLog       []database.ProvisionerJobLog
 	workspace               []database.Workspace
 	workspaceAgent          []database.WorkspaceAgent
 	workspaceHistory        []database.WorkspaceHistory
-	workspaceHistoryLog     []database.WorkspaceHistoryLog
 	workspaceResource       []database.WorkspaceResource
 }
 

diff --git a/database/dump.sql b/database/dump.sql
diff --git a/database/migrations/000002_projects.up.sql b/database/migrations/000002_projects.up.sql
@@ -98,37 +98,3 @@ CREATE TABLE project_version_parameter (
     validation_value_type varchar(64) NOT NULL,
     UNIQUE(project_version_id, name)
 );
-
-CREATE TYPE log_level AS ENUM (
-    'trace',
-    'debug',
-    'info',
-    'warn',
-    'error'
-);
-
-CREATE TYPE log_source AS ENUM (
-    'provisioner_daemon',
-    'provisioner'
-);
-
-CREATE TABLE project_version_log (
-    id uuid NOT NULL UNIQUE,
-    project_version_id uuid NOT NULL REFERENCES project_version (id) ON DELETE CASCADE,
-    created_at timestamptz NOT NULL,
-    source log_source NOT NULL,
-    level log_level NOT NULL,
-    output varchar(1024) NOT NULL
-);
-
--- Stores resources for a specific project version and workspace transition.
--- This is to display resources for the started and stopped transitions.
-CREATE TABLE project_version_resource (
-    id uuid NOT NULL UNIQUE,
-    project_version_id uuid NOT NULL REFERENCES project_version (id) ON DELETE CASCADE,
-    created_at timestamptz NOT NULL,
-    destroy_on_stop boolean NOT NULL,
-    type varchar(256) NOT NULL,
-    name varchar(64) NOT NULL,
-    UNIQUE(project_version_id, type, name)
-);
diff --git a/database/models.go b/database/models.go
diff --git a/database/querier.go b/database/querier.go
diff --git a/database/query.sql b/database/query.sql
@@ -443,17 +443,6 @@ INSERT INTO
 VALUES
   ($1, $2, $3, $4, $5, $6, $7, $8, $9) RETURNING *;
 
--- name: InsertProjectVersionParameter :one
-INSERT INTO
-  project_version_log
-SELECT
-  @project_version_id :: uuid AS project_version_id,
-  unnest(@id :: uuid [ ]) AS id,
-  unnest(@created_at :: timestamptz [ ]) AS created_at,
-  unnest(@source :: log_source [ ]) as source,
-  unnest(@level :: log_level [ ]) as level,
-  unnest(@output :: varchar(1024) [ ]) as output RETURNING *;
-
 -- name: InsertProjectVersionParameter :one
 INSERT INTO
   project_version_parameter (