fix: lint and unit test

KusionStack · Nov 12, 2024 · 5535fab · 5535fab
1 parent e43153e
commit 5535fab
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 16 deletions.
diff --git a/pkg/domain/constant/run.go b/pkg/domain/constant/run.go
@@ -4,8 +4,10 @@ import (
 	"fmt"
 )
 
-type RunType string
-type RunStatus string
+type (
+	RunType   string
+	RunStatus string
+)
 
 const (
 	RunTypeGenerate     RunType   = "Generate"

diff --git a/pkg/domain/entity/run.go b/pkg/domain/entity/run.go
@@ -67,6 +67,6 @@ func (r *Run) Validate() error {
 	return nil
 }
 
-func (s *Run) Summary() string {
-	return fmt.Sprintf("[%s][%s]", string(s.Type), string(s.Status))
+func (r *Run) Summary() string {
+	return fmt.Sprintf("[%s][%s]", string(r.Type), string(r.Status))
 }
diff --git a/pkg/infra/persistence/project_test.go b/pkg/infra/persistence/project_test.go
@@ -30,6 +30,7 @@ func TestProjectRepository(t *testing.T) {
 				Name: "mockedProject",
 				Source: &entity.Source{
 					ID:             1,
+					Name:           "mockedSource",
 					SourceProvider: constant.SourceProviderTypeGithub,
 					Remote:         mockRemoteURL,
 				},

diff --git a/pkg/infra/persistence/source_test.go b/pkg/infra/persistence/source_test.go
@@ -27,6 +27,7 @@ func TestSourceRepository(t *testing.T) {
 		var (
 			expectedID, expectedRows uint = 1, 1
 			actual                        = entity.Source{
+				Name:           "mockedSource",
 				SourceProvider: constant.SourceProviderTypeOCI,
 				Remote:         mockRemoteURL,
 				Description:    "i am a description",

diff --git a/pkg/infra/persistence/stack_test.go b/pkg/infra/persistence/stack_test.go
@@ -35,6 +35,7 @@ func TestStackRepository(t *testing.T) {
 					Path: "/path/to/project",
 					Source: &entity.Source{
 						ID:             1,
+						Name:           "mockedSource",
 						SourceProvider: constant.SourceProviderTypeGithub,
 						Remote:         mockRemoteURL,
 					},

diff --git a/pkg/server/handler/project/handler_test.go b/pkg/server/handler/project/handler_test.go
@@ -119,8 +119,8 @@ func TestProjectHandler(t *testing.T) {
 		req.Header.Add("Content-Type", "application/json")
 
 		sqlMock.ExpectQuery("SELECT").
-			WillReturnRows(sqlmock.NewRows([]string{"id", "remote", "source_provider"}).
-				AddRow(1, "https://github.com/test/repo", constant.SourceProviderTypeGithub))
+			WillReturnRows(sqlmock.NewRows([]string{"id", "name", "remote", "source_provider"}).
+				AddRow(1, "test-source", "https://github.com/test/repo", constant.SourceProviderTypeGithub))
 		sqlMock.ExpectQuery("SELECT").
 			WillReturnRows(sqlmock.NewRows([]string{"id", "name", "owners"}).
 				AddRow(1, "test-org", owners))
@@ -170,8 +170,8 @@ func TestProjectHandler(t *testing.T) {
 		req.Header.Add("Content-Type", "application/json")
 
 		sqlMock.ExpectQuery("SELECT").
-			WillReturnRows(sqlmock.NewRows([]string{"id", "remote", "source_provider"}).
-				AddRow(1, "https://github.com/test/repo", constant.SourceProviderTypeGithub))
+			WillReturnRows(sqlmock.NewRows([]string{"id", "name", "remote", "source_provider"}).
+				AddRow(1, "test-source", "https://github.com/test/repo", constant.SourceProviderTypeGithub))
 		sqlMock.ExpectQuery("SELECT").
 			WillReturnRows(sqlmock.NewRows([]string{"id", "name", "owners"}).
 				AddRow(1, "test-org", owners))

diff --git a/pkg/server/handler/source/handler_test.go b/pkg/server/handler/source/handler_test.go
@@ -102,6 +102,7 @@ func TestSourceHandler(t *testing.T) {
 		// Set request body
 		requestPayload := request.CreateSourceRequest{
 			// Set your request payload fields here
+			Name:           "test-source",
 			SourceProvider: string(constant.SourceProviderTypeGithub),
 			Remote:         "https://github.com/test/remote",
 		}

diff --git a/pkg/server/handler/stack/handler_test.go b/pkg/server/handler/stack/handler_test.go
@@ -122,8 +122,8 @@ func TestStackHandler(t *testing.T) {
 		req.Header.Add("Content-Type", "application/json")
 
 		sqlMock.ExpectQuery("SELECT").
-			WillReturnRows(sqlmock.NewRows([]string{"id", "name", "path", "Organization__id", "Organization__name", "Organization__owners", "Source__id", "Source__remote", "Source__source_provider"}).
-				AddRow(1, projectName, projectPath, 1, "test-org", owners, 1, "https://github.com/test/repo", constant.SourceProviderTypeGithub))
+			WillReturnRows(sqlmock.NewRows([]string{"id", "name", "path", "Organization__id", "Organization__name", "Organization__owners", "Source__id", "Source__name", "Source__remote", "Source__source_provider"}).
+				AddRow(1, projectName, projectPath, 1, "test-org", owners, 1, "test-source", "https://github.com/test/repo", constant.SourceProviderTypeGithub))
 		sqlMock.ExpectBegin()
 		sqlMock.ExpectExec("INSERT").
 			WillReturnResult(sqlmock.NewResult(int64(1), int64(1)))

diff --git a/pkg/server/handler/stack/run.go b/pkg/server/handler/stack/run.go
@@ -65,9 +65,9 @@ func (h *Handler) GetRunResult() http.HandlerFunc {
 			handler.HandleResult(w, r, ctx, err, existingEntity)
 			return
 		}
-		var resultJson any
-		err = json.Unmarshal([]byte(existingEntity.Result), &resultJson)
-		handler.HandleResult(w, r, ctx, err, resultJson)
+		var resultJSON any
+		err = json.Unmarshal([]byte(existingEntity.Result), &resultJSON)
+		handler.HandleResult(w, r, ctx, err, resultJSON)
 	}
 }
 

diff --git a/pkg/server/middleware/logger.go b/pkg/server/middleware/logger.go
@@ -14,9 +14,11 @@ import (
 )
 
 // APILoggerKey is a context key used for associating a logger with a request.
-var APILoggerKey = &contextKey{"logger"}
-var RunLoggerKey = &contextKey{"runLogger"}
-var RunLoggerBufferKey = &contextKey{"runLoggerBuffer"}
+var (
+	APILoggerKey       = &contextKey{"logger"}
+	RunLoggerKey       = &contextKey{"runLogger"}
+	RunLoggerBufferKey = &contextKey{"runLoggerBuffer"}
+)
 
 func InitLogger(logFilePath string, name string) *httplog.Logger {
 	logWriter, err := os.OpenFile(logFilePath, os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0o666)