chore: additional replacements to read the project id from google.auth (

#166) * feat: events samples: get project_id from auth.default * lint fix * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md Co-authored-by: Anthonios Partheniou <partheniou@google.com> Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
GoogleCloudPlatform · Feb 25, 2022 · dcb43a1 · dcb43a1
1 parent 29c0b23
commit dcb43a1
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 14 deletions.
diff --git a/generated_samples/interactive-tutorials/events/import_user_events_big_query.py b/generated_samples/interactive-tutorials/events/import_user_events_big_query.py
@@ -13,9 +13,10 @@
 # limitations under the License.
 
 import argparse
-import os
 
-project_id = os.environ["GOOGLE_CLOUD_PROJECT"]
+import google.auth
+
+project_id = google.auth.default()[1]
 
 
 def main(project_id, dataset_id, table_id):

diff --git a/generated_samples/interactive-tutorials/events/import_user_events_gcs.py b/generated_samples/interactive-tutorials/events/import_user_events_gcs.py
@@ -21,6 +21,7 @@ def main(bucket_name):
     # Import user events into a catalog from GCS using Retail API
 
     import time
+    import google.auth
 
     from google.cloud.retail import (
         GcsSource,
@@ -31,7 +32,7 @@ def main(bucket_name):
     )
 
     # Read the project number from the environment variable
-    project_id = os.getenv("GOOGLE_CLOUD_PROJECT")
+    project_id = google.auth.default()[1]
 
     # Read bucket name from the environment variable
     bucket_name = os.getenv("EVENTS_BUCKET_NAME")

diff --git a/generated_samples/interactive-tutorials/events/import_user_events_inline.py b/generated_samples/interactive-tutorials/events/import_user_events_inline.py
@@ -17,21 +17,23 @@
 # Import user events into a catalog from inline source using Retail API
 #
 import datetime
-import os
 import random
 import string
 import time
 
+import google.auth
+
 from google.cloud.retail import (
     ImportUserEventsRequest,
     UserEvent,
     UserEventInlineSource,
     UserEventInputConfig,
     UserEventServiceClient,
 )
+
 from google.protobuf.timestamp_pb2 import Timestamp
 
-project_id = os.getenv("GOOGLE_CLOUD_PROJECT")
+project_id = google.auth.default()[1]
 
 default_catalog = "projects/{0}/locations/global/catalogs/default_catalog".format(
     project_id

diff --git a/generated_samples/interactive-tutorials/events/purge_user_event.py b/generated_samples/interactive-tutorials/events/purge_user_event.py
@@ -16,13 +16,13 @@
 # [START retail_purge_user_event]
 # Import user events into a catalog from inline source using Retail API
 #
-import os
+import google.auth
 
 from google.cloud.retail import PurgeUserEventsRequest, UserEventServiceClient
 
 from setup_events.setup_cleanup import write_user_event
 
-project_id = os.getenv("GOOGLE_CLOUD_PROJECT")
+project_id = google.auth.default()[1]
 
 default_catalog = "projects/{0}/locations/global/catalogs/default_catalog".format(
     project_id

diff --git a/generated_samples/interactive-tutorials/events/rejoin_user_event.py b/generated_samples/interactive-tutorials/events/rejoin_user_event.py
@@ -16,13 +16,13 @@
 # [START retail_rejoin_user_event]
 # Import user events into a catalog from inline source using Retail API
 #
-import os
+import google.auth
 
 from google.cloud.retail import RejoinUserEventsRequest, UserEventServiceClient
 
 from setup_events.setup_cleanup import purge_user_event, write_user_event
 
-project_id = os.getenv("GOOGLE_CLOUD_PROJECT")
+project_id = google.auth.default()[1]
 
 default_catalog = "projects/{0}/locations/global/catalogs/default_catalog".format(
     project_id

diff --git a/generated_samples/interactive-tutorials/events/setup_events/events_create_gcs_bucket.py b/generated_samples/interactive-tutorials/events/setup_events/events_create_gcs_bucket.py
@@ -15,9 +15,11 @@
 import datetime
 import os
 
+import google.auth
+
 from setup_cleanup import create_bucket, upload_blob
 
-project_id = os.environ["GOOGLE_CLOUD_PROJECT"]
+project_id = google.auth.default()[1]
 timestamp_ = datetime.datetime.now().timestamp().__round__()
 bucket_name = os.environ["EVENTS_BUCKET_NAME"]
 

diff --git a/generated_samples/interactive-tutorials/events/setup_events/setup_cleanup.py b/generated_samples/interactive-tutorials/events/setup_events/setup_cleanup.py
@@ -15,21 +15,22 @@
 
 import datetime
 import json
-import os
 import re
 import shlex
 import subprocess
 
 from google.api_core.exceptions import NotFound
+import google.auth
 
 from google.cloud import bigquery
 from google.cloud import storage
 from google.cloud.retail import ProductDetail, PurgeUserEventsRequest, \
     UserEvent, UserEventServiceClient, WriteUserEventRequest
 from google.cloud.retail_v2 import Product
+
 from google.protobuf.timestamp_pb2 import Timestamp
 
-project_id = os.getenv('GOOGLE_CLOUD_PROJECT')
+project_id = google.auth.default()[1]
 default_catalog = "projects/{0}/locations/global/catalogs/default_catalog".format(
     project_id)
 

diff --git a/generated_samples/interactive-tutorials/events/write_user_event.py b/generated_samples/interactive-tutorials/events/write_user_event.py
@@ -17,14 +17,16 @@
 # Import user events into a catalog from inline source using Retail API
 #
 import datetime
-import os
+
+import google.auth
 
 from google.cloud.retail import UserEvent, UserEventServiceClient, WriteUserEventRequest
+
 from google.protobuf.timestamp_pb2 import Timestamp
 
 from setup_events.setup_cleanup import purge_user_event
 
-project_id = os.getenv("GOOGLE_CLOUD_PROJECT")
+project_id = google.auth.default()[1]
 
 default_catalog = "projects/{0}/locations/global/catalogs/default_catalog".format(
     project_id