feat: add DefaultFilteredQueryParams for job (#3608)

Signed-off-by: Gaius <gaius.qi@gmail.com>
dragonflyoss · Oct 28, 2024 · 90d2017 · 90d2017
1 parent 5a51a61
commit 90d2017
Show file tree

Hide file tree

Showing 14 changed files with 110 additions and 570 deletions.
diff --git a/api/manager/docs.go b/api/manager/docs.go
@@ -4208,10 +4208,6 @@ const docTemplate = `{
                 "bio": {
                     "type": "string"
                 },
-                "result": {
-                    "type": "object",
-                    "additionalProperties": {}
-                },
                 "scheduler_cluster_ids": {
                     "type": "array",
                     "items": {

diff --git a/api/manager/swagger.json b/api/manager/swagger.json
@@ -4202,10 +4202,6 @@
                 "bio": {
                     "type": "string"
                 },
-                "result": {
-                    "type": "object",
-                    "additionalProperties": {}
-                },
                 "scheduler_cluster_ids": {
                     "type": "array",
                     "items": {

diff --git a/api/manager/swagger.yaml b/api/manager/swagger.yaml
@@ -464,9 +464,6 @@ definitions:
         type: object
       bio:
         type: string
-      result:
-        additionalProperties: {}
-        type: object
       scheduler_cluster_ids:
         items:
           type: integer

diff --git a/manager/service/job.go b/manager/service/job.go
@@ -28,6 +28,7 @@ import (
 	"d7y.io/dragonfly/v2/manager/metrics"
 	"d7y.io/dragonfly/v2/manager/models"
 	"d7y.io/dragonfly/v2/manager/types"
+	"d7y.io/dragonfly/v2/pkg/net/http"
 	"d7y.io/dragonfly/v2/pkg/retry"
 	"d7y.io/dragonfly/v2/pkg/slices"
 	"d7y.io/dragonfly/v2/pkg/structure"
@@ -46,6 +47,10 @@ func (s *service) CreatePreheatJob(ctx context.Context, json types.CreatePreheat
 		json.Args.Timeout = types.DefaultJobTimeout
 	}
 
+	if json.Args.FilteredQueryParams == "" {
+		json.Args.FilteredQueryParams = http.RawDefaultFilteredQueryParams
+	}
+
 	args, err := structure.StructToMap(json.Args)
 	if err != nil {
 		return nil, err
@@ -85,6 +90,10 @@ func (s *service) CreatePreheatJob(ctx context.Context, json types.CreatePreheat
 }
 
 func (s *service) CreateGetTaskJob(ctx context.Context, json types.CreateGetTaskJobRequest) (*models.Job, error) {
+	if json.Args.FilteredQueryParams == "" {
+		json.Args.FilteredQueryParams = http.RawDefaultFilteredQueryParams
+	}
+
 	args, err := structure.StructToMap(json.Args)
 	if err != nil {
 		return nil, err
@@ -128,6 +137,10 @@ func (s *service) CreateDeleteTaskJob(ctx context.Context, json types.CreateDele
 		json.Args.Timeout = types.DefaultJobTimeout
 	}
 
+	if json.Args.FilteredQueryParams == "" {
+		json.Args.FilteredQueryParams = http.RawDefaultFilteredQueryParams
+	}
+
 	args, err := structure.StructToMap(json.Args)
 	if err != nil {
 		return nil, err

diff --git a/manager/types/model.go b/manager/types/model.go
diff --git a/manager/types/model_test.go b/manager/types/model_test.go
diff --git a/pkg/idgen/model_id.go b/pkg/idgen/model_id.go