Resolve external references in custom schemas #738
Conversation
Codecov Report
@@ Coverage Diff @@
## master #738 +/- ##
==========================================
+ Coverage 93.3% 93.31% +<.01%
==========================================
Files 39 39
Lines 4391 4382 -9
==========================================
- Hits 4097 4089 -8
+ Misses 294 293 -1
Continue to review full report at Codecov.
|
|
|
||
| if custom_schema is not None: | ||
| self._custom_schema = schema.load_custom_schema(custom_schema) | ||
| schema.check_schema(self._custom_schema) | ||
| self._custom_schema = schema.load_schema(custom_schema, self.resolver, True) |
There was a problem hiding this comment.
This was moved after the call to self._process_extensions so that we could use our AsdfFile's resolver when loading the custom schema.
| @@ -1,9 +1,7 @@ | |||
| %YAML 1.1 | |||
| --- | |||
| $schema: "http://stsci.edu/schemas/yaml-schema/draft-01" | |||
| id: "http://stsci.edu/schemas/asdf/core/asdf-1.1.0" | |||
There was a problem hiding this comment.
Re-using the core schema id causes problems when resolving external references. I don't think it's a good idea anyway, since the ids are meant to be globally unique.
| custom = load_schema(url, resolve_local_refs=True) | ||
| core = load_schema(AsdfObject.yaml_tag) | ||
|
|
||
| def update(d, u): |
There was a problem hiding this comment.
I don't think it's actually necessary to merge the core schema with the custom schema, since we already check against the core schema in a first validation pass.
eslavich
requested review from
jdavies-st,
nden,
perrygreenfield,
mcara,
cshanahan1 and
hcferguson
eslavich
force-pushed
the
AL-216-resolve-external-references-in-custom-schema
branch
from
423d033
to
a6d817a
Compare
eslavich
deleted the
AL-216-resolve-external-references-in-custom-schema
branch
Previously, external references in custom schemas were not being resolved (see #683). This was clearly deliberate, though I can't think of a reason why that would be the desired behavior. This PR changes the custom schema behavior to resolve external references, and fixes an issue in the tests that prevented the example custom schema from resolving correctly.
Resolves #683