diff --git a/appengine/flexible/storage/requirements.txt b/appengine/flexible/storage/requirements.txt index cbee45fc07e..3f1645b1377 100644 --- a/appengine/flexible/storage/requirements.txt +++ b/appengine/flexible/storage/requirements.txt @@ -1,4 +1,4 @@ Flask==1.1.2 -google-cloud-storage==1.28.0 +google-cloud-storage==1.28.1 gunicorn==20.0.4; python_version > '3.0' gunicorn==19.10.0; python_version < '3.0' diff --git a/asset/cloud-client/quickstart_batchgetassetshistory_test.py b/asset/cloud-client/quickstart_batchgetassetshistory_test.py index 9cdc30ffbce..6b446c9f806 100644 --- a/asset/cloud-client/quickstart_batchgetassetshistory_test.py +++ b/asset/cloud-client/quickstart_batchgetassetshistory_test.py @@ -15,15 +15,17 @@ # limitations under the License. import os -import time +import uuid +import backoff +from google.api_core.exceptions import InvalidArgument from google.cloud import storage import pytest import quickstart_batchgetassetshistory PROJECT = os.environ['GCLOUD_PROJECT'] -BUCKET = 'assets-{}'.format(int(time.time())) +BUCKET = 'assets-{}'.format(uuid.uuid4().hex) @pytest.fixture(scope='module') @@ -47,12 +49,15 @@ def asset_bucket(storage_client): def test_batch_get_assets_history(asset_bucket, capsys): bucket_asset_name = '//storage.googleapis.com/{}'.format(BUCKET) asset_names = [bucket_asset_name, ] - # There's some delay between bucket creation and when it's reflected in the - # backend. - time.sleep(15) - quickstart_batchgetassetshistory.batch_get_assets_history( - PROJECT, asset_names) - out, _ = capsys.readouterr() - - if not out: + + @backoff.on_exception( + backoff.expo, (AssertionError, InvalidArgument), max_time=30 + ) + def eventually_consistent_test(): + quickstart_batchgetassetshistory.batch_get_assets_history( + PROJECT, asset_names) + out, _ = capsys.readouterr() + assert bucket_asset_name in out + + eventually_consistent_test() diff --git a/asset/cloud-client/quickstart_createfeed_test.py b/asset/cloud-client/quickstart_createfeed_test.py index 3b0aeb7554b..956d957a578 100644 --- a/asset/cloud-client/quickstart_createfeed_test.py +++ b/asset/cloud-client/quickstart_createfeed_test.py @@ -16,7 +16,7 @@ import json import os -import time +import uuid from google.cloud import pubsub_v1 from google.cloud import resource_manager @@ -27,9 +27,9 @@ json_data = open(os.environ["GOOGLE_APPLICATION_CREDENTIALS"]).read() data = json.loads(json_data) PROJECT = data['project_id'] -ASSET_NAME = 'assets-{}'.format(int(time.time())) -FEED_ID = 'feed-{}'.format(int(time.time())) -TOPIC = 'topic-{}'.format(int(time.time())) +ASSET_NAME = 'assets-{}'.format(uuid.uuid4().hex) +FEED_ID = 'feed-{}'.format(uuid.uuid4().hex) +TOPIC = 'topic-{}'.format(uuid.uuid4().hex) def test_create_feed(capsys): diff --git a/asset/cloud-client/quickstart_deletefeed_test.py b/asset/cloud-client/quickstart_deletefeed_test.py index 9c5baf75e39..7d5d81a97a9 100644 --- a/asset/cloud-client/quickstart_deletefeed_test.py +++ b/asset/cloud-client/quickstart_deletefeed_test.py @@ -15,7 +15,7 @@ # limitations under the License. import os -import time +import uuid from google.cloud import pubsub_v1 from google.cloud import resource_manager @@ -24,9 +24,9 @@ import quickstart_deletefeed PROJECT = os.environ['GCLOUD_PROJECT'] -ASSET_NAME = 'assets-{}'.format(int(time.time())) -FEED_ID = 'feed-{}'.format(int(time.time())) -TOPIC = 'topic-{}'.format(int(time.time())) +ASSET_NAME = 'assets-{}'.format(uuid.uuid4().hex) +FEED_ID = 'feed-{}'.format(uuid.uuid4().hex) +TOPIC = 'topic-{}'.format(uuid.uuid4().hex) def test_delete_feed(capsys): diff --git a/asset/cloud-client/quickstart_exportassets_test.py b/asset/cloud-client/quickstart_exportassets_test.py index 4e08e007aed..6b2b4b1c995 100644 --- a/asset/cloud-client/quickstart_exportassets_test.py +++ b/asset/cloud-client/quickstart_exportassets_test.py @@ -15,7 +15,7 @@ # limitations under the License. import os -import time +import uuid from google.cloud import storage import pytest @@ -23,7 +23,7 @@ import quickstart_exportassets PROJECT = os.environ['GCLOUD_PROJECT'] -BUCKET = 'assets-{}'.format(int(time.time())) +BUCKET = 'assets-{}'.format(uuid.uuid4().hex) @pytest.fixture(scope='module') diff --git a/asset/cloud-client/quickstart_getfeed_test.py b/asset/cloud-client/quickstart_getfeed_test.py index a8a967758ce..9075582c054 100644 --- a/asset/cloud-client/quickstart_getfeed_test.py +++ b/asset/cloud-client/quickstart_getfeed_test.py @@ -15,7 +15,7 @@ # limitations under the License. import os -import time +import uuid from google.cloud import pubsub_v1 from google.cloud import resource_manager @@ -25,9 +25,9 @@ import quickstart_getfeed PROJECT = os.environ['GCLOUD_PROJECT'] -ASSET_NAME = 'assets-{}'.format(int(time.time())) -FEED_ID = 'feed-{}'.format(int(time.time())) -TOPIC = 'topic-{}'.format(int(time.time())) +ASSET_NAME = 'assets-{}'.format(uuid.uuid4().hex) +FEED_ID = 'feed-{}'.format(uuid.uuid4().hex) +TOPIC = 'topic-{}'.format(uuid.uuid4().hex) def test_get_feed(capsys): diff --git a/asset/cloud-client/quickstart_updatefeed_test.py b/asset/cloud-client/quickstart_updatefeed_test.py index c3dd20605bf..ac611c1c992 100644 --- a/asset/cloud-client/quickstart_updatefeed_test.py +++ b/asset/cloud-client/quickstart_updatefeed_test.py @@ -15,7 +15,7 @@ # limitations under the License. import os -import time +import uuid from google.cloud import pubsub_v1 from google.cloud import resource_manager @@ -25,10 +25,10 @@ import quickstart_updatefeed PROJECT = os.environ['GCLOUD_PROJECT'] -ASSET_NAME = 'assets-{}'.format(int(time.time())) -FEED_ID = 'feed-{}'.format(int(time.time())) -TOPIC = 'topic-{}'.format(int(time.time())) -NEW_TOPIC = 'new-topic-{}'.format(int(time.time())) +ASSET_NAME = 'assets-{}'.format(uuid.uuid4().hex) +FEED_ID = 'feed-{}'.format(uuid.uuid4().hex) +TOPIC = 'topic-{}'.format(uuid.uuid4().hex) +NEW_TOPIC = 'new-topic-{}'.format(uuid.uuid4().hex) def test_update_feed(capsys): diff --git a/asset/cloud-client/requirements-test.txt b/asset/cloud-client/requirements-test.txt index 781d4326c94..1d19ebfca08 100644 --- a/asset/cloud-client/requirements-test.txt +++ b/asset/cloud-client/requirements-test.txt @@ -1 +1,2 @@ -pytest==5.3.2 +backoff==1.10.0 +pytest==5.4.1 diff --git a/asset/cloud-client/requirements.txt b/asset/cloud-client/requirements.txt index fe80ee7fda1..b6c3d539cd2 100644 --- a/asset/cloud-client/requirements.txt +++ b/asset/cloud-client/requirements.txt @@ -1,4 +1,4 @@ -google-cloud-storage==1.28.0 +google-cloud-storage==1.28.1 google-cloud-asset==0.10.0 google-cloud-resource-manager==0.30.1 google-cloud-pubsub==1.4.3 diff --git a/auth/cloud-client/requirements.txt b/auth/cloud-client/requirements.txt index 7057255c5e0..8ba6a5507d8 100644 --- a/auth/cloud-client/requirements.txt +++ b/auth/cloud-client/requirements.txt @@ -1 +1 @@ -google-cloud-storage==1.28.0 +google-cloud-storage==1.28.1 diff --git a/automl/cloud-client/requirements.txt b/automl/cloud-client/requirements.txt index c3fa6770d33..723f90c9468 100644 --- a/automl/cloud-client/requirements.txt +++ b/automl/cloud-client/requirements.txt @@ -1,2 +1,2 @@ google-cloud-automl==0.10.0 -google-cloud-storage==1.28.0 \ No newline at end of file +google-cloud-storage==1.28.1 \ No newline at end of file diff --git a/codelabs/flex_and_vision/requirements.txt b/codelabs/flex_and_vision/requirements.txt index 67ec26d058e..3193dc8fffc 100644 --- a/codelabs/flex_and_vision/requirements.txt +++ b/codelabs/flex_and_vision/requirements.txt @@ -2,5 +2,5 @@ Flask==1.1.2 gunicorn==20.0.4; python_version > '3.0' gunicorn==19.10.0; python_version < '3.0' google-cloud-vision==1.0.0 -google-cloud-storage==1.28.0 +google-cloud-storage==1.28.1 google-cloud-datastore==1.12.0 diff --git a/dataproc/requirements.txt b/dataproc/requirements.txt index 6de928cebc2..6b4143a24a0 100644 --- a/dataproc/requirements.txt +++ b/dataproc/requirements.txt @@ -2,5 +2,5 @@ grpcio==1.28.1 google-auth==1.14.3 google-auth-httplib2==0.0.3 google-cloud==0.34.0 -google-cloud-storage==1.28.0 +google-cloud-storage==1.28.1 google-cloud-dataproc==0.7.0 diff --git a/dlp/requirements.txt b/dlp/requirements.txt index 28eb77c0c84..68cf746cfd0 100644 --- a/dlp/requirements.txt +++ b/dlp/requirements.txt @@ -1,5 +1,5 @@ google-cloud-dlp==0.15.0 -google-cloud-storage==1.28.0 +google-cloud-storage==1.28.1 google-cloud-pubsub==1.4.3 google-cloud-datastore==1.12.0 google-cloud-bigquery==1.24.0 diff --git a/document/cloud-client/requirements.txt b/document/cloud-client/requirements.txt index 9fe3bbde72c..01e6e89e9f6 100644 --- a/document/cloud-client/requirements.txt +++ b/document/cloud-client/requirements.txt @@ -1,2 +1,2 @@ google-cloud-documentai==0.1.0 -google-cloud-storage==1.28.0 \ No newline at end of file +google-cloud-storage==1.28.1 \ No newline at end of file diff --git a/functions/http/requirements.txt b/functions/http/requirements.txt index 764c2aa3954..ce8c2e69935 100644 --- a/functions/http/requirements.txt +++ b/functions/http/requirements.txt @@ -1,2 +1,2 @@ -google-cloud-storage==1.28.0 +google-cloud-storage==1.28.1 xmltodict==0.12.0 diff --git a/functions/imagemagick/requirements.txt b/functions/imagemagick/requirements.txt index dde7faaa645..f3beb1391cd 100644 --- a/functions/imagemagick/requirements.txt +++ b/functions/imagemagick/requirements.txt @@ -1,3 +1,3 @@ google-cloud-vision==1.0.0 -google-cloud-storage==1.28.0 +google-cloud-storage==1.28.1 Wand==0.6.1 diff --git a/functions/ocr/app/requirements.txt b/functions/ocr/app/requirements.txt index dbb51984d20..16bd67ad12a 100644 --- a/functions/ocr/app/requirements.txt +++ b/functions/ocr/app/requirements.txt @@ -1,4 +1,4 @@ google-cloud-pubsub==1.4.3 -google-cloud-storage==1.28.0 +google-cloud-storage==1.28.1 google-cloud-translate==2.0.1 google-cloud-vision==1.0.0 diff --git a/healthcare/api-client/fhir/requirements.txt b/healthcare/api-client/fhir/requirements.txt index 0962763ce3c..0029f1de610 100644 --- a/healthcare/api-client/fhir/requirements.txt +++ b/healthcare/api-client/fhir/requirements.txt @@ -2,5 +2,5 @@ google-api-python-client==1.8.2 google-auth-httplib2==0.0.3 google-auth==1.14.3 google-cloud==0.34.0 -google-cloud-storage==1.28.0 +google-cloud-storage==1.28.1 requests==2.23.0 diff --git a/healthcare/api-client/v1/fhir/requirements.txt b/healthcare/api-client/v1/fhir/requirements.txt index 25945a47b61..5c143efbd0a 100644 --- a/healthcare/api-client/v1/fhir/requirements.txt +++ b/healthcare/api-client/v1/fhir/requirements.txt @@ -2,4 +2,4 @@ google-api-python-client==1.8.2 google-auth-httplib2==0.0.3 google-auth==1.14.3 google-cloud==0.34.0 -google-cloud-storage==1.28.0 +google-cloud-storage==1.28.1 diff --git a/iot/api-client/gcs_file_to_device/requirements.txt b/iot/api-client/gcs_file_to_device/requirements.txt index d1d5c6796ea..b0560eb5b29 100644 --- a/iot/api-client/gcs_file_to_device/requirements.txt +++ b/iot/api-client/gcs_file_to_device/requirements.txt @@ -3,7 +3,7 @@ google-auth==1.14.3 google-auth-httplib2==0.0.3 google-cloud-iot==1.0.0 google-cloud-pubsub==1.4.3 -google-cloud-storage==1.28.0 +google-cloud-storage==1.28.1 cryptography==2.9.2 paho-mqtt==1.5.0 pyjwt==1.7.1 diff --git a/notebooks/requirements.txt b/notebooks/requirements.txt index bbc831b8c02..13fc9232d07 100644 --- a/notebooks/requirements.txt +++ b/notebooks/requirements.txt @@ -1,4 +1,4 @@ -google-cloud-storage==1.28.0 +google-cloud-storage==1.28.1 google-cloud-bigquery[pandas,pyarrow]==1.24.0 matplotlib==3.1.2; python_version > '3.0' matplotlib==2.2.5; python_version < '3.0' \ No newline at end of file diff --git a/run/image-processing/requirements.txt b/run/image-processing/requirements.txt index 6ee5c1a450b..17a429f7314 100644 --- a/run/image-processing/requirements.txt +++ b/run/image-processing/requirements.txt @@ -3,5 +3,5 @@ pytest==5.3.0; python_version > "3.0" pytest==4.6.6; python_version < "3.0" gunicorn==20.0.4 google-cloud-vision==1.0.0 -google-cloud-storage==1.28.0 +google-cloud-storage==1.28.1 Wand==0.6.1 diff --git a/storage/cloud-client/requirements.txt b/storage/cloud-client/requirements.txt index 9aa4e8ddb50..b2d1ae09c05 100644 --- a/storage/cloud-client/requirements.txt +++ b/storage/cloud-client/requirements.txt @@ -1,2 +1,2 @@ google-cloud-pubsub==1.4.3 -google-cloud-storage==1.28.0 +google-cloud-storage==1.28.1 diff --git a/storage/signed_urls/requirements.txt b/storage/signed_urls/requirements.txt index 6f2e7d2b164..360e5528232 100644 --- a/storage/signed_urls/requirements.txt +++ b/storage/signed_urls/requirements.txt @@ -1,3 +1,3 @@ -google-cloud-storage==1.28.0 +google-cloud-storage==1.28.1 google-auth==1.14.3 six==1.14.0 diff --git a/translate/automl/requirements.txt b/translate/automl/requirements.txt index e69036ac94e..f291443e730 100644 --- a/translate/automl/requirements.txt +++ b/translate/automl/requirements.txt @@ -1,3 +1,3 @@ google-cloud-translate==2.0.1 -google-cloud-storage==1.28.0 +google-cloud-storage==1.28.1 google-cloud-automl==0.10.0 diff --git a/translate/cloud-client/requirements.txt b/translate/cloud-client/requirements.txt index 5fb0a1e6a69..78de2e470ba 100644 --- a/translate/cloud-client/requirements.txt +++ b/translate/cloud-client/requirements.txt @@ -1,2 +1,2 @@ google-cloud-translate==2.0.1 -google-cloud-storage==1.28.0 +google-cloud-storage==1.28.1 diff --git a/video/cloud-client/analyze/requirements.txt b/video/cloud-client/analyze/requirements.txt index 47df62dc18b..57b777777f8 100644 --- a/video/cloud-client/analyze/requirements.txt +++ b/video/cloud-client/analyze/requirements.txt @@ -1,2 +1,2 @@ google-cloud-videointelligence==1.14.0 -google-cloud-storage==1.28.0 +google-cloud-storage==1.28.1 diff --git a/vision/cloud-client/detect/requirements.txt b/vision/cloud-client/detect/requirements.txt index c90fcead07c..906b538da3f 100644 --- a/vision/cloud-client/detect/requirements.txt +++ b/vision/cloud-client/detect/requirements.txt @@ -1,2 +1,2 @@ google-cloud-vision==1.0.0 -google-cloud-storage==1.28.0 +google-cloud-storage==1.28.1 diff --git a/vision/cloud-client/product_search/requirements.txt b/vision/cloud-client/product_search/requirements.txt index be0c224fc9d..0aeda2ce729 100644 --- a/vision/cloud-client/product_search/requirements.txt +++ b/vision/cloud-client/product_search/requirements.txt @@ -1,2 +1,2 @@ google-cloud-vision==1.0.0 -google-cloud-storage==1.28.0 \ No newline at end of file +google-cloud-storage==1.28.1 \ No newline at end of file