refactor(db): return library log on created and updated

api/build.go

@@ -1667,7 +1667,7 @@ func planServices(database database.Interface, p *pipeline.Build, b *library.Bui
 		l.SetData([]byte{})
 
 		// send API call to create the service logs
-		err = database.CreateLog(l)
+		_, err = database.CreateLog(l)
 		if err != nil {
 			return services, fmt.Errorf("unable to create service logs for service %s: %w", s.GetName(), err)
 		}
@@ -1726,7 +1726,7 @@ func planSteps(database database.Interface, p *pipeline.Build, b *library.Build)
 			l.SetData([]byte{})
 
 			// send API call to create the step logs
-			err = database.CreateLog(l)
+			_, err = database.CreateLog(l)
 			if err != nil {
 				return nil, fmt.Errorf("unable to create logs for step %s: %w", s.GetName(), err)
 			}
@@ -1775,7 +1775,7 @@ func planSteps(database database.Interface, p *pipeline.Build, b *library.Build)
 		l.SetData([]byte{})
 
 		// send API call to create the step logs
-		err = database.CreateLog(l)
+		_, err = database.CreateLog(l)
 		if err != nil {
 			return steps, fmt.Errorf("unable to create logs for step %s: %w", s.GetName(), err)
 		}

api/log/create_service.go

@@ -113,7 +113,7 @@ func CreateServiceLog(c *gin.Context) {
 	input.SetRepoID(r.GetID())
 
 	// send API call to create the logs
-	err = database.FromContext(c).CreateLog(input)
+	l, err := database.FromContext(c).CreateLog(input)
 	if err != nil {
 		retErr := fmt.Errorf("unable to create logs for service %s: %w", entry, err)
 
@@ -122,8 +122,5 @@ func CreateServiceLog(c *gin.Context) {
 		return
 	}
 
-	// send API call to capture the created log
-	l, _ := database.FromContext(c).GetLogForService(s)
-
 	c.JSON(http.StatusCreated, l)
 }

api/log/create_step.go

@@ -113,7 +113,7 @@ func CreateStepLog(c *gin.Context) {
 	input.SetRepoID(r.GetID())
 
 	// send API call to create the logs
-	err = database.FromContext(c).CreateLog(input)
+	l, err := database.FromContext(c).CreateLog(input)
 	if err != nil {
 		retErr := fmt.Errorf("unable to create logs for step %s: %w", entry, err)
 
@@ -122,8 +122,5 @@ func CreateStepLog(c *gin.Context) {
 		return
 	}
 
-	// send API call to capture the created log
-	l, _ := database.FromContext(c).GetLogForStep(s)
-
 	c.JSON(http.StatusCreated, l)
 }

api/log/update_service.go

@@ -124,7 +124,7 @@ func UpdateServiceLog(c *gin.Context) {
 	}
 
 	// send API call to update the log
-	err = database.FromContext(c).UpdateLog(l)
+	l, err = database.FromContext(c).UpdateLog(l)
 	if err != nil {
 		retErr := fmt.Errorf("unable to update logs for service %s: %w", entry, err)
 
@@ -133,8 +133,5 @@ func UpdateServiceLog(c *gin.Context) {
 		return
 	}
 
-	// send API call to capture the updated log
-	l, _ = database.FromContext(c).GetLogForService(s)
-
 	c.JSON(http.StatusOK, l)
 }

api/log/update_step.go

@@ -124,7 +124,7 @@ func UpdateStepLog(c *gin.Context) {
 	}
 
 	// send API call to update the log
-	err = database.FromContext(c).UpdateLog(l)
+	l, err = database.FromContext(c).UpdateLog(l)
 	if err != nil {
 		retErr := fmt.Errorf("unable to update logs for step %s: %w", entry, err)
 
@@ -133,8 +133,5 @@ func UpdateStepLog(c *gin.Context) {
 		return
 	}
 
-	// send API call to capture the updated log
-	l, _ = database.FromContext(c).GetLogForStep(s)
-
 	c.JSON(http.StatusOK, l)
 }

database/log/count_build_test.go

@@ -43,12 +43,12 @@ func TestLog_Engine_CountLogsForBuild(t *testing.T) {
 	_sqlite := testSqlite(t)
 	defer func() { _sql, _ := _sqlite.client.DB(); _sql.Close() }()
 
-	err := _sqlite.CreateLog(_service)
+	_, err := _sqlite.CreateLog(_service)
 	if err != nil {
 		t.Errorf("unable to create test service log for sqlite: %v", err)
 	}
 
-	err = _sqlite.CreateLog(_step)
+	_, err = _sqlite.CreateLog(_step)
 	if err != nil {
 		t.Errorf("unable to create test step log for sqlite: %v", err)
 	}

database/log/count_test.go

@@ -37,12 +37,12 @@ func TestLog_Engine_CountLogs(t *testing.T) {
 	_sqlite := testSqlite(t)
 	defer func() { _sql, _ := _sqlite.client.DB(); _sql.Close() }()
 
-	err := _sqlite.CreateLog(_service)
+	_, err := _sqlite.CreateLog(_service)
 	if err != nil {
 		t.Errorf("unable to create test service log for sqlite: %v", err)
 	}
 
-	err = _sqlite.CreateLog(_step)
+	_, err = _sqlite.CreateLog(_step)
 	if err != nil {
 		t.Errorf("unable to create test step log for sqlite: %v", err)
 	}

database/log/create.go

@@ -14,7 +14,7 @@ import (
 )
 
 // CreateLog creates a new log in the database.
-func (e *engine) CreateLog(l *library.Log) error {
+func (e *engine) CreateLog(l *library.Log) (*library.Log, error) {
 	// check what the log entry is for
 	switch {
 	case l.GetServiceID() > 0:
@@ -33,7 +33,7 @@ func (e *engine) CreateLog(l *library.Log) error {
 	// https://pkg.go.dev/github.com/go-vela/types/database#Log.Validate
 	err := log.Validate()
 	if err != nil {
-		return err
+		return nil, err
 	}
 
 	// compress log data for the resource
@@ -43,15 +43,14 @@ func (e *engine) CreateLog(l *library.Log) error {
 	if err != nil {
 		switch {
 		case l.GetServiceID() > 0:
-			return fmt.Errorf("unable to compress log for service %d for build %d: %w", l.GetServiceID(), l.GetBuildID(), err)
+			return nil, fmt.Errorf("unable to compress log for service %d for build %d: %w", l.GetServiceID(), l.GetBuildID(), err)
 		case l.GetStepID() > 0:
-			return fmt.Errorf("unable to compress log for step %d for build %d: %w", l.GetStepID(), l.GetBuildID(), err)
+			return nil, fmt.Errorf("unable to compress log for step %d for build %d: %w", l.GetStepID(), l.GetBuildID(), err)
 		}
 	}
 
 	// send query to the database
-	return e.client.
-		Table(constants.TableLog).
-		Create(log).
-		Error
+	result := e.client.Table(constants.TableLog).Create(log)
+
+	return log.ToLibrary(), result.Error
 }

database/log/create_test.go

@@ -73,7 +73,7 @@ VALUES ($1,$2,$3,$4,$5,$6) RETURNING "id"`).
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
 			for _, log := range test.logs {
-				err := test.database.CreateLog(log)
+				_, err := test.database.CreateLog(log)
 
 				if test.failure {
 					if err == nil {

database/log/delete_test.go

@@ -29,7 +29,7 @@ func TestLog_Engine_DeleteLog(t *testing.T) {
 	_sqlite := testSqlite(t)
 	defer func() { _sql, _ := _sqlite.client.DB(); _sql.Close() }()
 
-	err := _sqlite.CreateLog(_log)
+	_, err := _sqlite.CreateLog(_log)
 	if err != nil {
 		t.Errorf("unable to create test log for sqlite: %v", err)
 	}

database/log/get_service_test.go

@@ -42,7 +42,7 @@ func TestLog_Engine_GetLogForService(t *testing.T) {
 	_sqlite := testSqlite(t)
 	defer func() { _sql, _ := _sqlite.client.DB(); _sql.Close() }()
 
-	err := _sqlite.CreateLog(_log)
+	_, err := _sqlite.CreateLog(_log)
 	if err != nil {
 		t.Errorf("unable to create test log for sqlite: %v", err)
 	}

database/log/get_step_test.go

@@ -42,7 +42,7 @@ func TestLog_Engine_GetLogForStep(t *testing.T) {
 	_sqlite := testSqlite(t)
 	defer func() { _sql, _ := _sqlite.client.DB(); _sql.Close() }()
 
-	err := _sqlite.CreateLog(_log)
+	_, err := _sqlite.CreateLog(_log)
 	if err != nil {
 		t.Errorf("unable to create test log for sqlite: %v", err)
 	}

database/log/get_test.go

@@ -35,7 +35,7 @@ func TestLog_Engine_GetLog(t *testing.T) {
 	_sqlite := testSqlite(t)
 	defer func() { _sql, _ := _sqlite.client.DB(); _sql.Close() }()
 
-	err := _sqlite.CreateLog(_log)
+	_, err := _sqlite.CreateLog(_log)
 	if err != nil {
 		t.Errorf("unable to create test log for sqlite: %v", err)
 	}

database/log/interface.go

@@ -31,7 +31,7 @@ type LogInterface interface {
 	// CountLogsForBuild defines a function that gets the count of logs by build ID.
 	CountLogsForBuild(*library.Build) (int64, error)
 	// CreateLog defines a function that creates a new log.
-	CreateLog(*library.Log) error
+	CreateLog(*library.Log) (*library.Log, error)
 	// DeleteLog defines a function that deletes an existing log.
 	DeleteLog(*library.Log) error
 	// GetLog defines a function that gets a log by ID.
@@ -45,5 +45,5 @@ type LogInterface interface {
 	// ListLogsForBuild defines a function that gets a list of logs by build ID.
 	ListLogsForBuild(*library.Build, int, int) ([]*library.Log, int64, error)
 	// UpdateLog defines a function that updates an existing log.
-	UpdateLog(*library.Log) error
+	UpdateLog(*library.Log) (*library.Log, error)
 }

database/log/list_build_test.go

@@ -54,12 +54,12 @@ func TestLog_Engine_ListLogsForBuild(t *testing.T) {
 	_sqlite := testSqlite(t)
 	defer func() { _sql, _ := _sqlite.client.DB(); _sql.Close() }()
 
-	err := _sqlite.CreateLog(_service)
+	_, err := _sqlite.CreateLog(_service)
 	if err != nil {
 		t.Errorf("unable to create test service log for sqlite: %v", err)
 	}
 
-	err = _sqlite.CreateLog(_step)
+	_, err = _sqlite.CreateLog(_step)
 	if err != nil {
 		t.Errorf("unable to create test step log for sqlite: %v", err)
 	}

database/log/list_test.go

@@ -48,12 +48,12 @@ func TestLog_Engine_ListLogs(t *testing.T) {
 	_sqlite := testSqlite(t)
 	defer func() { _sql, _ := _sqlite.client.DB(); _sql.Close() }()
 
-	err := _sqlite.CreateLog(_service)
+	_, err := _sqlite.CreateLog(_service)
 	if err != nil {
 		t.Errorf("unable to create test service log for sqlite: %v", err)
 	}
 
-	err = _sqlite.CreateLog(_step)
+	_, err = _sqlite.CreateLog(_step)
 	if err != nil {
 		t.Errorf("unable to create test step log for sqlite: %v", err)
 	}

database/log/update.go

@@ -14,7 +14,7 @@ import (
 )
 
 // UpdateLog updates an existing log in the database.
-func (e *engine) UpdateLog(l *library.Log) error {
+func (e *engine) UpdateLog(l *library.Log) (*library.Log, error) {
 	// check what the log entry is for
 	switch {
 	case l.GetServiceID() > 0:
@@ -33,7 +33,7 @@ func (e *engine) UpdateLog(l *library.Log) error {
 	// https://pkg.go.dev/github.com/go-vela/types/database#Log.Validate
 	err := log.Validate()
 	if err != nil {
-		return err
+		return nil, err
 	}
 
 	// compress log data for the resource
@@ -43,15 +43,14 @@ func (e *engine) UpdateLog(l *library.Log) error {
 	if err != nil {
 		switch {
 		case l.GetServiceID() > 0:
-			return fmt.Errorf("unable to compress log for service %d for build %d: %w", l.GetServiceID(), l.GetBuildID(), err)
+			return nil, fmt.Errorf("unable to compress log for service %d for build %d: %w", l.GetServiceID(), l.GetBuildID(), err)
 		case l.GetStepID() > 0:
-			return fmt.Errorf("unable to compress log for step %d for build %d: %w", l.GetStepID(), l.GetBuildID(), err)
+			return nil, fmt.Errorf("unable to compress log for step %d for build %d: %w", l.GetStepID(), l.GetBuildID(), err)
 		}
 	}
 
 	// send query to the database
-	return e.client.
-		Table(constants.TableLog).
-		Save(log).
-		Error
+	result := e.client.Table(constants.TableLog).Save(log)
+
+	return log.ToLibrary(), result.Error
 }

database/log/update_test.go

@@ -47,12 +47,12 @@ WHERE "id" = $6`).
 	_sqlite := testSqlite(t)
 	defer func() { _sql, _ := _sqlite.client.DB(); _sql.Close() }()
 
-	err := _sqlite.CreateLog(_service)
+	_, err := _sqlite.CreateLog(_service)
 	if err != nil {
 		t.Errorf("unable to create test service log for sqlite: %v", err)
 	}
 
-	err = _sqlite.CreateLog(_step)
+	_, err = _sqlite.CreateLog(_step)
 	if err != nil {
 		t.Errorf("unable to create test step log for sqlite: %v", err)
 	}
@@ -82,7 +82,7 @@ WHERE "id" = $6`).
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
 			for _, log := range test.logs {
-				err = test.database.UpdateLog(log)
+				_, err = test.database.UpdateLog(log)
 
 				if test.failure {
 					if err == nil {