fog-google 1.8.2 → 1.12.0

data/ci/credentials.yml.template

@@ -3,8 +3,6 @@
 codecov_token:
 # Google Cloud Platform project to run under
 google_project:
-# Google Compute Engine Service Account email
-google_client_email:
 # Google Compute Engine Service Account JSON
 google_json_key_data: |
   {

data/ci/docker-image/Dockerfile

@@ -1,6 +1,6 @@
-FROM ubuntu:16.04
+FROM ubuntu:18.04
 
-# Packages
+# Common dependencies for the CI env and gems with C extensions
 RUN DEBIAN_FRONTEND=noninteractive apt-get -y -qq update && apt-get -y -qq install \
   build-essential \
   curl \
@@ -12,7 +12,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get -y -qq update && apt-get -y -qq insta
   libxml2-dev \
   libxslt-dev
 
-# Ubuntu 16.04 will fetch us 2.3.x without any issues.
+# Ubuntu 18.04 will fetch us Ruby 2.5.x
 RUN DEBIAN_FRONTEND=noninteractive apt-get -y -qq install ruby ruby-dev && apt-get clean
 
 RUN gem install bundler

data/ci/{pipeline.yml → integration-pipeline.yml}

@@ -16,7 +16,6 @@ jobs:
           codecov_token: {{codecov_token}}
           google_project: {{google_project}}
           google_json_key_data: {{google_json_key_data}}
-          google_client_email: {{google_client_email}}
         on_failure:
           put: pull-request
           params:
@@ -40,7 +39,6 @@ jobs:
           codecov_token: {{codecov_token}}
           google_project: {{google_project}}
           google_json_key_data: {{google_json_key_data}}
-          google_client_email: {{google_client_email}}
         on_failure:
           put: pull-request
           params:
@@ -64,7 +62,6 @@ jobs:
           codecov_token: {{codecov_token}}
           google_project: {{google_project}}
           google_json_key_data: {{google_json_key_data}}
-          google_client_email: {{google_client_email}}
         on_failure:
           put: pull-request
           params:
@@ -88,7 +85,6 @@ jobs:
           codecov_token: {{codecov_token}}
           google_project: {{google_project}}
           google_json_key_data: {{google_json_key_data}}
-          google_client_email: {{google_client_email}}
         on_failure:
           put: pull-request
           params:
@@ -112,7 +108,6 @@ jobs:
           codecov_token: {{codecov_token}}
           google_project: {{google_project}}
           google_json_key_data: {{google_json_key_data}}
-          google_client_email: {{google_client_email}}
         on_failure:
           put: pull-request
           params:
@@ -136,31 +131,6 @@ jobs:
           codecov_token: {{codecov_token}}
           google_project: {{google_project}}
           google_json_key_data: {{google_json_key_data}}
-          google_client_email: {{google_client_email}}
-        on_failure:
-          put: pull-request
-          params:
-            path: fog-google-src
-            status: failure
-
-  - name: integration-sqlv1
-    serial: true
-    plan:
-      - get: fog-google-src
-        resource: pull-request
-        version: every
-        trigger: true
-      - put: pull-request
-        params: {path: fog-google-src, status: pending}
-
-      - task: run-integration-tests
-        file: fog-google-src/ci/tasks/run-int.yml
-        params:
-          rake_task: test:sql-sqlv1
-          codecov_token: {{codecov_token}}
-          google_project: {{google_project}}
-          google_json_key_data: {{google_json_key_data}}
-          google_client_email: {{google_client_email}}
         on_failure:
           put: pull-request
           params:
@@ -184,7 +154,6 @@ jobs:
           codecov_token: {{codecov_token}}
           google_project: {{google_project}}
           google_json_key_data: {{google_json_key_data}}
-          google_client_email: {{google_client_email}}
         on_failure:
           put: pull-request
           params:
@@ -208,7 +177,6 @@ jobs:
           codecov_token: {{codecov_token}}
           google_project: {{google_project}}
           google_json_key_data: {{google_json_key_data}}
-          google_client_email: {{google_client_email}}
         on_failure:
           put: pull-request
           params:
@@ -222,7 +190,6 @@ jobs:
         passed: [integration-tests-storage,
                  integration-tests-pubsub,
                  integration-tests-monitoring,
-                 integration-sqlv1,
                  integration-sqlv2,
                  integration-compute-core_compute,
                  integration-compute-core_networking,

data/ci/pipeline-dev.yml

@@ -0,0 +1,58 @@
+jobs:
+  - name: integration-tests-monitoring
+    serial: true
+    plan:
+      - get: fog-google-src
+        resource: pull-request
+        version: every
+        trigger: true
+      - put: pull-request
+        params: {path: fog-google-src, status: pending}
+
+      - task: run-integration-tests
+        file: fog-google-src/ci/tasks/run-int.yml
+        params:
+          rake_task: test:monitoring
+          codecov_token: {{codecov_token}}
+          google_project: {{google_project}}
+          google_json_key_data: {{google_json_key_data}}
+        on_failure:
+          put: pull-request
+          params:
+            path: fog-google-src
+            status: failure
+
+  - name: github-pr-aggregator
+    plan:
+      - get: fog-google-src
+        resource: pull-request
+        passed: [integration-tests-monitoring]
+        trigger: true
+        on_success:
+          put: pull-request
+          params:
+            path: fog-google-src
+            status: success
+        on_failure:
+          put: pull-request
+          params:
+            path: fog-google-src
+            status: failure
+
+resources:
+  - name: pull-request
+    type: pull-request
+    source:
+      access_token: {{github_access_token}}
+      private_key: {{github_private_key}}
+      label: integrate-dev
+      repo: fog/fog-google
+
+resource_types:
+  # This is a third party resource.
+  # The referenced docker-image is maintained externally
+  # https://github.com/jtarchie/pullrequest-resource
+  - name: pull-request
+    type: docker-image
+    source:
+      repository: jtarchie/pr

data/ci/tasks/run-int.sh

@@ -13,7 +13,6 @@ source ci/tasks/utils.sh
 popd > /dev/null
 
 check_param google_project
-check_param google_client_email
 check_param google_json_key_data
 check_param rake_task
 check_param codecov_token
@@ -23,14 +22,32 @@ echo $google_json_key_data > `pwd`/service_account_key.json
 cat >~/.fog <<EOL
 test:
   google_project: ${google_project}
-  google_client_email: ${google_client_email}
   google_json_key_location: `pwd`/service_account_key.json
 EOL
 
 pushd ${release_dir} > /dev/null
 
-bundle install --jobs=3 --retry=3
+echo "Ruby version:"
+ruby --version
 
+echo "Bundler version:"
+bundler --version
+
+echo "Exporting bundler options..."
+
+# Setting via local config options as BUNDLE_PATH appears to not work
+# see https://github.com/rails/spring/issues/339
+bundle config --local path ../../bundle
+bundle config --local bin ../../bundle/bin
+
+echo "Checking dependencies..."
+# Check if dependencies are satisfied, otherwise kick off bundle install
+bundle check || bundle install --jobs=3 --retry=3
+
+echo "Dependencies resolved to:"
+bundle list
+
+echo "Starting test run..."
 FOG_MOCK=false COVERAGE=true CODECOV_TOKEN=${codecov_token} rake ${rake_task}
 
 popd > /dev/null

data/ci/tasks/run-int.yml

@@ -8,9 +8,11 @@ inputs:
   path: src/fog-google
 run:
   path: src/fog-google/ci/tasks/run-int.sh
+caches:
+- path: bundle
 params:
   rake_task: replace-me
+  codecov_token: replace-me
   google_project: replace-me
-  google_client_email: replace-me
   google_json_key_data: |
     replace-me

data/examples/sql/flags.rb

@@ -1,7 +1,11 @@
-def test
-  connection = Fog::Google::SQL.new
+# All examples presume that you have a ~/.fog credentials file set up.
+# More info on it can be found here: http://fog.io/about/getting_started.html
 
-  puts "Listing all Flags..."
-  puts "--------------------"
-  connection.flags
-end
+require "bundler"
+Bundler.require(:default, :development)
+
+connection = Fog::Google::SQL.new
+
+puts "Listing all Flags..."
+puts "--------------------"
+connection.flags

data/examples/sql/instances.rb

@@ -1,34 +1,38 @@
-def test
-  connection = Fog::Google::SQL.new
-
-  puts "Create a Instance..."
-  puts "--------------------"
-  instance = connection.instances.create(:name => Fog::Mock.random_letters(16), :tier => "D1")
-  instance.wait_for { ready? }
-
-  puts "Get the Instance..."
-  puts "----------------------"
-  connection.instances.get(instance.name)
-
-  puts "List all Instances..."
-  puts "---------------------"
-  connection.instances.all
-
-  puts "Update the Instance..."
-  puts "----------------------"
-  instance.settings[:activation_policy] = "ALWAYS"
-  instance.update
-  instance.wait_for { ready? }
-
-  puts "Reset the Instance SSL configuration..."
-  puts "---------------------------------------"
-  instance.reset_ssl_config
-
-  puts "Restart the Instance..."
-  puts "-----------------------"
-  instance.restart
-
-  puts "Delete the Instance..."
-  puts "----------------------"
-  instance.destroy
-end
+# All examples presume that you have a ~/.fog credentials file set up.
+# More info on it can be found here: http://fog.io/about/getting_started.html
+
+require "bundler"
+Bundler.require(:default, :development)
+
+connection = Fog::Google::SQL.new
+
+puts "Create a Instance..."
+puts "--------------------"
+instance = connection.instances.create(:name => Fog::Mock.random_letters(16), :tier => "db-n1-standard-1")
+instance.wait_for { ready? }
+
+puts "Get the Instance..."
+puts "----------------------"
+connection.instances.get(instance.name)
+
+puts "List all Instances..."
+puts "---------------------"
+connection.instances.all
+
+puts "Update the Instance..."
+puts "----------------------"
+instance.settings[:activation_policy] = "ALWAYS"
+instance.update
+instance.wait_for { ready? }
+
+puts "Reset the Instance SSL configuration..."
+puts "---------------------------------------"
+instance.reset_ssl_config
+
+puts "Restart the Instance..."
+puts "-----------------------"
+instance.restart
+
+puts "Delete the Instance..."
+puts "----------------------"
+instance.destroy

data/examples/sql/operations.rb

@@ -1,20 +1,24 @@
-def test
-  connection = Fog::Google::SQL.new
+# All examples presume that you have a ~/.fog credentials file set up.
+# More info on it can be found here: http://fog.io/about/getting_started.html
 
-  puts "Create a Instance..."
-  puts "--------------------"
-  instance = connection.instances.create(:name => Fog::Mock.random_letters(16), :tier => "D1")
-  instance.wait_for { ready? }
+require "bundler"
+Bundler.require(:default, :development)
 
-  puts "Delete the Instance..."
-  puts "----------------------"
-  operation = instance.destroy
+connection = Fog::Google::SQL.new
 
-  puts "Get the Operation..."
-  puts "--------------------"
-  connection.operations.get(operation.identity)
+puts "Create a Instance..."
+puts "--------------------"
+instance = connection.instances.create(:name => Fog::Mock.random_letters(16), :tier => "D1")
+instance.wait_for { ready? }
 
-  puts "Listing all Operations..."
-  puts "-------------------------"
-  connection.operations.all(instance.identity)
-end
+puts "Delete the Instance..."
+puts "----------------------"
+operation = instance.destroy
+
+puts "Get the Operation..."
+puts "--------------------"
+connection.operations.get(operation.identity)
+
+puts "Listing all Operations..."
+puts "-------------------------"
+connection.operations.all(instance.identity)

data/examples/sql/ssl_certs.rb

@@ -1,28 +1,32 @@
-def test
-  connection = Fog::Google::SQL.new
-
-  puts "Create a Instance..."
-  puts "--------------------"
-  instance = connection.instances.create(:name => Fog::Mock.random_letters(16), :tier => "D1")
-  instance.wait_for { ready? }
-
-  puts "Create a SSL certificate..."
-  puts "---------------------------"
-  ssl_cert = connection.ssl_certs.create(:instance => instance.name, :common_name => Fog::Mock.random_letters(16))
-
-  puts "Get the SSL certificate..."
-  puts "--------------------------"
-  connection.ssl_certs.get(instance.name, ssl_cert.sha1_fingerprint)
-
-  puts "List all SSL certificate..."
-  puts "---------------------------"
-  connection.ssl_certs.all(instance.name)
-
-  puts "Delete the SSL certificate..."
-  puts "-----------------------------"
-  ssl_cert.destroy
-
-  puts "Delete the Instance..."
-  puts "----------------------"
-  instance.destroy
-end
+# All examples presume that you have a ~/.fog credentials file set up.
+# More info on it can be found here: http://fog.io/about/getting_started.html
+
+require "bundler"
+Bundler.require(:default, :development)
+
+connection = Fog::Google::SQL.new
+
+puts "Create a Instance..."
+puts "--------------------"
+instance = connection.instances.create(:name => Fog::Mock.random_letters(16), :tier => "db-n1-standard-1")
+instance.wait_for { ready? }
+
+puts "Create a SSL certificate..."
+puts "---------------------------"
+ssl_cert = connection.ssl_certs.create(:instance => instance.name, :common_name => Fog::Mock.random_letters(16))
+
+puts "Get the SSL certificate..."
+puts "--------------------------"
+connection.ssl_certs.get(instance.name, ssl_cert.sha1_fingerprint)
+
+puts "List all SSL certificate..."
+puts "---------------------------"
+connection.ssl_certs.all(instance.name)
+
+puts "Delete the SSL certificate..."
+puts "-----------------------------"
+ssl_cert.destroy
+
+puts "Delete the Instance..."
+puts "----------------------"
+instance.destroy

data/examples/sql/tiers.rb

@@ -1,7 +1,11 @@
-def test
-  connection = Fog::Google::SQL.new
+# All examples presume that you have a ~/.fog credentials file set up.
+# More info on it can be found here: http://fog.io/about/getting_started.html
 
-  puts "Listing all Tiers..."
-  puts "--------------------"
-  connection.tiers
-end
+require "bundler"
+Bundler.require(:default, :development)
+
+connection = Fog::Google::SQL.new
+
+puts "Listing all Tiers..."
+puts "--------------------"
+connection.tiers