Consistent environment variable names!!!

Frank Natividad · Frank Natividad · commit f26e7da6f270 · 2016-10-26T15:06:28.000-07:00
diff --git a/appengine/datastore/README.md b/appengine/datastore/README.md
@@ -15,7 +15,7 @@ project id with `gcloud config list`.
 
 
 ```
-export GCLOUD_PROJECT=<your-project-id>
+export GOOGLE_CLOUD_PROJECT=<your-project-id>
 bundle
 bundle exec ruby ./app.rb
 ```
diff --git a/appengine/pubsub/README.md b/appengine/pubsub/README.md
@@ -34,7 +34,7 @@ string.
 ```
 export PUBSUB_VERIFICATION_TOKEN=<your-token>
 export PUBSUB_TOPIC=<your-topic-name>
-export GCLOUD_PROJECT=<your-project-id>
+export GOOGLE_CLOUD_PROJECT=<your-project-id>
 bundle
 bundle exec ruby ./app.rb
 ```
@@ -65,7 +65,7 @@ your repo.
 
 ```
 gcloud auth activate-service-account --key-file ../../client_secrets.json
-export GCLOUD_PROJECT=<your-project-id>
+export GOOGLE_CLOUD_PROJECT=<your-project-id>
 export TEST_DIR=appengine/pubsub/
 bundle exec rspec
 ```
diff --git a/appengine/storage/README.md b/appengine/storage/README.md
@@ -23,8 +23,8 @@ $ gsutil mb gs://<your-project-id>
 ## Run
 
 ```
-export GCLOUD_PROJECT=<your-project-id>
-export GCLOUD_STORAGE_BUCKET=<your-project-id>
+export GOOGLE_CLOUD_PROJECT=<your-project-id>
+export GOOGLE_CLOUD_STORAGE_BUCKET=<your-project-id>
 bundle
 bundle exec ruby app.rb
 ```
@@ -52,7 +52,7 @@ your repo.
 
 ```
 gcloud auth activate-service-account --key-file ../../client_secrets.json
-export GCLOUD_PROJECT=<your-project-id>
+export GOOGLE_CLOUD_PROJECT=<your-project-id>
 export TEST_DIR=appengine/storage/
 bundle exec rspec
 ```
diff --git a/appengine/storage/app.rb b/appengine/storage/app.rb
@@ -18,7 +18,7 @@
 
 gcloud  = Google::Cloud.new
 storage = gcloud.storage
-bucket  = storage.bucket ENV["GCLOUD_STORAGE_BUCKET"]
+bucket  = storage.bucket ENV["GOOGLE_CLOUD_STORAGE_BUCKET"]
 
 get "/" do
   # Present the user with an upload form
diff --git a/appengine/storage/app.yaml b/appengine/storage/app.yaml
@@ -18,5 +18,5 @@ vm: true
 entrypoint: bundle exec ruby app.rb -p 8080
 
 env_variables:
-  GCLOUD_STORAGE_BUCKET: <your-bucket-name>
+  GOOGLE_CLOUD_STORAGE_BUCKET: <your-bucket-name>
 # [END app_yaml]
diff --git a/appengine/storage/spec/storage_spec.rb b/appengine/storage/spec/storage_spec.rb
@@ -23,7 +23,7 @@
   before :all do
     app_yaml = File.expand_path("../../app.yaml", __FILE__)
     configuration = File.read(app_yaml)
-                        .sub("<your-bucket-name>", ENV["GCLOUD_STORAGE_BUCKET"])
+                        .sub("<your-bucket-name>", ENV["GOOGLE_CLOUD_STORAGE_BUCKET"])
     File.write(app_yaml, configuration)
 
     @url = E2E.url
diff --git a/bigquery/spec/bigquery_sample_spec.rb b/bigquery/spec/bigquery_sample_spec.rb
@@ -18,14 +18,14 @@
 require "google/cloud"
 require "csv"
 
-RSpec.describe "Google Cloud BigQuery samples" do
+describe "Google Cloud BigQuery samples" do
 
   before do
-    @project_id = ENV["GOOGLE_PROJECT_ID"]
+    @project_id = ENV["GOOGLE_CLOUD_PROJECT"]
     @gcloud     = Google::Cloud.new @project_id
     @bigquery   = @gcloud.bigquery
     @storage    = @gcloud.storage
-    @bucket     = @storage.bucket ENV["STORAGE_BUCKET"]
+    @bucket     = @storage.bucket ENV["GOOGLE_CLOUD_STORAGE_BUCKET"]
     @tempfiles  = []
 
     # Examples assume that newly created test_dataset and test_table exist
diff --git a/datastore/spec/sample_spec.rb b/datastore/spec/sample_spec.rb
@@ -19,7 +19,7 @@
   attr_reader :datastore
 
   before :all do
-    @gcloud = Google::Cloud.new
+    @gcloud = Google::Cloud.new ENV["GOOGLE_CLOUD_PROJECT"]
     @datastore = @gcloud.datastore
 
     task_list = datastore.entity "TaskList", "default"
diff --git a/language/spec/language_samples_spec.rb b/language/spec/language_samples_spec.rb
@@ -3,11 +3,11 @@
 require "tempfile"
 require "google/cloud"
 
-RSpec.describe "Google Cloud Natural Language API samples" do
+describe "Google Cloud Natural Language API samples" do
 
   before do
     @project_id  = ENV["GOOGLE_CLOUD_PROJECT"]
-    @bucket_name = ENV["STORAGE_BUCKET"]
+    @bucket_name = ENV["GOOGLE_CLOUD_STORAGE_BUCKET"]
     @gcloud      = Google::Cloud.new @project_id
     @storage     = @gcloud.storage
     @bucket      = @storage.bucket @bucket_name
diff --git a/logging/spec/sample_spec.rb b/logging/spec/sample_spec.rb
@@ -42,17 +42,19 @@ def my_application_log_entries
 
   # Tests require environment variables:
   #
-  #   GCLOUD_PROJECT   ID of your Google Cloud Platform project
-  #   BUCKET           Name of Google Cloud Storage bucket to use for log sink
-  #   ALT_BUCKET       Name of an alternative bucket to also use for log sink
+  # GOOGLE_CLOUD_PROJECT - ID of your Google Cloud Platform project
+  # GOOGLE_CLOUD_STORAGE_BUCKET - Name of Google Cloud Storage bucket to use
+  #                                 for log sink
+  # ALTERNATE_GOOGLE_CLOUD_STORAGE_BUCKET - Name of an alternative bucket to
+  #                                           also use for log sink
   #
   before :all do
-    @project_id = ENV["GCLOUD_PROJECT"]
+    @project_id = ENV["GOOGLE_CLOUD_PROJECT"]
     @gcloud     = Google::Cloud.new @project_id
     @logging    = @gcloud.logging
     @storage    = @gcloud.storage
-    @bucket     = @storage.bucket ENV["BUCKET"]
-    @alt_bucket = @storage.bucket ENV["ALT_BUCKET"]
+    @bucket     = @storage.bucket ENV["GOOGLE_CLOUD_STORAGE_BUCKET"]
+    @alt_bucket = @storage.bucket ENV["ALTERNATE_GOOGLE_CLOUD_STORAGE_BUCKET"]
 
     # Cloud Logging needs owner permissions on the buckets used
     @bucket.acl.add_owner "group-cloud-logs@google.com"
diff --git a/pubsub/README.md b/pubsub/README.md
@@ -1,6 +1,6 @@
 # Cloud Pub/Sub Sample
 
-Set the environment variable `GOOGLE_PROJECT_ID` to your Google Cloud
+Set the environment variable `GOOGLE_CLOUD_PROJECT` to your Google Cloud
 Platform project ID.
 
 Test:
diff --git a/pubsub/spec/sample_spec.rb b/pubsub/spec/sample_spec.rb
@@ -19,11 +19,11 @@
   TOPIC_NAME = "my-topic"
   SUBSCRIPTION_NAME = "my-subscription"
   SERVICE_ACCOUNT =
-    "serviceAccount:test-account@#{ENV['GOOGLE_PROJECT_ID']}"\
+    "serviceAccount:test-account@#{ENV["GOOGLE_CLOUD_PROJECT"]}"\
     ".iam.gserviceaccount.com"
 
   before :all do
-    @gcloud = Google::Cloud.new ENV["GOOGLE_PROJECT_ID"]
+    @gcloud = Google::Cloud.new ENV["GOOGLE_CLOUD_PROJECT"]
     @pubsub = @gcloud.pubsub
   end
 
@@ -114,7 +114,7 @@ def expect_with_retry attempts: 5
       ).and_return(
         @pubsub.topic(TOPIC_NAME).subscribe(
           subscription_name,
-          endpoint: "https://#{ENV['GOOGLE_PROJECT_ID']}.appspot.com/push"
+          endpoint: "https://#{ENV['GOOGLE_CLOUD_PROJECT']}.appspot.com/push"
         ))
 
     expect { create_push_subscription }.to \
diff --git a/spec/e2e.rb b/spec/e2e.rb
@@ -47,7 +47,7 @@ def deploy(test_dir, build_id = nil)
       key_json = JSON.parse(key_file)
 
       account_name = key_json['client_email'];
-      project_id = key_json['project_id'] || ENV["GOOGLE_PROJECT_ID"];
+      project_id = key_json['project_id'] || ENV["GOOGLE_CLOUD_PROJECT"];
 
       # authenticate with gcloud using our credentials file
       self.exec "gcloud config set project #{project_id}"
diff --git a/speech/spec/speech_samples_spec.rb b/speech/spec/speech_samples_spec.rb
@@ -15,7 +15,7 @@
 require_relative "../speech_samples"
 require "rspec"
 
-RSpec.describe "Google Cloud Speech API samples" do
+describe "Google Cloud Speech API samples" do
 
   before do
     # Path to RAW audio file with sample rate of 16000 using LINEAR16 encoding
diff --git a/storage/README.md b/storage/README.md
@@ -33,7 +33,7 @@ Commands:
   delete <bucket>    Delete bucket with the provided name
 
 Environment variables:
-  GCLOUD_PROJECT must be set to your Google Cloud project ID
+  GOOGLE_CLOUD_PROJECT must be set to your Google Cloud project ID
 ```
 
 ### Files
@@ -54,5 +54,5 @@ Commands:
   copy <srcBucket> <srcFile> <destBucket> <destFile>  Copy file to other bucket
 
 Environment variables:
-  GCLOUD_PROJECT must be set to your Google Cloud project ID
+  GOOGLE_CLOUD_PROJECT must be set to your Google Cloud project ID
 ```
diff --git a/storage/buckets.rb b/storage/buckets.rb
@@ -62,12 +62,12 @@ def delete_bucket project_id:, bucket_name:
 if __FILE__ == $0
   case ARGV.shift
   when "list"
-    list_buckets project_id: ENV["GCLOUD_PROJECT"]
+    list_buckets project_id: ENV["GOOGLE_CLOUD_PROJECT"]
   when "create"
-    create_bucket project_id:  ENV["GCLOUD_PROJECT"],
+    create_bucket project_id:  ENV["GOOGLE_CLOUD_PROJECT"],
                   bucket_name: ARGV.shift
   when "delete"
-    delete_bucket project_id:  ENV["GCLOUD_PROJECT"],
+    delete_bucket project_id:  ENV["GOOGLE_CLOUD_PROJECT"],
                   bucket_name: ARGV.shift
   else
     puts <<-usage
@@ -79,7 +79,7 @@ def delete_bucket project_id:, bucket_name:
   delete <bucket>    Delete bucket with the provided name
 
 Environment variables:
-  GCLOUD_PROJECT must be set to your Google Cloud project ID
+  GOOGLE_CLOUD_PROJECT must be set to your Google Cloud project ID
     usage
   end
 end
diff --git a/storage/files.rb b/storage/files.rb
@@ -215,40 +215,40 @@ def run_sample arguments
 
   case command
   when "list"
-    list_bucket_contents project_id:  ENV["GCLOUD_PROJECT"],
+    list_bucket_contents project_id:  ENV["GOOGLE_CLOUD_PROJECT"],
                          bucket_name: arguments.shift
   when "upload"
-    upload_file project_id:      ENV["GCLOUD_PROJECT"],
-                  bucket_name:     arguments.shift,
-                  local_file_path: arguments.shift
+    upload_file project_id:      ENV["GOOGLE_CLOUD_PROJECT"],
+                bucket_name:     arguments.shift,
+                local_file_path: arguments.shift
   when "download"
-    download_file project_id:  ENV["GCLOUD_PROJECT"],
-                    bucket_name: arguments.shift,
-                    file_name:   arguments.shift,
-                    local_path:  arguments.shift
-  when "delete"
-    delete_file project_id:  ENV["GCLOUD_PROJECT"],
+    download_file project_id:  ENV["GOOGLE_CLOUD_PROJECT"],
                   bucket_name: arguments.shift,
-                  file_name:   arguments.shift
+                  file_name:   arguments.shift,
+                  local_path:  arguments.shift
+  when "delete"
+    delete_file project_id:  ENV["GOOGLE_CLOUD_PROJECT"],
+                bucket_name: arguments.shift,
+                file_name:   arguments.shift
   when "metadata"
-    list_file_details project_id:  ENV["GCLOUD_PROJECT"],
-                        bucket_name: arguments.shift,
-                        file_name:   arguments.shift
+    list_file_details project_id:  ENV["GOOGLE_CLOUD_PROJECT"],
+                      bucket_name: arguments.shift,
+                      file_name:   arguments.shift
   when "make_public"
-    make_file_public project_id:  ENV["GCLOUD_PROJECT"],
-                       bucket_name: arguments.shift,
-                       file_name:   arguments.shift
+    make_file_public project_id:  ENV["GOOGLE_CLOUD_PROJECT"],
+                     bucket_name: arguments.shift,
+                     file_name:   arguments.shift
   when "rename"
-    rename_file project_id:  ENV["GCLOUD_PROJECT"],
-                  bucket_name: arguments.shift,
-                  file_name:   arguments.shift,
-                  new_name:    arguments.shift
+    rename_file project_id:  ENV["GOOGLE_CLOUD_PROJECT"],
+                bucket_name: arguments.shift,
+                file_name:   arguments.shift,
+                new_name:    arguments.shift
   when "copy"
-    copy_file project_id:         ENV["GCLOUD_PROJECT"],
-                source_bucket_name: arguments.shift,
-                source_file_name:   arguments.shift,
-                dest_bucket_name:   arguments.shift,
-                dest_file_name:     arguments.shift
+    copy_file project_id:         ENV["GOOGLE_CLOUD_PROJECT"],
+              source_bucket_name: arguments.shift,
+              source_file_name:   arguments.shift,
+              dest_bucket_name:   arguments.shift,
+              dest_file_name:     arguments.shift
   else
     puts <<-usage
 Usage: bundle exec ruby files.rb [command] [arguments]
@@ -264,7 +264,7 @@ def run_sample arguments
   copy <srcBucket> <srcFile> <destBucket> <destFile>  Copy file to other bucket
 
 Environment variables:
-  GCLOUD_PROJECT must be set to your Google Cloud project ID
+  GOOGLE_CLOUD_PROJECT must be set to your Google Cloud project ID
     usage
   end
 end
diff --git a/storage/spec/buckets_spec.rb b/storage/spec/buckets_spec.rb
@@ -16,11 +16,11 @@
 require "rspec"
 require "google/cloud"
 
-RSpec.describe "Google Cloud Storage buckets sample" do
+describe "Google Cloud Storage buckets sample" do
 
   before :all do
-    @project_id  = ENV["GOOGLE_PROJECT_ID"]
-    @bucket_name = ENV["STORAGE_BUCKET"]
+    @project_id  = ENV["GOOGLE_CLOUD_PROJECT"]
+    @bucket_name = ENV["GOOGLE_CLOUD_STORAGE_BUCKET"]
     @gcloud      = Google::Cloud.new @project_id
     @storage     = @gcloud.storage
   end
diff --git a/storage/spec/files_spec.rb b/storage/spec/files_spec.rb
@@ -20,8 +20,8 @@
 describe "Google Cloud Storage files sample" do
 
   before do
-    @project_id      = ENV["GOOGLE_PROJECT_ID"]
-    @bucket_name     = ENV["STORAGE_BUCKET"]
+    @project_id      = ENV["GOOGLE_CLOUD_PROJECT"]
+    @bucket_name     = ENV["GOOGLE_CLOUD_STORAGE_BUCKET"]
     @gcloud          = Google::Cloud.new @project_id
     @storage         = @gcloud.storage
     @bucket          = @storage.bucket @bucket_name
diff --git a/storage/spec/quickstart_spec.rb b/storage/spec/quickstart_spec.rb
@@ -20,7 +20,7 @@
   it "creates a new bucket" do
     gcloud      = Google::Cloud.new ENV["GOOGLE_CLOUD_PROJECT"]
     storage     = gcloud.storage
-    bucket_name = ENV["STORAGE_BUCKET"]
+    bucket_name = ENV["GOOGLE_CLOUD_STORAGE_BUCKET"]
 
     if storage.bucket bucket_name
       bucket = storage.bucket bucket_name
diff --git a/translate/README.md b/translate/README.md
@@ -16,7 +16,7 @@ To run the sample, first install dependencies:
 
 Run the sample:
 
-    export TRANSLATE_KEY="Your Translate API key"
+    export TRANSLATE_API_KEY="Your Translate API key"
 
     bundle exec ruby translate_samples.rb
 
diff --git a/translate/spec/quickstart_spec.rb b/translate/spec/quickstart_spec.rb
@@ -19,7 +19,7 @@
 
   it "translates Hello, world! to Russian" do
     gcloud    = Google::Cloud.new
-    translate = gcloud.translate ENV["TRANSLATE_KEY"]
+    translate = gcloud.translate ENV["TRANSLATE_API_KEY"]
     expect(Google::Cloud).to receive(:new).and_return(gcloud)
     expect(gcloud).to receive(:translate).with("YOUR_API_KEY").
                                            and_return(translate)
diff --git a/translate/spec/translate_samples_spec.rb b/translate/spec/translate_samples_spec.rb
@@ -15,10 +15,10 @@
 require_relative "../translate_samples"
 require "rspec"
 
-RSpec.describe "Google Translate API samples" do
+describe "Google Translate API samples" do
 
   before do
-    @api_key = ENV["TRANSLATE_KEY"]
+    @api_key = ENV["TRANSLATE_API_KEY"]
   end
 
   # Capture and return STDOUT output by block
diff --git a/translate/translate_samples.rb b/translate/translate_samples.rb
@@ -84,7 +84,7 @@ def list_supported_language_names api_key:, language_code: "en"
 end
 
 if __FILE__ == $PROGRAM_NAME
-  api_key = ENV["TRANSLATE_KEY"]
+  api_key = ENV["TRANSLATE_API_KEY"]
   command = ARGV.shift
 
   case command
diff --git a/vision/spec/vision_samples_spec.rb b/vision/spec/vision_samples_spec.rb
@@ -34,10 +34,6 @@ def capture &block
   end
   attr_reader :captured_output
 
-# cat.jpg
-# eiffel_tower.jpg
-# face.png
-
   example "detect labels" do
     capture { detect_labels path_to_image_file: image_path("cat.jpg") }
 
