synced/coder
1
0
Fork 0
mirror of https://github.com/coder/coder.git synced 2025-07-13 21:36:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: Update sqlc to v1.16.0 (#5788)

Browse Source 
* chore: Update sqlc to v1.16.0

* chore: Fix cases where types became Null-types

* chore: Set parameter_schemas default_destination_scheme and default_source_scheme to NOT NULL

* chore: Add enum validation to database fake

* chore: Fix all tests that skipping enum values

* fix: Use correct err in providionerdserver audit log failure log
This commit is contained in:
Mathias Fredriksson
2023-01-23 13:14:47 +02:00
committed by GitHub
parent f67acac2b7
commit 8afdf24d10
29 changed files with 1525 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coderd/httpmw/apikey_test.go
View File

@ -165,6 +165,7 @@ func TestAPIKey(t *testing.T) {
ID: id,
HashedSecret: hashed[:],
UserID: user.ID,
LoginType: database.LoginTypePassword,
Scope: database.APIKeyScopeAll,
})
require.NoError(t, err)
@ -640,6 +641,7 @@ func createUser(ctx context.Context, t *testing.T, db database.Store, opts ...fu
CreatedAt: time.Now(),
UpdatedAt: time.Now(),
RBACRoles: []string{},
LoginType: database.LoginTypePassword,
}
for _, opt := range opts {
opt(&insert)

1
coderd/httpmw/organizationparam_test.go
View File

@ -42,6 +42,7 @@ func TestOrganizationParam(t *testing.T) {
Username: username,
CreatedAt: database.Now(),
UpdatedAt: database.Now(),
LoginType: database.LoginTypePassword,
})
require.NoError(t, err)
_, err = db.InsertAPIKey(r.Context(), database.InsertAPIKeyParams{

2
coderd/httpmw/templateparam_test.go
View File

@ -41,6 +41,7 @@ func TestTemplateParam(t *testing.T) {
Username: username,
CreatedAt: database.Now(),
UpdatedAt: database.Now(),
LoginType: database.LoginTypePassword,
})
require.NoError(t, err)
@ -149,6 +150,7 @@ func TestTemplateParam(t *testing.T) {
ID: uuid.New(),
OrganizationID: org.ID,
Name: "moo",
Provisioner: database.ProvisionerTypeEcho,
})
require.NoError(t, err)
chi.RouteContext(r.Context()).URLParams.Add("template", template.ID.String())

2
coderd/httpmw/templateversionparam_test.go
View File

@ -41,6 +41,7 @@ func TestTemplateVersionParam(t *testing.T) {
Username: username,
CreatedAt: database.Now(),
UpdatedAt: database.Now(),
LoginType: database.LoginTypePassword,
})
require.NoError(t, err)
@ -77,6 +78,7 @@ func TestTemplateVersionParam(t *testing.T) {
ID: uuid.New(),
OrganizationID: organization.ID,
Name: "moo",
Provisioner: database.ProvisionerTypeEcho,
})
require.NoError(t, err)

7
coderd/httpmw/userparam_test.go
View File

@ -32,9 +32,10 @@ func TestUserParam(t *testing.T) {
r.Header.Set(codersdk.SessionCustomHeader, fmt.Sprintf("%s-%s", id, secret))
user, err := db.InsertUser(r.Context(), database.InsertUserParams{
ID: uuid.New(),
Email: "admin@email.com",
Username: "admin",
ID: uuid.New(),
Email: "admin@email.com",
Username: "admin",
LoginType: database.LoginTypePassword,
})
require.NoError(t, err)

14
coderd/httpmw/workspaceagentparam_test.go
View File

@ -41,6 +41,7 @@ func TestWorkspaceAgentParam(t *testing.T) {
Username: username,
CreatedAt: database.Now(),
UpdatedAt: database.Now(),
LoginType: database.LoginTypePassword,
})
require.NoError(t, err)
@ -67,18 +68,23 @@ func TestWorkspaceAgentParam(t *testing.T) {
ID: uuid.New(),
WorkspaceID: workspace.ID,
JobID: uuid.New(),
Transition: database.WorkspaceTransitionStart,
Reason: database.BuildReasonInitiator,
})
require.NoError(t, err)
job, err := db.InsertProvisionerJob(context.Background(), database.InsertProvisionerJobParams{
ID: build.JobID,
Type: database.ProvisionerJobTypeWorkspaceBuild,
ID: build.JobID,
Type: database.ProvisionerJobTypeWorkspaceBuild,
Provisioner: database.ProvisionerTypeEcho,
StorageMethod: database.ProvisionerStorageMethodFile,
})
require.NoError(t, err)
resource, err := db.InsertWorkspaceResource(context.Background(), database.InsertWorkspaceResourceParams{
ID: uuid.New(),
JobID: job.ID,
ID: uuid.New(),
JobID: job.ID,
Transition: database.WorkspaceTransitionStart,
})
require.NoError(t, err)

3
coderd/httpmw/workspacebuildparam_test.go
View File

@ -41,6 +41,7 @@ func TestWorkspaceBuildParam(t *testing.T) {
Username: username,
CreatedAt: database.Now(),
UpdatedAt: database.Now(),
LoginType: database.LoginTypePassword,
})
require.NoError(t, err)
@ -123,6 +124,8 @@ func TestWorkspaceBuildParam(t *testing.T) {
workspaceBuild, err := db.InsertWorkspaceBuild(context.Background(), database.InsertWorkspaceBuildParams{
ID: uuid.New(),
WorkspaceID: workspace.ID,
Transition: database.WorkspaceTransitionStart,
Reason: database.BuildReasonInitiator,
})
require.NoError(t, err)
chi.RouteContext(r.Context()).URLParams.Add("workspacebuild", workspaceBuild.ID.String())

17
coderd/httpmw/workspaceparam_test.go
View File

@ -44,6 +44,7 @@ func TestWorkspaceParam(t *testing.T) {
Username: username,
CreatedAt: database.Now(),
UpdatedAt: database.Now(),
LoginType: database.LoginTypePassword,
})
require.NoError(t, err)
@ -356,6 +357,7 @@ func setupWorkspaceWithAgents(t testing.TB, cfg setupConfig) (database.Store, *h
Username: username,
CreatedAt: database.Now(),
UpdatedAt: database.Now(),
LoginType: database.LoginTypePassword,
})
require.NoError(t, err)
@ -382,20 +384,25 @@ func setupWorkspaceWithAgents(t testing.TB, cfg setupConfig) (database.Store, *h
ID: uuid.New(),
WorkspaceID: workspace.ID,
JobID: uuid.New(),
Transition: database.WorkspaceTransitionStart,
Reason: database.BuildReasonInitiator,
})
require.NoError(t, err)
job, err := db.InsertProvisionerJob(context.Background(), database.InsertProvisionerJobParams{
ID: build.JobID,
Type: database.ProvisionerJobTypeWorkspaceBuild,
ID: build.JobID,
Type: database.ProvisionerJobTypeWorkspaceBuild,
Provisioner: database.ProvisionerTypeEcho,
StorageMethod: database.ProvisionerStorageMethodFile,
})
require.NoError(t, err)
for resourceName, agentNames := range cfg.Agents {
resource, err := db.InsertWorkspaceResource(context.Background(), database.InsertWorkspaceResourceParams{
ID: uuid.New(),
JobID: job.ID,
Name: resourceName,
ID: uuid.New(),
JobID: job.ID,
Name: resourceName,
Transition: database.WorkspaceTransitionStart,
})
require.NoError(t, err)

17
coderd/httpmw/workspaceresourceparam_test.go
View File

@ -21,18 +21,23 @@ func TestWorkspaceResourceParam(t *testing.T) {
setup := func(db database.Store, jobType database.ProvisionerJobType) (*http.Request, database.WorkspaceResource) {
r := httptest.NewRequest("GET", "/", nil)
job, err := db.InsertProvisionerJob(context.Background(), database.InsertProvisionerJobParams{
ID: uuid.New(),
Type: jobType,
ID: uuid.New(),
Type: jobType,
Provisioner: database.ProvisionerTypeEcho,
StorageMethod: database.ProvisionerStorageMethodFile,
})
require.NoError(t, err)
workspaceBuild, err := db.InsertWorkspaceBuild(context.Background(), database.InsertWorkspaceBuildParams{
ID: uuid.New(),
JobID: job.ID,
ID: uuid.New(),
JobID: job.ID,
Transition: database.WorkspaceTransitionStart,
Reason: database.BuildReasonInitiator,
})
require.NoError(t, err)
resource, err := db.InsertWorkspaceResource(context.Background(), database.InsertWorkspaceResourceParams{
ID: uuid.New(),
JobID: job.ID,
ID: uuid.New(),
JobID: job.ID,
Transition: database.WorkspaceTransitionStart,
})
require.NoError(t, err)