Renaming all GCLOUD_* env. vars. as GOOGLE_CLOUD_*.

Done via: $ git grep -l 'GCLOUD_' | \ > xargs sed -i s/'GCLOUD_'/'GOOGLE_CLOUD_'/g
googleapis · dhermes · Sep 7, 2016 · Sep 3, 2016 · Sep 3, 2016 · Sep 3, 2016
commit ab59f8d725949e00dd6efc503c8ac1057fd3f406
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
@@ -100,8 +100,8 @@ Coding Style
 - In order to make ``tox -e lint`` run faster, you can set some environment
   variables::
 
-   export GCLOUD_REMOTE_FOR_LINT="upstream"
-   export GCLOUD_BRANCH_FOR_LINT="master"
+   export GOOGLE_CLOUD_REMOTE_FOR_LINT="upstream"
+   export GOOGLE_CLOUD_BRANCH_FOR_LINT="master"
 
   By doing this, you are specifying the location of the most up-to-date
   version of ``google-cloud-python``. The the suggested remote name ``upstream``
@@ -153,7 +153,7 @@ Running System Tests
   so you'll need to provide some environment variables to facilitate
   authentication to your project:
 
-  - ``GCLOUD_TESTS_PROJECT_ID``: Developers Console project ID (e.g.
+  - ``GOOGLE_CLOUD_TESTS_PROJECT_ID``: Developers Console project ID (e.g.
     bamboo-shift-455).
   - ``GOOGLE_APPLICATION_CREDENTIALS``: The path to a JSON key file;
     see ``system_tests/app_credentials.json.sample`` as an example. Such a file
@@ -187,7 +187,7 @@ Running System Tests
 
    # Create the indexes
    $ gcloud preview datastore create-indexes system_tests/data/index.yaml \
-   > --project=$GCLOUD_TESTS_PROJECT_ID
+   > --project=$GOOGLE_CLOUD_TESTS_PROJECT_ID
 
    # Restore your environment to its previous state.
    $ unset CLOUDSDK_PYTHON_SITEPACKAGES
@@ -230,7 +230,7 @@ Running System Tests
 
    $ DATASTORE_HOST=http://localhost:8471 \
    >   DATASTORE_DATASET=gcloud-settings-app-id \
-   >   GCLOUD_NO_PRINT=true \
+   >   GOOGLE_CLOUD_NO_PRINT=true \
    >   python system_tests/run_system_test.py \
    >   --package=datastore --ignore-requirements
 

diff --git a/docs/bigquery-usage.rst b/docs/bigquery-usage.rst
@@ -17,7 +17,7 @@ Authentication / Configuration
   :meth:`from_service_account_p12 <google.cloud.bigquery.client.Client.from_service_account_p12>`.
 
 - After setting :envvar:`GOOGLE_APPLICATION_CREDENTIALS` and
-  :envvar:`GCLOUD_PROJECT` environment variables, create an instance of
+  :envvar:`GOOGLE_CLOUD_PROJECT` environment variables, create an instance of
   :class:`Client <google.cloud.bigquery.client.Client>`.
 
   .. doctest::

diff --git a/docs/bigtable-client-intro.rst b/docs/bigtable-client-intro.rst
@@ -26,7 +26,7 @@ Configuration
   see :doc:`gcloud-auth`.
 
 - In addition to any authentication configuration, you can also set the
-  :envvar:`GCLOUD_PROJECT` environment variable for the Google Cloud Console
+  :envvar:`GOOGLE_CLOUD_PROJECT` environment variable for the Google Cloud Console
   project you'd like to interact with. If your code is running in Google App
   Engine or Google Compute Engine the project will be detected automatically.
   (Setting this environment variable is not required, you may instead pass the

diff --git a/docs/error-reporting-usage.rst b/docs/error-reporting-usage.rst
@@ -9,7 +9,7 @@ Authentication and Configuration
   see :doc:`gcloud-auth`.
 
 - In addition to any authentication configuration, you should also set the
-  :envvar:`GCLOUD_PROJECT` environment variable for the project you'd like
+  :envvar:`GOOGLE_CLOUD_PROJECT` environment variable for the project you'd like
   to interact with. If you are Google App Engine or Google Compute Engine
   this will be detected automatically.
 

diff --git a/docs/gcloud-config.rst b/docs/gcloud-config.rst
@@ -16,7 +16,7 @@ For example:
 When creating a client in this way, the project ID will be determined by
 searching these locations in the following order.
 
-* GCLOUD_PROJECT environment variable
+* GOOGLE_CLOUD_PROJECT environment variable
 * GOOGLE_APPLICATION_CREDENTIALS JSON file
 * Default service configuration path from
   ``$ gcloud beta auth application-default login``.
@@ -49,7 +49,7 @@ Logging in via ``gcloud beta auth application-default login`` will
 automatically configure a JSON key file with your default project ID and
 credentials.
 
-Setting the ``GOOGLE_APPLICATION_CREDENTIALS`` and ``GCLOUD_PROJECT``
+Setting the ``GOOGLE_APPLICATION_CREDENTIALS`` and ``GOOGLE_CLOUD_PROJECT``
 environment variables will override the automatically configured credentials.
 
 You can change your default project ID to ``my-new-default-project`` by

diff --git a/docs/logging-usage.rst b/docs/logging-usage.rst
@@ -9,15 +9,15 @@ Authentication and Configuration
   see :doc:`gcloud-auth`.
 
 - In addition to any authentication configuration, you should also set the
-  :envvar:`GCLOUD_PROJECT` environment variable for the project you'd like
+  :envvar:`GOOGLE_CLOUD_PROJECT` environment variable for the project you'd like
   to interact with. If you are Google App Engine or Google Compute Engine
   this will be detected automatically.
 
 - The library now enables the ``gRPC`` transport for the logging API by
   default, assuming that the required dependencies are installed and
   importable.  To *disable* this transport, set the
-  :envvar:`GCLOUD_DISABLE_GAX` environment variable to a non-empty string,
-  e.g.:  ``$ export GCLOUD_DISABLE_GAX=1``.
+  :envvar:`GOOGLE_CLOUD_DISABLE_GAX` environment variable to a non-empty string,
+  e.g.:  ``$ export GOOGLE_CLOUD_DISABLE_GAX=1``.
 
 - After configuring your environment, create a
   :class:`Client <google.cloud.logging.client.Client>`

diff --git a/docs/monitoring-usage.rst b/docs/monitoring-usage.rst
@@ -59,7 +59,7 @@ It is thus typical to create a client object as follows::
 
 If you are running in Google Compute Engine or Google App Engine,
 the current project is the default target project. This default
-can be further overridden with the :envvar:`GCLOUD_PROJECT`
+can be further overridden with the :envvar:`GOOGLE_CLOUD_PROJECT`
 environment variable. Using the default target project is
 even easier::
 

diff --git a/docs/pubsub-usage.rst b/docs/pubsub-usage.rst
@@ -8,15 +8,15 @@ Authentication / Configuration
   your applications.
 
 - In addition to any authentication configuration, you should also set the
-  :envvar:`GCLOUD_PROJECT` environment variable for the project you'd like
+  :envvar:`GOOGLE_CLOUD_PROJECT` environment variable for the project you'd like
   to interact with. If you are Google App Engine or Google Compute Engine
   this will be detected automatically.
 
 - The library now enables the ``gRPC`` transport for the pubsub API by
   default, assuming that the required dependencies are installed and
   importable.  To *disable* this transport, set the
-  :envvar:`GCLOUD_DISABLE_GAX` environment variable to a non-empty string,
-  e.g.:  ``$ export GCLOUD_DISABLE_GAX=1``.
+  :envvar:`GOOGLE_CLOUD_DISABLE_GAX` environment variable to a non-empty string,
+  e.g.:  ``$ export GOOGLE_CLOUD_DISABLE_GAX=1``.
 
 - :class:`Client <google.cloud.pubsub.client.Client>` objects hold both a ``project``
   and an authenticated connection to the PubSub service.
@@ -27,7 +27,7 @@ Authentication / Configuration
   and
   :meth:`from_service_account_p12 <google.cloud.pubsub.client.Client.from_service_account_p12>`.
 
-- After setting ``GOOGLE_APPLICATION_CREDENTIALS`` and ``GCLOUD_PROJECT``
+- After setting ``GOOGLE_APPLICATION_CREDENTIALS`` and ``GOOGLE_CLOUD_PROJECT``
   environment variables, create a :class:`Client <google.cloud.pubsub.client.Client>`
 
   .. doctest::

diff --git a/docs/vision-usage.rst b/docs/vision-usage.rst
@@ -8,8 +8,8 @@ Authentication and Configuration
   see :doc:`gcloud-auth`.
 
 - In addition to any authentication configuration, you should also set the
-  :envvar:`GCLOUD_PROJECT` environment variable for the project you'd like
-  to interact with. If the GCLOUD_PROJECT environment variable is not present,
+  :envvar:`GOOGLE_CLOUD_PROJECT` environment variable for the project you'd like
+  to interact with. If the GOOGLE_CLOUD_PROJECT environment variable is not present,
   the project ID from JSON file credentials is used.
 
   If you are using Google App Engine or Google Compute Engine

diff --git a/google/cloud/_helpers.py b/google/cloud/_helpers.py
@@ -63,10 +63,10 @@
     _USER_ROOT = os.path.expanduser('~')
 except ImportError:  # pragma: NO COVER
     _USER_ROOT = None
-_GCLOUD_CONFIG_FILE = os.path.join(
+_GOOGLE_CLOUD_CONFIG_FILE = os.path.join(
     'gcloud', 'configurations', 'config_default')
-_GCLOUD_CONFIG_SECTION = 'core'
-_GCLOUD_CONFIG_KEY = 'project'
+_GOOGLE_CLOUD_CONFIG_SECTION = 'core'
+_GOOGLE_CLOUD_CONFIG_KEY = 'project'
 
 
 class _LocalStack(Local):
@@ -201,7 +201,7 @@ def _get_nix_config_path():
     :returns: The filename on a *nix system containing the CLI
               config file.
     """
-    return os.path.join(_USER_ROOT, '.config', _GCLOUD_CONFIG_FILE)
+    return os.path.join(_USER_ROOT, '.config', _GOOGLE_CLOUD_CONFIG_FILE)
 
 
 def _get_windows_config_path():
@@ -212,7 +212,7 @@ def _get_windows_config_path():
               config file.
     """
     appdata_dir = os.getenv('APPDATA', '')
-    return os.path.join(appdata_dir, _GCLOUD_CONFIG_FILE)
+    return os.path.join(appdata_dir, _GOOGLE_CLOUD_CONFIG_FILE)
 
 
 def _default_service_project_id():
@@ -242,8 +242,8 @@ def _default_service_project_id():
     config = configparser.RawConfigParser()
     config.read(search_paths)
 
-    if config.has_section(_GCLOUD_CONFIG_SECTION):
-        return config.get(_GCLOUD_CONFIG_SECTION, _GCLOUD_CONFIG_KEY)
+    if config.has_section(_GOOGLE_CLOUD_CONFIG_SECTION):
+        return config.get(_GOOGLE_CLOUD_CONFIG_SECTION, _GOOGLE_CLOUD_CONFIG_KEY)
 
 
 def _compute_engine_id():
@@ -290,7 +290,7 @@ def _determine_default_project(project=None):
     In implicit case, supports three environments. In order of precedence, the
     implicit environments are:
 
-    * GCLOUD_PROJECT environment variable
+    * GOOGLE_CLOUD_PROJECT environment variable
     * GOOGLE_APPLICATION_CREDENTIALS JSON file
     * Get default service project from
       ``$ gcloud beta auth application-default login``

diff --git a/google/cloud/datastore/client.py b/google/cloud/datastore/client.py
@@ -45,7 +45,7 @@ def _determine_default_project(project=None):
     implicit environments are:
 
     * DATASTORE_DATASET environment variable (for ``gcd`` / emulator testing)
-    * GCLOUD_PROJECT environment variable
+    * GOOGLE_CLOUD_PROJECT environment variable
     * Google App Engine application ID
     * Google Compute Engine project ID (from metadata server)
 

diff --git a/google/cloud/environment_vars.py b/google/cloud/environment_vars.py
@@ -18,10 +18,10 @@
 and tests.
 """
 
-PROJECT = 'GCLOUD_PROJECT'
+PROJECT = 'GOOGLE_CLOUD_PROJECT'
 """Environment variable defining default project."""
 
-TESTS_PROJECT = 'GCLOUD_TESTS_PROJECT_ID'
+TESTS_PROJECT = 'GOOGLE_CLOUD_TESTS_PROJECT_ID'
 """Environment variable defining project for tests."""
 
 GCD_DATASET = 'DATASTORE_DATASET'

diff --git a/google/cloud/logging/client.py b/google/cloud/logging/client.py
@@ -47,7 +47,7 @@
 from google.cloud.logging.sink import Sink
 
 
-_DISABLE_GAX = os.getenv('GCLOUD_DISABLE_GAX', False)
+_DISABLE_GAX = os.getenv('GOOGLE_CLOUD_DISABLE_GAX', False)
 _USE_GAX = _HAVE_GAX and not _DISABLE_GAX
 
 

diff --git a/google/cloud/pubsub/client.py b/google/cloud/pubsub/client.py
@@ -41,7 +41,7 @@
 # pylint: enable=ungrouped-imports
 
 
-_DISABLE_GAX = os.getenv('GCLOUD_DISABLE_GAX', False)
+_DISABLE_GAX = os.getenv('GOOGLE_CLOUD_DISABLE_GAX', False)
 _USE_GAX = _HAVE_GAX and not _DISABLE_GAX
 
 

diff --git a/scripts/run_pylint.py b/scripts/run_pylint.py
@@ -144,7 +144,7 @@ def get_files_for_linting(allow_limited=True):
     this value is not dependable.
 
     To allow faster local ``tox`` runs, the environment variables
-    ``GCLOUD_REMOTE_FOR_LINT`` and ``GCLOUD_BRANCH_FOR_LINT`` can be set to
+    ``GOOGLE_CLOUD_REMOTE_FOR_LINT`` and ``GOOGLE_CLOUD_BRANCH_FOR_LINT`` can be set to
     specify a remote branch to diff against.
 
     :type allow_limited: bool
@@ -163,8 +163,8 @@ def get_files_for_linting(allow_limited=True):
         diff_base = 'origin/master'
     elif os.getenv('TRAVIS') is None:
         # Only allow specified remote and branch in local dev.
-        remote = os.getenv('GCLOUD_REMOTE_FOR_LINT')
-        branch = os.getenv('GCLOUD_BRANCH_FOR_LINT')
+        remote = os.getenv('GOOGLE_CLOUD_REMOTE_FOR_LINT')
+        branch = os.getenv('GOOGLE_CLOUD_BRANCH_FOR_LINT')
         if remote is not None and branch is not None:
             diff_base = '%s/%s' % (remote, branch)
 

diff --git a/system_tests/clear_datastore.py b/system_tests/clear_datastore.py
@@ -36,7 +36,7 @@
 
 
 def print_func(message):
-    if os.getenv('GCLOUD_NO_PRINT') != 'true':
+    if os.getenv('GOOGLE_CLOUD_NO_PRINT') != 'true':
         print(message)
 
 

diff --git a/system_tests/local_test_setup.sample b/system_tests/local_test_setup.sample
@@ -1,4 +1,4 @@
 export GOOGLE_APPLICATION_CREDENTIALS="app_credentials.json.sample"
-export GCLOUD_TESTS_PROJECT_ID="my-project"
-export GCLOUD_REMOTE_FOR_LINT="upstream"
-export GCLOUD_BRANCH_FOR_LINT="master"
+export GOOGLE_CLOUD_TESTS_PROJECT_ID="my-project"
+export GOOGLE_CLOUD_REMOTE_FOR_LINT="upstream"
+export GOOGLE_CLOUD_BRANCH_FOR_LINT="master"
diff --git a/system_tests/populate_datastore.py b/system_tests/populate_datastore.py
@@ -84,7 +84,7 @@
 
 
 def print_func(message):
-    if os.getenv('GCLOUD_NO_PRINT') != 'true':
+    if os.getenv('GOOGLE_CLOUD_NO_PRINT') != 'true':
         print(message)
 
 

diff --git a/system_tests/translate.py b/system_tests/translate.py
@@ -20,7 +20,7 @@
 from google.cloud import translate
 
 
-ENV_VAR = 'GCLOUD_TESTS_API_KEY'
+ENV_VAR = 'GOOGLE_CLOUD_TESTS_API_KEY'
 
 
 class Config(object):

diff --git a/tox.ini b/tox.ini
@@ -108,7 +108,7 @@ basepython =
     python2.7
 commands =
     python {toxinidir}/system_tests/attempt_system_tests.py
-passenv = GOOGLE_* GCLOUD_* TRAVIS* encrypted_*
+passenv = GOOGLE_* GOOGLE_CLOUD_* TRAVIS* encrypted_*
 
 [testenv:system-tests3]
 basepython =
@@ -123,7 +123,7 @@ basepython =
 commands =
     python {toxinidir}/system_tests/run_emulator.py --package=datastore
 setenv =
-    GCLOUD_NO_PRINT=true
+    GOOGLE_CLOUD_NO_PRINT=true
 deps =
     {[testenv]deps}
     psutil
@@ -133,5 +133,5 @@ basepython =
     python2.7
 commands =
     python {toxinidir}/system_tests/run_emulator.py --package=pubsub
-passenv = GCLOUD_*
+passenv = GOOGLE_CLOUD_*
 deps = {[testenv:datastore-emulator]deps}
diff --git a/unit_tests/test__helpers.py b/unit_tests/test__helpers.py
@@ -195,7 +195,7 @@ def test_it(self):
         user_root = 'a'
         config_file = 'b'
         with _Monkey(MUT, _USER_ROOT=user_root,
-                     _GCLOUD_CONFIG_FILE=config_file):
+                     _GOOGLE_CLOUD_CONFIG_FILE=config_file):
             result = self._callFUT()
 
         expected = os.path.join(user_root, '.config', config_file)
@@ -216,7 +216,7 @@ def test_it(self):
         environ = {'APPDATA': appdata_dir}
         config_file = 'b'
         with _Monkey(os, getenv=environ.get):
-            with _Monkey(MUT, _GCLOUD_CONFIG_FILE=config_file):
+            with _Monkey(MUT, _GOOGLE_CLOUD_CONFIG_FILE=config_file):
                 result = self._callFUT()
 
         expected = os.path.join(appdata_dir, config_file)
@@ -239,8 +239,8 @@ def test_nix(self):
         project_id = 'test-project-id'
         with _NamedTemporaryFile() as temp:
             config_value = self.CONFIG_TEMPLATE % (
-                MUT._GCLOUD_CONFIG_SECTION,
-                MUT._GCLOUD_CONFIG_KEY, project_id)
+                MUT._GOOGLE_CLOUD_CONFIG_SECTION,
+                MUT._GOOGLE_CLOUD_CONFIG_KEY, project_id)
             with open(temp.name, 'w') as config_file:
                 config_file.write(config_value)
 
@@ -262,8 +262,8 @@ def test_windows(self):
         project_id = 'test-project-id'
         with _NamedTemporaryFile() as temp:
             config_value = self.CONFIG_TEMPLATE % (
-                MUT._GCLOUD_CONFIG_SECTION,
-                MUT._GCLOUD_CONFIG_KEY, project_id)
+                MUT._GOOGLE_CLOUD_CONFIG_SECTION,
+                MUT._GOOGLE_CLOUD_CONFIG_KEY, project_id)
             with open(temp.name, 'w') as config_file:
                 config_file.write(config_value)