fog-google 1.15.0 → 1.19.0

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog-google
 version: !ruby/object:Gem::Version
-  version: 1.15.0
+  version: 1.19.0
 platform: ruby
 authors:
 - Nat Welch
@@ -9,22 +9,22 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-24 00:00:00.000000000 Z
+date: 2022-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: fog-json
   requirement: !ruby/object:Gem::Requirement
@@ -54,25 +54,103 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.1.0
 - !ruby/object:Gem::Dependency
-  name: google-api-client
+  name: google-apis-storage_v1
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.44.2
-    - - "<"
+        version: '0.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.51'
+        version: '0.6'
+- !ruby/object:Gem::Dependency
+  name: google-apis-iamcredentials_v1
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.44.2
-    - - "<"
+        version: '0.6'
+- !ruby/object:Gem::Dependency
+  name: google-apis-compute_v1
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.14'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.14'
+- !ruby/object:Gem::Dependency
+  name: google-apis-monitoring_v3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.12'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.12'
+- !ruby/object:Gem::Dependency
+  name: google-apis-dns_v1
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.12'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.12'
+- !ruby/object:Gem::Dependency
+  name: google-apis-pubsub_v1
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.51'
+        version: '0.7'
+- !ruby/object:Gem::Dependency
+  name: google-apis-sqladmin_v1beta4
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.13'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.13'
 - !ruby/object:Gem::Dependency
   name: google-cloud-env
   requirement: !ruby/object:Gem::Requirement
@@ -91,16 +169,16 @@ dependencies:
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.13.0
 - !ruby/object:Gem::Dependency
   name: retriable
   requirement: !ruby/object:Gem::Requirement
@@ -212,8 +290,10 @@ files:
 - ".editorconfig"
 - ".fog.example"
 - ".github/dependabot.yml"
-- ".github/workflows/ruby.yml"
+- ".github/scripts/setup_creds.sh"
+- ".github/workflows/integration.yml"
 - ".github/workflows/stale.yml"
+- ".github/workflows/unit.yml"
 - ".gitignore"
 - ".hound.yml"
 - ".rubocop.yml"
@@ -227,16 +307,6 @@ files:
 - README.md
 - Rakefile
 - SECURITY.md
-- ci/.gitignore
-- ci/README.md
-- ci/build-head-pipeline.yml
-- ci/credentials.yml.template
-- ci/docker-image/Dockerfile
-- ci/integration-pipeline.yml
-- ci/pipeline-dev.yml
-- ci/tasks/run-int.sh
-- ci/tasks/run-int.yml
-- ci/tasks/utils.sh
 - examples/backend_services.rb
 - examples/bootstrap.rb
 - examples/create_instance.rb
@@ -782,7 +852,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.3.5
 signing_key:
 specification_version: 4
 summary: Module for the 'fog' gem to support Google.

data/.github/workflows/ruby.yml

@@ -1,34 +0,0 @@
-# This workflow uses actions that are not certified by GitHub.
-# They are provided by a third-party and are governed by
-# separate terms of service, privacy policy, and support
-# documentation.
-# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
-# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
-
-name: Ruby
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
-
-jobs:
-  test:
-
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        ruby-version: ['2.5', '2.6', '2.7', '3.0', '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/ci/.gitignore

@@ -1 +0,0 @@
-credentials.yml

data/ci/README.md

@@ -1,65 +0,0 @@
-# fog-google CI
-
-This pipeline performs integration tests against every PR with the
-`integrate` label. This allows whitelisted PRs to be tested
-automatically before being merged. Status is updated on the
-PR when the test completes.
-
-## Setup
-
-In order to run the fog-google Concourse Pipeline you must have an existing
-[Concourse](http://concourse.ci) environment.
-
-To deploy the pipeline:
-
-* Download the `fly` binary from the Concourse web interface and place it in your `$PATH`.
-
-* Login to your Concourse:
-
-```
-fly -t fog-ci login -c <YOUR CONCOURSE URL>
-```
-
-* Update the [credentials.yml](https://github.com/fog/fog-google/blob/master/ci/credentials.yml.tpl)
-file. See [Credentials Requirements](#credentials-requirements) for specific instructions.
-
-* Set the fog-google pipelines:
-
-```
-fly -t fog set-pipeline -p build-head -c build-head-pipeline.yml -l credentials.yml
-fly -t fog-ci set-pipeline -p pr-integration -c integration-pipeline.yml -l credentials.yml
-```
-
-* Unpause the fog-google pipeline:
-
-```
-fly -t fog-ci unpause-pipeline -p pr-integration
-```
-
-## Credentials Requirements
-
-Several external pieces of authentication are needed for credentials.yml
-
-1. A JSON Service Account File for a service account with at least Editor access to the project.
-    * To get a Service Account File, see [here](https://developers.google.com/identity/protocols/OAuth2ServiceAccount#creatinganaccount)
-      and create using the Project/Editor role.
-
-1. A [Github Access Token](https://github.com/blog/1509-personal-api-tokens) with at least
-`repo:status` access and a private key with push access to the `fog/fog-google` repositoy.
-
-1. A [Codecov.io](https://codecov.io/) token for tracking test coverage.
-
-These items are equivalent to your login credentials for their resources.
-
-## Login Gotchas
-
-* Our concourse pipeline is using GitHub auth, providing access to manipulate the pipeline to the members of the [fog-google team](https://github.com/orgs/fog/teams/fog-google), managed through the OAuth application managed by [fog-google bot](https://github.com/fog-google-bot).
-
-* If logging into a specific team, ie `fog-google`, use `--team-name fog-google` to specify that.
-
-## Dockerfile
-
-The [docker-image](https://github.com/fog/fog-google/blob/master/ci/docker-image) directory contains
-the Dockerfile necessary for recreating the Docker image used in tasks. This is referenced
-in a per-task basis as `image_resource`, ie in
-image_resource [run-int.yml](https://github.com/fog/fog-google/blob/master/ci/tasks/run-int.yml)

data/ci/build-head-pipeline.yml

@@ -1,173 +0,0 @@
-jobs:
-  - name: manual-trigger
-    plan:
-    - get: master
-      trigger: false
-
-  - name: integration-compute-core_compute
-    serial: true
-    plan:
-      - get: fog-google-src
-        resource: master
-        version: every
-        trigger: true
-        passed:
-          - manual-trigger
-
-      - task: run-integration-tests
-        file: fog-google-src/ci/tasks/run-int.yml
-        params:
-          rake_task: test:compute-core_compute
-          codecov_token: {{codecov_token}}
-          google_project: {{google_project}}
-          google_json_key_data: {{google_json_key_data}}
-
-  - name: integration-compute-core_networking
-    serial: true
-    plan:
-      - get: fog-google-src
-        resource: master
-        version: every
-        trigger: true
-        passed:
-          - manual-trigger
-
-      - task: run-integration-tests
-        file: fog-google-src/ci/tasks/run-int.yml
-        params:
-          rake_task: test:compute-core_networking
-          codecov_token: {{codecov_token}}
-          google_project: {{google_project}}
-          google_json_key_data: {{google_json_key_data}}
-
-  - name: integration-compute-instance_groups
-    serial: true
-    plan:
-      - get: fog-google-src
-        resource: master
-        version: every
-        trigger: true
-        passed:
-          - manual-trigger
-
-      - task: run-integration-tests
-        file: fog-google-src/ci/tasks/run-int.yml
-        params:
-          rake_task: test:compute-instance_groups
-          codecov_token: {{codecov_token}}
-          google_project: {{google_project}}
-          google_json_key_data: {{google_json_key_data}}
-
-  - name: integration-compute-loadbalancing
-    serial: true
-    plan:
-      - get: fog-google-src
-        resource: master
-        version: every
-        trigger: true
-        passed:
-          - manual-trigger
-
-      - task: run-integration-tests
-        file: fog-google-src/ci/tasks/run-int.yml
-        params:
-          rake_task: test:compute-loadbalancing
-          codecov_token: {{codecov_token}}
-          google_project: {{google_project}}
-          google_json_key_data: {{google_json_key_data}}
-
-  - name: integration-tests-monitoring
-    serial: true
-    plan:
-      - get: fog-google-src
-        resource: master
-        version: every
-        trigger: true
-        passed:
-          - manual-trigger
-
-      - 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}}
-
-  - name: integration-tests-pubsub
-    serial: true
-    plan:
-      - get: fog-google-src
-        resource: master
-        version: every
-        trigger: true
-        passed:
-          - manual-trigger
-
-      - task: run-integration-tests
-        file: fog-google-src/ci/tasks/run-int.yml
-        params:
-          rake_task: test:pubsub
-          codecov_token: {{codecov_token}}
-          google_project: {{google_project}}
-          google_json_key_data: {{google_json_key_data}}
-
-  - name: integration-sqlv1
-    serial: true
-    plan:
-      - get: fog-google-src
-        resource: master
-        version: every
-        trigger: true
-        passed:
-          - manual-trigger
-
-      - 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}}
-
-  - name: integration-sqlv2
-    serial: true
-    plan:
-      - get: fog-google-src
-        resource: master
-        version: every
-        trigger: true
-        passed:
-          - manual-trigger
-
-      - task: run-integration-tests
-        file: fog-google-src/ci/tasks/run-int.yml
-        params:
-          rake_task: test:sql-sqlv2
-          codecov_token: {{codecov_token}}
-          google_project: {{google_project}}
-          google_json_key_data: {{google_json_key_data}}
-
-  - name: integration-tests-storage
-    serial: true
-    plan:
-      - get: fog-google-src
-        resource: master
-        version: every
-        trigger: true
-        passed:
-          - manual-trigger
-      - task: run-integration-tests
-        file: fog-google-src/ci/tasks/run-int.yml
-        params:
-          rake_task: test:storage
-          codecov_token: {{codecov_token}}
-          google_project: {{google_project}}
-          google_json_key_data: {{google_json_key_data}}
-
-resources:
-  - name: master
-    type: git
-    source:
-      uri: https://github.com/fog/fog-google.git
-      branch: master

data/ci/credentials.yml.template

@@ -1,28 +0,0 @@
----
-# Codecov.io token to upload coverage reports
-codecov_token:
-# Google Cloud Platform project to run under
-google_project:
-# Google Compute Engine Service Account JSON
-google_json_key_data: |
-  {
-    "type": "service_account",
-    "project_id": "myproject",
-    "private_key_id": "number",
-    "private_key": "-----BEGIN PRIVATE KEY-----\nIAMAVERYLONGKEYAMA==\n-----END PRIVATE KEY-----\n",
-    "client_email": "account@myproject.iam.gserviceaccount.com",
-    "client_id": "7435873987592347",
-    "auth_uri": "https://accounts.google.com/o/oauth2/auth",
-    "token_uri": "https://accounts.google.com/o/oauth2/token",
-    "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs",
-    "client_x509_cert_url": "https://www.googleapis.com/robot/v1/metadata/x509/account%40myproject.iam.gserviceaccount.com"
-  }
-
-# An access token with repo:status access from an account that has push access to the repo
-github_access_token:
-# A SSH private key associated with the access token's account or
-# a repo push deploy key
-github_private_key: |
-  -----BEGIN RSA PRIVATE KEY-----
-  IAMAVERYLONGKEYAMA=
-  -----END RSA PRIVATE KEY-----

data/ci/docker-image/Dockerfile

@@ -1,18 +0,0 @@
-FROM ubuntu:18.04
-
-# 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 \
-  git \
-  zlib1g-dev \
-  libssl-dev \
-  libreadline-dev \
-  libyaml-dev \
-  libxml2-dev \
-  libxslt-dev
-
-# 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