Allow additional properties for variables inside jsonschema (projectd…

…iscovery#3669) * Allow additional properties in variables inside jsonschema * Update variables jsonschema function * Add tags for archive and mime-type
Ralaam · May 15, 2023 · 2dd13b9 · 2dd13b9
1 parent 89ed726
commit 2dd13b9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/v2/pkg/protocols/common/variables/variables.go b/v2/pkg/protocols/common/variables/variables.go
@@ -21,11 +21,12 @@ type Variable struct {
 	utils.InsertionOrderedStringMap `yaml:"-" json:"-"`
 }
 
-func (variables *Variable) JSONSchemaType() *jsonschema.Type {
+func (variables Variable) JSONSchemaType() *jsonschema.Type {
 	gotType := &jsonschema.Type{
-		Type:        "map[string]string",
-		Title:       "variables for the request",
-		Description: "Additional variables for the request",
+		Type:                 "object",
+		Title:                "variables for the request",
+		Description:          "Additional variables for the request",
+		AdditionalProperties: []byte("true"),
 	}
 	return gotType
 }

diff --git a/v2/pkg/protocols/file/file.go b/v2/pkg/protocols/file/file.go
@@ -51,11 +51,11 @@ type Request struct {
 
 	// description: |
 	//   elaborates archives
-	Archive bool
+	Archive bool `yaml:"archive,omitempty" json:"archive,omitempty" jsonschema:"title=enable archives,description=Process compressed archives without unpacking"`
 
 	// description: |
 	//   enables mime types check
-	MimeType bool
+	MimeType bool `yaml:"mime-type,omitempty" json:"mime-type,omitempty" jsonschema:"title=enable filtering by mime-type,description=Filter files by mime-type"`
 
 	CompiledOperators *operators.Operators `yaml:"-" json:"-"`