fix fixture problem

Author: Joe Reuter

airbyte-integrations/bases/source-acceptance-test/CHANGELOG.md

@@ -1,7 +1,13 @@
 # Changelog
 
+## 0.5.0
+Re-release of 0.3.0 [#21451](https://github.com/airbytehq/airbyte/pull/21451)
+
+## 0.4.0
+Revert 0.3.0
+
 ## 0.3.0
-Add various stricter checks for specs (see PR for details). [#21451](https://github.com/airbytehq/airbyte/pull/21451)
+(Broken) Add various stricter checks for specs (see PR for details). [#21451](https://github.com/airbytehq/airbyte/pull/21451)
 
 ## 0.2.26
 Check `future_state` only for incremental streams. [#21248](https://github.com/airbytehq/airbyte/pull/21248)

airbyte-integrations/bases/source-acceptance-test/Dockerfile

@@ -33,7 +33,7 @@ COPY pytest.ini setup.py ./
 COPY source_acceptance_test ./source_acceptance_test
 RUN pip install .
 
-LABEL io.airbyte.version=0.3.0
+LABEL io.airbyte.version=0.5.0
 LABEL io.airbyte.name=airbyte/source-acceptance-test
 
 ENTRYPOINT ["python", "-m", "pytest", "-p", "source_acceptance_test.plugin", "-r", "fEsx"]

airbyte-integrations/bases/source-acceptance-test/source_acceptance_test/tests/test_core.py

@@ -86,10 +86,6 @@ class TestSpec(BaseTest):
     spec_cache: ConnectorSpecification = None
     previous_spec_cache: ConnectorSpecification = None
 
-    @pytest.fixture(name="connection_specification", scope="class")
-    def connection_specification_fixture(self, connector_spec_dict: dict) -> dict:
-        return connector_spec_dict["connectionSpecification"]
-
     @pytest.fixture(name="skip_backward_compatibility_tests")
     def skip_backward_compatibility_tests_fixture(
         self,
@@ -285,12 +281,12 @@ def _fail_on_errors(self, errors: List[str]):
         if len(errors) > 0:
             pytest.fail("\n".join(errors))
 
-    def test_property_type_is_not_array(self, connector_specification: dict):
+    def test_property_type_is_not_array(self, connector_spec: ConnectorSpecification):
         """
         Each field has one or multiple types, but the UI only supports a single type and optionally "null" as a second type.
         """
         errors = []
-        for type_path, type_value in dpath.util.search(connector_specification, "**/properties/*/type", yielded=True):
+        for type_path, type_value in dpath.util.search(connector_spec.connectionSpecification, "**/properties/*/type", yielded=True):
             if isinstance(type_value, List):
                 number_of_types = len(type_value)
                 if number_of_types != 2 and number_of_types != 1:
@@ -303,14 +299,14 @@ def test_property_type_is_not_array(self, connector_specification: dict):
                     )
         self._fail_on_errors(errors)
 
-    def test_object_not_empty(self, connector_specification: dict):
+    def test_object_not_empty(self, connector_spec: ConnectorSpecification):
         """
         Each object field needs to have at least one property as the UI won't be able to show them otherwise.
         If the whole spec is empty, it's allowed to have a single empty object at the top level
         """
-        schema_helper = JsonSchemaHelper(connector_specification)
+        schema_helper = JsonSchemaHelper(connector_spec.connectionSpecification)
         errors = []
-        for type_path, type_value in dpath.util.search(connector_specification, "**/type", yielded=True):
+        for type_path, type_value in dpath.util.search(connector_spec.connectionSpecification, "**/type", yielded=True):
             if type_path == "type":
                 # allow empty root object
                 continue
@@ -322,13 +318,13 @@ def test_object_not_empty(self, connector_specification: dict):
                     )
         self._fail_on_errors(errors)
 
-    def test_array_type(self, connector_specification: dict):
+    def test_array_type(self, connector_spec: ConnectorSpecification):
         """
         Each array has one or multiple types for its items, but the UI only supports a single type which can either be object, string or an enum
         """
-        schema_helper = JsonSchemaHelper(connector_specification)
+        schema_helper = JsonSchemaHelper(connector_spec.connectionSpecification)
         errors = []
-        for type_path, type_type in dpath.util.search(connector_specification, "**/type", yielded=True):
+        for type_path, type_type in dpath.util.search(connector_spec.connectionSpecification, "**/type", yielded=True):
             property_definition = schema_helper.get_parent(type_path)
             if type_type != "array":
                 # unrelated "items", not an array definition
@@ -342,7 +338,7 @@ def test_array_type(self, connector_specification: dict):
                 errors.append(f"Items of {type_path} has to be either object or string or define an enum")
         self._fail_on_errors(errors)
 
-    def test_forbidden_complex_types(self, connector_specification: dict):
+    def test_forbidden_complex_types(self, connector_spec: ConnectorSpecification):
         """
         not, anyOf, patternProperties, prefixItems, allOf, if, then, else, dependentSchemas and dependentRequired are not allowed
         """
@@ -360,25 +356,25 @@ def test_forbidden_complex_types(self, connector_specification: dict):
         ]
         found_keys = set()
         for forbidden_key in forbidden_keys:
-            for path, value in dpath.util.search(connector_specification, f"**/{forbidden_key}", yielded=True):
+            for path, value in dpath.util.search(connector_spec.connectionSpecification, f"**/{forbidden_key}", yielded=True):
                 found_keys.add(path)
 
         for forbidden_key in forbidden_keys:
             # remove forbidden keys if they are used as properties directly
-            for path, _value in dpath.util.search(connector_specification, f"**/properties/{forbidden_key}", yielded=True):
+            for path, _value in dpath.util.search(connector_spec.connectionSpecification, f"**/properties/{forbidden_key}", yielded=True):
                 found_keys.remove(path)
 
         if len(found_keys) > 0:
             key_list = ", ".join(found_keys)
             pytest.fail(f"Found the following disallowed JSON schema features: {key_list}")
 
-    def test_date_pattern(self, connector_specification: dict, detailed_logger):
+    def test_date_pattern(self, connector_spec: ConnectorSpecification, detailed_logger):
         """
         Properties with format date or date-time should always have a pattern defined how the date/date-time should be formatted
         that corresponds with the format the datepicker component is creating.
         """
-        schema_helper = JsonSchemaHelper(connector_specification)
-        for format_path, format in dpath.util.search(connector_specification, "**/format", yielded=True):
+        schema_helper = JsonSchemaHelper(connector_spec.connectionSpecification)
+        for format_path, format in dpath.util.search(connector_spec.connectionSpecification, "**/format", yielded=True):
             if not isinstance(format, str):
                 # format is not a format definition here but a property named format
                 continue
@@ -393,12 +389,12 @@ def test_date_pattern(self, connector_specification: dict, detailed_logger):
                     f"{format_path} is defining a date-time format without the corresponding pattern Consider setting the pattern to {DATETIME_PATTERN} to make it easier for users to edit this field in the UI."
                 )
 
-    def test_date_format(self, connector_specification: dict, detailed_logger):
+    def test_date_format(self, connector_spec: ConnectorSpecification, detailed_logger):
         """
         Properties with a pattern that looks like a date should have their format set to date or date-time.
         """
-        schema_helper = JsonSchemaHelper(connector_specification)
-        for pattern_path, pattern in dpath.util.search(connector_specification, "**/pattern", yielded=True):
+        schema_helper = JsonSchemaHelper(connector_spec.connectionSpecification)
+        for pattern_path, pattern in dpath.util.search(connector_spec.connectionSpecification, "**/pattern", yielded=True):
             if not isinstance(pattern, str):
                 # pattern is not a pattern definition here but a property named pattern
                 continue

airbyte-integrations/bases/source-acceptance-test/unit_tests/test_spec.py

@@ -700,7 +700,7 @@ def test_airbyte_secret(mocker, connector_spec, should_fail):
 def test_property_type_is_not_array(mocker, connector_spec, should_fail):
     mocker.patch.object(conftest.pytest, "fail")
     t = _TestSpec()
-    t.test_property_type_is_not_array(connector_spec)
+    t.test_property_type_is_not_array(ConnectorSpecification(connectionSpecification=connector_spec))
     if should_fail:
         conftest.pytest.fail.assert_called_once()
     else:
@@ -750,7 +750,7 @@ def test_property_type_is_not_array(mocker, connector_spec, should_fail):
 def test_object_not_empty(mocker, connector_spec, should_fail):
     mocker.patch.object(conftest.pytest, "fail")
     t = _TestSpec()
-    t.test_object_not_empty(connector_spec)
+    t.test_object_not_empty(ConnectorSpecification(connectionSpecification=connector_spec))
     if should_fail:
         conftest.pytest.fail.assert_called_once()
     else:
@@ -781,7 +781,7 @@ def test_object_not_empty(mocker, connector_spec, should_fail):
 def test_array_type(mocker, connector_spec, should_fail):
     mocker.patch.object(conftest.pytest, "fail")
     t = _TestSpec()
-    t.test_array_type(connector_spec)
+    t.test_array_type(ConnectorSpecification(connectionSpecification=connector_spec))
     if should_fail:
         conftest.pytest.fail.assert_called_once()
     else:
@@ -818,7 +818,7 @@ def test_array_type(mocker, connector_spec, should_fail):
 def test_forbidden_complex_types(mocker, connector_spec, should_fail):
     mocker.patch.object(conftest.pytest, "fail")
     t = _TestSpec()
-    t.test_forbidden_complex_types(connector_spec)
+    t.test_forbidden_complex_types(ConnectorSpecification(connectionSpecification=connector_spec))
     if should_fail:
         conftest.pytest.fail.assert_called_once()
     else:
@@ -862,7 +862,7 @@ def test_date_pattern(mocker, connector_spec, is_warning_logged):
     mocker.patch.object(conftest.pytest, "fail")
     logger = mocker.Mock()
     t = _TestSpec()
-    t.test_date_pattern(connector_spec, logger)
+    t.test_date_pattern(ConnectorSpecification(connectionSpecification=connector_spec), logger)
     conftest.pytest.fail.assert_not_called()
     if is_warning_logged:
         _, args, _ = logger.warning.mock_calls[0]
@@ -907,7 +907,7 @@ def test_date_format(mocker, connector_spec, is_warning_logged):
     mocker.patch.object(conftest.pytest, "fail")
     logger = mocker.Mock()
     t = _TestSpec()
-    t.test_date_format(connector_spec, logger)
+    t.test_date_format(ConnectorSpecification(connectionSpecification=connector_spec), logger)
     conftest.pytest.fail.assert_not_called()
     if is_warning_logged:
         _, args, _ = logger.warning.mock_calls[0]