From 98e5953d8d2b87ac7fb35eb13155a218ed810f49 Mon Sep 17 00:00:00 2001 From: jordan-glitch <65691557+jordan-glitch@users.noreply.github.com> Date: Tue, 3 May 2022 07:44:21 +1000 Subject: [PATCH] :bug: Source Gitlab: allow `container_expiration_policy` to be nullable + fix null projects list (#11907) * allow nullable container_expiration_policy * Update Dockerfile * Update source_definitions.yaml * Update source_specs.yaml * fix unspecified projects * add doc update Co-authored-by: marcosmarxm --- .../init/src/main/resources/seed/source_definitions.yaml | 2 +- airbyte-config/init/src/main/resources/seed/source_specs.yaml | 2 +- airbyte-integrations/connectors/source-gitlab/Dockerfile | 2 +- .../source-gitlab/source_gitlab/schemas/projects.json | 2 +- .../connectors/source-gitlab/source_gitlab/source.py | 2 +- docs/integrations/sources/gitlab.md | 1 + 6 files changed, 6 insertions(+), 5 deletions(-) diff --git a/airbyte-config/init/src/main/resources/seed/source_definitions.yaml b/airbyte-config/init/src/main/resources/seed/source_definitions.yaml index fd9121924be..e94e30369ed 100644 --- a/airbyte-config/init/src/main/resources/seed/source_definitions.yaml +++ b/airbyte-config/init/src/main/resources/seed/source_definitions.yaml @@ -265,7 +265,7 @@ - name: Gitlab sourceDefinitionId: 5e6175e5-68e1-4c17-bff9-56103bbb0d80 dockerRepository: airbyte/source-gitlab - dockerImageTag: 0.1.4 + dockerImageTag: 0.1.5 documentationUrl: https://docs.airbyte.io/integrations/sources/gitlab icon: gitlab.svg sourceType: api diff --git a/airbyte-config/init/src/main/resources/seed/source_specs.yaml b/airbyte-config/init/src/main/resources/seed/source_specs.yaml index 65386e30285..a49160a0fd3 100644 --- a/airbyte-config/init/src/main/resources/seed/source_specs.yaml +++ b/airbyte-config/init/src/main/resources/seed/source_specs.yaml @@ -2595,7 +2595,7 @@ path_in_connector_config: - "credentials" - "client_secret" -- dockerImage: "airbyte/source-gitlab:0.1.4" +- dockerImage: "airbyte/source-gitlab:0.1.5" spec: documentationUrl: "https://docs.airbyte.io/integrations/sources/gitlab" connectionSpecification: diff --git a/airbyte-integrations/connectors/source-gitlab/Dockerfile b/airbyte-integrations/connectors/source-gitlab/Dockerfile index 9cd9977769f..f831f3760d4 100644 --- a/airbyte-integrations/connectors/source-gitlab/Dockerfile +++ b/airbyte-integrations/connectors/source-gitlab/Dockerfile @@ -13,5 +13,5 @@ RUN pip install . ENTRYPOINT ["python", "/airbyte/integration_code/main.py"] -LABEL io.airbyte.version=0.1.4 +LABEL io.airbyte.version=0.1.5 LABEL io.airbyte.name=airbyte/source-gitlab diff --git a/airbyte-integrations/connectors/source-gitlab/source_gitlab/schemas/projects.json b/airbyte-integrations/connectors/source-gitlab/source_gitlab/schemas/projects.json index b440ceb148b..e7b21178e79 100644 --- a/airbyte-integrations/connectors/source-gitlab/source_gitlab/schemas/projects.json +++ b/airbyte-integrations/connectors/source-gitlab/source_gitlab/schemas/projects.json @@ -138,7 +138,7 @@ "type": ["null", "boolean"] }, "container_expiration_policy": { - "type": "object", + "type": ["null", "object"], "properties": { "cadence": { "type": ["null", "string"] diff --git a/airbyte-integrations/connectors/source-gitlab/source_gitlab/source.py b/airbyte-integrations/connectors/source-gitlab/source_gitlab/source.py index d7dea49b254..d05a7188838 100644 --- a/airbyte-integrations/connectors/source-gitlab/source_gitlab/source.py +++ b/airbyte-integrations/connectors/source-gitlab/source_gitlab/source.py @@ -43,7 +43,7 @@ class SourceGitlab(AbstractSource): auth = TokenAuthenticator(token=config["private_token"]) auth_params = dict(authenticator=auth, api_url=config["api_url"]) - pids = list(filter(None, config.get("projects").split(" "))) + pids = list(filter(None, config.get("projects", "").split(" "))) gids = config.get("groups") if gids: diff --git a/docs/integrations/sources/gitlab.md b/docs/integrations/sources/gitlab.md index 8b6259b235a..ce17f977fe8 100644 --- a/docs/integrations/sources/gitlab.md +++ b/docs/integrations/sources/gitlab.md @@ -63,6 +63,7 @@ GitLab source is working with GitLab API v4. It can also work with self-hosted G | Version | Date | Pull Request | Subject | |:--------|:-----------|:---------------------------------------------------------| :--- | +| 0.1.5 | 2022-05-02 | [11907](https://github.com/airbytehq/airbyte/pull/11907) | Fix null projects param and `container_expiration_policy` | | 0.1.4 | 2022-03-23 | [11140](https://github.com/airbytehq/airbyte/pull/11140) | Ingest All Accessible Groups if not Specified in Config | | 0.1.3 | 2021-12-21 | [8991](https://github.com/airbytehq/airbyte/pull/8991) | Update connector fields title/description | | 0.1.2 | 2021-10-18 | [7108](https://github.com/airbytehq/airbyte/pull/7108) | Allow all domains to be used as `api_url` |