Skip to content

Commit 863235d

Browse files
hugodutkahugodutka
committed
TestCompleteJob - Modules WIP
1 parent 7f2f155 commit 863235d

File tree

7 files changed

+211
-1
lines changed

7 files changed

+211
-1
lines changed

‎coderd/database/dbauthz/dbauthz.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2666,6 +2666,13 @@ func (q *querier) GetWorkspaceByWorkspaceAppID(ctx context.Context, workspaceApp
26662666
return fetch(q.log, q.auth, q.db.GetWorkspaceByWorkspaceAppID)(ctx, workspaceAppID)
26672667
}
26682668

2669+
func (q *querier) GetWorkspaceModulesByJobID(ctx context.Context, jobID uuid.UUID) ([]database.WorkspaceModule, error) {
2670+
if err := q.authorizeContext(ctx, policy.ActionRead, rbac.ResourceSystem); err != nil {
2671+
return nil, err
2672+
}
2673+
return q.db.GetWorkspaceModulesByJobID(ctx, jobID)
2674+
}
2675+
26692676
func (q *querier) GetWorkspaceProxies(ctx context.Context) ([]database.WorkspaceProxy, error) {
26702677
return fetchWithPostFilter(q.auth, policy.ActionRead, func(ctx context.Context, _ interface{}) ([]database.WorkspaceProxy, error) {
26712678
return q.db.GetWorkspaceProxies(ctx)

‎coderd/database/dbmem/dbmem.go

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ func New() database.Store {
7373
workspaceAgents: make([]database.WorkspaceAgent, 0),
7474
provisionerJobLogs: make([]database.ProvisionerJobLog, 0),
7575
workspaceResources: make([]database.WorkspaceResource, 0),
76+
workspaceModules: make([]database.WorkspaceModule, 0),
7677
workspaceResourceMetadata: make([]database.WorkspaceResourceMetadatum, 0),
7778
provisionerJobs: make([]database.ProvisionerJob, 0),
7879
templateVersions: make([]database.TemplateVersionTable, 0),
@@ -232,6 +233,7 @@ type data struct {
232233
workspaceBuildParameters []database.WorkspaceBuildParameter
233234
workspaceResourceMetadata []database.WorkspaceResourceMetadatum
234235
workspaceResources []database.WorkspaceResource
236+
workspaceModules []database.WorkspaceModule
235237
workspaces []database.WorkspaceTable
236238
workspaceProxies []database.WorkspaceProxy
237239
customRoles []database.CustomRole
@@ -6671,6 +6673,19 @@ func (q *FakeQuerier) GetWorkspaceByWorkspaceAppID(_ context.Context, workspaceA
66716673
return database.Workspace{}, sql.ErrNoRows
66726674
}
66736675

6676+
func (q *FakeQuerier) GetWorkspaceModulesByJobID(_ context.Context, jobID uuid.UUID) ([]database.WorkspaceModule, error) {
6677+
q.mutex.RLock()
6678+
defer q.mutex.RUnlock()
6679+
6680+
modules := make([]database.WorkspaceModule, 0)
6681+
for _, module := range q.workspaceModules {
6682+
if module.JobID == jobID {
6683+
modules = append(modules, module)
6684+
}
6685+
}
6686+
return modules, nil
6687+
}
6688+
66746689
func (q *FakeQuerier) GetWorkspaceProxies(_ context.Context) ([]database.WorkspaceProxy, error) {
66756690
q.mutex.RLock()
66766691
defer q.mutex.RUnlock()
@@ -8239,7 +8254,20 @@ func (q *FakeQuerier) InsertWorkspaceModule(ctx context.Context, arg database.In
82398254
return database.WorkspaceModule{}, err
82408255
}
82418256

8242-
panic("not implemented")
8257+
q.mutex.Lock()
8258+
defer q.mutex.Unlock()
8259+
8260+
workspaceModule := database.WorkspaceModule{
8261+
ID: arg.ID,
8262+
JobID: arg.JobID,
8263+
Transition: arg.Transition,
8264+
Source: arg.Source,
8265+
Version: arg.Version,
8266+
Key: arg.Key,
8267+
CreatedAt: arg.CreatedAt,
8268+
}
8269+
q.workspaceModules = append(q.workspaceModules, workspaceModule)
8270+
return workspaceModule, nil
82438271
}
82448272

82458273
func (q *FakeQuerier) InsertWorkspaceProxy(_ context.Context, arg database.InsertWorkspaceProxyParams) (database.WorkspaceProxy, error) {
@@ -8292,6 +8320,7 @@ func (q *FakeQuerier) InsertWorkspaceResource(_ context.Context, arg database.In
82928320
Hide: arg.Hide,
82938321
Icon: arg.Icon,
82948322
DailyCost: arg.DailyCost,
8323+
ModulePath: arg.ModulePath,
82958324
}
82968325
q.workspaceResources = append(q.workspaceResources, resource)
82978326
return resource, nil

‎coderd/database/dbmetrics/querymetrics.go

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

‎coderd/database/querier.go

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

‎coderd/database/queries.sql.go

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

‎coderd/database/queries/workspacemodules.sql

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,11 @@ INSERT INTO
33
workspace_modules (id, job_id, transition, source, version, key, created_at)
44
VALUES
55
($1, $2, $3, $4, $5, $6, $7) RETURNING *;
6+
7+
-- name: GetWorkspaceModulesByJobID :many
8+
SELECT
9+
*
10+
FROM
11+
workspace_modules
12+
WHERE
13+
job_id = $1;

‎coderd/provisionerdserver/provisionerdserver_test.go

Lines changed: 118 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1430,6 +1430,124 @@ func TestCompleteJob(t *testing.T) {
14301430
})
14311431
require.NoError(t, err)
14321432
})
1433+
1434+
t.Run("Modules", func(t *testing.T) {
1435+
t.Parallel()
1436+
srv, db, _, pd := setup(t, false, &overrides{})
1437+
job, err := db.InsertProvisionerJob(ctx, database.InsertProvisionerJobParams{
1438+
ID: uuid.New(),
1439+
Provisioner: database.ProvisionerTypeEcho,
1440+
Type: database.ProvisionerJobTypeTemplateVersionDryRun,
1441+
StorageMethod: database.ProvisionerStorageMethodFile,
1442+
})
1443+
require.NoError(t, err)
1444+
_, err = db.AcquireProvisionerJob(ctx, database.AcquireProvisionerJobParams{
1445+
WorkerID: uuid.NullUUID{
1446+
UUID: pd.ID,
1447+
Valid: true,
1448+
},
1449+
Types: []database.ProvisionerType{database.ProvisionerTypeEcho},
1450+
})
1451+
require.NoError(t, err)
1452+
1453+
cases := []struct {
1454+
name string
1455+
job *proto.CompletedJob
1456+
expectedResources []database.WorkspaceResource
1457+
expectedModules []database.WorkspaceModule
1458+
}{
1459+
{
1460+
name: "TemplateDryRun",
1461+
job: &proto.CompletedJob{
1462+
Type: &proto.CompletedJob_TemplateDryRun_{
1463+
TemplateDryRun: &proto.CompletedJob_TemplateDryRun{
1464+
Resources: []*sdkproto.Resource{{
1465+
Name: "something",
1466+
Type: "aws_instance",
1467+
ModulePath: "module.test1",
1468+
}, {
1469+
Name: "something2",
1470+
Type: "aws_instance",
1471+
ModulePath: "",
1472+
}},
1473+
Modules: []*sdkproto.Module{
1474+
{
1475+
Key: "test1",
1476+
Version: "1.0.0",
1477+
Source: "github.com/example/example",
1478+
},
1479+
},
1480+
},
1481+
},
1482+
},
1483+
expectedResources: []database.WorkspaceResource{{
1484+
Name: "something",
1485+
Type: "aws_instance",
1486+
ModulePath: sql.NullString{
1487+
String: "module.test1",
1488+
Valid: true,
1489+
},
1490+
}, {
1491+
Name: "something2",
1492+
Type: "aws_instance",
1493+
ModulePath: sql.NullString{
1494+
String: "",
1495+
Valid: true,
1496+
},
1497+
}},
1498+
expectedModules: []database.WorkspaceModule{{
1499+
Key: "test1",
1500+
Version: "1.0.0",
1501+
Source: "github.com/example/example",
1502+
}},
1503+
},
1504+
}
1505+
1506+
for _, c := range cases {
1507+
c := c
1508+
1509+
t.Run(c.name, func(t *testing.T) {
1510+
t.Parallel()
1511+
1512+
completedJob := c.job
1513+
completedJob.JobId = job.ID.String()
1514+
1515+
_, err = srv.CompleteJob(ctx, completedJob)
1516+
require.NoError(t, err)
1517+
1518+
resources, err := db.GetWorkspaceResourcesByJobID(ctx, job.ID)
1519+
require.NoError(t, err)
1520+
require.Len(t, resources, len(c.expectedResources))
1521+
1522+
for _, expectedResource := range c.expectedResources {
1523+
for i, resource := range resources {
1524+
if resource.Name == expectedResource.Name && resource.Type == expectedResource.Type && resource.ModulePath == expectedResource.ModulePath {
1525+
resources[i] = database.WorkspaceResource{Name: "matched"}
1526+
}
1527+
}
1528+
}
1529+
// all resources should be matched
1530+
for _, resource := range resources {
1531+
require.Equal(t, "matched", resource.Name)
1532+
}
1533+
1534+
modules, err := db.GetWorkspaceModulesByJobID(ctx, job.ID)
1535+
require.NoError(t, err)
1536+
require.Len(t, modules, len(c.expectedModules))
1537+
1538+
for _, expectedModule := range c.expectedModules {
1539+
for i, module := range modules {
1540+
if module.Key == expectedModule.Key && module.Version == expectedModule.Version && module.Source == expectedModule.Source {
1541+
modules[i] = database.WorkspaceModule{Key: "matched"}
1542+
}
1543+
}
1544+
}
1545+
for _, module := range modules {
1546+
require.Equal(t, "matched", module.Key)
1547+
}
1548+
})
1549+
}
1550+
})
14331551
}
14341552

14351553
func TestInsertWorkspaceResource(t *testing.T) {

0 commit comments

Comments
 (0)