separate custom openapi test from the others

This commit is contained in:
natasha41575
2021-09-30 14:21:31 -07:00
parent 0d8c107362
commit 11e19a3d0f
4 changed files with 11 additions and 22030 deletions

View File

@@ -547,9 +547,6 @@ func SetSchema(openAPIField map[string]string, schema []byte, reset bool) error
return nil
}
// if the schema is changed, initSchema should parse the new schema
defer func() { globalSchema.schemaInit = false }()
version, exists := openAPIField["version"]
if exists && schema != nil {
return fmt.Errorf("builtin version and custom schema provided, cannot use both")
@@ -558,6 +555,8 @@ func SetSchema(openAPIField map[string]string, schema []byte, reset bool) error
if schema != nil { // use custom schema
customSchema = schema
kubernetesOpenAPIVersion = "custom"
// if the schema is changed, initSchema should parse the new schema
globalSchema.schemaInit = false
return nil
}
@@ -570,6 +569,8 @@ func SetSchema(openAPIField map[string]string, schema []byte, reset bool) error
return fmt.Errorf("the specified OpenAPI version is not built in")
}
customSchema = nil
// if the schema is changed, initSchema should parse the new schema
globalSchema.schemaInit = false
return nil
}