Merge pull request #97 from GoogleCloudPlatform/fix_environment_variables

Fix environment variables (updated run-all.sh, circleci, and travis to reflect changes)

Author: frankyn

.travis.yml

@@ -27,8 +27,6 @@ cache:
     - vendor/bundle
 
 env:
-  global:
-  - GOOGLE_APPLICATION_CREDENTIALS=$TRAVIS_BUILD_DIR/client_secrets.json
   matrix:
   - TEST_DIR=storage
   - TEST_DIR=pubsub
@@ -43,8 +41,7 @@ env:
   - TEST_DIR=vision
 
 before_install:
-- openssl aes-256-cbc -K $encrypted_aeb4e2af7332_key -iv $encrypted_aeb4e2af7332_iv
-  -in client_secrets.json.enc -out client_secrets.json -d
+- echo $GOOGLE_APPLICATION_CREDENTIALS_JSON | base64 --decode > $HOME/service-account.json
 
 install:
 - cd $TEST_DIR

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
 ```

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
 ```

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
 ```

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

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]

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

bigquery/spec/bigquery_sample_spec.rb

@@ -21,11 +21,11 @@
 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

client_secrets.json.enc

@@ -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"