From 833a14646c9e79b6b6554ede3c49b6bd85291e66 Mon Sep 17 00:00:00 2001 From: gbg3 <31935320+gbg3@users.noreply.github.com> Date: Wed, 25 Sep 2024 14:58:17 -0400 Subject: [PATCH] Updating to Gen2 --- cloudbuild.yaml | 3 ++- main.py | 8 ++++++-- requirements.txt | 3 ++- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/cloudbuild.yaml b/cloudbuild.yaml index be26c6c..8f9df1c 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -6,11 +6,12 @@ steps: - functions - deploy - gcp-role-audit + - --gen2 - --region=us-central1 - --runtime=python312 - --memory=256MB - --source=. - - --trigger-topic=gcp-role-audit-trigger + - --trigger-http - --service-account=gcp-role-audit@up-eit-ce-production.iam.gserviceaccount.com - --timeout=540 - --entry-point=main_http diff --git a/main.py b/main.py index b7d368e..b8b7d64 100644 --- a/main.py +++ b/main.py @@ -1,5 +1,9 @@ -def main_http(event, context): +import functions_framework +from cloudevents.http import CloudEvent + +@functions_framework.http +def main_http(cloud_event: CloudEvent) -> None: import owner_report_native if __name__ == '__main__': - main_http(None) \ No newline at end of file + main_http() \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index d240b17..afb4bb6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,4 @@ pandas google-cloud-bigquery -google-cloud-resource-manager \ No newline at end of file +google-cloud-resource-manager +functions-framework==3.* \ No newline at end of file