fix: modules and runs api (#1364)

Author: Yangyang96

api/openapispec/docs.go

@@ -1602,6 +1602,18 @@ const docTemplate = `{
                         "name": "status",
                         "in": "query"
                     },
+                    {
+                        "type": "integer",
+                        "description": "StackID to filter runs by. Default to all",
+                        "name": "stackID",
+                        "in": "query"
+                    },
+                    {
+                        "type": "string",
+                        "description": "Workspace to filter runs by. Default to all",
+                        "name": "workspace",
+                        "in": "query"
+                    },
                     {
                         "type": "string",
                         "description": "StartTime to filter runs by. Default to all. Format: RFC3339",

api/openapispec/swagger.json

@@ -1591,6 +1591,18 @@
                         "name": "status",
                         "in": "query"
                     },
+                    {
+                        "type": "integer",
+                        "description": "StackID to filter runs by. Default to all",
+                        "name": "stackID",
+                        "in": "query"
+                    },
+                    {
+                        "type": "string",
+                        "description": "Workspace to filter runs by. Default to all",
+                        "name": "workspace",
+                        "in": "query"
+                    },
                     {
                         "type": "string",
                         "description": "StartTime to filter runs by. Default to all. Format: RFC3339",

api/openapispec/swagger.yaml

@@ -2456,6 +2456,14 @@ paths:
           type: string
         name: status
         type: array
+      - description: StackID to filter runs by. Default to all
+        in: query
+        name: stackID
+        type: integer
+      - description: Workspace to filter runs by. Default to all
+        in: query
+        name: workspace
+        type: string
       - description: 'StartTime to filter runs by. Default to all. Format: RFC3339'
         in: query
         name: startTime

pkg/cmd/server/database_access.go

@@ -40,10 +40,6 @@ func (o *DatabaseAccessOptions) InstallDB() (*gorm.DB, error) {
 	config.Net = "tcp"
 	config.ParseTime = true
 	config.InterpolateParams = true
-	config.Params = map[string]string{
-		"charset": "utf8",
-		"loc":     "Asia/Shanghai",
-	}
 	dsn := config.FormatDSN()
 	// silence log output
 	cfg := &gorm.Config{

pkg/infra/persistence/module_model.go

@@ -33,7 +33,7 @@ func (m *ModuleModel) ToEntity() (*entity.Module, error) {
 		return nil, ErrModuleModelNil
 	}
 
-	url, err := url.Parse(m.URL)
+	address, err := url.Parse(m.URL)
 	if err != nil {
 		return nil, ErrFailedToGetModuleRemote
 	}
@@ -45,7 +45,7 @@ func (m *ModuleModel) ToEntity() (*entity.Module, error) {
 
 	return &entity.Module{
 		Name:        m.Name,
-		URL:         url,
+		URL:         address,
 		Description: m.Description,
 		Owners:      []string(m.Owners),
 		Doc:         doc,

pkg/infra/persistence/resource.go

@@ -151,7 +151,6 @@ func (r *resourceRepository) GetByKusionResourceURN(ctx context.Context, id stri
 }
 
 // List retrieves all resources.
-// TODO: add `disablePagination` for resource list method.
 func (r *resourceRepository) List(ctx context.Context, filter *entity.ResourceFilter) (*entity.ResourceListResult, error) {
 	var dataModel []ResourceModel
 	resourceEntityList := make([]*entity.Resource, 0)
@@ -167,11 +166,17 @@ func (r *resourceRepository) List(ctx context.Context, filter *entity.ResourceFi
 	searchResult.Model(dataModel).Count(&totalRows)
 
 	// Fetch paginated data from searchResult with offset and limit
-	offset := (filter.Pagination.Page - 1) * filter.Pagination.PageSize
-	result := searchResult.Offset(offset).Limit(filter.Pagination.PageSize).Find(&dataModel)
+	var result *gorm.DB
+	if filter.Pagination != nil {
+		offset := (filter.Pagination.Page - 1) * filter.Pagination.PageSize
+		result = searchResult.Offset(offset).Limit(filter.Pagination.PageSize).Find(&dataModel)
+	} else {
+		result = searchResult.Find(&dataModel)
+	}
 	if result.Error != nil {
 		return nil, result.Error
 	}
+
 	for _, resource := range dataModel {
 		resourceEntity, err := resource.ToEntity()
 		if err != nil {

pkg/server/handler/resource/handler.go

@@ -108,7 +108,7 @@ func (h *Handler) GetResourceGraph() http.HandlerFunc {
 		logger := logutil.GetLogger(ctx)
 		logger.Info("Getting resource graph...")
 		query := r.URL.Query()
-		filter, err := h.resourceManager.BuildResourceFilter(ctx, &query)
+		filter, err := h.resourceManager.BuildResourceGraphFilter(ctx, &query)
 		if err != nil {
 			render.Render(w, r, handler.FailureResponse(ctx, err))
 			return

pkg/server/handler/resource/handler_test.go

@@ -116,7 +116,7 @@ func TestResourceHandler(t *testing.T) {
 				AddRow(1, "test-project"))
 
 		// Create a new HTTP request
-		req, err := http.NewRequest("GET", "/resources", nil)
+		req, err := http.NewRequest("GET", "/resources/graph?stackID=1", nil)
 		assert.NoError(t, err)
 
 		rctx := chi.NewRouteContext()

pkg/server/handler/stack/run.go

@@ -85,6 +85,8 @@ func (h *Handler) GetRunResult() http.HandlerFunc {
 // @Param			env			query		string													false	"Environment to filter runs by. Default to all"
 // @Param			type		query		[]string												false	"RunType to filter runs by. Default to all"
 // @Param			status		query		[]string												false	"RunStatus to filter runs by. Default to all"
+// @Param			stackID		query		uint													false	"StackID to filter runs by. Default to all"
+// @Param			workspace	query		string													false	"Workspace to filter runs by. Default to all"
 // @Param			startTime	query		string													false	"StartTime to filter runs by. Default to all. Format: RFC3339"
 // @Param			endTime		query		string													false	"EndTime to filter runs by. Default to all. Format: RFC3339"
 // @Param			page		query		uint													false	"The current page to fetch. Default to 1"

pkg/server/manager/module/module_manager.go

@@ -24,17 +24,25 @@ func (m *ModuleManager) CreateModule(ctx context.Context, requestPayload request
 	}
 
 	// Parse remote string of `URL` and `Doc`.
-	url, err := url.Parse(requestPayload.URL)
+	address, err := url.Parse(requestPayload.URL)
 	if err != nil {
 		return nil, err
 	}
-	createdEntity.URL = url
+	if address.Scheme == "" {
+		address.Scheme = "https"
+	}
+	createdEntity.URL = address
 
-	doc, err := url.Parse(requestPayload.URL)
-	if err != nil {
-		return nil, err
+	if requestPayload.Doc != "" {
+		doc, err := url.Parse(requestPayload.Doc)
+		if err != nil {
+			return nil, err
+		}
+		if doc.Scheme == "" {
+			doc.Scheme = "https"
+		}
+		createdEntity.Doc = doc
 	}
-	createdEntity.Doc = doc
 
 	// Create module with repository
 	err = m.moduleRepo.Create(ctx, &createdEntity)

pkg/server/manager/resource/util.go

@@ -2,6 +2,7 @@ package resource
 
 import (
 	"context"
+	"errors"
 	"net/url"
 	"strconv"
 
@@ -70,3 +71,25 @@ func (m *ResourceManager) BuildResourceFilter(ctx context.Context, query *url.Va
 
 	return &filter, nil
 }
+
+func (m *ResourceManager) BuildResourceGraphFilter(ctx context.Context, query *url.Values) (*entity.ResourceFilter, error) {
+	logger := logutil.GetLogger(ctx)
+	logger.Info("Building resource graph filter...")
+
+	filter := entity.ResourceFilter{}
+
+	stackIDParam := query.Get("stackID")
+
+	if stackIDParam != "" {
+		// if stack id is present, use stack id
+		stackID, err := strconv.Atoi(stackIDParam)
+		if err != nil {
+			return nil, constant.ErrInvalidStackID
+		}
+		filter.StackID = uint(stackID)
+	} else {
+		return nil, errors.New("stackID is required")
+	}
+
+	return &filter, nil
+}