[Integration][GitLab] Fix few bugs

integrations/gitlab/CHANGELOG.md

@@ -7,6 +7,16 @@ this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 
 <!-- towncrier release notes start -->
 
+0.1.26 (2023-11-07)
+===================
+
+### Bug Fixes
+
+- Fixed a bug of not finding merge requests on hook event (#1)
+- Fixed a bug of sending binary data when `file://` is configured in `port.yml` (#2)
+- Fixed a bug of type validation that caused skipping merge requests on resync (#3)
+
+
 0.1.25 (2023-11-03)
 ===================
 

integrations/gitlab/gitlab_integration/core/entities.py

@@ -20,9 +20,9 @@ def generate_entity_from_port_yaml(
             gitlab_file = project.files.get(file_path=str(file_meta), ref=ref)
 
             if file_meta.suffix == JSON_SUFFIX:
-                properties[key] = json.loads(gitlab_file.decode())
+                properties[key] = json.loads(gitlab_file.decode().decode("utf-8"))
             else:
-                properties[key] = gitlab_file.decode()
+                properties[key] = gitlab_file.decode().decode("utf-8")
         else:
             properties[key] = value
 

integrations/gitlab/gitlab_integration/core/paging.py

@@ -31,16 +31,7 @@ async def fetch(
             ],
         ],
         validation_func: Callable[
-            [
-                Union[
-                    RESTObject,
-                    ProjectPipelineJob,
-                    Issue,
-                    ProjectPipeline,
-                    Dict[str, Any],
-                    Project,
-                ]
-            ],
+            [Any],
             bool,
         ],
         batch_size: int = int(os.environ.get("GITLAB_BATCH_SIZE", 100)),

integrations/gitlab/gitlab_integration/events/hooks/merge_request.py

@@ -14,6 +14,6 @@ async def _on_hook(
         self, group_id: str, body: dict[str, Any], gitlab_project: Project
     ) -> None:
         merge_requests = gitlab_project.mergerequests.get(
-            body["object_attributes"]["id"]
+            body["object_attributes"]["iid"]
         )
         await ocean.register_raw(ObjectKind.MERGE_REQUEST, [merge_requests.asdict()])

integrations/gitlab/gitlab_integration/events/hooks/push.py

@@ -41,5 +41,6 @@ async def _on_hook(
                 {"before": entities_before, "after": entities_after},
                 UserAgentType.gitops,
             )
+            return
 
         await ocean.register_raw(ObjectKind.PROJECT, [gitlab_project.asdict()])

integrations/gitlab/gitlab_integration/gitlab_service.py

@@ -13,6 +13,7 @@
     Issue,
     Group,
     ProjectPipeline,
+    GroupMergeRequest,
     ProjectPipelineJob,
 )
 from loguru import logger
@@ -124,33 +125,27 @@ def should_run_for_path(self, path: str) -> bool:
 
     def should_run_for_project(
         self,
-        project: typing.Union[RESTObject | dict[str, Any] | Project],
+        project: Project,
     ) -> bool:
-        if isinstance(project, Project):
-            return self.should_run_for_path(project.path_with_namespace)
-        return False
+        return self.should_run_for_path(project.path_with_namespace)
 
     def should_run_for_merge_request(
         self,
-        merge_request: typing.Union[RESTObject, dict[str, Any], Project, MergeRequest],
+        merge_request: typing.Union[MergeRequest, GroupMergeRequest],
     ) -> bool:
-        if type(merge_request) == MergeRequest:
-            project_path = merge_request.references.get("full").rstrip(
-                merge_request.references.get("short")
-            )
-            return self.should_run_for_path(project_path)
-        return False
+        project_path = merge_request.references.get("full").rstrip(
+            merge_request.references.get("short")
+        )
+        return self.should_run_for_path(project_path)
 
     def should_run_for_issue(
         self,
-        issue: typing.Union[RESTObject, dict[str, Any], Project, MergeRequest, Issue],
+        issue: Issue,
     ) -> bool:
-        if type(issue) == Issue:
-            project_path = issue.references.get("full").rstrip(
-                issue.references.get("short")
-            )
-            return self.should_run_for_path(project_path)
-        return False
+        project_path = issue.references.get("full").rstrip(
+            issue.references.get("short")
+        )
+        return self.should_run_for_path(project_path)
 
     def get_root_groups(self) -> List[Group]:
         groups = self.gitlab_client.groups.list(iterator=True)

integrations/gitlab/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "gitlab"
-version = "0.1.25"
+version = "0.1.26"
 description = "Gitlab integration for Port using Port-Ocean Framework"
 authors = ["Yair Siman-Tov <yair@getport.io>"]