Merge branch 'kms-flaky-fix' of github.com:GoogleCloudPlatform/python-docs-samples into kms-flaky-fix

daniel-sanche · daniel-sanche · commit 39ab1cb4fcb9 · 2020-04-07T10:39:23.000-07:00
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -23,7 +23,7 @@
 /container_registry/            @DanSanche @GoogleCloudPlatform/python-samples-owners
 /datacatalog/                   @shollyman @GoogleCloudPlatform/python-samples-owners
 /dataflow/                      @davidcavazos @GoogleCloudPlatform/python-samples-owners
-/datalabeling/                  @czahedi @GoogleCloudPlatform/python-samples-owners
+/datalabeling/                  @sgreenberg @GoogleCloudPlatform/python-samples-owners
 /dataproc/                      @bradmiro @GoogleCloudPlatform/python-samples-owners
 /datastore/                     @andrewsg @GoogleCloudPlatform/python-samples-owners
 /dialogflow/                    @nnegrey @telpirion @sirtorry @GoogleCloudPlatform/python-samples-owners
diff --git a/AUTHORING_GUIDE.md b/AUTHORING_GUIDE.md
diff --git a/appengine/flexible/pubsub/main.py b/appengine/flexible/pubsub/main.py
@@ -35,6 +35,9 @@
 # Global list to storage messages received by this instance.
 MESSAGES = []
 
+# Initialize the publisher client once to avoid memory leak
+# and reduce publish latency.
+publisher = pubsub_v1.PublisherClient()
 
 # [START gae_flex_pubsub_index]
 @app.route('/', methods=['GET', 'POST'])
@@ -44,9 +47,7 @@ def index():
 
     data = request.form.get('payload', 'Example payload').encode('utf-8')
 
-    # Consider initialzing the publisher client outside this function
-    # for low latency publish.
-    publisher = pubsub_v1.PublisherClient()
+    # publisher = pubsub_v1.PublisherClient()
     topic_path = publisher.topic_path(
         current_app.config['PROJECT'],
         current_app.config['PUBSUB_TOPIC'])
diff --git a/endpoints/bookstore-grpc-transcoding/requirements.txt b/endpoints/bookstore-grpc-transcoding/requirements.txt
@@ -1,5 +1,5 @@
 grpcio==1.27.2
-grpcio-tools==1.27.2
+grpcio-tools==1.28.1
 google-auth==1.11.2
 six==1.14.0
 googleapis-common-protos==1.51.0
diff --git a/endpoints/bookstore-grpc/requirements.txt b/endpoints/bookstore-grpc/requirements.txt
@@ -1,4 +1,4 @@
 grpcio==1.27.2
-grpcio-tools==1.27.2
+grpcio-tools==1.28.1
 google-auth==1.11.2
 six==1.14.0
diff --git a/endpoints/getting-started-grpc/requirements.txt b/endpoints/getting-started-grpc/requirements.txt
@@ -1,2 +1,2 @@
 grpcio==1.27.2
-grpcio-tools==1.27.2
+grpcio-tools==1.28.1
diff --git a/functions/billing/main.py b/functions/billing/main.py
@@ -26,7 +26,6 @@
 # [START functions_billing_limit_appengine]
 # [START functions_billing_stop]
 from googleapiclient import discovery
-from oauth2client.client import GoogleCredentials
 # [END functions_billing_stop]
 # [END functions_billing_limit]
 # [END functions_billing_limit_appengine]
@@ -80,7 +79,6 @@ def stop_billing(data, context):
         'cloudbilling',
         'v1',
         cache_discovery=False,
-        credentials=GoogleCredentials.get_application_default()
     )
 
     projects = billing.projects()
@@ -130,7 +128,6 @@ def limit_use(data, context):
         'compute',
         'v1',
         cache_discovery=False,
-        credentials=GoogleCredentials.get_application_default()
     )
     instances = compute.instances()
 
@@ -190,8 +187,7 @@ def limit_use_appengine(data, context):
     appengine = discovery.build(
         'appengine',
         'v1',
-        cache_discovery=False,
-        credentials=GoogleCredentials.get_application_default()
+        cache_discovery=False
     )
     apps = appengine.apps()
 
diff --git a/functions/billing/requirements.txt b/functions/billing/requirements.txt
@@ -1,5 +1,4 @@
 slackclient==2.5.0
 # [START functions_billing_limit_appengine_deps]
-oauth2client==4.1.3
 google-api-python-client==1.7.11
 # [START functions_billing_limit_appengine_deps]
diff --git a/functions/slack/requirements.txt b/functions/slack/requirements.txt
@@ -1,4 +1,3 @@
 google-api-python-client==1.7.11
 flask==1.1.1
-oauth2client==4.1.3
 slackeventsapi==2.1.0
diff --git a/healthcare/api-client/fhir/fhir_resources_test.py b/healthcare/api-client/fhir/fhir_resources_test.py
@@ -29,8 +29,8 @@
 service_account_json = os.environ["GOOGLE_APPLICATION_CREDENTIALS"]
 
 bundle = os.path.join(os.path.dirname(__file__), "resources/execute_bundle.json")
-dataset_id = "test_dataset_{}".format(str(uuid.uuid4()))
-fhir_store_id = "test_fhir_store-{}".format(str(uuid.uuid4()))
+dataset_id = "test_dataset_{}".format(uuid.uuid4())
+fhir_store_id = "test_fhir_store-{}".format(uuid.uuid4())
 resource_type = "Patient"
 
 
diff --git a/healthcare/api-client/fhir/fhir_stores_test.py b/healthcare/api-client/fhir/fhir_stores_test.py
@@ -16,6 +16,7 @@
 import pytest
 import sys
 import time
+import uuid
 
 from google.cloud import exceptions, storage
 
@@ -28,8 +29,8 @@
 project_id = os.environ["GOOGLE_CLOUD_PROJECT"]
 service_account_json = os.environ["GOOGLE_APPLICATION_CREDENTIALS"]
 
-dataset_id = "test_dataset_{}".format(int(time.time()))
-fhir_store_id = "test_fhir_store-{}".format(int(time.time()))
+dataset_id = "test_dataset_{}".format(uuid.uuid4())
+fhir_store_id = "test_fhir_store-{}".format(uuid.uuid4())
 
 gcs_uri = os.environ["CLOUD_STORAGE_BUCKET"]
 RESOURCES = os.path.join(os.path.dirname(__file__), "resources")
diff --git a/healthcare/api-client/hl7v2/hl7v2_messages.py b/healthcare/api-client/hl7v2/hl7v2_messages.py
@@ -190,7 +190,7 @@ def list_hl7v2_messages(
         hl7v2_messages_parent, hl7v2_store_id)
 
     hl7v2_messages = client.projects().locations().datasets().hl7V2Stores(
-    ).messages().list(parent=hl7v2_message_path).execute().get('messages', [])
+    ).messages().list(parent=hl7v2_message_path).execute().get('hl7V2Messages', [])
 
     for hl7v2_message in hl7v2_messages:
         print(hl7v2_message)
diff --git a/healthcare/api-client/hl7v2/hl7v2_messages_test.py b/healthcare/api-client/hl7v2/hl7v2_messages_test.py
@@ -14,9 +14,10 @@
 
 import os
 import pytest
-import re
 import sys
-import time
+import uuid
+
+from gcp_devrel.testing import eventually_consistent
 
 # Add datasets for bootstrapping datasets for testing
 sys.path.append(os.path.join(os.path.dirname(__file__), '..', 'datasets')) # noqa
@@ -28,8 +29,8 @@
 project_id = os.environ['GOOGLE_CLOUD_PROJECT']
 service_account_json = os.environ['GOOGLE_APPLICATION_CREDENTIALS']
 
-dataset_id = 'test_dataset_{}'.format(int(time.time()))
-hl7v2_store_id = 'test_hl7v2_store-{}'.format(int(time.time()))
+dataset_id = 'test_dataset_{}'.format(uuid.uuid4())
+hl7v2_store_id = 'test_hl7v2_store-{}'.format(uuid.uuid4())
 hl7v2_message_file = 'resources/hl7-sample-ingest.json'
 label_key = 'PROCESSED'
 label_value = 'TRUE'
@@ -81,15 +82,20 @@ def test_CRUD_hl7v2_message(test_dataset, test_hl7v2_store, capsys):
         hl7v2_store_id,
         hl7v2_message_file)
 
-    hl7v2_messages_list = hl7v2_messages.list_hl7v2_messages(
-        service_account_json,
-        project_id,
-        cloud_region,
-        dataset_id,
-        hl7v2_store_id)
-
-    hl7v2_messages_list_to_str = str(hl7v2_messages_list).split('/', 9)[9]
-    hl7v2_message_id = re.sub('\']', '', hl7v2_messages_list_to_str)
+    hl7v2_message_id = ""
+    @eventually_consistent.call
+    def _():
+        hl7v2_messages_list = hl7v2_messages.list_hl7v2_messages(
+            service_account_json,
+            project_id,
+            cloud_region,
+            dataset_id,
+            hl7v2_store_id)
+
+        assert len(hl7v2_messages_list) > 0
+        hl7v2_message_name = hl7v2_messages_list[0].get('name')
+        nonlocal hl7v2_message_id
+        hl7v2_message_id = hl7v2_message_name.split('/', 9)[9]
 
     hl7v2_messages.get_hl7v2_message(
         service_account_json,
@@ -124,15 +130,20 @@ def test_ingest_hl7v2_message(test_dataset, test_hl7v2_store, capsys):
         hl7v2_store_id,
         hl7v2_message_file)
 
-    hl7v2_messages_list = hl7v2_messages.list_hl7v2_messages(
-        service_account_json,
-        project_id,
-        cloud_region,
-        dataset_id,
-        hl7v2_store_id)
-
-    hl7v2_messages_list_to_str = str(hl7v2_messages_list).split('/', 9)[9]
-    hl7v2_message_id = re.sub('\']', '', hl7v2_messages_list_to_str)
+    hl7v2_message_id = ""
+    @eventually_consistent.call
+    def _():
+        hl7v2_messages_list = hl7v2_messages.list_hl7v2_messages(
+            service_account_json,
+            project_id,
+            cloud_region,
+            dataset_id,
+            hl7v2_store_id)
+
+        assert len(hl7v2_messages_list) > 0
+        hl7v2_message_name = hl7v2_messages_list[0].get('name')
+        nonlocal hl7v2_message_id
+        hl7v2_message_id = hl7v2_message_name.split('/', 9)[9]
 
     hl7v2_messages.get_hl7v2_message(
         service_account_json,
@@ -167,15 +178,20 @@ def test_patch_hl7v2_message(test_dataset, test_hl7v2_store, capsys):
         hl7v2_store_id,
         hl7v2_message_file)
 
-    hl7v2_messages_list = hl7v2_messages.list_hl7v2_messages(
-        service_account_json,
-        project_id,
-        cloud_region,
-        dataset_id,
-        hl7v2_store_id)
-
-    hl7v2_messages_list_to_str = str(hl7v2_messages_list).split('/', 9)[9]
-    hl7v2_message_id = re.sub('\']', '', hl7v2_messages_list_to_str)
+    hl7v2_message_id = ""
+    @eventually_consistent.call
+    def _():
+        hl7v2_messages_list = hl7v2_messages.list_hl7v2_messages(
+            service_account_json,
+            project_id,
+            cloud_region,
+            dataset_id,
+            hl7v2_store_id)
+
+        assert len(hl7v2_messages_list) > 0
+        hl7v2_message_name = hl7v2_messages_list[0].get('name')
+        nonlocal hl7v2_message_id
+        hl7v2_message_id = hl7v2_message_name.split('/', 9)[9]
 
     hl7v2_messages.patch_hl7v2_message(
         service_account_json,
diff --git a/healthcare/api-client/hl7v2/hl7v2_stores_test.py b/healthcare/api-client/hl7v2/hl7v2_stores_test.py
@@ -15,7 +15,7 @@
 import os
 import pytest
 import sys
-import time
+import uuid
 
 # Add datasets for bootstrapping datasets for testing
 sys.path.append(os.path.join(os.path.dirname(__file__), '..', 'datasets')) # noqa
@@ -26,8 +26,8 @@
 project_id = os.environ['GOOGLE_CLOUD_PROJECT']
 service_account_json = os.environ['GOOGLE_APPLICATION_CREDENTIALS']
 
-dataset_id = 'test_dataset_{}'.format(int(time.time()))
-hl7v2_store_id = 'test_hl7v2_store-{}'.format(int(time.time()))
+dataset_id = 'test_dataset_{}'.format(uuid.uuid4())
+hl7v2_store_id = 'test_hl7v2_store-{}'.format(uuid.uuid4())
 
 
 @pytest.fixture(scope='module')
diff --git a/healthcare/api-client/hl7v2/requirements-test.txt b/healthcare/api-client/hl7v2/requirements-test.txt
@@ -1 +1,3 @@
 pytest==5.3.2
+gcp-devrel-py-tools==0.0.15
+google-cloud-core
diff --git a/iot/api-client/end_to_end_example/cloudiot_pubsub_example_server.py b/iot/api-client/end_to_end_example/cloudiot_pubsub_example_server.py
@@ -45,7 +45,7 @@
 from google.cloud import pubsub
 from googleapiclient import discovery
 from googleapiclient.errors import HttpError
-from oauth2client.service_account import ServiceAccountCredentials
+from google.oauth2 import service_account
 
 
 API_SCOPES = ['https://www.googleapis.com/auth/cloud-platform']
@@ -58,8 +58,8 @@ class Server(object):
     """Represents the state of the server."""
 
     def __init__(self, service_account_json):
-        credentials = ServiceAccountCredentials.from_json_keyfile_name(
-            service_account_json, API_SCOPES)
+        credentials = service_account.Credentials.from_service_account_file(
+            service_account_json).with_scopes(API_SCOPES)
         if not credentials:
             sys.exit('Could not load service account credential '
                      'from {}'.format(service_account_json))
diff --git a/iot/api-client/end_to_end_example/requirements.txt b/iot/api-client/end_to_end_example/requirements.txt
@@ -3,6 +3,5 @@ google-api-python-client==1.7.11
 google-auth-httplib2==0.0.3
 google-auth==1.11.2
 google-cloud-pubsub==1.1.0
-oauth2client==4.1.3
 pyjwt==1.7.1
 paho-mqtt==1.5.0
diff --git a/iot/api-client/manager/manager.py b/iot/api-client/manager/manager.py
diff --git a/iot/api-client/manager/requirements.txt b/iot/api-client/manager/requirements.txt
diff --git a/iot/api-client/mqtt_example/cloudiot_mqtt_example.py b/iot/api-client/mqtt_example/cloudiot_mqtt_example.py
diff --git a/storage/cloud-client/requirements.txt b/storage/cloud-client/requirements.txt
diff --git a/storage/cloud-client/snippets_test.py b/storage/cloud-client/snippets_test.py
diff --git a/storage/cloud-client/storage_generate_signed_post_policy_v4.py b/storage/cloud-client/storage_generate_signed_post_policy_v4.py

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`grpcio==1.27.2`
`2`		`-grpcio-tools==1.27.2`
	`2`	`+grpcio-tools==1.28.1`