Skip to content

Commit 8427194

Browse files
tetiana-karasovapartheagcf-owl-bot[bot]
authored andcommitted
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 <[email protected]> Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
1 parent ac66ffe commit 8427194

File tree

8 files changed

+23
-14
lines changed

8 files changed

+23
-14
lines changed

generated_samples/interactive-tutorials/events/import_user_events_big_query.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,10 @@
1313
# limitations under the License.
1414

1515
import argparse
16-
import os
1716

18-
project_id = os.environ["GOOGLE_CLOUD_PROJECT"]
17+
import google.auth
18+
19+
project_id = google.auth.default()[1]
1920

2021

2122
def main(project_id, dataset_id, table_id):

generated_samples/interactive-tutorials/events/import_user_events_gcs.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ def main(bucket_name):
2121
# Import user events into a catalog from GCS using Retail API
2222

2323
import time
24+
import google.auth
2425

2526
from google.cloud.retail import (
2627
GcsSource,
@@ -31,7 +32,7 @@ def main(bucket_name):
3132
)
3233

3334
# Read the project number from the environment variable
34-
project_id = os.getenv("GOOGLE_CLOUD_PROJECT")
35+
project_id = google.auth.default()[1]
3536

3637
# Read bucket name from the environment variable
3738
bucket_name = os.getenv("EVENTS_BUCKET_NAME")

generated_samples/interactive-tutorials/events/import_user_events_inline.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,21 +17,23 @@
1717
# Import user events into a catalog from inline source using Retail API
1818
#
1919
import datetime
20-
import os
2120
import random
2221
import string
2322
import time
2423

24+
import google.auth
25+
2526
from google.cloud.retail import (
2627
ImportUserEventsRequest,
2728
UserEvent,
2829
UserEventInlineSource,
2930
UserEventInputConfig,
3031
UserEventServiceClient,
3132
)
33+
3234
from google.protobuf.timestamp_pb2 import Timestamp
3335

34-
project_id = os.getenv("GOOGLE_CLOUD_PROJECT")
36+
project_id = google.auth.default()[1]
3537

3638
default_catalog = "projects/{0}/locations/global/catalogs/default_catalog".format(
3739
project_id

generated_samples/interactive-tutorials/events/purge_user_event.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616
# [START retail_purge_user_event]
1717
# Import user events into a catalog from inline source using Retail API
1818
#
19-
import os
19+
import google.auth
2020

2121
from google.cloud.retail import PurgeUserEventsRequest, UserEventServiceClient
2222

2323
from setup_events.setup_cleanup import write_user_event
2424

25-
project_id = os.getenv("GOOGLE_CLOUD_PROJECT")
25+
project_id = google.auth.default()[1]
2626

2727
default_catalog = "projects/{0}/locations/global/catalogs/default_catalog".format(
2828
project_id

generated_samples/interactive-tutorials/events/rejoin_user_event.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616
# [START retail_rejoin_user_event]
1717
# Import user events into a catalog from inline source using Retail API
1818
#
19-
import os
19+
import google.auth
2020

2121
from google.cloud.retail import RejoinUserEventsRequest, UserEventServiceClient
2222

2323
from setup_events.setup_cleanup import purge_user_event, write_user_event
2424

25-
project_id = os.getenv("GOOGLE_CLOUD_PROJECT")
25+
project_id = google.auth.default()[1]
2626

2727
default_catalog = "projects/{0}/locations/global/catalogs/default_catalog".format(
2828
project_id

generated_samples/interactive-tutorials/events/setup_events/events_create_gcs_bucket.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,11 @@
1515
import datetime
1616
import os
1717

18+
import google.auth
19+
1820
from setup_cleanup import create_bucket, upload_blob
1921

20-
project_id = os.environ["GOOGLE_CLOUD_PROJECT"]
22+
project_id = google.auth.default()[1]
2123
timestamp_ = datetime.datetime.now().timestamp().__round__()
2224
bucket_name = os.environ["EVENTS_BUCKET_NAME"]
2325

generated_samples/interactive-tutorials/events/setup_events/setup_cleanup.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,22 @@
1515

1616
import datetime
1717
import json
18-
import os
1918
import re
2019
import shlex
2120
import subprocess
2221

2322
from google.api_core.exceptions import NotFound
23+
import google.auth
2424

2525
from google.cloud import bigquery
2626
from google.cloud import storage
2727
from google.cloud.retail import ProductDetail, PurgeUserEventsRequest, \
2828
UserEvent, UserEventServiceClient, WriteUserEventRequest
2929
from google.cloud.retail_v2 import Product
30+
3031
from google.protobuf.timestamp_pb2 import Timestamp
3132

32-
project_id = os.getenv('GOOGLE_CLOUD_PROJECT')
33+
project_id = google.auth.default()[1]
3334
default_catalog = "projects/{0}/locations/global/catalogs/default_catalog".format(
3435
project_id)
3536

generated_samples/interactive-tutorials/events/write_user_event.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,16 @@
1717
# Import user events into a catalog from inline source using Retail API
1818
#
1919
import datetime
20-
import os
20+
21+
import google.auth
2122

2223
from google.cloud.retail import UserEvent, UserEventServiceClient, WriteUserEventRequest
24+
2325
from google.protobuf.timestamp_pb2 import Timestamp
2426

2527
from setup_events.setup_cleanup import purge_user_event
2628

27-
project_id = os.getenv("GOOGLE_CLOUD_PROJECT")
29+
project_id = google.auth.default()[1]
2830

2931
default_catalog = "projects/{0}/locations/global/catalogs/default_catalog".format(
3032
project_id

0 commit comments

Comments
 (0)