GoogleCloudPlatform · kurtisvg · Jun 9, 2020 · Jun 9, 2020
diff --git a/appengine/flexible/tasks/create_app_engine_queue_task_test.py b/appengine/flexible/tasks/create_app_engine_queue_task_test.py
@@ -16,7 +16,7 @@
 
 import create_app_engine_queue_task
 
-TEST_PROJECT_ID = os.getenv('GCLOUD_PROJECT')
+TEST_PROJECT_ID = os.getenv('GOOGLE_CLOUD_PROJECT')
 TEST_LOCATION = os.getenv('TEST_QUEUE_LOCATION', 'us-central1')
 TEST_QUEUE_NAME = os.getenv('TEST_QUEUE_NAME', 'my-appengine-queue')
 

diff --git a/appengine/flexible/tasks/snippets_test.py b/appengine/flexible/tasks/snippets_test.py
@@ -19,7 +19,7 @@
 
 import snippets
 
-TEST_PROJECT_ID = os.getenv('GCLOUD_PROJECT')
+TEST_PROJECT_ID = os.getenv('GOOGLE_CLOUD_PROJECT')
 TEST_LOCATION = os.getenv('TEST_QUEUE_LOCATION', 'us-central1')
 QUEUE_NAME_1 = "queue-{}".format(uuid.uuid4())
 QUEUE_NAME_2 = "queue-{}".format(uuid.uuid4())

diff --git a/appengine/standard/background/main_test.py b/appengine/standard/background/main_test.py
@@ -20,7 +20,7 @@
 
 import main
 
-PROJECT = os.environ['GCLOUD_PROJECT']
+PROJECT = os.environ['GOOGLE_CLOUD_PROJECT']
 
 
 @pytest.fixture

diff --git a/appengine/standard/pubsub/main.py b/appengine/standard/pubsub/main.py
@@ -30,7 +30,7 @@
 app.config['PUBSUB_VERIFICATION_TOKEN'] = \
     os.environ['PUBSUB_VERIFICATION_TOKEN']
 app.config['PUBSUB_TOPIC'] = os.environ['PUBSUB_TOPIC']
-app.config['GCLOUD_PROJECT'] = os.environ['GOOGLE_CLOUD_PROJECT']
+app.config['GOOGLE_CLOUD_PROJECT'] = os.environ['GOOGLE_CLOUD_PROJECT']
 
 
 # Global list to storage messages received by this instance.
@@ -47,7 +47,7 @@ def index():
 
     service = build('pubsub', 'v1')
     topic_path = 'projects/{project_id}/topics/{topic}'.format(
-        project_id=app.config['GCLOUD_PROJECT'],
+        project_id=app.config['GOOGLE_CLOUD_PROJECT'],
         topic=app.config['PUBSUB_TOPIC']
     )
     service.projects().topics().publish(

diff --git a/appengine/standard/storage/api-client/main_test.py b/appengine/standard/storage/api-client/main_test.py
@@ -19,7 +19,7 @@
 
 import main
 
-PROJECT = os.environ['GCLOUD_PROJECT']
+PROJECT = os.environ['GOOGLE_CLOUD_PROJECT']
 
 
 def test_get():

diff --git a/appengine/standard/storage/appengine-client/main_test.py b/appengine/standard/storage/appengine-client/main_test.py
@@ -18,7 +18,7 @@
 
 import main
 
-PROJECT = os.environ['GCLOUD_PROJECT']
+PROJECT = os.environ['GOOGLE_CLOUD_PROJECT']
 
 
 def test_get(testbed):

diff --git a/appengine/standard_python3/pubsub/main.py b/appengine/standard_python3/pubsub/main.py
@@ -32,7 +32,7 @@
 app.config['PUBSUB_VERIFICATION_TOKEN'] = \
     os.environ['PUBSUB_VERIFICATION_TOKEN']
 app.config['PUBSUB_TOPIC'] = os.environ['PUBSUB_TOPIC']
-app.config['GCLOUD_PROJECT'] = os.environ['GOOGLE_CLOUD_PROJECT']
+app.config['GOOGLE_CLOUD_PROJECT'] = os.environ['GOOGLE_CLOUD_PROJECT']
 
 # Global list to store messages, tokens, etc. received by this instance.
 MESSAGES = []
@@ -52,7 +52,7 @@ def index():
     # Consider initializing the publisher client outside this function
     # for better latency performance.
     publisher = pubsub_v1.PublisherClient()
-    topic_path = publisher.topic_path(app.config['GCLOUD_PROJECT'],
+    topic_path = publisher.topic_path(app.config['GOOGLE_CLOUD_PROJECT'],
                                       app.config['PUBSUB_TOPIC'])
     future = publisher.publish(topic_path, data)
     future.result()

diff --git a/appengine/standard_python37/pubsub/main.py b/appengine/standard_python37/pubsub/main.py
@@ -32,7 +32,7 @@
 app.config['PUBSUB_VERIFICATION_TOKEN'] = \
     os.environ['PUBSUB_VERIFICATION_TOKEN']
 app.config['PUBSUB_TOPIC'] = os.environ['PUBSUB_TOPIC']
-app.config['GCLOUD_PROJECT'] = os.environ['GOOGLE_CLOUD_PROJECT']
+app.config['GOOGLE_CLOUD_PROJECT'] = os.environ['GOOGLE_CLOUD_PROJECT']
 
 # Global list to store messages, tokens, etc. received by this instance.
 MESSAGES = []
@@ -52,7 +52,7 @@ def index():
     # Consider initializing the publisher client outside this function
     # for better latency performance.
     publisher = pubsub_v1.PublisherClient()
-    topic_path = publisher.topic_path(app.config['GCLOUD_PROJECT'],
+    topic_path = publisher.topic_path(app.config['GOOGLE_CLOUD_PROJECT'],
                                       app.config['PUBSUB_TOPIC'])
     future = publisher.publish(topic_path, data)
     future.result()

diff --git a/asset/cloud-client/quickstart_batchgetassetshistory_test.py b/asset/cloud-client/quickstart_batchgetassetshistory_test.py
@@ -24,7 +24,7 @@
 
 import quickstart_batchgetassetshistory
 
-PROJECT = os.environ['GCLOUD_PROJECT']
+PROJECT = os.environ['GOOGLE_CLOUD_PROJECT']
 BUCKET = 'assets-{}'.format(uuid.uuid4().hex)
 
 

diff --git a/asset/cloud-client/quickstart_deletefeed_test.py b/asset/cloud-client/quickstart_deletefeed_test.py
@@ -23,7 +23,7 @@
 import quickstart_createfeed
 import quickstart_deletefeed
 
-PROJECT = os.environ['GCLOUD_PROJECT']
+PROJECT = os.environ['GOOGLE_CLOUD_PROJECT']
 ASSET_NAME = 'assets-{}'.format(uuid.uuid4().hex)
 FEED_ID = 'feed-{}'.format(uuid.uuid4().hex)
 TOPIC = 'topic-{}'.format(uuid.uuid4().hex)

diff --git a/asset/cloud-client/quickstart_exportassets_test.py b/asset/cloud-client/quickstart_exportassets_test.py
@@ -22,7 +22,7 @@
 
 import quickstart_exportassets
 
-PROJECT = os.environ['GCLOUD_PROJECT']
+PROJECT = os.environ['GOOGLE_CLOUD_PROJECT']
 BUCKET = 'assets-{}'.format(uuid.uuid4().hex)
 
 

diff --git a/asset/cloud-client/quickstart_getfeed_test.py b/asset/cloud-client/quickstart_getfeed_test.py
@@ -24,7 +24,7 @@
 import quickstart_deletefeed
 import quickstart_getfeed
 
-PROJECT = os.environ['GCLOUD_PROJECT']
+PROJECT = os.environ['GOOGLE_CLOUD_PROJECT']
 ASSET_NAME = 'assets-{}'.format(uuid.uuid4().hex)
 FEED_ID = 'feed-{}'.format(uuid.uuid4().hex)
 TOPIC = 'topic-{}'.format(uuid.uuid4().hex)

diff --git a/asset/cloud-client/quickstart_listfeeds_test.py b/asset/cloud-client/quickstart_listfeeds_test.py
@@ -18,7 +18,7 @@
 
 import quickstart_listfeeds
 
-PROJECT = os.environ['GCLOUD_PROJECT']
+PROJECT = os.environ['GOOGLE_CLOUD_PROJECT']
 
 
 def test_list_feeds(capsys):

diff --git a/asset/cloud-client/quickstart_updatefeed_test.py b/asset/cloud-client/quickstart_updatefeed_test.py
@@ -24,7 +24,7 @@
 import quickstart_deletefeed
 import quickstart_updatefeed
 
-PROJECT = os.environ['GCLOUD_PROJECT']
+PROJECT = os.environ['GOOGLE_CLOUD_PROJECT']
 ASSET_NAME = 'assets-{}'.format(uuid.uuid4().hex)
 FEED_ID = 'feed-{}'.format(uuid.uuid4().hex)
 TOPIC = 'topic-{}'.format(uuid.uuid4().hex)

diff --git a/auth/api-client/snippets_test.py b/auth/api-client/snippets_test.py
@@ -21,7 +21,7 @@
 
 
 def test_implicit():
-    snippets.implicit(os.environ['GCLOUD_PROJECT'])
+    snippets.implicit(os.environ['GOOGLE_CLOUD_PROJECT'])
 
 
 def test_explicit():
@@ -31,7 +31,7 @@ def test_explicit():
     open_mock = mock.mock_open(read_data=creds_file_data)
 
     with mock.patch('io.open', open_mock):
-        snippets.explicit(os.environ['GCLOUD_PROJECT'])
+        snippets.explicit(os.environ['GOOGLE_CLOUD_PROJECT'])
 
 
 def test_explicit_compute_engine():

diff --git a/automl/beta/set_endpoint_test.py b/automl/beta/set_endpoint_test.py
@@ -17,7 +17,7 @@
 import set_endpoint
 
 
-PROJECT_ID = os.environ['GCLOUD_PROJECT']
+PROJECT_ID = os.environ['GOOGLE_CLOUD_PROJECT']
 
 
 def test_set_endpoint(capsys):

diff --git a/automl/beta/video_classification_create_model_test.py b/automl/beta/video_classification_create_model_test.py
@@ -20,7 +20,7 @@
 
 import video_classification_create_model
 
-PROJECT_ID = os.environ["GCLOUD_PROJECT"]
+PROJECT_ID = os.environ["GOOGLE_CLOUD_PROJECT"]
 DATASET_ID = "VCN510437278078730240"
 OPERATION_ID = None
 

diff --git a/automl/beta/video_object_tracking_create_model_test.py b/automl/beta/video_object_tracking_create_model_test.py
@@ -20,7 +20,7 @@
 
 import video_object_tracking_create_model
 
-PROJECT_ID = os.environ["GCLOUD_PROJECT"]
+PROJECT_ID = os.environ["GOOGLE_CLOUD_PROJECT"]
 DATASET_ID = "VOT2823376535338090496"
 OPERATION_ID = None
 

diff --git a/bigquery/cloud-client/noxfile_config.py b/bigquery/cloud-client/noxfile_config.py
@@ -28,7 +28,7 @@
     # to 'BUILD_SPECIFIC_GCLOUD_PROJECT' if you want to opt in using a
     # build specific Cloud project. You can also use your own string
     # to use your own Cloud project.
-    # 'gcloud_project_env': 'GCLOUD_PROJECT',
+    # 'gcloud_project_env': 'GOOGLE_CLOUD_PROJECT',
     'gcloud_project_env': 'BUILD_SPECIFIC_GCLOUD_PROJECT',
 
     # A dictionary you want to inject into your test. Don't put any

diff --git a/bigquery/cloud-client/user_credentials_test.py b/bigquery/cloud-client/user_credentials_test.py
@@ -21,7 +21,7 @@
 from user_credentials import main
 
 
-PROJECT = os.environ['GCLOUD_PROJECT']
+PROJECT = os.environ['GOOGLE_CLOUD_PROJECT']
 
 
 @pytest.fixture

diff --git a/bigquery/pandas-gbq-migration/samples_test.py b/bigquery/pandas-gbq-migration/samples_test.py
@@ -49,7 +49,7 @@ def test_client_library_query():
     project_id = 'your-project-id'
     # [END bigquery_migration_client_library_query]
     assert len(df) > 0
-    project_id = os.environ['GCLOUD_PROJECT']
+    project_id = os.environ['GOOGLE_CLOUD_PROJECT']
     # [START bigquery_migration_client_library_query]
     df = client.query(sql, project=project_id).to_dataframe()
     # [END bigquery_migration_client_library_query]
@@ -74,7 +74,7 @@ def test_pandas_gbq_query():
     project_id = 'your-project-id'
     # [END bigquery_migration_pandas_gbq_query]
     assert len(df) > 0
-    project_id = os.environ['GCLOUD_PROJECT']
+    project_id = os.environ['GOOGLE_CLOUD_PROJECT']
     # [START bigquery_migration_pandas_gbq_query]
     df = pandas.read_gbq(sql, project_id=project_id, dialect='standard')
     # [END bigquery_migration_pandas_gbq_query]

diff --git a/bigquery/transfer/cloud-client/quickstart_test.py b/bigquery/transfer/cloud-client/quickstart_test.py
@@ -20,7 +20,7 @@
 import quickstart
 
 
-PROJECT = os.environ['GCLOUD_PROJECT']
+PROJECT = os.environ['GOOGLE_CLOUD_PROJECT']
 
 
 @pytest.fixture

diff --git a/bigtable/hello/main_test.py b/bigtable/hello/main_test.py
@@ -17,7 +17,7 @@
 
 from main import main
 
-PROJECT = os.environ['GCLOUD_PROJECT']
+PROJECT = os.environ['GOOGLE_CLOUD_PROJECT']
 BIGTABLE_INSTANCE = os.environ['BIGTABLE_INSTANCE']
 TABLE_NAME_FORMAT = 'hello-world-test-{}'
 TABLE_NAME_RANGE = 10000

diff --git a/bigtable/hello_happybase/main_test.py b/bigtable/hello_happybase/main_test.py
@@ -17,7 +17,7 @@
 
 from main import main
 
-PROJECT = os.environ['GCLOUD_PROJECT']
+PROJECT = os.environ['GOOGLE_CLOUD_PROJECT']
 BIGTABLE_INSTANCE = os.environ['BIGTABLE_INSTANCE']
 TABLE_NAME_FORMAT = 'hello-world-hb-test-{}'
 TABLE_NAME_RANGE = 10000

diff --git a/bigtable/metricscaler/metricscaler.py b/bigtable/metricscaler/metricscaler.py
@@ -24,7 +24,7 @@
 from google.cloud.bigtable import enums
 from google.cloud.monitoring_v3 import query
 
-PROJECT = os.environ['GCLOUD_PROJECT']
+PROJECT = os.environ['GOOGLE_CLOUD_PROJECT']
 
 
 def get_cpu_load():

diff --git a/bigtable/metricscaler/metricscaler_test.py b/bigtable/metricscaler/metricscaler_test.py
@@ -28,7 +28,7 @@
 from metricscaler import main
 from metricscaler import scale_bigtable
 
-PROJECT = os.environ['GCLOUD_PROJECT']
+PROJECT = os.environ['GOOGLE_CLOUD_PROJECT']
 BIGTABLE_ZONE = os.environ['BIGTABLE_ZONE']
 SIZE_CHANGE_STEP = 3
 INSTANCE_ID_FORMAT = 'metric-scale-test-{}'

diff --git a/bigtable/quickstart/main_test.py b/bigtable/quickstart/main_test.py
@@ -21,7 +21,7 @@
 from main import main
 
 
-PROJECT = os.environ['GCLOUD_PROJECT']
+PROJECT = os.environ['GOOGLE_CLOUD_PROJECT']
 BIGTABLE_INSTANCE = os.environ['BIGTABLE_INSTANCE']
 TABLE_ID_FORMAT = 'quickstart-test-{}'
 TABLE_ID_RANGE = 10000

diff --git a/bigtable/quickstart_happybase/main_test.py b/bigtable/quickstart_happybase/main_test.py
@@ -21,7 +21,7 @@
 from main import main
 
 
-PROJECT = os.environ['GCLOUD_PROJECT']
+PROJECT = os.environ['GOOGLE_CLOUD_PROJECT']
 BIGTABLE_INSTANCE = os.environ['BIGTABLE_INSTANCE']
 TABLE_ID_FORMAT = 'quickstart-hb-test-{}'
 TABLE_ID_RANGE = 10000

diff --git a/bigtable/snippets/filters/filters_test.py b/bigtable/snippets/filters/filters_test.py
@@ -22,7 +22,7 @@
 import filter_snippets
 
 
-PROJECT = os.environ['GCLOUD_PROJECT']
+PROJECT = os.environ['GOOGLE_CLOUD_PROJECT']
 BIGTABLE_INSTANCE = os.environ['BIGTABLE_INSTANCE']
 TABLE_ID_PREFIX = 'mobile-time-series-{}'
 

diff --git a/bigtable/snippets/reads/reads_test.py b/bigtable/snippets/reads/reads_test.py
@@ -21,7 +21,7 @@
 import read_snippets
 
 
-PROJECT = os.environ['GCLOUD_PROJECT']
+PROJECT = os.environ['GOOGLE_CLOUD_PROJECT']
 BIGTABLE_INSTANCE = os.environ['BIGTABLE_INSTANCE']
 TABLE_ID_PREFIX = 'mobile-time-series-{}'
 

diff --git a/bigtable/snippets/writes/writes_test.py b/bigtable/snippets/writes/writes_test.py
@@ -26,7 +26,7 @@
 from .write_simple import write_simple
 
 
-PROJECT = os.environ['GCLOUD_PROJECT']
+PROJECT = os.environ['GOOGLE_CLOUD_PROJECT']
 BIGTABLE_INSTANCE = os.environ['BIGTABLE_INSTANCE']
 TABLE_ID_PREFIX = 'mobile-time-series-{}'
 

diff --git a/bigtable/tableadmin/tableadmin_test.py b/bigtable/tableadmin/tableadmin_test.py
@@ -20,7 +20,7 @@
 from tableadmin import delete_table
 from tableadmin import run_table_operations
 
-PROJECT = os.environ['GCLOUD_PROJECT']
+PROJECT = os.environ['GOOGLE_CLOUD_PROJECT']
 BIGTABLE_INSTANCE = os.environ['BIGTABLE_INSTANCE']
 TABLE_NAME_FORMAT = 'tableadmin-test-{}'
 TABLE_NAME_RANGE = 10000

diff --git a/blog/introduction_to_data_models_in_cloud_datastore/blog_test.py b/blog/introduction_to_data_models_in_cloud_datastore/blog_test.py
@@ -17,7 +17,7 @@
 
 from blog import main
 
-PROJECT = os.environ['GCLOUD_PROJECT']
+PROJECT = os.environ['GOOGLE_CLOUD_PROJECT']
 
 
 @pytest.mark.flaky

diff --git a/blog/introduction_to_data_models_in_cloud_datastore/wiki_test.py b/blog/introduction_to_data_models_in_cloud_datastore/wiki_test.py
@@ -17,7 +17,7 @@
 
 from wiki import main
 
-PROJECT = os.environ['GCLOUD_PROJECT']
+PROJECT = os.environ['GOOGLE_CLOUD_PROJECT']
 
 
 @pytest.mark.flaky

diff --git a/composer/workflows/dataflowtemplateoperator_create_dataset_and_table_test.py b/composer/workflows/dataflowtemplateoperator_create_dataset_and_table_test.py
@@ -23,7 +23,7 @@
 
 from . import dataflowtemplateoperator_create_dataset_and_table_helper as helper
 
-PROJECT_ID = os.environ["GCLOUD_PROJECT"]
+PROJECT_ID = os.environ["GOOGLE_CLOUD_PROJECT"]
 
 client = bigquery.Client()
 

diff --git a/compute/api/create_instance_test.py b/compute/api/create_instance_test.py
@@ -18,7 +18,7 @@
 
 from create_instance import main
 
-PROJECT = os.environ['GCLOUD_PROJECT']
+PROJECT = os.environ['GOOGLE_CLOUD_PROJECT']
 BUCKET = os.environ['CLOUD_STORAGE_BUCKET']
 
 

diff --git a/compute/auth/access_token_test.py b/compute/auth/access_token_test.py
@@ -17,7 +17,7 @@
 
 import access_token
 
-PROJECT = os.environ['GCLOUD_PROJECT']
+PROJECT = os.environ['GOOGLE_CLOUD_PROJECT']
 
 
 @mock.patch('access_token.requests')

diff --git a/compute/auth/application_default_test.py b/compute/auth/application_default_test.py
@@ -15,7 +15,7 @@
 
 from application_default import main
 
-PROJECT = os.environ['GCLOUD_PROJECT']
+PROJECT = os.environ['GOOGLE_CLOUD_PROJECT']
 
 
 def test_main():

diff --git a/compute/encryption/generate_wrapped_rsa_key_test.py b/compute/encryption/generate_wrapped_rsa_key_test.py
@@ -18,7 +18,7 @@
 
 import generate_wrapped_rsa_key
 
-PROJECT = os.environ['GCLOUD_PROJECT']
+PROJECT = os.environ['GOOGLE_CLOUD_PROJECT']
 
 
 def test_main():