Skip to content

Commit

Permalink
Merge branch 'main' into PORT-13306-Bitbucket-resource-sync
Browse files Browse the repository at this point in the history
  • Loading branch information
mk-armah authored Mar 5, 2025
2 parents c7a8e96 + 31b3675 commit 9ef2a15
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 14 deletions.
8 changes: 8 additions & 0 deletions integrations/azure-devops/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

<!-- towncrier release notes start -->

## 0.1.134 (2025-03-04)


### Bug Fixes

- Fixed bug causing repositories of disabled projects to be fetched, causing failure to retrieve child objects of the repositories


## 0.1.133 (2025-03-03)


Expand Down
2 changes: 1 addition & 1 deletion integrations/azure-devops/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "azure-devops"
version = "0.1.133"
version = "0.1.134"
description = "An Azure Devops Ocean integration"
authors = ["Matan Geva <matang@getport.io>"]

Expand Down
8 changes: 8 additions & 0 deletions integrations/gcp/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

<!-- towncrier release notes start -->

## 0.1.115 (2025-03-04)


### Improvements

- Improved logs for handled exceptions by adding the stringified version of such exception


## 0.1.114 (2025-03-03)


Expand Down
24 changes: 12 additions & 12 deletions integrations/gcp/gcp_core/search/resource_searches.py
Original file line number Diff line number Diff line change
Expand Up @@ -94,13 +94,13 @@ def parse_asset_response(response: Any) -> list[dict[Any, Any]]:
):
yield assets

except PermissionDenied:
except PermissionDenied as e:
logger.error(
f"Service account doesn't have permissions to search all resources within project {project_name} for kind {asset_type}"
f"Service account doesn't have permissions to search all resources within project {project_name} for kind {asset_type}. Error: {str(e.message)}"
)
except NotFound:
except NotFound as e:
logger.info(
f"Couldn't perform search_all_resources on project {project_name} since it's deleted."
f"Couldn't perform search_all_resources on project {project_name} since it's deleted. Error: {str(e)}"
)
else:
logger.info(
Expand Down Expand Up @@ -132,13 +132,13 @@ async def list_all_topics_per_project(
for topic in topics:
topic[EXTRA_PROJECT_FIELD] = project
yield topics
except PermissionDenied:
except PermissionDenied as e:
logger.error(
f"Service account doesn't have permissions to list topics from project {project_name}"
f"Service account doesn't have permissions to list topics from project {project_name}. Error: {str(e.message)}"
)
except NotFound:
except NotFound as e:
logger.info(
f"Couldn't perform list_topics on project {project_name} since it's deleted."
f"Couldn't perform list_topics on project {project_name} since it's deleted. Error: {str(e)}"
)
else:
logger.info(f"Successfully listed all topics within project {project_name}")
Expand Down Expand Up @@ -168,13 +168,13 @@ async def list_all_subscriptions_per_project(
for subscription in subscriptions:
subscription[EXTRA_PROJECT_FIELD] = project
yield subscriptions
except PermissionDenied:
except PermissionDenied as e:
logger.error(
f"Service account doesn't have permissions to list subscriptions from project {project_name}"
f"Service account doesn't have permissions to list subscriptions from project {project_name}. Error: {str(e.message)}"
)
except NotFound:
except NotFound as e:
logger.info(
f"Couldn't perform list_subscriptions on project {project_name} since it's deleted."
f"Couldn't perform list_subscriptions on project {project_name} since it's deleted. Error: {str(e)}"
)
else:
logger.info(
Expand Down
2 changes: 1 addition & 1 deletion integrations/gcp/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "gcp"
version = "0.1.114"
version = "0.1.115"
description = "A GCP ocean integration"
authors = ["Matan Geva <matang@getport.io>"]

Expand Down

0 comments on commit 9ef2a15

Please sign in to comment.