Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit342e27f

Browse files
committed
dbauthz test fixes
1 parentfa1ee2a commit342e27f

File tree

2 files changed

+15
-15
lines changed

2 files changed

+15
-15
lines changed

‎coderd/database/dbauthz/dbauthz.go‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import (
55
"database/sql"
66
"encoding/json"
77
"errors"
8-
"fmt"
98
"strings"
109
"sync/atomic"
1110
"testing"
@@ -48,7 +47,11 @@ type NotAuthorizedError struct {
4847
var_ httpapiconstraints.IsUnauthorizedError= (*NotAuthorizedError)(nil)
4948

5049
func (eNotAuthorizedError)Error()string {
51-
returnfmt.Sprintf("unauthorized: %s",e.Err.Error())
50+
vardetailstring
51+
ife.Err!=nil {
52+
detail=": "+e.Err.Error()
53+
}
54+
return"unauthorized"+detail
5255
}
5356

5457
// IsUnauthorized implements the IsUnauthorized interface.

‎coderd/database/dbauthz/dbauthz_test.go‎

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3259,31 +3259,28 @@ func (s *MethodTestSuite) TestExtraMethods() {
32593259
}))
32603260
s.Run("GetProvisionerJobsByOrganizationAndStatusWithQueuePositionAndProvisioner",s.Subtest(func(db database.Store,check*expects) {
32613261
org:=dbgen.Organization(s.T(),db, database.Organization{})
3262+
user:=dbgen.User(s.T(),db, database.User{})
32623263
tags:=database.StringMap(map[string]string{
32633264
provisionersdk.TagScope:provisionersdk.ScopeOrganization,
32643265
})
3265-
t:=dbgen.Template(s.T(),db, database.Template{})
3266-
tv:=dbgen.TemplateVersion(s.T(),db, database.TemplateVersion{TemplateID: uuid.NullUUID{UUID:t.ID,Valid:true}})
3267-
w:=dbgen.Workspace(s.T(),db, database.WorkspaceTable{OrganizationID:org.ID,TemplateID:t.ID})
3268-
wb:=dbgen.WorkspaceBuild(s.T(),db, database.WorkspaceBuild{WorkspaceID:w.ID,TemplateVersionID:tv.ID})
3269-
j1,err:=db.InsertProvisionerJob(context.Background(), database.InsertProvisionerJobParams{
3266+
t:=dbgen.Template(s.T(),db, database.Template{OrganizationID:org.ID,CreatedBy:user.ID})
3267+
tv:=dbgen.TemplateVersion(s.T(),db, database.TemplateVersion{OrganizationID:org.ID,CreatedBy:user.ID,TemplateID: uuid.NullUUID{UUID:t.ID,Valid:true}})
3268+
j1:=dbgen.ProvisionerJob(s.T(),db,nil, database.ProvisionerJob{
32703269
OrganizationID:org.ID,
32713270
Type:database.ProvisionerJobTypeTemplateVersionImport,
32723271
Input: []byte(`{"template_version_id":"`+tv.ID.String()+`"}`),
32733272
Tags:tags,
3274-
Provisioner:database.ProvisionerTypeEcho,
3275-
StorageMethod:database.ProvisionerStorageMethodFile,
32763273
})
3277-
s.NoError(err,"insert provisioner job")
3278-
j2,err:=db.InsertProvisionerJob(context.Background(), database.InsertProvisionerJobParams{
3274+
w:=dbgen.Workspace(s.T(),db, database.WorkspaceTable{OrganizationID:org.ID,OwnerID:user.ID,TemplateID:t.ID})
3275+
wbID:=uuid.New()
3276+
j2:=dbgen.ProvisionerJob(s.T(),db,nil, database.ProvisionerJob{
32793277
OrganizationID:org.ID,
32803278
Type:database.ProvisionerJobTypeWorkspaceBuild,
3281-
Input: []byte(`{"workspace_build_id":"`+wb.ID.String()+`"}`),
3279+
Input: []byte(`{"workspace_build_id":"`+wbID.String()+`"}`),
32823280
Tags:tags,
3283-
Provisioner:database.ProvisionerTypeEcho,
3284-
StorageMethod:database.ProvisionerStorageMethodFile,
32853281
})
3286-
s.NoError(err,"insert provisioner job")
3282+
dbgen.WorkspaceBuild(s.T(),db, database.WorkspaceBuild{ID:wbID,WorkspaceID:w.ID,TemplateVersionID:tv.ID,JobID:j2.ID})
3283+
32873284
ds,err:=db.GetProvisionerJobsByOrganizationAndStatusWithQueuePositionAndProvisioner(context.Background(), database.GetProvisionerJobsByOrganizationAndStatusWithQueuePositionAndProvisionerParams{
32883285
OrganizationID: uuid.NullUUID{Valid:true,UUID:org.ID},
32893286
})

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp