Skip to content

Commit ba61fd7

Browse files
ecrupperecrupper
authored
Merge branch 'main' into enhance-no-return-log
2 parents 146f401 + ad8d7d7 commit ba61fd7

27 files changed

+534
-407
lines changed

‎cmd/vela-server/schedule.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,6 @@ func processSchedule(s *library.Schedule, compiler compiler.Engine, database dat
233233
}
234234

235235
// set the build numbers based off repo counter
236-
r.SetCounter(r.GetCounter() + 1)
237236
b.SetNumber(r.GetCounter() + 1)
238237
// set the parent equal to the current repo counter
239238
b.SetParent(r.GetCounter())
@@ -242,6 +241,7 @@ func processSchedule(s *library.Schedule, compiler compiler.Engine, database dat
242241
// parent should be "1" if it's the first build ran
243242
b.SetParent(1)
244243
}
244+
r.SetCounter(r.GetCounter() + 1)
245245

246246
// set the build link if a web address is provided
247247
if len(metadata.Vela.WebAddress) > 0 {

‎database/interface.go‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,8 @@ import (
2222
type Interface interface {
2323
// Generic Interface Functions
2424

25-
// TODO: Add this function to the interface once other code has been updated to use the agnostic engine.
26-
//
2725
// Close defines a function that stops and terminates the connection to the database.
28-
// Close() error
26+
Close() error
2927

3028
// Driver defines a function that outputs the configured database driver.
3129
Driver() string

‎internal/token/refresh_test.go‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ import (
1010
"time"
1111

1212
"github.com/gin-gonic/gin"
13-
"github.com/go-vela/server/database/sqlite"
13+
"github.com/go-vela/server/database"
1414
"github.com/go-vela/types/constants"
1515
"github.com/go-vela/types/library"
16-
jwt "github.com/golang-jwt/jwt/v5"
16+
"github.com/golang-jwt/jwt/v5"
1717
)
1818

1919
func TestTokenManager_Refresh(t *testing.T) {
@@ -45,12 +45,14 @@ func TestTokenManager_Refresh(t *testing.T) {
4545
u.SetRefreshToken(rt)
4646

4747
// setup database
48-
db, _ := sqlite.NewTest()
48+
db, err := database.NewTest()
49+
if err != nil {
50+
t.Errorf("unable to create test database engine: %v", err)
51+
}
4952

5053
defer func() {
51-
db.Sqlite.Exec("delete from users;")
52-
_sql, _ := db.Sqlite.DB()
53-
_sql.Close()
54+
db.DeleteUser(u)
55+
db.Close()
5456
}()
5557

5658
_ = db.CreateUser(u)
@@ -102,12 +104,14 @@ func TestTokenManager_Refresh_Expired(t *testing.T) {
102104
u.SetRefreshToken(rt)
103105

104106
// setup database
105-
db, _ := sqlite.NewTest()
107+
db, err := database.NewTest()
108+
if err != nil {
109+
t.Errorf("unable to create test database engine: %v", err)
110+
}
106111

107112
defer func() {
108-
db.Sqlite.Exec("delete from users;")
109-
_sql, _ := db.Sqlite.DB()
110-
_sql.Close()
113+
db.DeleteUser(u)
114+
db.Close()
111115
}()
112116

113117
_ = db.CreateUser(u)

‎router/middleware/build/build_test.go‎

Lines changed: 31 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,9 @@ import (
1010
"reflect"
1111
"testing"
1212

13-
"github.com/go-vela/server/router/middleware/org"
14-
1513
"github.com/gin-gonic/gin"
1614
"github.com/go-vela/server/database"
17-
"github.com/go-vela/server/database/sqlite"
15+
"github.com/go-vela/server/router/middleware/org"
1816
"github.com/go-vela/server/router/middleware/repo"
1917
"github.com/go-vela/types/library"
2018
)
@@ -85,13 +83,15 @@ func TestBuild_Establish(t *testing.T) {
8583
got := new(library.Build)
8684

8785
// setup database
88-
db, _ := sqlite.NewTest()
86+
db, err := database.NewTest()
87+
if err != nil {
88+
t.Errorf("unable to create test database engine: %v", err)
89+
}
8990

9091
defer func() {
91-
db.Sqlite.Exec("delete from repos;")
92-
db.Sqlite.Exec("delete from builds;")
93-
_sql, _ := db.Sqlite.DB()
94-
_sql.Close()
92+
db.DeleteBuild(want)
93+
db.DeleteRepo(r)
94+
db.Close()
9595
}()
9696

9797
_ = db.CreateRepo(r)
@@ -129,9 +129,11 @@ func TestBuild_Establish(t *testing.T) {
129129

130130
func TestBuild_Establish_NoRepo(t *testing.T) {
131131
// setup database
132-
db, _ := sqlite.NewTest()
133-
134-
defer func() { _sql, _ := db.Sqlite.DB(); _sql.Close() }()
132+
db, err := database.NewTest()
133+
if err != nil {
134+
t.Errorf("unable to create test database engine: %v", err)
135+
}
136+
defer db.Close()
135137

136138
// setup context
137139
gin.SetMode(gin.TestMode)
@@ -164,12 +166,14 @@ func TestBuild_Establish_NoBuildParameter(t *testing.T) {
164166
r.SetVisibility("public")
165167

166168
// setup database
167-
db, _ := sqlite.NewTest()
169+
db, err := database.NewTest()
170+
if err != nil {
171+
t.Errorf("unable to create test database engine: %v", err)
172+
}
168173

169174
defer func() {
170-
db.Sqlite.Exec("delete from repos;")
171-
_sql, _ := db.Sqlite.DB()
172-
_sql.Close()
175+
db.DeleteRepo(r)
176+
db.Close()
173177
}()
174178

175179
_ = db.CreateRepo(r)
@@ -210,12 +214,14 @@ func TestBuild_Establish_InvalidBuildParameter(t *testing.T) {
210214
r.SetVisibility("public")
211215

212216
// setup database
213-
db, _ := sqlite.NewTest()
217+
db, err := database.NewTest()
218+
if err != nil {
219+
t.Errorf("unable to create test database engine: %v", err)
220+
}
214221

215222
defer func() {
216-
db.Sqlite.Exec("delete from repos;")
217-
_sql, _ := db.Sqlite.DB()
218-
_sql.Close()
223+
db.DeleteRepo(r)
224+
db.Close()
219225
}()
220226

221227
_ = db.CreateRepo(r)
@@ -256,12 +262,14 @@ func TestBuild_Establish_NoBuild(t *testing.T) {
256262
r.SetVisibility("public")
257263

258264
// setup database
259-
db, _ := sqlite.NewTest()
265+
db, err := database.NewTest()
266+
if err != nil {
267+
t.Errorf("unable to create test database engine: %v", err)
268+
}
260269

261270
defer func() {
262-
db.Sqlite.Exec("delete from repos;")
263-
_sql, _ := db.Sqlite.DB()
264-
_sql.Close()
271+
db.DeleteRepo(r)
272+
db.Close()
265273
}()
266274

267275
_ = db.CreateRepo(r)

‎router/middleware/claims/claims_test.go‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,12 @@ import (
1313
"testing"
1414
"time"
1515

16+
"github.com/gin-gonic/gin"
1617
"github.com/go-vela/server/database"
17-
"github.com/go-vela/server/database/sqlite"
1818
"github.com/go-vela/server/internal/token"
19-
"github.com/golang-jwt/jwt/v5"
20-
2119
"github.com/go-vela/types/constants"
2220
"github.com/go-vela/types/library"
23-
24-
"github.com/gin-gonic/gin"
21+
"github.com/golang-jwt/jwt/v5"
2522
)
2623

2724
func TestClaims_Retrieve(t *testing.T) {
@@ -271,12 +268,14 @@ func TestClaims_Establish_BadToken(t *testing.T) {
271268
u.SetHash("abc")
272269

273270
// setup database
274-
db, _ := sqlite.NewTest()
271+
db, err := database.NewTest()
272+
if err != nil {
273+
t.Errorf("unable to create test database engine: %v", err)
274+
}
275275

276276
defer func() {
277-
db.Sqlite.Exec("delete from users;")
278-
_sql, _ := db.Sqlite.DB()
279-
_sql.Close()
277+
db.DeleteUser(u)
278+
db.Close()
280279
}()
281280

282281
_ = db.CreateUser(u)

‎router/middleware/database_test.go‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,17 @@ import (
1212

1313
"github.com/gin-gonic/gin"
1414
"github.com/go-vela/server/database"
15-
"github.com/go-vela/server/database/sqlite"
1615
)
1716

1817
func TestMiddleware_Database(t *testing.T) {
1918
// setup types
2019
var got database.Interface
2120

22-
want, _ := sqlite.NewTest()
23-
24-
defer func() { _sql, _ := want.Sqlite.DB(); _sql.Close() }()
21+
want, err := database.NewTest()
22+
if err != nil {
23+
t.Errorf("unable to create test database engine: %v", err)
24+
}
25+
defer want.Close()
2526

2627
// setup context
2728
gin.SetMode(gin.TestMode)

‎router/middleware/org/org_test.go‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import (
1212

1313
"github.com/gin-gonic/gin"
1414
"github.com/go-vela/server/database"
15-
"github.com/go-vela/server/database/sqlite"
1615
"github.com/go-vela/types/library"
1716
)
1817

@@ -60,12 +59,14 @@ func TestOrg_Establish(t *testing.T) {
6059
got := ""
6160

6261
// setup database
63-
db, _ := sqlite.NewTest()
62+
db, err := database.NewTest()
63+
if err != nil {
64+
t.Errorf("unable to create test database engine: %v", err)
65+
}
6466

6567
defer func() {
66-
db.Sqlite.Exec("delete from repos;")
67-
_sql, _ := db.Sqlite.DB()
68-
_sql.Close()
68+
db.DeleteRepo(r)
69+
db.Close()
6970
}()
7071

7172
_ = db.CreateRepo(r)
@@ -100,9 +101,11 @@ func TestOrg_Establish(t *testing.T) {
100101

101102
func TestOrg_Establish_NoOrgParameter(t *testing.T) {
102103
// setup database
103-
db, _ := sqlite.NewTest()
104-
105-
defer func() { _sql, _ := db.Sqlite.DB(); _sql.Close() }()
104+
db, err := database.NewTest()
105+
if err != nil {
106+
t.Errorf("unable to create test database engine: %v", err)
107+
}
108+
defer db.Close()
106109

107110
// setup context
108111
gin.SetMode(gin.TestMode)

0 commit comments

Comments
 (0)