Addressed issue in #482

pattern is now checked, not format. silly me!
daveshanley · Apr 21, 2024 · 1c37e79 · 1c37e79
1 parent 9ba4676
commit 1c37e79
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/functions/openapi/schema_type.go b/functions/openapi/schema_type.go
@@ -138,14 +138,14 @@ func (st SchemaTypeCheck) validateString(schema *base.Schema, context *model.Rul
 		}
 	}
 
-	if schema.Value.Format != "" {
+	if schema.Value.Pattern != "" {
 		vm := goja.New()
-		script := strings.Replace("const regex = new RegExp('{format}');", "{format}", schema.Value.Format, 1)
+		script := strings.Replace("const regex = new RegExp('{pattern}');", "{pattern}", schema.Value.Pattern, 1)
 		_, err := vm.RunString(script)
 		if err != nil {
-			result := st.buildResult("schema `format` should be a ECMA-262 regular expression dialect",
-				fmt.Sprintf("%s.%s", schema.GenerateJSONPath(), "format"),
-				schema, schema.Value.GoLow().Format.KeyNode, context)
+			result := st.buildResult("schema `pattern` should be a ECMA-262 regular expression dialect",
+				fmt.Sprintf("%s.%s", schema.GenerateJSONPath(), "pattern"),
+				schema, schema.Value.GoLow().Pattern.KeyNode, context)
 			results = append(results, result)
 		}
 	}

diff --git a/functions/openapi/schema_type_test.go b/functions/openapi/schema_type_test.go
@@ -148,14 +148,14 @@ components:
 	assert.Equal(t, "$.components.schemas['Gum'].maxLength", res[0].Path)
 }
 
-func TestSchemaType_InvalidFormat(t *testing.T) {
+func TestSchemaType_InvalidPattern(t *testing.T) {
 
 	yml := `openapi: 3.1
 components:
   schemas:
     Gum:
      type: string
-     format: (*&@(*&@(*&@#*&@`
+     pattern: (*&@(*&@(*&@#*&@`
 
 	document, err := libopenapi.NewDocument([]byte(yml))
 	if err != nil {
@@ -178,18 +178,18 @@ components:
 	res := def.RunRule(nil, ctx)
 
 	assert.Len(t, res, 1)
-	assert.Equal(t, "schema `format` should be a ECMA-262 regular expression dialect", res[0].Message)
-	assert.Equal(t, "$.components.schemas['Gum'].format", res[0].Path)
+	assert.Equal(t, "schema `pattern` should be a ECMA-262 regular expression dialect", res[0].Message)
+	assert.Equal(t, "$.components.schemas['Gum'].pattern", res[0].Path)
 }
 
-func TestSchemaType_ValidFormat(t *testing.T) {
+func TestSchemaType_ValidPattern(t *testing.T) {
 
 	yml := `openapi: 3.1
 components:
   schemas:
     Gum:
      type: string
-     format: hello`
+     pattern: hello`
 
 	document, err := libopenapi.NewDocument([]byte(yml))
 	if err != nil {