From a8b68617f49d54df2ff8167d95c0e5c39ca8ce8c Mon Sep 17 00:00:00 2001 From: Marius Posta Date: Tue, 10 Sep 2024 10:15:25 -0400 Subject: [PATCH 1/3] metadata_service: add 0 values for sl and ql --- .../metadata_service/models/generated/AirbyteInternal.py | 4 ++-- .../models/generated/ConnectorMetadataDefinitionV0.py | 4 ++-- .../generated/ConnectorRegistryDestinationDefinition.py | 4 ++-- .../models/generated/ConnectorRegistryReleases.py | 4 ++-- .../models/generated/ConnectorRegistrySourceDefinition.py | 4 ++-- .../models/generated/ConnectorRegistryV0.py | 4 ++-- .../lib/metadata_service/models/src/AirbyteInternal.yaml | 2 ++ airbyte-ci/connectors/metadata_service/lib/pyproject.toml | 2 +- .../lib/tests/test_validators/test_metadata_validators.py | 6 ++---- .../connectors/metadata_service/orchestrator/pyproject.toml | 2 +- 10 files changed, 18 insertions(+), 18 deletions(-) diff --git a/airbyte-ci/connectors/metadata_service/lib/metadata_service/models/generated/AirbyteInternal.py b/airbyte-ci/connectors/metadata_service/lib/metadata_service/models/generated/AirbyteInternal.py index c70266521316..8c59150adcdc 100644 --- a/airbyte-ci/connectors/metadata_service/lib/metadata_service/models/generated/AirbyteInternal.py +++ b/airbyte-ci/connectors/metadata_service/lib/metadata_service/models/generated/AirbyteInternal.py @@ -13,5 +13,5 @@ class AirbyteInternal(BaseModel): class Config: extra = Extra.allow - sl: Optional[Literal[100, 200, 300]] = None - ql: Optional[Literal[100, 200, 300, 400, 500, 600]] = None + sl: Optional[Literal[0, 100, 200, 300]] = None + ql: Optional[Literal[0, 100, 200, 300, 400, 500, 600]] = None diff --git a/airbyte-ci/connectors/metadata_service/lib/metadata_service/models/generated/ConnectorMetadataDefinitionV0.py b/airbyte-ci/connectors/metadata_service/lib/metadata_service/models/generated/ConnectorMetadataDefinitionV0.py index 2e0af418fe6c..87970748adda 100644 --- a/airbyte-ci/connectors/metadata_service/lib/metadata_service/models/generated/ConnectorMetadataDefinitionV0.py +++ b/airbyte-ci/connectors/metadata_service/lib/metadata_service/models/generated/ConnectorMetadataDefinitionV0.py @@ -123,8 +123,8 @@ class AirbyteInternal(BaseModel): class Config: extra = Extra.allow - sl: Optional[Literal[100, 200, 300]] = None - ql: Optional[Literal[100, 200, 300, 400, 500, 600]] = None + sl: Optional[Literal[0, 100, 200, 300]] = None + ql: Optional[Literal[0, 100, 200, 300, 400, 500, 600]] = None class PyPi(BaseModel): diff --git a/airbyte-ci/connectors/metadata_service/lib/metadata_service/models/generated/ConnectorRegistryDestinationDefinition.py b/airbyte-ci/connectors/metadata_service/lib/metadata_service/models/generated/ConnectorRegistryDestinationDefinition.py index 009a7f225018..b34f28794f50 100644 --- a/airbyte-ci/connectors/metadata_service/lib/metadata_service/models/generated/ConnectorRegistryDestinationDefinition.py +++ b/airbyte-ci/connectors/metadata_service/lib/metadata_service/models/generated/ConnectorRegistryDestinationDefinition.py @@ -100,8 +100,8 @@ class AirbyteInternal(BaseModel): class Config: extra = Extra.allow - sl: Optional[Literal[100, 200, 300]] = None - ql: Optional[Literal[100, 200, 300, 400, 500, 600]] = None + sl: Optional[Literal[0, 100, 200, 300]] = None + ql: Optional[Literal[0, 100, 200, 300, 400, 500, 600]] = None class GitInfo(BaseModel): diff --git a/airbyte-ci/connectors/metadata_service/lib/metadata_service/models/generated/ConnectorRegistryReleases.py b/airbyte-ci/connectors/metadata_service/lib/metadata_service/models/generated/ConnectorRegistryReleases.py index 21696bf0158c..7db158099e89 100644 --- a/airbyte-ci/connectors/metadata_service/lib/metadata_service/models/generated/ConnectorRegistryReleases.py +++ b/airbyte-ci/connectors/metadata_service/lib/metadata_service/models/generated/ConnectorRegistryReleases.py @@ -86,8 +86,8 @@ class AirbyteInternal(BaseModel): class Config: extra = Extra.allow - sl: Optional[Literal[100, 200, 300]] = None - ql: Optional[Literal[100, 200, 300, 400, 500, 600]] = None + sl: Optional[Literal[0, 100, 200, 300]] = None + ql: Optional[Literal[0, 100, 200, 300, 400, 500, 600]] = None class GitInfo(BaseModel): diff --git a/airbyte-ci/connectors/metadata_service/lib/metadata_service/models/generated/ConnectorRegistrySourceDefinition.py b/airbyte-ci/connectors/metadata_service/lib/metadata_service/models/generated/ConnectorRegistrySourceDefinition.py index 4b0124284fd6..016ede2915aa 100644 --- a/airbyte-ci/connectors/metadata_service/lib/metadata_service/models/generated/ConnectorRegistrySourceDefinition.py +++ b/airbyte-ci/connectors/metadata_service/lib/metadata_service/models/generated/ConnectorRegistrySourceDefinition.py @@ -100,8 +100,8 @@ class AirbyteInternal(BaseModel): class Config: extra = Extra.allow - sl: Optional[Literal[100, 200, 300]] = None - ql: Optional[Literal[100, 200, 300, 400, 500, 600]] = None + sl: Optional[Literal[0, 100, 200, 300]] = None + ql: Optional[Literal[0, 100, 200, 300, 400, 500, 600]] = None class GitInfo(BaseModel): diff --git a/airbyte-ci/connectors/metadata_service/lib/metadata_service/models/generated/ConnectorRegistryV0.py b/airbyte-ci/connectors/metadata_service/lib/metadata_service/models/generated/ConnectorRegistryV0.py index 715bbc0dfe62..30c234cedf76 100644 --- a/airbyte-ci/connectors/metadata_service/lib/metadata_service/models/generated/ConnectorRegistryV0.py +++ b/airbyte-ci/connectors/metadata_service/lib/metadata_service/models/generated/ConnectorRegistryV0.py @@ -100,8 +100,8 @@ class AirbyteInternal(BaseModel): class Config: extra = Extra.allow - sl: Optional[Literal[100, 200, 300]] = None - ql: Optional[Literal[100, 200, 300, 400, 500, 600]] = None + sl: Optional[Literal[0, 100, 200, 300]] = None + ql: Optional[Literal[0, 100, 200, 300, 400, 500, 600]] = None class GitInfo(BaseModel): diff --git a/airbyte-ci/connectors/metadata_service/lib/metadata_service/models/src/AirbyteInternal.yaml b/airbyte-ci/connectors/metadata_service/lib/metadata_service/models/src/AirbyteInternal.yaml index 9376d99a76fd..b74f56f638fe 100644 --- a/airbyte-ci/connectors/metadata_service/lib/metadata_service/models/src/AirbyteInternal.yaml +++ b/airbyte-ci/connectors/metadata_service/lib/metadata_service/models/src/AirbyteInternal.yaml @@ -9,12 +9,14 @@ properties: sl: type: integer enum: + - 0 - 100 - 200 - 300 ql: type: integer enum: + - 0 - 100 - 200 - 300 diff --git a/airbyte-ci/connectors/metadata_service/lib/pyproject.toml b/airbyte-ci/connectors/metadata_service/lib/pyproject.toml index 839b6dfd9c88..9e9e5127f88b 100644 --- a/airbyte-ci/connectors/metadata_service/lib/pyproject.toml +++ b/airbyte-ci/connectors/metadata_service/lib/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "metadata-service" -version = "0.14.1" +version = "0.15.0" description = "" authors = ["Ben Church "] readme = "README.md" diff --git a/airbyte-ci/connectors/metadata_service/lib/tests/test_validators/test_metadata_validators.py b/airbyte-ci/connectors/metadata_service/lib/tests/test_validators/test_metadata_validators.py index a0d823b2fde1..132beeaf008d 100644 --- a/airbyte-ci/connectors/metadata_service/lib/tests/test_validators/test_metadata_validators.py +++ b/airbyte-ci/connectors/metadata_service/lib/tests/test_validators/test_metadata_validators.py @@ -71,10 +71,8 @@ def test_validation_fail_on_docker_image_tag_decrement(metadata_definition, decr metadata_definition.data.dockerImageTag = decremented_version success, error_message = metadata_validator.validate_docker_image_tag_is_not_decremented(metadata_definition, None) assert not success - assert ( - error_message - == f"The dockerImageTag value ({decremented_version}) can't be decremented: it should be equal to or above {current_version}." - ) + expected_prefix = f"The dockerImageTag value ({decremented_version}) can't be decremented: it should be equal to or above" + assert error_message.startswith(expected_prefix), error_message def test_validation_pass_on_docker_image_tag_increment(metadata_definition, incremented_version): diff --git a/airbyte-ci/connectors/metadata_service/orchestrator/pyproject.toml b/airbyte-ci/connectors/metadata_service/orchestrator/pyproject.toml index 85a097ca6aa2..d1fd3464f99c 100644 --- a/airbyte-ci/connectors/metadata_service/orchestrator/pyproject.toml +++ b/airbyte-ci/connectors/metadata_service/orchestrator/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "orchestrator" -version = "0.5.4" +version = "0.5.5" description = "" authors = ["Ben Church "] readme = "README.md" From 9c873b5e985244872959ec2f35d2db6de7891607 Mon Sep 17 00:00:00 2001 From: Marius Posta Date: Tue, 10 Sep 2024 10:18:00 -0400 Subject: [PATCH 2/3] connectors_qa: add minimum sl threshold to doc checks --- airbyte-ci/connectors/connectors_qa/README.md | 4 ++++ airbyte-ci/connectors/connectors_qa/pyproject.toml | 2 +- .../src/connectors_qa/checks/documentation/documentation.py | 1 + docs/contributing-to-airbyte/resources/qa-checks.md | 6 +++--- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/airbyte-ci/connectors/connectors_qa/README.md b/airbyte-ci/connectors/connectors_qa/README.md index c81cb682f944..a942d0bba757 100644 --- a/airbyte-ci/connectors/connectors_qa/README.md +++ b/airbyte-ci/connectors/connectors_qa/README.md @@ -108,6 +108,10 @@ poe lint ## Changelog +### 1.8.0 + +Added minimum sl threshold value to documentation checks to skip them for connectors for which sl is 0. + ### 1.7.0 Added `CheckDocumentationLinks`, `CheckDocumentationHeadersOrder`, `CheckPrerequisitesSectionDescribesRequiredFieldsFromSpec`, diff --git a/airbyte-ci/connectors/connectors_qa/pyproject.toml b/airbyte-ci/connectors/connectors_qa/pyproject.toml index 8a3d93eae83a..ef234cef252c 100644 --- a/airbyte-ci/connectors/connectors_qa/pyproject.toml +++ b/airbyte-ci/connectors/connectors_qa/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "connectors-qa" -version = "1.7.0" +version = "1.8.0" description = "A package to run QA checks on Airbyte connectors, generate reports and documentation." authors = ["Airbyte "] readme = "README.md" diff --git a/airbyte-ci/connectors/connectors_qa/src/connectors_qa/checks/documentation/documentation.py b/airbyte-ci/connectors/connectors_qa/src/connectors_qa/checks/documentation/documentation.py index aa59d35aa1d7..700b7162ed27 100644 --- a/airbyte-ci/connectors/connectors_qa/src/connectors_qa/checks/documentation/documentation.py +++ b/airbyte-ci/connectors/connectors_qa/src/connectors_qa/checks/documentation/documentation.py @@ -24,6 +24,7 @@ class DocumentationCheck(Check): category = CheckCategory.DOCUMENTATION + applies_to_connector_ab_internal_sl = 100 class CheckMigrationGuide(DocumentationCheck): diff --git a/docs/contributing-to-airbyte/resources/qa-checks.md b/docs/contributing-to-airbyte/resources/qa-checks.md index 48ee995f0179..0a471d23d6e6 100644 --- a/docs/contributing-to-airbyte/resources/qa-checks.md +++ b/docs/contributing-to-airbyte/resources/qa-checks.md @@ -13,7 +13,7 @@ They are by no mean replacing the need for a manual review of the connector code _Applies to the following connector types: source, destination_ _Applies to the following connector languages: java, low-code, python, manifest-only_ _Applies to connector with any support level_ -_Applies to connector with any internal support level_ +_Applies to connector with 100 internal support level_ _Applies to connector with any Airbyte usage level_ When a breaking change is introduced, we check that a migration guide is available. It should be stored under `./docs/integrations/s/-migrations.md`. @@ -24,7 +24,7 @@ This document should contain a section for each breaking change, in order of the _Applies to the following connector types: source, destination_ _Applies to the following connector languages: java, low-code, python, manifest-only_ _Applies to connector with any support level_ -_Applies to connector with any internal support level_ +_Applies to connector with 100 internal support level_ _Applies to connector with any Airbyte usage level_ The user facing connector documentation should be stored under `./docs/integrations/s/.md`. @@ -251,7 +251,7 @@ Check verifies that Changelog header section content follows standard template: _Applies to the following connector types: source, destination_ _Applies to the following connector languages: java, low-code, python, manifest-only_ _Applies to connector with any support level_ -_Applies to connector with any internal support level_ +_Applies to connector with 100 internal support level_ _Applies to connector with any Airbyte usage level_ Each new version of a connector must have a changelog entry defined in the user facing documentation in `./docs/integrations/s/.md`. From e30bdce0489899e6481d0e6b8b02fae1e414e7c5 Mon Sep 17 00:00:00 2001 From: Marius Posta Date: Tue, 10 Sep 2024 10:28:27 -0400 Subject: [PATCH 3/3] pipelines: bump version and update changelog --- airbyte-ci/connectors/pipelines/README.md | 1 + airbyte-ci/connectors/pipelines/pyproject.toml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/airbyte-ci/connectors/pipelines/README.md b/airbyte-ci/connectors/pipelines/README.md index effc227180c9..98114ab545de 100644 --- a/airbyte-ci/connectors/pipelines/README.md +++ b/airbyte-ci/connectors/pipelines/README.md @@ -843,6 +843,7 @@ airbyte-ci connectors --language=low-code migrate-to-manifest-only | Version | PR | Description | | ------- | ---------------------------------------------------------- |------------------------------------------------------------------------------------------------------------------------------| +| 4.35.2 | [#45360](https://github.com/airbytehq/airbyte/pull/45360) | Updated dependencies. | | 4.35.1 | [#45160](https://github.com/airbytehq/airbyte/pull/45160) | Remove deps.toml dependency for java connectors. | | 4.35.0 | [#44879](https://github.com/airbytehq/airbyte/pull/44879) | Mount `components.py` when building manifest-only connector image | | 4.34.2 | [#44786](https://github.com/airbytehq/airbyte/pull/44786) | Pre-emptively skip archived connectors when searching for modified files | diff --git a/airbyte-ci/connectors/pipelines/pyproject.toml b/airbyte-ci/connectors/pipelines/pyproject.toml index 5ad7203d1b35..b6551d8b7423 100644 --- a/airbyte-ci/connectors/pipelines/pyproject.toml +++ b/airbyte-ci/connectors/pipelines/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api" [tool.poetry] name = "pipelines" -version = "4.35.1" +version = "4.35.2" description = "Packaged maintained by the connector operations team to perform CI for connectors' pipelines" authors = ["Airbyte "]