Refactor devbuild service initialization and CloudEvents

Author: wuhuizuo

experiments/tibuild-v2/cmd/tibuild/init.go

@@ -1,46 +1,27 @@
 package main
 
 import (
-	"context"
 	"fmt"
 	"os"
 
-	"github.com/rs/zerolog/log"
 	"gopkg.in/yaml.v3"
 
-	"github.com/PingCAP-QE/ee-apps/tibuild/internal/database/ent"
 	"github.com/PingCAP-QE/ee-apps/tibuild/pkg/config"
 
 	_ "github.com/go-sql-driver/mysql"
 )
 
 // Load and parse configuration
-func loadConfig(configFile string) (config.Service, error) {
+func loadConfig(configFile string) (*config.Service, error) {
 	var config config.Service
 	{
 		configData, err := os.ReadFile(configFile)
 		if err != nil {
-			return config, fmt.Errorf("error reading config file: %v", err)
+			return nil, fmt.Errorf("error reading config file: %v", err)
 		}
 		if err := yaml.Unmarshal(configData, &config); err != nil {
-			return config, fmt.Errorf("error parsing config file: %v", err)
+			return nil, fmt.Errorf("error parsing config file: %v", err)
 		}
 	}
-	return config, nil
-}
-
-func newStoreClient(cfg config.Store) (*ent.Client, error) {
-	db, err := ent.Open(cfg.Driver, cfg.DSN)
-	if err != nil {
-		log.Err(err).Msgf("failed opening connection to %s", cfg.Driver)
-		return nil, err
-	}
-
-	// Run the auto migration tool.
-	if err := db.Schema.Create(context.Background()); err != nil {
-		log.Err(err).Msg("failed creating schema resources")
-		return nil, err
-	}
-
-	return db, nil
+	return &config, nil
 }

experiments/tibuild-v2/cmd/tibuild/main.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"context"
+	"errors"
 	"flag"
 	"fmt"
 	"net"
@@ -67,12 +68,11 @@ func main() {
 			artifactSvc = impl.NewArtifact(&logger)
 		}
 		{
-			dbClient, err := newStoreClient(cfg.Store)
-			if err != nil {
-				log.Fatalf(ctx, err, "failed to create store client")
-			}
 			logger := zerolog.New(os.Stderr).With().Timestamp().Str("service", devbuild.ServiceName).Logger()
-			devbuildSvc = impl.NewDevbuild(&logger, dbClient)
+			devbuildSvc = impl.NewDevbuild(&logger, cfg)
+			if devbuildSvc == nil {
+				log.Fatalf(ctx, errors.New("failed to initialize devbuild service"), "please check the configuration")
+			}
 		}
 	}
 

experiments/tibuild-v2/internal/service/impl/devbuild.go

@@ -14,29 +14,39 @@ import (
 	"github.com/PingCAP-QE/ee-apps/tibuild/internal/database/ent"
 	entdevbuild "github.com/PingCAP-QE/ee-apps/tibuild/internal/database/ent/devbuild"
 	"github.com/PingCAP-QE/ee-apps/tibuild/internal/service/gen/devbuild"
+	"github.com/PingCAP-QE/ee-apps/tibuild/pkg/config"
 )
 
 // devbuild service example implementation.
 // The example methods log the requests and return zero values.
 type devbuildsrvc struct {
-	logger         *zerolog.Logger
-	dbClient       *ent.Client
-	productRepoMap map[string]string
-	ghClient       *github.Client
-	tektonClient   tektonClient
-	jenkinsClient  *gojenkins.Jenkins
-	tknListenerURL string
+	logger                 *zerolog.Logger
+	dbClient               *ent.Client
+	productRepoMap         map[string]string
+	ghClient               *github.Client
+	tektonCloudEventClient cloudevents.Client
+	jenkinsClient          *gojenkins.Jenkins
 }
 
-type tektonClient struct {
-	client      cloudevents.Client
-	listenerURL string
-}
+func NewDevbuild(logger *zerolog.Logger, cfg *config.Service) devbuild.Service {
+	dbClient, err := newStoreClient(cfg.Store)
+	if err != nil {
+		logger.Err(err).Msg("failed to create store client")
+		return nil
+	}
+
+	client, err := cloudevents.NewClientHTTP(cloudevents.WithTarget(cfg.Tekton.CloudeventEndpoint))
+	if err != nil {
+		logger.Err(err).Msg("failed to create cloud event client")
+		return nil
+	}
 
-func NewDevbuild(logger *zerolog.Logger, client *ent.Client) devbuild.Service {
 	return &devbuildsrvc{
-		logger:   logger,
-		dbClient: client,
+		logger:                 logger,
+		dbClient:               dbClient,
+		productRepoMap:         map[string]string{"pd": "tikv/pd"},
+		ghClient:               github.NewClientWithEnvProxy().WithAuthToken(cfg.Github.Token),
+		tektonCloudEventClient: client,
 	}
 }
 
@@ -177,3 +187,17 @@ func (s *devbuildsrvc) Rerun(ctx context.Context, p *devbuild.RerunPayload) (res
 
 	return transformDevBuild(newBuild), nil
 }
+
+func newStoreClient(cfg config.Store) (*ent.Client, error) {
+	db, err := ent.Open(cfg.Driver, cfg.DSN)
+	if err != nil {
+		return nil, err
+	}
+
+	// Run the auto migration tool.
+	if err := db.Schema.Create(context.Background()); err != nil {
+		return nil, err
+	}
+
+	return db, nil
+}

experiments/tibuild-v2/internal/service/impl/devbuild_create.go

@@ -2,9 +2,8 @@ package impl
 
 import (
 	"context"
-	"errors"
 	"fmt"
-	"log/slog"
+	"net/http"
 	"strconv"
 	"strings"
 	"time"
@@ -24,7 +23,7 @@ func (s *devbuildsrvc) newBuildEntity(ctx context.Context, p *devbuild.CreatePay
 	// 1. get the github full repo by product.
 	githubFullRepo := s.productRepoMap[p.Request.Product]
 	if githubFullRepo == "" {
-		return nil, errors.New("github full repo not found")
+		return nil, &devbuild.HTTPError{Code: http.StatusBadRequest, Message: "github full repo not found"}
 	}
 
 	// 2. get the commit sha
@@ -49,20 +48,17 @@ func (s *devbuildsrvc) newBuildEntity(ctx context.Context, p *devbuild.CreatePay
 }
 
 func (s *devbuildsrvc) triggerTknBuild(ctx context.Context, record *ent.DevBuild) (*ent.DevBuild, error) {
-	// TODO: trigger the actual build process according to the record.
-	//
-	//
 	// 1. Compose a cloud event from the record.
 	event, err := newDevBuildCloudEvent(record)
 	if err != nil {
+		s.logger.Err(err).Msg("failed to create cloud event")
 		return nil, err
 	}
-	// 2. Send the cloud event to tekton listener that serves for tibuild.
 
-	c := cloudevents.ContextWithTarget(ctx, s.tektonClient.listenerURL)
-	if result := s.tektonClient.client.Send(c, *event); !protocol.IsACK(result) {
-		slog.ErrorContext(ctx, "failed to send", "reason", result)
-		return nil, fmt.Errorf("failed to send ce:%w", result)
+	// 2. Send the cloud event to tekton listener that serves for tibuild.
+	if result := s.tektonCloudEventClient.Send(ctx, *event); !protocol.IsACK(result) {
+		s.logger.Err(result).Msg("failed to send cloud event")
+		return nil, fmt.Errorf("failed to send cloud event: %w", result)
 	}
 
 	return nil, nil

experiments/tibuild-v2/internal/service/impl/devbuild_github.go

@@ -9,6 +9,10 @@ import (
 )
 
 func getGhRefSha(ctx context.Context, ghClient *github.Client, fullRepo, ref string) string {
+	if ghClient == nil {
+		return ""
+	}
+
 	parts := strings.SplitN(fullRepo, "/", 2)
 	if len(parts) != 2 {
 		return ""

experiments/tibuild-v2/pkg/config/config.go

@@ -23,9 +23,9 @@ type Jenkins struct {
 }
 
 type Tekton struct {
-	Cloudevent_Endpoint string `yaml:"cloudevent_endpoint,omitempty" json:"cloudevent_endpoint,omitempty"`
-	ViewURL             string `yaml:"view_url,omitempty" json:"view_url,omitempty"`
-	OciFileDownloadURL  string `yaml:"oci_file_download_url,omitempty" json:"oci_file_download_url,omitempty"`
+	CloudeventEndpoint string `yaml:"cloudevent_endpoint,omitempty" json:"cloudevent_endpoint,omitempty"`
+	ViewURL            string `yaml:"view_url,omitempty" json:"view_url,omitempty"`
+	OciFileDownloadURL string `yaml:"oci_file_download_url,omitempty" json:"oci_file_download_url,omitempty"`
 }
 
 type RestApiSecret struct {