Merge branch 'main' into enhance-repo-topics

go-vela · Apr 17, 2023 · e43b59f · e43b59f
2 parents b091dbe + f37d973
commit e43b59f
Show file tree

Hide file tree

Showing 55 changed files with 2,231 additions and 2,047 deletions.
diff --git a/api/build.go b/api/build.go
@@ -1837,7 +1837,7 @@ func CancelBuild(c *gin.Context) {
 
 	for page > 0 {
 		// retrieve build steps (per page) from the database
-		stepsPart, err := database.FromContext(c).GetBuildStepList(b, page, perPage)
+		stepsPart, _, err := database.FromContext(c).ListStepsForBuild(b, map[string]interface{}{}, page, perPage)
 		if err != nil {
 			retErr := fmt.Errorf("unable to retrieve steps for build %s: %w", entry, err)
 			util.HandleError(c, http.StatusNotFound, retErr)

diff --git a/api/metrics.go b/api/metrics.go
@@ -324,7 +324,7 @@ func recordGauges(c *gin.Context) {
 	// step_image_count
 	if q.StepImageCount {
 		// send API call to capture the total number of step images
-		stepImageMap, err := database.FromContext(c).GetStepImageCount()
+		stepImageMap, err := database.FromContext(c).ListStepImageCount()
 		if err != nil {
 			logrus.Errorf("unable to get count of all step images: %v", err)
 		}
@@ -337,7 +337,7 @@ func recordGauges(c *gin.Context) {
 	// step_status_count
 	if q.StepStatusCount {
 		// send API call to capture the total number of step statuses
-		stepStatusMap, err := database.FromContext(c).GetStepStatusCount()
+		stepStatusMap, err := database.FromContext(c).ListStepStatusCount()
 		if err != nil {
 			logrus.Errorf("unable to get count of all step statuses: %v", err)
 		}

diff --git a/api/step.go b/api/step.go
@@ -127,7 +127,7 @@ func CreateStep(c *gin.Context) {
 	}
 
 	// send API call to capture the created step
-	s, _ := database.FromContext(c).GetStep(input.GetNumber(), b)
+	s, _ := database.FromContext(c).GetStepForBuild(b, input.GetNumber())
 
 	c.JSON(http.StatusCreated, s)
 }
@@ -235,18 +235,8 @@ func GetSteps(c *gin.Context) {
 	// ensure per_page isn't above or below allowed values
 	perPage = util.MaxInt(1, util.MinInt(100, perPage))
 
-	// send API call to capture the total number of steps for the build
-	t, err := database.FromContext(c).GetBuildStepCount(b)
-	if err != nil {
-		retErr := fmt.Errorf("unable to get steps count for build %s: %w", entry, err)
-
-		util.HandleError(c, http.StatusInternalServerError, retErr)
-
-		return
-	}
-
 	// send API call to capture the list of steps for the build
-	s, err := database.FromContext(c).GetBuildStepList(b, page, perPage)
+	s, t, err := database.FromContext(c).ListStepsForBuild(b, map[string]interface{}{}, page, perPage)
 	if err != nil {
 		retErr := fmt.Errorf("unable to get steps for build %s: %w", entry, err)
 
@@ -464,7 +454,7 @@ func UpdateStep(c *gin.Context) {
 	}
 
 	// send API call to capture the updated step
-	s, _ = database.FromContext(c).GetStep(s.GetNumber(), b)
+	s, _ = database.FromContext(c).GetStepForBuild(b, s.GetNumber())
 
 	c.JSON(http.StatusOK, s)
 }
@@ -535,7 +525,7 @@ func DeleteStep(c *gin.Context) {
 	}).Infof("deleting step %s", entry)
 
 	// send API call to remove the step
-	err := database.FromContext(c).DeleteStep(s.GetID())
+	err := database.FromContext(c).DeleteStep(s)
 	if err != nil {
 		retErr := fmt.Errorf("unable to delete step %s: %w", entry, err)
 
@@ -576,7 +566,7 @@ func planSteps(database database.Service, p *pipeline.Build, b *library.Build) (
 			}
 
 			// send API call to capture the created step
-			s, err = database.GetStep(s.GetNumber(), b)
+			s, err = database.GetStepForBuild(b, s.GetNumber())
 			if err != nil {
 				return steps, fmt.Errorf("unable to get step %s: %w", s.GetName(), err)
 			}
@@ -625,7 +615,7 @@ func planSteps(database database.Service, p *pipeline.Build, b *library.Build) (
 		}
 
 		// send API call to capture the created step
-		s, err = database.GetStep(s.GetNumber(), b)
+		s, err = database.GetStepForBuild(b, s.GetNumber())
 		if err != nil {
 			return steps, fmt.Errorf("unable to get step %s: %w", s.GetName(), err)
 		}

diff --git a/database/postgres/ddl/step.go b/database/postgres/ddl/step.go
diff --git a/database/postgres/dml/step.go b/database/postgres/dml/step.go
diff --git a/database/postgres/postgres.go b/database/postgres/postgres.go
@@ -15,6 +15,7 @@ import (
 	"github.com/go-vela/server/database/postgres/ddl"
 	"github.com/go-vela/server/database/repo"
 	"github.com/go-vela/server/database/secret"
+	"github.com/go-vela/server/database/step"
 	"github.com/go-vela/server/database/user"
 	"github.com/go-vela/server/database/worker"
 	"github.com/go-vela/types/constants"
@@ -58,6 +59,8 @@ type (
 		repo.RepoService
 		// https://pkg.go.dev/github.com/go-vela/server/database/secret#SecretService
 		secret.SecretService
+		// https://pkg.go.dev/github.com/go-vela/server/database/step#StepService
+		step.StepService
 		// https://pkg.go.dev/github.com/go-vela/server/database/user#UserService
 		user.UserService
 		// https://pkg.go.dev/github.com/go-vela/server/database/worker#WorkerService
@@ -175,6 +178,8 @@ func NewTest() (*client, sqlmock.Sqlmock, error) {
 	_mock.ExpectExec(secret.CreateTypeOrgRepo).WillReturnResult(sqlmock.NewResult(1, 1))
 	_mock.ExpectExec(secret.CreateTypeOrgTeam).WillReturnResult(sqlmock.NewResult(1, 1))
 	_mock.ExpectExec(secret.CreateTypeOrg).WillReturnResult(sqlmock.NewResult(1, 1))
+	// ensure the mock expects the step queries
+	_mock.ExpectExec(step.CreatePostgresTable).WillReturnResult(sqlmock.NewResult(1, 1))
 	// ensure the mock expects the user queries
 	_mock.ExpectExec(user.CreatePostgresTable).WillReturnResult(sqlmock.NewResult(1, 1))
 	_mock.ExpectExec(user.CreateUserRefreshIndex).WillReturnResult(sqlmock.NewResult(1, 1))
@@ -273,12 +278,6 @@ func createTables(c *client) error {
 		return fmt.Errorf("unable to create %s table: %w", constants.TableService, err)
 	}
 
-	// create the steps table
-	err = c.Postgres.Exec(ddl.CreateStepTable).Error
-	if err != nil {
-		return fmt.Errorf("unable to create %s table: %w", constants.TableStep, err)
-	}
-
 	return nil
 }
 
@@ -382,6 +381,18 @@ func createServices(c *client) error {
 		return err
 	}
 
+	// create the database agnostic step service
+	//
+	// https://pkg.go.dev/github.com/go-vela/server/database/repo#New
+	c.StepService, err = step.New(
+		step.WithClient(c.Postgres),
+		step.WithLogger(c.Logger),
+		step.WithSkipCreation(c.config.SkipCreation),
+	)
+	if err != nil {
+		return err
+	}
+
 	// create the database agnostic user service
 	//
 	// https://pkg.go.dev/github.com/go-vela/server/database/user#New

diff --git a/database/postgres/postgres_test.go b/database/postgres/postgres_test.go
@@ -16,6 +16,7 @@ import (
 	"github.com/go-vela/server/database/postgres/ddl"
 	"github.com/go-vela/server/database/repo"
 	"github.com/go-vela/server/database/secret"
+	"github.com/go-vela/server/database/step"
 	"github.com/go-vela/server/database/user"
 	"github.com/go-vela/server/database/worker"
 	"github.com/go-vela/types/library"
@@ -82,7 +83,6 @@ func TestPostgres_setupDatabase(t *testing.T) {
 	// ensure the mock expects the table queries
 	_mock.ExpectExec(ddl.CreateBuildTable).WillReturnResult(sqlmock.NewResult(1, 1))
 	_mock.ExpectExec(ddl.CreateServiceTable).WillReturnResult(sqlmock.NewResult(1, 1))
-	_mock.ExpectExec(ddl.CreateStepTable).WillReturnResult(sqlmock.NewResult(1, 1))
 
 	// ensure the mock expects the index queries
 	_mock.ExpectExec(ddl.CreateBuildRepoIDIndex).WillReturnResult(sqlmock.NewResult(1, 1))
@@ -107,6 +107,8 @@ func TestPostgres_setupDatabase(t *testing.T) {
 	_mock.ExpectExec(secret.CreateTypeOrgRepo).WillReturnResult(sqlmock.NewResult(1, 1))
 	_mock.ExpectExec(secret.CreateTypeOrgTeam).WillReturnResult(sqlmock.NewResult(1, 1))
 	_mock.ExpectExec(secret.CreateTypeOrg).WillReturnResult(sqlmock.NewResult(1, 1))
+	// ensure the mock expects the step queries
+	_mock.ExpectExec(step.CreatePostgresTable).WillReturnResult(sqlmock.NewResult(1, 1))
 	// ensure the mock expects the user queries
 	_mock.ExpectExec(user.CreatePostgresTable).WillReturnResult(sqlmock.NewResult(1, 1))
 	_mock.ExpectExec(user.CreateUserRefreshIndex).WillReturnResult(sqlmock.NewResult(1, 1))
@@ -175,7 +177,6 @@ func TestPostgres_createTables(t *testing.T) {
 	// ensure the mock expects the table queries
 	_mock.ExpectExec(ddl.CreateBuildTable).WillReturnResult(sqlmock.NewResult(1, 1))
 	_mock.ExpectExec(ddl.CreateServiceTable).WillReturnResult(sqlmock.NewResult(1, 1))
-	_mock.ExpectExec(ddl.CreateStepTable).WillReturnResult(sqlmock.NewResult(1, 1))
 
 	tests := []struct {
 		failure bool
@@ -272,6 +273,8 @@ func TestPostgres_createServices(t *testing.T) {
 	_mock.ExpectExec(secret.CreateTypeOrgRepo).WillReturnResult(sqlmock.NewResult(1, 1))
 	_mock.ExpectExec(secret.CreateTypeOrgTeam).WillReturnResult(sqlmock.NewResult(1, 1))
 	_mock.ExpectExec(secret.CreateTypeOrg).WillReturnResult(sqlmock.NewResult(1, 1))
+	// ensure the mock expects the step queries
+	_mock.ExpectExec(step.CreatePostgresTable).WillReturnResult(sqlmock.NewResult(1, 1))
 	// ensure the mock expects the user queries
 	_mock.ExpectExec(user.CreatePostgresTable).WillReturnResult(sqlmock.NewResult(1, 1))
 	_mock.ExpectExec(user.CreateUserRefreshIndex).WillReturnResult(sqlmock.NewResult(1, 1))

diff --git a/database/postgres/step.go b/database/postgres/step.go