Skip to content

chore: join user information to workspace_build and template_version #8625

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 16 commits into from
Jul 25, 2023
Merged

chore: join user information to workspace_build and template_version #8625

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
eddc782
include minimial user on template version and build
Emyrk Jul 20, 2023
e7a4034
make gen
Emyrk Jul 20, 2023
3aad7af
Fix unit tests
Emyrk Jul 20, 2023
4623a56
fixup! Fix unit tests
Emyrk Jul 20, 2023
05b0767
Merge remote-tracking branch 'origin/main' into stevenmasley/join_use…
Emyrk Jul 21, 2023
ba7cf91
Fix unit test
Emyrk Jul 21, 2023
d5bbd85
update db mocks
Emyrk Jul 21, 2023
55ff364
Fix dbfake with joins
Emyrk Jul 21, 2023
c8e96ed
Fix tx
Emyrk Jul 21, 2023
589c15b
Fix mock expects
Emyrk Jul 21, 2023
1898c59
Fix dbfake, replaced the wrong function
Emyrk Jul 21, 2023
5b7d955
More missed mocks
Emyrk Jul 21, 2023
9bf32c5
use correct id in fetch
Emyrk Jul 21, 2023
262edb0
linting, remove unused ctx in dbfake
Emyrk Jul 21, 2023
aa6bb77
Add unit test to ensure join is superset
Emyrk Jul 21, 2023
b94a0a1
Merge remote-tracking branch 'origin/main' into stevenmasley/join_use…
Emyrk Jul 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix unit tests
  • Loading branch information
@Emyrk
Emyrk committed Jul 20, 2023
commit 3aad7afebd2b64adb5a235ba7ac3ef028c30601e
31 changes: 18 additions & 13 deletions coderd/provisionerdserver/provisionerdserver_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -558,7 +558,8 @@ func TestUpdateJob(t *testing.T) {
t.Parallel()
srv := setup(t, false)
job := setupJob(t, srv)
version, err := srv.Database.InsertTemplateVersion(ctx, database.InsertTemplateVersionParams{
versionID := uuid.New()
err := srv.Database.InsertTemplateVersion(ctx, database.InsertTemplateVersionParams{
ID: uuid.New(),
JobID: job,
})
Expand All @@ -569,7 +570,7 @@ func TestUpdateJob(t *testing.T) {
})
require.NoError(t, err)

version, err = srv.Database.GetTemplateVersionByID(ctx, version.ID)
version, err := srv.Database.GetTemplateVersionByID(ctx, versionID)
require.NoError(t, err)
require.Equal(t, "# hello world", version.Readme)
})
Expand All @@ -583,8 +584,9 @@ func TestUpdateJob(t *testing.T) {

srv := setup(t, false)
job := setupJob(t, srv)
version, err := srv.Database.InsertTemplateVersion(ctx, database.InsertTemplateVersionParams{
ID: uuid.New(),
versionID := uuid.New()
err := srv.Database.InsertTemplateVersion(ctx, database.InsertTemplateVersionParams{
ID: versionID,
JobID: job,
})
require.NoError(t, err)
Expand Down Expand Up @@ -616,7 +618,7 @@ func TestUpdateJob(t *testing.T) {
require.NoError(t, err)
require.Len(t, response.VariableValues, 2)

templateVariables, err := srv.Database.GetTemplateVersionVariables(ctx, version.ID)
templateVariables, err := srv.Database.GetTemplateVersionVariables(ctx, versionID)
require.NoError(t, err)
require.Len(t, templateVariables, 2)
require.Equal(t, templateVariables[0].Value, firstTemplateVariable.DefaultValue)
Expand All @@ -629,8 +631,9 @@ func TestUpdateJob(t *testing.T) {

srv := setup(t, false)
job := setupJob(t, srv)
version, err := srv.Database.InsertTemplateVersion(ctx, database.InsertTemplateVersionParams{
ID: uuid.New(),
versionID := uuid.New()
err := srv.Database.InsertTemplateVersion(ctx, database.InsertTemplateVersionParams{
ID: versionID,
JobID: job,
})
require.NoError(t, err)
Expand Down Expand Up @@ -658,7 +661,7 @@ func TestUpdateJob(t *testing.T) {

// Even though there is an error returned, variables are stored in the database
// to show the schema in the site UI.
templateVariables, err := srv.Database.GetTemplateVersionVariables(ctx, version.ID)
templateVariables, err := srv.Database.GetTemplateVersionVariables(ctx, versionID)
require.NoError(t, err)
require.Len(t, templateVariables, 2)
require.Equal(t, templateVariables[0].Value, firstTemplateVariable.DefaultValue)
Expand Down Expand Up @@ -761,6 +764,7 @@ func TestFailJob(t *testing.T) {
WorkspaceBuildID: buildID,
})
require.NoError(t, err)

job, err := srv.Database.InsertProvisionerJob(ctx, database.InsertProvisionerJobParams{
ID: uuid.New(),
Input: input,
Expand All @@ -779,7 +783,7 @@ func TestFailJob(t *testing.T) {
require.NoError(t, err)

publishedWorkspace := make(chan struct{})
closeWorkspaceSubscribe, err := srv.Pubsub.Subscribe(codersdk.WorkspaceNotifyChannel(build.WorkspaceID), func(_ context.Context, _ []byte) {
closeWorkspaceSubscribe, err := srv.Pubsub.Subscribe(codersdk.WorkspaceNotifyChannel(workspace.ID), func(_ context.Context, _ []byte) {
close(publishedWorkspace)
})
require.NoError(t, err)
Expand All @@ -802,7 +806,7 @@ func TestFailJob(t *testing.T) {
require.NoError(t, err)
<-publishedWorkspace
<-publishedLogs
build, err = srv.Database.GetWorkspaceBuildByID(ctx, build.ID)
build, err := srv.Database.GetWorkspaceBuildByID(ctx, buildID)
require.NoError(t, err)
require.Equal(t, "some state", string(build.ProvisionerState))
})
Expand Down Expand Up @@ -852,15 +856,16 @@ func TestCompleteJob(t *testing.T) {
t.Parallel()
srv := setup(t, false)
jobID := uuid.New()
version, err := srv.Database.InsertTemplateVersion(ctx, database.InsertTemplateVersionParams{
ID: uuid.New(),
versionID := uuid.New()
err := srv.Database.InsertTemplateVersion(ctx, database.InsertTemplateVersionParams{
ID: versionID
JobID: jobID,
})
require.NoError(t, err)
job, err := srv.Database.InsertProvisionerJob(ctx, database.InsertProvisionerJobParams{
ID: jobID,
Provisioner: database.ProvisionerTypeEcho,
Input: []byte(`{"template_version_id": "` + version.ID.String() + `"}`),
Input: []byte(`{"template_version_id": "` + versionID.String() + `"}`),
StorageMethod: database.ProvisionerStorageMethodFile,
Type: database.ProvisionerJobTypeWorkspaceBuild,
})
Expand Down