From 174af67ecd8ad5c8c00f8e37e21887ac79513fcc Mon Sep 17 00:00:00 2001 From: Matan <51418643+matan84@users.noreply.github.com> Date: Wed, 25 Sep 2024 16:48:52 +0300 Subject: [PATCH] [Gitlab] Added verbosity to files (#1032) # Description What - added logs Why - better UX How - ## Type of change Please leave one option from the following and delete the rest: - [ ] Bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds functionality) - [ ] New Integration (non-breaking change which adds a new integration) - [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected) - [ ] Non-breaking change (fix of existing functionality that will not change current behavior) - [ ] Documentation (added/updated documentation)

All tests should be run against the port production environment(using a testing org).

### Core testing checklist - [ ] Integration able to create all default resources from scratch - [ ] Resync finishes successfully - [ ] Resync able to create entities - [ ] Resync able to update entities - [ ] Resync able to detect and delete entities - [ ] Scheduled resync able to abort existing resync and start a new one - [ ] Tested with at least 2 integrations from scratch - [ ] Tested with Kafka and Polling event listeners - [ ] Tested deletion of entities that don't pass the selector ### Integration testing checklist - [ ] Integration able to create all default resources from scratch - [ ] Resync able to create entities - [ ] Resync able to update entities - [ ] Resync able to detect and delete entities - [ ] Resync finishes successfully - [ ] If new resource kind is added or updated in the integration, add example raw data, mapping and expected result to the `examples` folder in the integration directory. - [ ] If resource kind is updated, run the integration with the example data and check if the expected result is achieved - [ ] If new resource kind is added or updated, validate that live-events for that resource are working as expected - [ ] Docs PR link [here](#) ### Preflight checklist - [ ] Handled rate limiting - [ ] Handled pagination - [ ] Implemented the code in async - [ ] Support Multi account ## Screenshots Include screenshots from your environment showing how the resources of the integration will look. ## API Documentation Provide links to the API documentation used for this integration. --- integrations/gitlab/CHANGELOG.md | 7 +++++++ integrations/gitlab/gitlab_integration/ocean.py | 4 ++++ integrations/gitlab/pyproject.toml | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/integrations/gitlab/CHANGELOG.md b/integrations/gitlab/CHANGELOG.md index 2ea4f97483..092d45fca6 100644 --- a/integrations/gitlab/CHANGELOG.md +++ b/integrations/gitlab/CHANGELOG.md @@ -6,6 +6,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +0.1.125 (2024-09-25) +==================== + +### Improvements + +- Added log for when file kind's project iteration found a relevant project, and for when the batch entirely isn't relevant + 0.1.124 (2024-09-24) ==================== diff --git a/integrations/gitlab/gitlab_integration/ocean.py b/integrations/gitlab/gitlab_integration/ocean.py index 8ed72c113b..45bbde1784 100644 --- a/integrations/gitlab/gitlab_integration/ocean.py +++ b/integrations/gitlab/gitlab_integration/ocean.py @@ -208,9 +208,13 @@ async def resync_files(kind: str) -> ASYNC_GENERATOR_RESYNC_TYPE: for project in projects_batch if service.should_process_project(project, selector.files.repos) ] + if tasks: + logger.info(f"Found {len(tasks)} relevant projects in batch") async for batch in stream_async_iterators_tasks(*tasks): yield batch + else: + logger.info("No relevant projects were found in batch, skipping it") @ocean.on_resync(ObjectKind.MERGE_REQUEST) diff --git a/integrations/gitlab/pyproject.toml b/integrations/gitlab/pyproject.toml index 7d0ca910f0..084f52ffd7 100644 --- a/integrations/gitlab/pyproject.toml +++ b/integrations/gitlab/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "gitlab" -version = "0.1.124" +version = "0.1.125" description = "Gitlab integration for Port using Port-Ocean Framework" authors = ["Yair Siman-Tov "]