chore: clean up pipeline database engine

database/pipeline/count_repo_test.go

@@ -37,9 +37,7 @@ func TestPipeline_Engine_CountPipelinesForRepo(t *testing.T) {
 	_rows := sqlmock.NewRows([]string{"count"}).AddRow(1)
 
 	// ensure the mock expects the query
-	_mock.ExpectQuery(`SELECT count(*) FROM "pipelines" WHERE repo_id = $1`).
-		WithArgs(1).
-		WillReturnRows(_rows)
+	_mock.ExpectQuery(`SELECT count(*) FROM "pipelines" WHERE repo_id = $1`).WithArgs(1).WillReturnRows(_rows)
 
 	_sqlite := testSqlite(t)
 	defer func() { _sql, _ := _sqlite.client.DB(); _sql.Close() }()

database/pipeline/count_test.go

@@ -17,15 +17,15 @@ func TestPipeline_Engine_CountPipelines(t *testing.T) {
 	_pipelineOne.SetID(1)
 	_pipelineOne.SetRepoID(1)
 	_pipelineOne.SetNumber(1)
-	_pipelineOne.SetRef("48afb5bdc41ad69bf22588491333f7cf71135163")
+	_pipelineOne.SetRef("refs/heads/master")
 	_pipelineOne.SetType("yaml")
 	_pipelineOne.SetVersion("1")
 
 	_pipelineTwo := testPipeline()
 	_pipelineTwo.SetID(2)
 	_pipelineTwo.SetRepoID(2)
 	_pipelineTwo.SetNumber(1)
-	_pipelineTwo.SetRef("48afb5bdc41ad69bf22588491333f7cf71135163")
+	_pipelineTwo.SetRef("refs/heads/main")
 	_pipelineTwo.SetType("yaml")
 	_pipelineTwo.SetVersion("1")
 
@@ -36,8 +36,7 @@ func TestPipeline_Engine_CountPipelines(t *testing.T) {
 	_rows := sqlmock.NewRows([]string{"count"}).AddRow(2)
 
 	// ensure the mock expects the query
-	_mock.ExpectQuery(`SELECT count(*) FROM "pipelines"`).
-		WillReturnRows(_rows)
+	_mock.ExpectQuery(`SELECT count(*) FROM "pipelines"`).WillReturnRows(_rows)
 
 	_sqlite := testSqlite(t)
 	defer func() { _sql, _ := _sqlite.client.DB(); _sql.Close() }()

database/pipeline/create_test.go

@@ -16,7 +16,6 @@ func TestPipeline_Engine_CreatePipeline(t *testing.T) {
 	_pipeline.SetID(1)
 	_pipeline.SetRepoID(1)
 	_pipeline.SetNumber(1)
-	_pipeline.SetCommit("48afb5bdc41ad69bf22588491333f7cf71135163")
 	_pipeline.SetRef("refs/heads/master")
 	_pipeline.SetType("yaml")
 	_pipeline.SetVersion("1")
@@ -31,7 +30,7 @@ func TestPipeline_Engine_CreatePipeline(t *testing.T) {
 	_mock.ExpectQuery(`INSERT INTO "pipelines"
 ("repo_id","number","commit","flavor","platform","ref","type","version","external_secrets","internal_secrets","services","stages","steps","templates","data","id")
 VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11,$12,$13,$14,$15,$16) RETURNING "id"`).
-		WithArgs(1, 1, "48afb5bdc41ad69bf22588491333f7cf71135163", nil, nil, "refs/heads/master", "yaml", "1", false, false, false, false, false, false, AnyArgument{}, 1).
+		WithArgs(1, 1, nil, nil, nil, "refs/heads/master", "yaml", "1", false, false, false, false, false, false, AnyArgument{}, 1).
 		WillReturnRows(_rows)
 
 	_sqlite := testSqlite(t)

database/pipeline/delete_test.go

@@ -16,7 +16,7 @@ func TestPipeline_Engine_DeletePipeline(t *testing.T) {
 	_pipeline.SetID(1)
 	_pipeline.SetRepoID(1)
 	_pipeline.SetNumber(1)
-	_pipeline.SetRef("48afb5bdc41ad69bf22588491333f7cf71135163")
+	_pipeline.SetRef("refs/heads/master")
 	_pipeline.SetType("yaml")
 	_pipeline.SetVersion("1")
 

database/pipeline/get.go

@@ -5,13 +5,9 @@
 package pipeline
 
 import (
-	"errors"
-
 	"github.com/go-vela/types/constants"
 	"github.com/go-vela/types/database"
 	"github.com/go-vela/types/library"
-
-	"gorm.io/gorm"
 )
 
 // GetPipeline gets a pipeline by ID from the database.
@@ -22,27 +18,26 @@ func (e *engine) GetPipeline(id int64) (*library.Pipeline, error) {
 	p := new(database.Pipeline)
 
 	// send query to the database and store result in variable
-	result := e.client.
+	err := e.client.
 		Table(constants.TablePipeline).
 		Where("id = ?", id).
 		Limit(1).
-		Scan(p)
-
-	// check if the query returned a record not found error or no rows were returned
-	if errors.Is(result.Error, gorm.ErrRecordNotFound) || result.RowsAffected == 0 {
-		return nil, gorm.ErrRecordNotFound
+		Scan(p).
+		Error
+	if err != nil {
+		return nil, err
 	}
 
 	// decompress data for the pipeline
 	//
 	// https://pkg.go.dev/github.com/go-vela/types/database#Pipeline.Decompress
-	err := p.Decompress()
+	err = p.Decompress()
 	if err != nil {
 		return nil, err
 	}
 
 	// return the decompressed pipeline
 	//
 	// https://pkg.go.dev/github.com/go-vela/types/database#Pipeline.ToLibrary
-	return p.ToLibrary(), result.Error
+	return p.ToLibrary(), nil
 }

database/pipeline/get_repo.go

@@ -5,14 +5,10 @@
 package pipeline
 
 import (
-	"errors"
-
 	"github.com/go-vela/types/constants"
 	"github.com/go-vela/types/database"
 	"github.com/go-vela/types/library"
 	"github.com/sirupsen/logrus"
-
-	"gorm.io/gorm"
 )
 
 // GetPipelineForRepo gets a pipeline by number and repo ID from the database.
@@ -27,28 +23,27 @@ func (e *engine) GetPipelineForRepo(number int, r *library.Repo) (*library.Pipel
 	p := new(database.Pipeline)
 
 	// send query to the database and store result in variable
-	result := e.client.
+	err := e.client.
 		Table(constants.TablePipeline).
 		Where("repo_id = ?", r.GetID()).
 		Where("number = ?", number).
 		Limit(1).
-		Scan(p)
-
-	// check if the query returned a record not found error or no rows were returned
-	if errors.Is(result.Error, gorm.ErrRecordNotFound) || result.RowsAffected == 0 {
-		return nil, gorm.ErrRecordNotFound
+		Scan(p).
+		Error
+	if err != nil {
+		return nil, err
 	}
 
 	// decompress data for the pipeline
 	//
 	// https://pkg.go.dev/github.com/go-vela/types/database#Pipeline.Decompress
-	err := p.Decompress()
+	err = p.Decompress()
 	if err != nil {
 		return nil, err
 	}
 
 	// return the decompressed pipeline
 	//
 	// https://pkg.go.dev/github.com/go-vela/types/database#Pipeline.ToLibrary
-	return p.ToLibrary(), result.Error
+	return p.ToLibrary(), nil
 }

database/pipeline/get_repo_test.go

@@ -18,7 +18,7 @@ func TestPipeline_Engine_GetPipelineForRepo(t *testing.T) {
 	_pipeline.SetID(1)
 	_pipeline.SetRepoID(1)
 	_pipeline.SetNumber(1)
-	_pipeline.SetRef("48afb5bdc41ad69bf22588491333f7cf71135163")
+	_pipeline.SetRef("refs/heads/master")
 	_pipeline.SetType("yaml")
 	_pipeline.SetVersion("1")
 	_pipeline.SetData([]byte("foo"))
@@ -28,12 +28,11 @@ func TestPipeline_Engine_GetPipelineForRepo(t *testing.T) {
 
 	// create expected result in mock
 	_rows := sqlmock.NewRows(
-		[]string{"id", "repo_id", "number", "flavor", "platform", "ref", "type", "version", "services", "stages", "steps", "templates", "data"}).
-		AddRow(1, 1, 1, "", "", "48afb5bdc41ad69bf22588491333f7cf71135163", "yaml", "1", false, false, false, false, []byte{120, 94, 74, 203, 207, 7, 4, 0, 0, 255, 255, 2, 130, 1, 69})
+		[]string{"id", "repo_id", "number", "commit", "flavor", "platform", "ref", "type", "version", "services", "stages", "steps", "templates", "data"}).
+		AddRow(1, 1, 1, "", "", "", "refs/heads/master", "yaml", "1", false, false, false, false, []byte{120, 94, 74, 203, 207, 7, 4, 0, 0, 255, 255, 2, 130, 1, 69})
 
 	// ensure the mock expects the query
-	_mock.ExpectQuery(`SELECT * FROM "pipelines" WHERE repo_id = $1 AND number = $2 LIMIT 1`).
-		WithArgs(1, 1).WillReturnRows(_rows)
+	_mock.ExpectQuery(`SELECT * FROM "pipelines" WHERE repo_id = $1 AND number = $2 LIMIT 1`).WithArgs(1, 1).WillReturnRows(_rows)
 
 	_sqlite := testSqlite(t)
 	defer func() { _sql, _ := _sqlite.client.DB(); _sql.Close() }()

database/pipeline/get_test.go

@@ -18,7 +18,7 @@ func TestPipeline_Engine_GetPipeline(t *testing.T) {
 	_pipeline.SetID(1)
 	_pipeline.SetRepoID(1)
 	_pipeline.SetNumber(1)
-	_pipeline.SetRef("48afb5bdc41ad69bf22588491333f7cf71135163")
+	_pipeline.SetRef("refs/heads/master")
 	_pipeline.SetType("yaml")
 	_pipeline.SetVersion("1")
 	_pipeline.SetData([]byte("foo"))
@@ -28,12 +28,11 @@ func TestPipeline_Engine_GetPipeline(t *testing.T) {
 
 	// create expected result in mock
 	_rows := sqlmock.NewRows(
-		[]string{"id", "repo_id", "number", "flavor", "platform", "ref", "type", "version", "services", "stages", "steps", "templates", "data"}).
-		AddRow(1, 1, 1, "", "", "48afb5bdc41ad69bf22588491333f7cf71135163", "yaml", "1", false, false, false, false, []byte{120, 94, 74, 203, 207, 7, 4, 0, 0, 255, 255, 2, 130, 1, 69})
+		[]string{"id", "repo_id", "number", "commit", "flavor", "platform", "ref", "type", "version", "services", "stages", "steps", "templates", "data"}).
+		AddRow(1, 1, 1, "", "", "", "refs/heads/master", "yaml", "1", false, false, false, false, []byte{120, 94, 74, 203, 207, 7, 4, 0, 0, 255, 255, 2, 130, 1, 69})
 
 	// ensure the mock expects the query
-	_mock.ExpectQuery(`SELECT * FROM "pipelines" WHERE id = $1 LIMIT 1`).
-		WithArgs(1).WillReturnRows(_rows)
+	_mock.ExpectQuery(`SELECT * FROM "pipelines" WHERE id = $1 LIMIT 1`).WithArgs(1).WillReturnRows(_rows)
 
 	_sqlite := testSqlite(t)
 	defer func() { _sql, _ := _sqlite.client.DB(); _sql.Close() }()

database/pipeline/last_repo.go

@@ -5,14 +5,10 @@
 package pipeline
 
 import (
-	"errors"
-
 	"github.com/go-vela/types/constants"
 	"github.com/go-vela/types/database"
 	"github.com/go-vela/types/library"
 	"github.com/sirupsen/logrus"
-
-	"gorm.io/gorm"
 )
 
 // LastPipelineForRepo gets the last pipeline by repo ID from the database.
@@ -26,29 +22,27 @@ func (e *engine) LastPipelineForRepo(r *library.Repo) (*library.Pipeline, error)
 	p := new(database.Pipeline)
 
 	// send query to the database and store result in variable
-	result := e.client.
+	err := e.client.
 		Table(constants.TablePipeline).
 		Where("repo_id = ?", r.GetID()).
 		Order("number DESC").
 		Limit(1).
-		Scan(p)
-
-	// check if the query returned a record not found error or no rows were returned
-	if errors.Is(result.Error, gorm.ErrRecordNotFound) || result.RowsAffected == 0 {
-		// the record will not exist if it's a new repo
-		return nil, nil
+		Scan(p).
+		Error
+	if err != nil {
+		return nil, err
 	}
 
 	// decompress data for the pipeline
 	//
 	// https://pkg.go.dev/github.com/go-vela/types/database#Pipeline.Decompress
-	err := p.Decompress()
+	err = p.Decompress()
 	if err != nil {
 		return nil, err
 	}
 
 	// return the decompressed pipeline
 	//
 	// https://pkg.go.dev/github.com/go-vela/types/database#Pipeline.ToLibrary
-	return p.ToLibrary(), result.Error
+	return p.ToLibrary(), nil
 }

database/pipeline/last_repo_test.go

@@ -18,7 +18,7 @@ func TestPipeline_Engine_LastPipelineForRepo(t *testing.T) {
 	_pipelineOne.SetID(1)
 	_pipelineOne.SetRepoID(1)
 	_pipelineOne.SetNumber(1)
-	_pipelineOne.SetRef("48afb5bdc41ad69bf22588491333f7cf71135163")
+	_pipelineOne.SetRef("refs/heads/master")
 	_pipelineOne.SetType("yaml")
 	_pipelineOne.SetVersion("1")
 	_pipelineOne.SetData([]byte("foo"))
@@ -27,7 +27,7 @@ func TestPipeline_Engine_LastPipelineForRepo(t *testing.T) {
 	_pipelineTwo.SetID(2)
 	_pipelineTwo.SetRepoID(1)
 	_pipelineTwo.SetNumber(2)
-	_pipelineTwo.SetRef("48afb5bdc41ad69bf22588491333f7cf71135163")
+	_pipelineTwo.SetRef("refs/heads/main")
 	_pipelineTwo.SetType("yaml")
 	_pipelineTwo.SetVersion("1")
 	_pipelineTwo.SetData([]byte("foo"))
@@ -37,12 +37,11 @@ func TestPipeline_Engine_LastPipelineForRepo(t *testing.T) {
 
 	// create expected result in mock
 	_rows := sqlmock.NewRows(
-		[]string{"id", "repo_id", "number", "flavor", "platform", "ref", "type", "version", "services", "stages", "steps", "templates", "data"}).
-		AddRow(2, 1, 2, "", "", "48afb5bdc41ad69bf22588491333f7cf71135163", "yaml", "1", false, false, false, false, []byte{120, 94, 74, 203, 207, 7, 4, 0, 0, 255, 255, 2, 130, 1, 69})
+		[]string{"id", "repo_id", "number", "commit", "flavor", "platform", "ref", "type", "version", "services", "stages", "steps", "templates", "data"}).
+		AddRow(2, 1, 2, "", "", "", "refs/heads/main", "yaml", "1", false, false, false, false, []byte{120, 94, 74, 203, 207, 7, 4, 0, 0, 255, 255, 2, 130, 1, 69})
 
 	// ensure the mock expects the query
-	_mock.ExpectQuery(`SELECT * FROM "pipelines" WHERE repo_id = $1 ORDER BY number DESC LIMIT 1`).
-		WithArgs(1).WillReturnRows(_rows)
+	_mock.ExpectQuery(`SELECT * FROM "pipelines" WHERE repo_id = $1 ORDER BY number DESC LIMIT 1`).WithArgs(1).WillReturnRows(_rows)
 
 	_sqlite := testSqlite(t)
 	defer func() { _sql, _ := _sqlite.client.DB(); _sql.Close() }()

database/pipeline/list.go

@@ -15,11 +15,23 @@ func (e *engine) ListPipelines() ([]*library.Pipeline, error) {
 	e.logger.Trace("listing all pipelines from the database")
 
 	// variables to store query results and return value
+	count := int64(0)
 	p := new([]database.Pipeline)
 	pipelines := []*library.Pipeline{}
 
+	// count the results
+	count, err := e.CountPipelines()
+	if err != nil {
+		return nil, err
+	}
+
+	// short-circuit if there are no results
+	if count == 0 {
+		return pipelines, nil
+	}
+
 	// send query to the database and store result in variable
-	err := e.client.
+	err = e.client.
 		Table(constants.TablePipeline).
 		Find(&p).
 		Error

database/pipeline/list_repo_test.go

@@ -18,7 +18,7 @@ func TestPipeline_Engine_ListPipelinesForRepo(t *testing.T) {
 	_pipelineOne.SetID(1)
 	_pipelineOne.SetRepoID(1)
 	_pipelineOne.SetNumber(1)
-	_pipelineOne.SetRef("48afb5bdc41ad69bf22588491333f7cf71135163")
+	_pipelineOne.SetRef("refs/heads/master")
 	_pipelineOne.SetType("yaml")
 	_pipelineOne.SetVersion("1")
 	_pipelineOne.SetData([]byte("foo"))
@@ -27,7 +27,7 @@ func TestPipeline_Engine_ListPipelinesForRepo(t *testing.T) {
 	_pipelineTwo.SetID(2)
 	_pipelineTwo.SetRepoID(2)
 	_pipelineTwo.SetNumber(1)
-	_pipelineTwo.SetRef("48afb5bdc41ad69bf22588491333f7cf71135163")
+	_pipelineTwo.SetRef("refs/heads/main")
 	_pipelineTwo.SetType("yaml")
 	_pipelineTwo.SetVersion("1")
 	_pipelineTwo.SetData([]byte("foo"))
@@ -39,19 +39,15 @@ func TestPipeline_Engine_ListPipelinesForRepo(t *testing.T) {
 	_rows := sqlmock.NewRows([]string{"count"}).AddRow(1)
 
 	// ensure the mock expects the query
-	_mock.ExpectQuery(`SELECT count(*) FROM "pipelines" WHERE repo_id = $1`).
-		WithArgs(1).
-		WillReturnRows(_rows)
+	_mock.ExpectQuery(`SELECT count(*) FROM "pipelines" WHERE repo_id = $1`).WithArgs(1).WillReturnRows(_rows)
 
 	// create expected result in mock
 	_rows = sqlmock.NewRows(
-		[]string{"id", "repo_id", "number", "flavor", "platform", "ref", "type", "version", "services", "stages", "steps", "templates", "data"}).
-		AddRow(1, 1, 1, "", "", "48afb5bdc41ad69bf22588491333f7cf71135163", "yaml", "1", false, false, false, false, []byte{120, 94, 74, 203, 207, 7, 4, 0, 0, 255, 255, 2, 130, 1, 69})
+		[]string{"id", "repo_id", "number", "commit", "flavor", "platform", "ref", "type", "version", "services", "stages", "steps", "templates", "data"}).
+		AddRow(1, 1, 1, "", "", "", "refs/heads/master", "yaml", "1", false, false, false, false, []byte{120, 94, 74, 203, 207, 7, 4, 0, 0, 255, 255, 2, 130, 1, 69})
 
 	// ensure the mock expects the query
-	_mock.ExpectQuery(`SELECT * FROM "pipelines" WHERE repo_id = $1 LIMIT 1`).
-		WithArgs(1).
-		WillReturnRows(_rows)
+	_mock.ExpectQuery(`SELECT * FROM "pipelines" WHERE repo_id = $1 LIMIT 1`).WithArgs(1).WillReturnRows(_rows)
 
 	_sqlite := testSqlite(t)
 	defer func() { _sql, _ := _sqlite.client.DB(); _sql.Close() }()