refactor(tibuild): move pkg/database to internal/database (#225)

Signed-off-by: wuhuizuo <[email protected]> Signed-off-by: wuhuizuo <[email protected]>
PingCAP-QE · Jan 29, 2025 · a0e6c34 · a0e6c34
1 parent 54be63d
commit a0e6c34
Show file tree

Hide file tree

Showing 12 changed files with 11 additions and 14 deletions.
diff --git a/tibuild/api/api.go b/tibuild/api/api.go
@@ -11,8 +11,8 @@ import (
 	ginSwagger "github.com/swaggo/gin-swagger"
 
 	"github.com/PingCAP-QE/ee-apps/tibuild/internal/controller"
+	"github.com/PingCAP-QE/ee-apps/tibuild/internal/database"
 	"github.com/PingCAP-QE/ee-apps/tibuild/pkg/configs"
-	"github.com/PingCAP-QE/ee-apps/tibuild/pkg/database"
 	controllers "github.com/PingCAP-QE/ee-apps/tibuild/pkg/rest/controller"
 	"github.com/PingCAP-QE/ee-apps/tibuild/pkg/rest/service"
 	events "github.com/PingCAP-QE/ee-apps/tibuild/pkg/webhook/handler"

diff --git a/tibuild/cmd/tibuild/main.go b/tibuild/cmd/tibuild/main.go
@@ -2,8 +2,8 @@ package main
 
 import (
 	"github.com/PingCAP-QE/ee-apps/tibuild/api"
+	"github.com/PingCAP-QE/ee-apps/tibuild/internal/database"
 	"github.com/PingCAP-QE/ee-apps/tibuild/pkg/configs"
-	"github.com/PingCAP-QE/ee-apps/tibuild/pkg/database"
 )
 
 func main() {

diff --git a/tibuild/internal/controller/params_available_for_pipeline.go b/tibuild/internal/controller/params_available_for_pipeline.go
@@ -8,7 +8,7 @@ import (
 	"github.com/gin-gonic/gin/binding"
 	"github.com/rs/zerolog/log"
 
-	"github.com/PingCAP-QE/ee-apps/tibuild/pkg/database"
+	"github.com/PingCAP-QE/ee-apps/tibuild/internal/database"
 )
 
 type ParamsAvailableForPipelineStruct struct {

diff --git a/tibuild/internal/controller/pipeline_for_build_type.go b/tibuild/internal/controller/pipeline_for_build_type.go
@@ -6,7 +6,7 @@ import (
 	"github.com/gin-gonic/gin"
 	"github.com/gin-gonic/gin/binding"
 
-	"github.com/PingCAP-QE/ee-apps/tibuild/pkg/database"
+	"github.com/PingCAP-QE/ee-apps/tibuild/internal/database"
 )
 
 type PipelineForBuildTypeStruct struct {

diff --git a/tibuild/internal/controller/pipeline_list_show.go b/tibuild/internal/controller/pipeline_list_show.go
@@ -7,8 +7,8 @@ import (
 	"github.com/gin-gonic/gin/binding"
 	"github.com/rs/zerolog/log"
 
+	"github.com/PingCAP-QE/ee-apps/tibuild/internal/database"
 	"github.com/PingCAP-QE/ee-apps/tibuild/internal/entity"
-	"github.com/PingCAP-QE/ee-apps/tibuild/pkg/database"
 )
 
 type PipelinesListShowRequest struct {

diff --git a/tibuild/internal/controller/pipeline_trigger.go b/tibuild/internal/controller/pipeline_trigger.go
@@ -11,10 +11,10 @@ import (
 	"github.com/gin-gonic/gin"
 	"github.com/rs/zerolog/log"
 
+	"github.com/PingCAP-QE/ee-apps/tibuild/internal/database"
 	"github.com/PingCAP-QE/ee-apps/tibuild/internal/entity"
 	"github.com/PingCAP-QE/ee-apps/tibuild/internal/service"
 	"github.com/PingCAP-QE/ee-apps/tibuild/pkg/configs"
-	"github.com/PingCAP-QE/ee-apps/tibuild/pkg/database"
 )
 
 const (

diff --git a/tibuild/internal/controller/request_result.go b/tibuild/internal/controller/request_result.go
@@ -6,8 +6,8 @@ import (
 	"github.com/gin-gonic/gin"
 	"github.com/gin-gonic/gin/binding"
 
+	"github.com/PingCAP-QE/ee-apps/tibuild/internal/database"
 	"github.com/PingCAP-QE/ee-apps/tibuild/internal/entity"
-	"github.com/PingCAP-QE/ee-apps/tibuild/pkg/database"
 )
 
 type RequestResultRequestStruct struct {

diff --git a/tibuild/internal/controller/request_rotation.go b/tibuild/internal/controller/request_rotation.go
@@ -6,8 +6,8 @@ import (
 	"github.com/gin-gonic/gin"
 	"github.com/gin-gonic/gin/binding"
 
+	"github.com/PingCAP-QE/ee-apps/tibuild/internal/database"
 	"github.com/PingCAP-QE/ee-apps/tibuild/internal/entity"
-	"github.com/PingCAP-QE/ee-apps/tibuild/pkg/database"
 )
 
 type RequestRotationRequestStruct struct {

diff --git a/tibuild/pkg/database/client_api.go → tibuild/internal/database/client_api.go b/tibuild/pkg/database/client_api.go → tibuild/internal/database/client_api.go
diff --git a/tibuild/pkg/database/mysql.go → tibuild/internal/database/mysql.go b/tibuild/pkg/database/mysql.go → tibuild/internal/database/mysql.go
diff --git a/tibuild/internal/service/job_build.go b/tibuild/internal/service/job_build.go
@@ -10,8 +10,8 @@ import (
 
 	"github.com/bndr/gojenkins"
 
+	"github.com/PingCAP-QE/ee-apps/tibuild/internal/database"
 	"github.com/PingCAP-QE/ee-apps/tibuild/internal/entity"
-	"github.com/PingCAP-QE/ee-apps/tibuild/pkg/database"
 )
 
 func JobBuild(jenkins *gojenkins.Jenkins, ctx context.Context, jobname string, params map[string]string, pipeline_build_id int64) {

diff --git a/tibuild/pkg/rest/service/cloud_event_client.go b/tibuild/pkg/rest/service/cloud_event_client.go
@@ -2,7 +2,6 @@ package service
 
 import (
 	"context"
-	"encoding/json"
 	"fmt"
 	"log/slog"
 	"strings"
@@ -39,19 +38,17 @@ type CloudEventClient struct {
 }
 
 func (s CloudEventClient) TriggerDevBuild(ctx context.Context, dev DevBuild) error {
-	bs, _ := json.Marshal(dev)
-	slog.InfoContext(ctx, "trigger dev build", "dev", string(bs))
 	event, err := newDevBuildCloudEvent(dev)
 	if err != nil {
 		return err
 	}
-	eventBytes, _ := event.MarshalJSON()
-	slog.InfoContext(ctx, "trigger dev build event", "event", string(eventBytes))
+
 	c := cloudevents.ContextWithTarget(ctx, s.endpoint)
 	if result := s.client.Send(c, *event); !protocol.IsACK(result) {
 		slog.ErrorContext(ctx, "failed to send", "reason", result)
 		return fmt.Errorf("failed to send ce:%w", result)
 	}
+
 	return nil
 }