Skip to content

Commit 24ed128

Browse files
chore: more linting fix
1 parent f6ea0e5 commit 24ed128

File tree

8 files changed

+245
-114
lines changed

8 files changed

+245
-114
lines changed

apps/workspace-engine/pkg/db/changeset.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ func FlushChangeset(ctx context.Context, cs *changeset.ChangeSet) error {
2727
if err != nil {
2828
return err
2929
}
30-
defer tx.Rollback(ctx)
30+
defer func() { _ = tx.Rollback(ctx) }()
3131

3232
for _, change := range cs.Changes {
3333
if err := applyChange(ctx, tx, change); err != nil {

apps/workspace-engine/pkg/db/relationships.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -245,9 +245,11 @@ func convertDbRelationshipRuleToOapiRelationshipRule(dbRelationship *dbRelations
245245
name := getName(dbRelationship)
246246

247247
matcher := &oapi.RelationshipRule_Matcher{}
248-
matcher.FromPropertiesMatcher(oapi.PropertiesMatcher{
248+
if err := matcher.FromPropertiesMatcher(oapi.PropertiesMatcher{
249249
Properties: propertyMatchers,
250-
})
250+
}); err != nil {
251+
return nil, err
252+
}
251253
return &oapi.RelationshipRule{
252254
Id: dbRelationship.ID,
253255
Name: name,

apps/workspace-engine/pkg/memsql/memsql_test.go

Lines changed: 62 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1177,7 +1177,9 @@ func TestMemSQL_CRUD_Integration(t *testing.T) {
11771177
}
11781178

11791179
// Update (via delete and re-insert)
1180-
memSQL.DeleteOne("ID = ?", "2")
1180+
if err := memSQL.DeleteOne("ID = ?", "2"); err != nil {
1181+
t.Fatalf("DeleteOne failed: %v", err)
1182+
}
11811183
if err := memSQL.Insert(User{ID: "2", Name: "Bob Updated", Email: "[email protected]", Age: 26}); err != nil {
11821184
t.Fatalf("Insert failed: %v", err)
11831185
}
@@ -1558,7 +1560,9 @@ func TestMemSQL_StructPB_Update(t *testing.T) {
15581560
Name: "Test Agent",
15591561
Config: config1,
15601562
}
1561-
memSQL.Insert(agent)
1563+
if err := memSQL.Insert(agent); err != nil {
1564+
t.Fatalf("Insert failed: %v", err)
1565+
}
15621566

15631567
// Update with new config (delete and re-insert)
15641568
config2, _ := structpb.NewStruct(map[string]interface{}{
@@ -1567,9 +1571,13 @@ func TestMemSQL_StructPB_Update(t *testing.T) {
15671571
"newField": "value",
15681572
})
15691573

1570-
memSQL.DeleteOne("id = ?", "agent1")
1574+
if err := memSQL.DeleteOne("id = ?", "agent1"); err != nil {
1575+
t.Fatalf("DeleteOne failed: %v", err)
1576+
}
15711577
agent.Config = config2
1572-
memSQL.Insert(agent)
1578+
if err := memSQL.Insert(agent); err != nil {
1579+
t.Fatalf("Insert failed: %v", err)
1580+
}
15731581

15741582
// Query back
15751583
agents, _ := memSQL.Query("SELECT * FROM job_agents WHERE id = ?", "agent1")
@@ -1610,10 +1618,12 @@ func TestMemSQL_StructPB_Delete(t *testing.T) {
16101618
config1, _ := structpb.NewStruct(map[string]interface{}{"type": "k8s"})
16111619
config2, _ := structpb.NewStruct(map[string]interface{}{"type": "docker"})
16121620

1613-
memSQL.InsertMany([]JobAgent{
1621+
if err := memSQL.InsertMany([]JobAgent{
16141622
{ID: "agent1", Name: "Agent 1", Config: config1},
16151623
{ID: "agent2", Name: "Agent 2", Config: config2},
1616-
})
1624+
}); err != nil {
1625+
t.Fatalf("InsertMany failed: %v", err)
1626+
}
16171627

16181628
// Delete one
16191629
rowsAffected, err := memSQL.Delete("id = ?", "agent1")
@@ -1655,10 +1665,12 @@ func TestMemSQL_StructPB_QueryWithWhere(t *testing.T) {
16551665
config1, _ := structpb.NewStruct(map[string]interface{}{"enabled": true})
16561666
config2, _ := structpb.NewStruct(map[string]interface{}{"enabled": false})
16571667

1658-
memSQL.InsertMany([]JobAgent{
1668+
if err := memSQL.InsertMany([]JobAgent{
16591669
{ID: "agent1", Name: "Active Agent", Config: config1},
16601670
{ID: "agent2", Name: "Inactive Agent", Config: config2},
1661-
})
1671+
}); err != nil {
1672+
t.Fatalf("InsertMany failed: %v", err)
1673+
}
16621674

16631675
// Query specific agent with exact match
16641676
agents, err := memSQL.Query("SELECT * FROM job_agents_query WHERE name = ?", "Active Agent")
@@ -1692,15 +1704,13 @@ func TestMemSQL_Insert_Upsert(t *testing.T) {
16921704

16931705
// Insert initial record
16941706
user1 := User{ID: "1", Name: "Alice", Email: "[email protected]", Age: 30}
1695-
err := memSQL.Insert(user1)
1696-
if err != nil {
1707+
if err := memSQL.Insert(user1); err != nil {
16971708
t.Fatalf("First insert failed: %v", err)
16981709
}
16991710

17001711
// Insert again with same ID (should update)
17011712
user2 := User{ID: "1", Name: "Alice Updated", Email: "[email protected]", Age: 31}
1702-
err = memSQL.Insert(user2)
1703-
if err != nil {
1713+
if err := memSQL.Insert(user2); err != nil {
17041714
t.Fatalf("Second insert (upsert) failed: %v", err)
17051715
}
17061716

@@ -1880,15 +1890,19 @@ func TestMemSQL_Insert_Upsert_WithStructPB(t *testing.T) {
18801890
"enabled": true,
18811891
})
18821892
agent1 := JobAgent{ID: "agent1", Name: "Test Agent", Config: config1}
1883-
memSQL.Insert(agent1)
1893+
if err := memSQL.Insert(agent1); err != nil {
1894+
t.Fatalf("First insert failed: %v", err)
1895+
}
18841896

18851897
// Upsert with new config
18861898
config2, _ := structpb.NewStruct(map[string]interface{}{
18871899
"version": "2.0.0",
18881900
"enabled": false,
18891901
})
18901902
agent2 := JobAgent{ID: "agent1", Name: "Test Agent Updated", Config: config2}
1891-
memSQL.Insert(agent2)
1903+
if err := memSQL.Insert(agent2); err != nil {
1904+
t.Fatalf("Second insert (upsert) failed: %v", err)
1905+
}
18921906

18931907
// Verify was updated
18941908
agents, _ := memSQL.Query("SELECT * FROM job_agents_upsert WHERE id = ?", "agent1")
@@ -1920,19 +1934,23 @@ func TestMemSQL_InsertMany_Upsert_Mixed(t *testing.T) {
19201934
memSQL := NewMemSQL[User](tableBuilder)
19211935

19221936
// Insert 3 users initially
1923-
memSQL.InsertMany([]User{
1937+
if err := memSQL.InsertMany([]User{
19241938
{ID: "1", Name: "Alice", Email: "[email protected]", Age: 30},
19251939
{ID: "2", Name: "Bob", Email: "[email protected]", Age: 25},
19261940
{ID: "3", Name: "Charlie", Email: "[email protected]", Age: 35},
1927-
})
1941+
}); err != nil {
1942+
t.Fatalf("InsertMany failed: %v", err)
1943+
}
19281944

19291945
// Upsert: update 2, insert 2 new
1930-
memSQL.InsertMany([]User{
1946+
if err := memSQL.InsertMany([]User{
19311947
{ID: "1", Name: "Alice Updated", Email: "[email protected]", Age: 31},
19321948
{ID: "3", Name: "Charlie Updated", Email: "[email protected]", Age: 36},
19331949
{ID: "4", Name: "David", Email: "[email protected]", Age: 40},
19341950
{ID: "5", Name: "Eve", Email: "[email protected]", Age: 28},
1935-
})
1951+
}); err != nil {
1952+
t.Fatalf("InsertMany failed: %v", err)
1953+
}
19361954

19371955
// Verify we have 5 users
19381956
users, _ := memSQL.Query("SELECT * FROM users ORDER BY ID")
@@ -1974,11 +1992,13 @@ func TestMemSQL_PointerType_Query(t *testing.T) {
19741992
memSQL := NewMemSQL[*User](tableBuilder)
19751993

19761994
// Insert test data using raw SQL
1977-
memSQL.DB().Exec(`
1995+
if _, err := memSQL.DB().Exec(`
19781996
INSERT INTO users (ID, Name, Email, Age) VALUES
19791997
('1', 'Alice', '[email protected]', 30),
19801998
('2', 'Bob', '[email protected]', 25)
1981-
`)
1999+
`); err != nil {
2000+
t.Fatalf("Failed to insert test data: %v", err)
2001+
}
19822002

19832003
// Query should work with pointer type
19842004
users, err := memSQL.Query("SELECT * FROM users ORDER BY ID")
@@ -2081,14 +2101,21 @@ func TestMemSQL_PointerType_Upsert(t *testing.T) {
20812101

20822102
// Initial insert
20832103
user1 := &User{ID: "1", Name: "Alice", Email: "[email protected]", Age: 30}
2084-
memSQL.Insert(user1)
2104+
if err := memSQL.Insert(user1); err != nil {
2105+
t.Fatalf("Insert failed: %v", err)
2106+
}
20852107

20862108
// Upsert
20872109
user2 := &User{ID: "1", Name: "Alice Updated", Email: "[email protected]", Age: 31}
2088-
memSQL.Insert(user2)
2110+
if err := memSQL.Insert(user2); err != nil {
2111+
t.Fatalf("Insert failed: %v", err)
2112+
}
20892113

20902114
// Verify update
2091-
users, _ := memSQL.Query("SELECT * FROM users WHERE ID = ?", "1")
2115+
users, err := memSQL.Query("SELECT * FROM users WHERE ID = ?", "1")
2116+
if err != nil {
2117+
t.Fatalf("Query failed: %v", err)
2118+
}
20922119
if len(users) != 1 {
20932120
t.Fatalf("Expected 1 user, got %d", len(users))
20942121
}
@@ -2127,7 +2154,10 @@ func TestMemSQL_PointerType_WithTimestamp(t *testing.T) {
21272154
}
21282155

21292156
// Query back
2130-
events, _ := memSQL.Query("SELECT * FROM events WHERE id = ?", "e1")
2157+
events, err := memSQL.Query("SELECT * FROM events WHERE id = ?", "e1")
2158+
if err != nil {
2159+
t.Fatalf("Query failed: %v", err)
2160+
}
21312161
if len(events) != 1 {
21322162
t.Fatalf("Expected 1 event, got %d", len(events))
21332163
}
@@ -2171,7 +2201,10 @@ func TestMemSQL_PointerType_WithStructPB(t *testing.T) {
21712201
}
21722202

21732203
// Query back
2174-
agents, _ := memSQL.Query("SELECT * FROM job_agents_ptr WHERE id = ?", "agent1")
2204+
agents, err := memSQL.Query("SELECT * FROM job_agents_ptr WHERE id = ?", "agent1")
2205+
if err != nil {
2206+
t.Fatalf("Query failed: %v", err)
2207+
}
21752208
if len(agents) != 1 {
21762209
t.Fatalf("Expected 1 agent, got %d", len(agents))
21772210
}
@@ -2229,7 +2262,10 @@ func TestMemSQL_PointerType_InsertManyWithNil(t *testing.T) {
22292262
}
22302263

22312264
// Verify only 2 users inserted (nil was skipped)
2232-
result, _ := memSQL.Query("SELECT * FROM users ORDER BY ID")
2265+
result, err := memSQL.Query("SELECT * FROM users ORDER BY ID")
2266+
if err != nil {
2267+
t.Fatalf("Query failed: %v", err)
2268+
}
22332269
if len(result) != 2 {
22342270
t.Fatalf("Expected 2 users, got %d", len(result))
22352271
}

apps/workspace-engine/pkg/selector/resources_test.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,9 @@ func conditionToSelector(t *testing.T, condition unknown.UnknownCondition) *oapi
2525
}
2626

2727
v := &oapi.Selector{}
28-
v.FromJsonSelector(oapi.JsonSelector{Json: conditionMap})
28+
if err := v.FromJsonSelector(oapi.JsonSelector{Json: conditionMap}); err != nil {
29+
t.Fatalf("Failed to create JSON selector: %v", err)
30+
}
2931
return v
3032
}
3133

apps/workspace-engine/pkg/workspace/releasemanager/policymanager/evaluator/skipdeployed/skipdeployed_test.go

Lines changed: 30 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,9 @@ func TestSkipDeployedEvaluator_PreviousDeploymentFailed(t *testing.T) {
6363

6464
// Create failed job with completion time
6565
completedAt := time.Now()
66-
st.Releases.Upsert(ctx, previousRelease)
66+
if err := st.Releases.Upsert(ctx, previousRelease); err != nil {
67+
t.Fatalf("Failed to upsert previous release: %v", err)
68+
}
6769
st.Jobs.Upsert(ctx, &oapi.Job{
6870
Id: "job-1",
6971
ReleaseId: previousRelease.ID(),
@@ -116,7 +118,9 @@ func TestSkipDeployedEvaluator_AlreadyDeployed(t *testing.T) {
116118

117119
// Create successful job with completion time
118120
completedAt := time.Now()
119-
st.Releases.Upsert(ctx, deployedRelease)
121+
if err := st.Releases.Upsert(ctx, deployedRelease); err != nil {
122+
t.Fatalf("Failed to upsert deployed release: %v", err)
123+
}
120124
st.Jobs.Upsert(ctx, &oapi.Job{
121125
Id: "job-1",
122126
ReleaseId: deployedRelease.ID(),
@@ -173,7 +177,9 @@ func TestSkipDeployedEvaluator_NewVersionAfterSuccessful(t *testing.T) {
173177
}
174178

175179
completedAt := time.Now().Add(-1 * time.Hour)
176-
st.Releases.Upsert(ctx, v1Release)
180+
if err := st.Releases.Upsert(ctx, v1Release); err != nil {
181+
t.Fatalf("Failed to upsert v1 release: %v", err)
182+
}
177183
st.Jobs.Upsert(ctx, &oapi.Job{
178184
Id: "job-v1",
179185
ReleaseId: v1Release.ID(),
@@ -190,7 +196,9 @@ func TestSkipDeployedEvaluator_NewVersionAfterSuccessful(t *testing.T) {
190196
Tag: "v2.0.0",
191197
},
192198
}
193-
st.Releases.Upsert(ctx, v2Release)
199+
if err := st.Releases.Upsert(ctx, v2Release); err != nil {
200+
t.Fatalf("Failed to upsert v2 release: %v", err)
201+
}
194202

195203
evaluator := NewSkipDeployedEvaluator(st)
196204

@@ -231,7 +239,9 @@ func TestSkipDeployedEvaluator_JobInProgressNotSuccessful(t *testing.T) {
231239
}
232240

233241
// Create in-progress job
234-
st.Releases.Upsert(ctx, release)
242+
if err := st.Releases.Upsert(ctx, release); err != nil {
243+
t.Fatalf("Failed to upsert release: %v", err)
244+
}
235245
st.Jobs.Upsert(ctx, &oapi.Job{
236246
Id: "job-1",
237247
ReleaseId: release.ID(),
@@ -283,7 +293,9 @@ func TestSkipDeployedEvaluator_CancelledJobDeniesRedeploy(t *testing.T) {
283293

284294
// Create cancelled job with completion time
285295
completedAt := time.Now()
286-
st.Releases.Upsert(ctx, release)
296+
if err := st.Releases.Upsert(ctx, release); err != nil {
297+
t.Fatalf("Failed to upsert release: %v", err)
298+
}
287299
st.Jobs.Upsert(ctx, &oapi.Job{
288300
Id: "job-1",
289301
ReleaseId: release.ID(),
@@ -327,7 +339,9 @@ func TestSkipDeployedEvaluator_VariableChangeCreatesNewRelease(t *testing.T) {
327339
}
328340

329341
replicas := oapi.LiteralValue{}
330-
replicas.FromIntegerValue(3)
342+
if err := replicas.FromIntegerValue(3); err != nil {
343+
t.Fatalf("Failed to create replicas: %v", err)
344+
}
331345

332346
release1 := &oapi.Release{
333347
ReleaseTarget: *releaseTarget,
@@ -341,7 +355,9 @@ func TestSkipDeployedEvaluator_VariableChangeCreatesNewRelease(t *testing.T) {
341355
}
342356

343357
completedAt := time.Now()
344-
st.Releases.Upsert(ctx, release1)
358+
if err := st.Releases.Upsert(ctx, release1); err != nil {
359+
t.Fatalf("Failed to upsert release1: %v", err)
360+
}
345361
st.Jobs.Upsert(ctx, &oapi.Job{
346362
Id: "job-1",
347363
ReleaseId: release1.ID(),
@@ -352,7 +368,9 @@ func TestSkipDeployedEvaluator_VariableChangeCreatesNewRelease(t *testing.T) {
352368

353369
// Deploy same version with different variables: {replicas: 5}
354370
replicas2 := oapi.LiteralValue{}
355-
replicas2.FromIntegerValue(5)
371+
if err := replicas2.FromIntegerValue(5); err != nil {
372+
t.Fatalf("Failed to create replicas2: %v", err)
373+
}
356374

357375
release2 := &oapi.Release{
358376
ReleaseTarget: *releaseTarget,
@@ -364,7 +382,9 @@ func TestSkipDeployedEvaluator_VariableChangeCreatesNewRelease(t *testing.T) {
364382
"replicas": replicas2, // Different value!
365383
},
366384
}
367-
st.Releases.Upsert(ctx, release2)
385+
if err := st.Releases.Upsert(ctx, release2); err != nil {
386+
t.Fatalf("Failed to upsert release2: %v", err)
387+
}
368388

369389
evaluator := NewSkipDeployedEvaluator(st)
370390

0 commit comments

Comments
 (0)