fog-google 1.15.0 → 1.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a6eea488c39dbca402a8a3a648ab1ebfbca31762c7b3f9d6828c3e2866b9e500
-  data.tar.gz: ce03073c85ae8b82eb60c60f38e4ae400defd42964bf4eeb74e12dfc3f550732
+  metadata.gz: 3c2a96b4bd15024461fec8eef7f06eec40e0f3ea0ac38c4fe076a321f90af2d9
+  data.tar.gz: f05c9185882395140713d9ad79c10d6807c3e987ffac1e7b8b9852cf690671ab
 SHA512:
-  metadata.gz: 1d53bdc28be406f9144ef15790f71dbece9444c44d06786ccf6a6aa35c7214bf5e5af28e26a45dbe7feef184c242c07cb90cc20dfadf869b79af6f9c330893a1
-  data.tar.gz: 65a11e596a256e5d784ff63e0080615a5cfefc6d35628b77f131166ff00bc949858c96bed221ebef1860debe996bd7adf55cf0ffe2c3d4f065cd6f64d7bbf61c
+  metadata.gz: 2aab3e033028612e70daa467b0bd8f3701f3e4ffc5ced7c8a773d2d8766b3d100d0ec8f9d36d11d6b346241e4958c42d36c0a43bdcb32c6058aae296399439a3
+  data.tar.gz: 03b82d1bdeee36bbce9fcf9c73a001bd7364d8885e975ad323d71cab3d1cf0fbdace93cee9509edcdb2fc5e058bd604e6d7d8befaaea356943337f5d159e63de

data/.github/scripts/setup_creds.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+GOOGLE_PROJECT=$(curl "http://metadata.google.internal/computeMetadata/v1/project/project-id" -H "Metadata-Flavor: Google")
+
+# fog needs the google project to be specified even if it uses application-default creds
+cat >~/.fog <<EOL
+test:
+  google_project: ${GOOGLE_PROJECT}
+  google_application_default: true
+EOL

data/.github/workflows/integration.yml

@@ -0,0 +1,225 @@
+name: integration-tests
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+    types: [ assigned, opened, synchronize, reopened, labeled ]
+
+jobs:
+  test-compute-core:
+    runs-on: self-hosted
+    strategy:
+      matrix:
+        ruby-version: [ '2.7', '3.0' ]
+      # Integration tests from the same task cannot run in parallel yet due to cleanup
+      max-parallel: 1
+
+    steps:
+      - uses: actions/checkout@v2.3.4
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        env:
+          # Needs to be set up for self-hosted runners, see:
+          # https://github.com/ruby/setup-ruby#using-self-hosted-runners
+          # Image used in runners: summerwind/actions-runner
+          ImageOS: ubuntu20
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+      - name: Install dependencies
+        run: bundle install
+      - name: Run tests
+        run: >-
+          ./.github/scripts/setup_creds.sh &&
+          bundle exec rake test:compute-core_compute
+
+  test-compute-networking:
+    runs-on: self-hosted
+    strategy:
+      matrix:
+        ruby-version: [ '2.7', '3.0' ]
+      # Integration tests from the same task cannot run in parallel yet due to cleanup
+      max-parallel: 1
+
+    steps:
+      - uses: actions/checkout@v2.3.4
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        env:
+          # Needs to be set up for self-hosted runners, see:
+          # https://github.com/ruby/setup-ruby#using-self-hosted-runners
+          # Image used in runners: summerwind/actions-runner
+          ImageOS: ubuntu20
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+      - name: Install dependencies
+        run: bundle install
+      - name: Run tests
+        run: >-
+          ./.github/scripts/setup_creds.sh &&
+          bundle exec rake test:compute-core_networking
+
+  test-compute-instance_groups:
+    runs-on: self-hosted
+    strategy:
+      matrix:
+        ruby-version: [ '2.7', '3.0' ]
+      # Integration tests from the same task cannot run in parallel yet due to cleanup
+      max-parallel: 1
+
+    steps:
+      - uses: actions/checkout@v2.3.4
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        env:
+          # Needs to be set up for self-hosted runners, see:
+          # https://github.com/ruby/setup-ruby#using-self-hosted-runners
+          # Image used in runners: summerwind/actions-runner
+          ImageOS: ubuntu20
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+      - name: Install dependencies
+        run: bundle install
+      - name: Run tests
+        run: >-
+          ./.github/scripts/setup_creds.sh &&
+          bundle exec rake test:compute-instance_groups
+
+  test-compute-loadbalancing:
+    runs-on: self-hosted
+    strategy:
+      matrix:
+        ruby-version: [ '2.7', '3.0' ]
+      # Integration tests from the same task cannot run in parallel yet due to cleanup
+      max-parallel: 1
+
+    steps:
+      - uses: actions/checkout@v2.3.4
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        env:
+          # Needs to be set up for self-hosted runners, see:
+          # https://github.com/ruby/setup-ruby#using-self-hosted-runners
+          # Image used in runners: summerwind/actions-runner
+          ImageOS: ubuntu20
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+      - name: Install dependencies
+        run: bundle install
+      - name: Run tests
+        run: >-
+          ./.github/scripts/setup_creds.sh &&
+          bundle exec rake test:compute-loadbalancing
+
+  test-monitoring:
+    runs-on: self-hosted
+    strategy:
+      matrix:
+        ruby-version: [ '2.7', '3.0' ]
+      # Integration tests from the same task cannot run in parallel yet due to cleanup
+      max-parallel: 1
+
+    steps:
+      - uses: actions/checkout@v2.3.4
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        env:
+          # Needs to be set up for self-hosted runners, see:
+          # https://github.com/ruby/setup-ruby#using-self-hosted-runners
+          # Image used in runners: summerwind/actions-runner
+          ImageOS: ubuntu20
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+      - name: Install dependencies
+        run: bundle install
+      - name: Run tests
+        run: >-
+          ./.github/scripts/setup_creds.sh &&
+          bundle exec rake test:monitoring
+
+  test-storage:
+    runs-on: self-hosted
+    strategy:
+      matrix:
+        ruby-version: [ '2.7', '3.0' ]
+      # Integration tests from the same task cannot run in parallel yet due to cleanup
+      max-parallel: 1
+
+    steps:
+      - uses: actions/checkout@v2.3.4
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        env:
+          # Needs to be set up for self-hosted runners, see:
+          # https://github.com/ruby/setup-ruby#using-self-hosted-runners
+          # Image used in runners: summerwind/actions-runner
+          ImageOS: ubuntu20
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+      - name: Install dependencies
+        run: bundle install
+      - name: Run tests
+        run: >-
+          ./.github/scripts/setup_creds.sh &&
+          bundle exec rake test:storage
+
+  test-pubsub:
+    runs-on: self-hosted
+    strategy:
+      matrix:
+        ruby-version: [ '2.7', '3.0' ]
+      # Integration tests from the same task cannot run in parallel yet due to cleanup
+      max-parallel: 1
+
+    steps:
+      - uses: actions/checkout@v2.3.4
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        env:
+          # Needs to be set up for self-hosted runners, see:
+          # https://github.com/ruby/setup-ruby#using-self-hosted-runners
+          # Image used in runners: summerwind/actions-runner
+          ImageOS: ubuntu20
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+      - name: Install dependencies
+        run: bundle install
+      - name: Run tests
+        run: >-
+          ./.github/scripts/setup_creds.sh &&
+          bundle exec rake test:pubsub
+
+  test-sql:
+    runs-on: self-hosted
+    strategy:
+      matrix:
+        ruby-version: [ '2.7', '3.0' ]
+      # Integration tests from the same task cannot run in parallel yet due to cleanup
+      max-parallel: 1
+
+    steps:
+      - uses: actions/checkout@v2.3.4
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        env:
+          # Needs to be set up for self-hosted runners, see:
+          # https://github.com/ruby/setup-ruby#using-self-hosted-runners
+          # Image used in runners: summerwind/actions-runner
+          ImageOS: ubuntu20
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+      - name: Install dependencies
+        run: bundle install
+      - name: Run tests
+        run: >-
+          ./.github/scripts/setup_creds.sh &&
+          bundle exec rake test:sql

data/.github/workflows/stale.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/stale@v3.0.18
+    - uses: actions/stale@v4
       with:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
         days-before-stale: 60

data/.github/workflows/unit.yml

@@ -0,0 +1,26 @@
+name: unit-tests
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test-unit:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: ['2.5', '2.6', '2.7', '3.0', 'head', 'truffleruby-head']
+
+    steps:
+      - uses: actions/checkout@v2.3.4
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+      - name: Install dependencies
+        run: bundle install
+      - name: Run tests
+        run: bundle exec rake

data/CHANGELOG.md

@@ -6,6 +6,20 @@ This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html
 
 ## Next
 
+## 1.16.0
+
+### User-facing
+
+#### Fixed
+
+- \#540 Bring back integration tests for Fog-Google and fix an array of small bugs/regressions [temikus]
+
+### Development changes
+
+#### Added
+
+- \#532 Add Truffleruby head to CI [gogainda]
+
 ## 1.15.0
 
 ### User-facing

data/README.md

@@ -1,12 +1,3 @@
-# ⚠️ ATTENTION ⚠️ HELP NEEDED WITH CI
-
-With both me and icco@ departing Google **fog-google no longer has a CI stack** as we don't have access to a sponsored GCP account anymore and I've been unsuccessful in finding someone who would volunteer to maintain this project or CI at the time of my departure.
-
-There is no easy way to say this but we need help as costs of running a CI stack that touches almost all GCP resources is significant. We know there's a lot of companies out there that are using this lib, as well as tooling based on it so if you want to help us with running a CI stack or provide sponsorship for a GCP account - please contact me at code \<at\> temik.me
-    
---  
-Artem (temikus@) - Lead maintainer
-
 # Fog::Google
 
 [![Gem Version](https://badge.fury.io/rb/fog-google.svg)](http://badge.fury.io/rb/fog-google) [![Build Status](https://github.com/fog/fog-google/actions/workflows/ruby.yml/badge.svg)](https://github.com/fog/fog-google/actions/workflows/ruby.yml) [![codecov](https://codecov.io/gh/fog/fog-google/branch/master/graph/badge.svg)](https://codecov.io/gh/fog/fog-google) [![Dependabot Status](https://api.dependabot.com/badges/status?host=github&repo=fog/fog-google)](https://dependabot.com) [![Doc coverage](https://inch-ci.org/github/fog/fog-google.svg?branch=master)](https://inch-ci.org/github/fog/fog-google)
@@ -21,6 +12,16 @@ The main maintainers for the Google sections are @icco, @Temikus and @plribeiro3
 
 See **[MIGRATING.md](MIGRATING.md)** for migration between major versions.
 
+# Sponsors
+
+We're proud to be sponsored by MeisterLabs who are generously funding our CI stack. A small message from them:
+
+<img align="right" width=100 height=100 src="https://user-images.githubusercontent.com/2083229/125146917-d965a680-e16b-11eb-8ad2-611b39056ca2.png">
+
+*"As extensive users of fog-google we are excited to help! Meister is the company behind the productivity tools [MindMeister](https://www.mindmeister.com/), [MeisterTask](https://www.meistertask.com), and [MeisterNote](https://www.meisternote.com/). We are based in Vienna, Austria and we have a very talented international team who build our products on top of Ruby on Rails, Elixir, React and Redux. We are constantly looking for great talent in Engineering, so If you feel like taking on a new Ruby or Elixir challenge. get in touch, open jobs can be found [here](https://www.meisterlabs.com/jobs/)."*
+
+# Usage
+
 ## Storage
 
 There are two ways to access [Google Cloud Storage](https://cloud.google.com/storage/). The old S3 API and the new JSON API. `Fog::Storage::Google` will automatically direct you to the appropriate API based on the credentials you provide it.

data/fog-google.gemspec

@@ -25,11 +25,20 @@ Gem::Specification.new do |spec|
   spec.add_dependency "fog-json", "~> 1.2"
   spec.add_dependency "fog-xml", "~> 0.1.0"
 
-  spec.add_dependency "google-api-client", ">= 0.44.2", "< 0.51"
+  spec.add_dependency "google-apis-storage_v1", "~> 0.6"
+  spec.add_dependency "google-apis-iamcredentials_v1", "~> 0.6"
+  spec.add_dependency "google-apis-compute_v1", "~> 0.14"
+  spec.add_dependency "google-apis-monitoring_v3", "~> 0.12"
+  spec.add_dependency "google-apis-dns_v1", "~> 0.12"
+  spec.add_dependency "google-apis-pubsub_v1", "~> 0.7"
+  spec.add_dependency "google-apis-sqladmin_v1beta4", "~> 0.13"
+
   spec.add_dependency "google-cloud-env", "~> 1.2"
 
   # Debugger
-  spec.add_development_dependency "pry"
+  # Locked because pry-byebug is broken with 13+
+  # see: https://github.com/deivid-rodriguez/pry-byebug/issues/343
+  spec.add_development_dependency "pry", "= 0.13.0"
 
   # Testing gems
   spec.add_development_dependency "retriable"

data/lib/fog/compute/google/models/network.rb

@@ -27,7 +27,7 @@ module Fog
         alias_method :ipv4_range, :i_pv4_range
 
         def save
-          requires :identity, :ipv4_range
+          requires :identity
 
           data = service.insert_network(identity, attributes)
           operation = Fog::Compute::Google::Operations.new(:service => service)

data/lib/fog/compute/google/models/servers.rb

@@ -84,7 +84,10 @@ module Fog
           server.wait_for { ready? }
 
           # Set the disk to be autodeleted
-          server.set_disk_auto_delete(true)
+          # true - autodelete setting
+          # nil - device name (not needed if there's only one disk)
+          # false - set async to false so set the property synchronously
+          server.set_disk_auto_delete(true, nil, false)
 
           server
         end

data/lib/fog/compute/google/requests/insert_network.rb

@@ -10,18 +10,8 @@ module Fog
       end
 
       class Real
-        INSERTABLE_NETWORK_FIELDS = %i{
-          auto_create_subnetworks
-          description
-          gateway_i_pv4
-          i_pv4_range
-          name
-          routing_config
-        }.freeze
-
         def insert_network(network_name, opts = {})
-          opts = opts.select { |k, _| INSERTABLE_NETWORK_FIELDS.include? k }
-                     .merge(:name => network_name)
+          opts = opts.merge(:name => network_name)
 
           @compute.insert_network(
             @project,

data/lib/fog/google/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Google
-    VERSION = "1.15.0".freeze
+    VERSION = "1.16.0".freeze
   end
 end

data/lib/fog/storage/google_json/models/file.rb

@@ -45,7 +45,16 @@ module Fog
         end
 
         def body
-          last_modified && (file = collection.get(identity)) ? attributes[:body] ||= file.body : attributes[:body] ||= ""
+          return attributes[:body] if attributes.key?(:body)
+
+          file = collection.get(identity)
+
+          attributes[:body] =
+            if file
+              file.attributes[:body]
+            else
+              ""
+            end
         end
 
         def body=(new_body)

data/lib/fog/storage/google_json/models/files.rb

@@ -42,12 +42,12 @@ module Fog
 
         def get_https_url(key, expires, options = {})
           requires :directory
-          service.get_object_https_url(directory.key, key, expires, options)
+          service.get_object_https_url(directory.key, key, expires, **options)
         end
 
         def metadata(key, options = {})
           requires :directory
-          data = service.get_object_metadata(directory.key, key, options).to_h
+          data = service.get_object_metadata(directory.key, key, **options).to_h
           new(data)
         rescue ::Google::Apis::ClientError
           nil

data/lib/fog/storage/google_json/real.rb

@@ -156,12 +156,12 @@ DATA
         #   See https://cloud.google.com/storage/docs/access-control/signed-urls-v2
         # @return [String] Signature binary blob
         def iam_signer(string_to_sign)
-          request = {
-            "payload": string_to_sign
-          }
+          request = ::Google::Apis::IamcredentialsV1::SignBlobRequest.new(
+            payload: string_to_sign
+          )
 
           resource = "projects/-/serviceAccounts/#{google_access_id}"
-          response = @iam_service.sign_service_account_blob resource, request, {}
+          response = @iam_service.sign_service_account_blob(resource, request)
 
           return response.signed_blob
         end

data/lib/fog/storage/google_json/requests/get_object_url.rb

@@ -6,14 +6,14 @@ module Fog
         # Deprecated, redirects to get_object_https_url.rb
         def get_object_url(bucket_name, object_name, expires, options = {})
           Fog::Logger.deprecation("Fog::Storage::Google => #get_object_url is deprecated, use #get_object_https_url instead[/] [light_black](#{caller(0..0)})")
-          get_object_https_url(bucket_name, object_name, expires, options)
+          get_object_https_url(bucket_name, object_name, expires, **options)
         end
       end
 
       class Mock # :nodoc:all
         def get_object_url(bucket_name, object_name, expires, options = {})
           Fog::Logger.deprecation("Fog::Storage::Google => #get_object_url is deprecated, use #get_object_https_url instead[/] [light_black](#{caller(0..0)})")
-          get_object_https_url(bucket_name, object_name, expires, options)
+          get_object_https_url(bucket_name, object_name, expires, **options)
         end
       end
     end

data/test/helpers/integration_test_helper.rb

@@ -22,8 +22,8 @@ TEST_IMAGE_PROJECT = "debian-cloud".freeze
 TEST_IMAGE_FAMILY = "debian-9".freeze
 
 # XXX This depends on a public image in gs://fog-test-bucket; there may be a better way to do this
-# The image was created like so: https://cloud.google.com/compute/docs/images#export_an_image_to_google_cloud_storage
-TEST_RAW_DISK_SOURCE = "https://storage.googleapis.com/fog-testing-bucket/fog-test-raw-disk-source.image.tar.gz".freeze
+# The image was created like so: https://cloud.google.com/compute/docs/images/export-image
+TEST_RAW_DISK_SOURCE = "https://storage.googleapis.com/fog-test-assets-bucket/fog-test-raw-disk-source.image.tar.gz".freeze
 
 TEST_SQL_TIER = "db-n1-standard-1".freeze
 TEST_SQL_REGION = TEST_REGION

data/test/helpers/test_helper.rb

@@ -17,8 +17,12 @@ end
 # See https://github.com/seattlerb/minitest/#install
 gem "minitest"
 require "minitest/autorun"
-# Custom formatters
-require "minitest/reporters"
-Minitest::Reporters.use! Minitest::Reporters::SpecReporter.new
+
+# This is a workaround for RubyMine debugger that doesn't play nice with Minitest::Reporters
+unless ENV['RM_INFO']
+  # Custom formatters to make the tests more legible in CI
+  require "minitest/reporters"
+  Minitest::Reporters.use! Minitest::Reporters::SpecReporter.new
+end
 
 require File.join(File.dirname(__FILE__), "../../lib/fog/google")

data/test/integration/compute/core_compute/test_servers.rb

@@ -135,8 +135,8 @@ class TestServers < FogIntegrationTest
   def test_reset_windows_password
     win_disk = @disks.create(
       :name => "fog-test-1-testservers-test-reset-windows-password-2",
-      :source_image => "windows-server-1909-dc-core-v20200310",
-      :size_gb => 32
+      :source_image => "windows-server-2019-dc-v20210713",
+      :size_gb => 64
     )
     server = @factory.create(:disks => [win_disk])
     server.wait_for { ready? }

data/test/integration/compute/core_networking/test_networks.rb

@@ -17,17 +17,6 @@ class TestNetworks < FogIntegrationTest
     super
   end
 
-  def test_valid_range
-    network = @factory.create
-
-    octet = /\d{,2}|1\d{2}|2[0-4]\d|25[0-5]/
-    netmask = /(\d{1}|1[0-9]|2[0-9]|3[0-2])/
-    re = /\A#{octet}\.#{octet}\.#{octet}\.#{octet}\/#{netmask}\z/
-
-    assert_match(re, network.ipv4_range,
-                 "Network range should be valid")
-  end
-
   def test_run_instance
     network = @factory.create
     server = @servers.create(:network_interfaces => [network.get_as_interface_config])

data/test/integration/factories/networks_factory.rb

@@ -2,15 +2,13 @@ require "integration/factories/collection_factory"
 
 class NetworksFactory < CollectionFactory
   def initialize(example)
-    # We cannot have 2 networks with the same IP range so instantiating a
-    # class variable holding a generator, ensuring that the factory gives
-    # us a new network every time it's called
-    @octet_generator = (0..255).each
     super(Fog::Compute[:google].networks, example)
   end
 
   def params
-    { :name => resource_name,
-      :ipv4_range => "172.16.#{@octet_generator.next}.0/24" }
+    {
+      :name => resource_name,
+      :auto_create_subnetworks => true
+    }
   end
 end