Skip to content

Commit acd1243

Browse files
spikecurtisspikecurtis
committed
Fix CI generation; rename mock->dbmock
Signed-off-by: Spike Curtis <spike@coder.com>
1 parent 510a1b0 commit acd1243

File tree

6 files changed

+32
-30
lines changed

6 files changed

+32
-30
lines changed

‎.github/workflows/ci.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,8 @@ jobs:
184184
run: go install golang.org/x/tools/cmd/goimports@latest
185185
- name: Install yq
186186
run: go run github.com/mikefarah/yq/v4@v4.30.6
187+
- name: Install mockgen
188+
run: go install github.com/golang/mock/mockgen@v1.6.0
187189

188190
- name: Install Protoc
189191
run: |

‎Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,7 @@ lint/shellcheck: $(SHELL_SRC_FILES)
420420
gen: \
421421
coderd/database/dump.sql \
422422
coderd/database/querier.go \
423-
coderd/database/mock/store.go \
423+
coderd/database/dbmock/store.go \
424424
provisionersdk/proto/provisioner.pb.go \
425425
provisionerd/proto/provisionerd.pb.go \
426426
site/src/api/typesGenerated.ts \
@@ -442,7 +442,7 @@ gen/mark-fresh:
442442
files="\
443443
coderd/database/dump.sql \
444444
coderd/database/querier.go \
445-
coderd/database/mock/store.go \
445+
coderd/database/dbmock/store.go \
446446
provisionersdk/proto/provisioner.pb.go \
447447
provisionerd/proto/provisionerd.pb.go \
448448
site/src/api/typesGenerated.ts \
@@ -479,8 +479,8 @@ coderd/database/querier.go: coderd/database/sqlc.yaml coderd/database/dump.sql $
479479
./coderd/database/generate.sh
480480

481481

482-
coderd/database/mock/store.go: coderd/database/db.go coderd/database/querier.go
483-
go generate ./coderd/database/mock/
482+
coderd/database/dbmock/store.go: coderd/database/db.go coderd/database/querier.go
483+
go generate ./coderd/database/dbmock/
484484

485485
provisionersdk/proto/provisioner.pb.go: provisionersdk/proto/provisioner.proto
486486
protoc \

‎coderd/database/dbmock/doc.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
// package dbmock contains a mocked implementation of the database.Store interface for use in tests
2+
package dbmock
3+
4+
//go:generate mockgen -destination ./store.go -package dbmock github.com/coder/coder/coderd/database Store

‎coderd/database/mock/store.go renamed to ‎coderd/database/dbmock/store.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/mock/doc.go

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎coderd/wsbuilder/wsbuilder_test.go

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ import (
1515
"github.com/stretchr/testify/require"
1616

1717
"github.com/coder/coder/coderd/database"
18+
"github.com/coder/coder/coderd/database/dbmock"
1819
"github.com/coder/coder/coderd/database/dbtype"
19-
"github.com/coder/coder/coderd/database/mock"
2020
"github.com/coder/coder/coderd/provisionerdserver"
2121
"github.com/coder/coder/coderd/wsbuilder"
2222
"github.com/coder/coder/codersdk"
@@ -557,13 +557,13 @@ func TestWorkspaceBuildWithRichParameters(t *testing.T) {
557557
})
558558
}
559559

560-
type txExpect func(mTx *mock.MockStore)
560+
type txExpect func(mTx *dbmock.MockStore)
561561

562-
func expectDB(t *testing.T, opts ...txExpect) *mock.MockStore {
562+
func expectDB(t *testing.T, opts ...txExpect) *dbmock.MockStore {
563563
t.Helper()
564564
ctrl := gomock.NewController(t)
565-
mDB := mock.NewMockStore(ctrl)
566-
mTx := mock.NewMockStore(ctrl)
565+
mDB := dbmock.NewMockStore(ctrl)
566+
mTx := dbmock.NewMockStore(ctrl)
567567

568568
// we expect to be run in a transaction; we use mTx to record the
569569
// "in transaction" calls.
@@ -582,7 +582,7 @@ func expectDB(t *testing.T, opts ...txExpect) *mock.MockStore {
582582
return mDB
583583
}
584584

585-
func withTemplate(mTx *mock.MockStore) {
585+
func withTemplate(mTx *dbmock.MockStore) {
586586
mTx.EXPECT().GetTemplateByID(gomock.Any(), templateID).
587587
Times(1).
588588
Return(database.Template{
@@ -593,8 +593,8 @@ func withTemplate(mTx *mock.MockStore) {
593593
}, nil)
594594
}
595595

596-
func withActiveVersion(params []database.TemplateVersionParameter) func(mTx *mock.MockStore) {
597-
return func(mTx *mock.MockStore) {
596+
func withActiveVersion(params []database.TemplateVersionParameter) func(mTx *dbmock.MockStore) {
597+
return func(mTx *dbmock.MockStore) {
598598
mTx.EXPECT().GetTemplateVersionByID(gomock.Any(), activeVersionID).
599599
Times(1).
600600
Return(database.TemplateVersion{
@@ -633,8 +633,8 @@ func withActiveVersion(params []database.TemplateVersionParameter) func(mTx *moc
633633
}
634634
}
635635

636-
func withInactiveVersion(params []database.TemplateVersionParameter) func(mTx *mock.MockStore) {
637-
return func(mTx *mock.MockStore) {
636+
func withInactiveVersion(params []database.TemplateVersionParameter) func(mTx *dbmock.MockStore) {
637+
return func(mTx *dbmock.MockStore) {
638638
mTx.EXPECT().GetTemplateVersionByID(gomock.Any(), inactiveVersionID).
639639
Times(1).
640640
Return(database.TemplateVersion{
@@ -673,7 +673,7 @@ func withInactiveVersion(params []database.TemplateVersionParameter) func(mTx *m
673673
}
674674
}
675675

676-
func withLastBuildFound(mTx *mock.MockStore) {
676+
func withLastBuildFound(mTx *dbmock.MockStore) {
677677
mTx.EXPECT().GetLatestWorkspaceBuildByWorkspaceID(gomock.Any(), workspaceID).
678678
Times(1).
679679
Return(database.WorkspaceBuild{
@@ -704,14 +704,14 @@ func withLastBuildFound(mTx *mock.MockStore) {
704704
}, nil)
705705
}
706706

707-
func withLastBuildNotFound(mTx *mock.MockStore) {
707+
func withLastBuildNotFound(mTx *dbmock.MockStore) {
708708
mTx.EXPECT().GetLatestWorkspaceBuildByWorkspaceID(gomock.Any(), workspaceID).
709709
Times(1).
710710
Return(database.WorkspaceBuild{}, sql.ErrNoRows)
711711
}
712712

713-
func withLegacyParameters(params []database.ParameterValue) func(mTx *mock.MockStore) {
714-
return func(mTx *mock.MockStore) {
713+
func withLegacyParameters(params []database.ParameterValue) func(mTx *dbmock.MockStore) {
714+
return func(mTx *dbmock.MockStore) {
715715
c := mTx.EXPECT().ParameterValues(
716716
gomock.Any(),
717717
database.ParameterValuesParams{
@@ -727,8 +727,8 @@ func withLegacyParameters(params []database.ParameterValue) func(mTx *mock.MockS
727727
}
728728
}
729729

730-
func withRichParameters(params []database.WorkspaceBuildParameter) func(mTx *mock.MockStore) {
731-
return func(mTx *mock.MockStore) {
730+
func withRichParameters(params []database.WorkspaceBuildParameter) func(mTx *dbmock.MockStore) {
731+
return func(mTx *dbmock.MockStore) {
732732
c := mTx.EXPECT().GetWorkspaceBuildParameters(gomock.Any(), lastBuildID).
733733
Times(1)
734734
if len(params) > 0 {
@@ -747,8 +747,8 @@ func withRichParameters(params []database.WorkspaceBuildParameter) func(mTx *moc
747747
// against it.
748748
func expectProvisionerJob(
749749
assertions func(job database.InsertProvisionerJobParams),
750-
) func(mTx *mock.MockStore) {
751-
return func(mTx *mock.MockStore) {
750+
) func(mTx *dbmock.MockStore) {
751+
return func(mTx *dbmock.MockStore) {
752752
mTx.EXPECT().InsertProvisionerJob(gomock.Any(), gomock.Any()).
753753
Times(1).
754754
DoAndReturn(
@@ -766,8 +766,8 @@ func expectProvisionerJob(
766766
// against it.
767767
func expectBuild(
768768
assertions func(job database.InsertWorkspaceBuildParams),
769-
) func(mTx *mock.MockStore) {
770-
return func(mTx *mock.MockStore) {
769+
) func(mTx *dbmock.MockStore) {
770+
return func(mTx *dbmock.MockStore) {
771771
mTx.EXPECT().InsertWorkspaceBuild(gomock.Any(), gomock.Any()).
772772
Times(1).
773773
DoAndReturn(

0 commit comments

Comments
 (0)