diff --git a/plugins/gcp/fix_plugin_gcp/resources/aiplatform.py b/plugins/gcp/fix_plugin_gcp/resources/aiplatform.py index 924d86a5f..c8cd57dd4 100644 --- a/plugins/gcp/fix_plugin_gcp/resources/aiplatform.py +++ b/plugins/gcp/fix_plugin_gcp/resources/aiplatform.py @@ -64,7 +64,9 @@ def collect_resources(cls, builder: GraphBuilder, **kwargs: Any) -> List[GcpReso if builder.region: items = builder.client.list(spec, **kwargs) collected_resources = cls.collect(items, builder) - log.info(f"[GCP:{builder.project.id}] finished collecting: {cls.kind}") + log.info( + f"[GCP:{builder.project.id}:{builder.region.safe_name}] finished collecting: {cls.kind}" + ) return collected_resources return [] diff --git a/plugins/gcp/fix_plugin_gcp/resources/base.py b/plugins/gcp/fix_plugin_gcp/resources/base.py index 125abff93..005d7c9bd 100644 --- a/plugins/gcp/fix_plugin_gcp/resources/base.py +++ b/plugins/gcp/fix_plugin_gcp/resources/base.py @@ -428,7 +428,9 @@ def collect_resources(cls: Type[GcpResource], builder: GraphBuilder, **kwargs: A ): items = builder.client.list(spec, **kwargs) resources = cls.collect(items, builder) - log.info(f"[GCP:{builder.project.id}] finished collecting: {cls.kind}") + log.info( + f"[GCP:{builder.project.id}:{builder.region.safe_name if builder.region else "global"}] finished collecting: {cls.kind}" + ) return resources return [] diff --git a/plugins/gcp/fix_plugin_gcp/resources/filestore.py b/plugins/gcp/fix_plugin_gcp/resources/filestore.py index 7f7714fa1..309e037bc 100644 --- a/plugins/gcp/fix_plugin_gcp/resources/filestore.py +++ b/plugins/gcp/fix_plugin_gcp/resources/filestore.py @@ -289,7 +289,9 @@ def collect_snapshots() -> None: snapshots = GcpFilestoreInstanceSnapshot.collect(items, graph_builder) for snapshot in snapshots: graph_builder.add_edge(self, node=snapshot) - log.info(f"[GCP:{graph_builder.project.id}] finished collecting: {GcpFilestoreInstanceSnapshot.kind}") + log.info( + f"[GCP:{graph_builder.project.id}:{graph_builder.region.safe_name if graph_builder.region else "global"}] finished collecting: {GcpFilestoreInstanceSnapshot.kind}" + ) graph_builder.submit_work(collect_snapshots) diff --git a/plugins/gcp/fix_plugin_gcp/resources/firestore.py b/plugins/gcp/fix_plugin_gcp/resources/firestore.py index 5909408ce..a9c3ac916 100644 --- a/plugins/gcp/fix_plugin_gcp/resources/firestore.py +++ b/plugins/gcp/fix_plugin_gcp/resources/firestore.py @@ -148,7 +148,9 @@ def collect_documents() -> None: documents = GcpFirestoreDocument.collect(items, graph_builder) for document in documents: graph_builder.add_edge(self, node=document) - log.info(f"[GCP:{graph_builder.project.id}] finished collecting: {GcpFirestoreDocument.kind}") + log.info( + f"[GCP:{graph_builder.project.id}:{graph_builder.region.safe_name if graph_builder.region else "global"}] finished collecting: {GcpFirestoreDocument.kind}" + ) graph_builder.submit_work(collect_documents)