Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

SAT: Relax checking of oneOf common property and allow optional default keyword additional to const keyword #16172

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

SAT: Relax checking of oneOf common property and allow optional default keyword additional to const keyword #16172

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a94a60a
allow 'default' in oneOf with 'const'
grubberr Aug 31, 2022
c0e6a21
CHANGELOG.md updated
grubberr Aug 31, 2022
b6db0ca
Merge branch 'master' into grubberr/sat-allow-default-with_const
grubberr Aug 31, 2022
57a1c25
Merge branch 'master' into grubberr/sat-allow-default-with_const
grubberr Sep 1, 2022
f5f3a3f
pydantic~=1.10.0
grubberr Sep 1, 2022
925ca73
Merge branch 'master' into grubberr/sat-allow-default-with_const
grubberr Sep 6, 2022
b9db0bf
pydantic==1.10.2
grubberr Sep 6, 2022
f9f7b70
CHANGELOG.md updated
grubberr Sep 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions airbyte-integrations/bases/source-acceptance-test/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# Changelog

## 0.2.3
Relax checking of `oneOf` common property and allow optional `default` keyword additional to `const` keyword. [16172](https://github.com/airbytehq/airbyte/pull/16172)

## 0.2.2
Backward compatibility tests: improve `check_if_cursor_field_was_changed` to make it less radical and allow stream addition to catalog.[#15835](https://github.com/airbytehq/airbyte/pull/15835/)

Expand Down
2 changes: 1 addition & 1 deletion airbyte-integrations/bases/source-acceptance-test/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ COPY pytest.ini setup.py ./
COPY source_acceptance_test ./source_acceptance_test
RUN pip install .

LABEL io.airbyte.version=0.2.2
LABEL io.airbyte.version=0.2.3
LABEL io.airbyte.name=airbyte/source-acceptance-test

ENTRYPOINT ["python", "-m", "pytest", "-p", "source_acceptance_test.plugin", "-r", "fEsx"]
3 changes: 0 additions & 3 deletions airbyte-integrations/bases/source-acceptance-test/source_acceptance_test/tests/test_core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,9 +117,6 @@ def test_oneof_usage(self, actual_connector_spec: ConnectorSpecification):
const_common_prop = const_common_props.pop()
for n, variant in enumerate(variants):
prop_obj = variant["properties"][const_common_prop]
assert (
"default" not in prop_obj
), f"There should not be 'default' keyword in common property {oneof_path}[{n}].{const_common_prop}. Use `const` instead. {docs_msg}"
assert (
"enum" not in prop_obj
), f"There should not be 'enum' keyword in common property {oneof_path}[{n}].{const_common_prop}. Use `const` instead. {docs_msg}"
Expand Down
28 changes: 28 additions & 0 deletions airbyte-integrations/bases/source-acceptance-test/unit_tests/test_spec.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,6 +339,34 @@ def parametrize_test_case(*test_cases: Dict[str, Any]) -> Callable:
}
},
},
"should_fail": False,
},
{
"test_id": "enum_keyword_in_common_property",
"connector_spec": {
"type": "object",
"properties": {
"credentials": {
"type": "object",
"oneOf": [
{
"type": "object",
"properties": {
"common": {"type": "string", "const": "option1", "enum": "option1"},
"option1": {"type": "string"},
},
},
{
"type": "object",
"properties": {
"common": {"type": "string", "const": "option2", "enum": "option2"},
"option2": {"type": "string"},
},
},
],
}
},
},
"should_fail": True,
},
)
Expand Down