fog-google 1.10.0 → 1.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 3563c5d9fb6cd9c28bd38b0b6c1ae1d619c33c81
-  data.tar.gz: 41ecb920dbcb66a2f6aa13f6557ef2a044d26d80
+SHA256:
+  metadata.gz: b08d74db716e12e161488ce7f6699d8ae3480eb9ec0c978d8eb9458fd6447b4f
+  data.tar.gz: f593447eed2cb01ea0f4d6a676d60c53749cac333809cef542ce1e5661c1e85f
 SHA512:
-  metadata.gz: f4a9c9650d0824ad4dcd5389e63eb5c7e583d256c6c469481709cee80bd53f5fe168556e9e563a704878721ea733282c0af87fd24680c59513a6203d5026743c
-  data.tar.gz: 2cc78e1c0731a87179ffb6179698e5fa5bd90635d141aec05d9c5faa1e7b18fe8e1123c5ded5f925f7065f5b3ae4893f8876f72c23b164ad1172953f5b74f829
+  metadata.gz: 2d34fa3e02b8f8dea154556f5b6ffe942f7dbeef630707730d88dc312f59ae644685d5f00aa319ebfd340d43334d796578e0e7649b1229bd3448eec7f4802c31
+  data.tar.gz: 3f7773d5d3ae3ad824f9a8a5dde09eb0727d0354bf995407628a62e58c1b5a8f5850f2a72e08ac7df95c0ee0a870f903b652eb2e8e19e49b34e4344064fe55b7

data/.github/dependabot.yml

@@ -0,0 +1,10 @@
+version: 2
+updates:
+  - package-ecosystem: "bundler"
+    directory: "/"
+    schedule:
+      interval: "daily"
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"

data/.github/workflows/ruby.yml

@@ -0,0 +1,34 @@
+# 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/.github/workflows/stale.yml

@@ -0,0 +1,23 @@
+name: Mark stale issues and pull requests
+
+on:
+  schedule:
+  - cron: "30 1 * * *"
+
+jobs:
+  stale:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/stale@v3.0.18
+      with:
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+        days-before-stale: 60
+        days-before-close: 7
+        exempt-issue-labels: 'pinned,security'
+        exempt-pr-labels: 'pinned,security'
+        stale-issue-message: 'This issue has been marked inactive and will be closed if no further activity occurs.'
+        stale-pr-message: 'This pr has been marked inactive and will be closed if no further activity occurs.'
+        stale-issue-label: 'no-issue-activity'
+        stale-pr-label: 'no-pr-activity'

data/.rubocop.yml

@@ -1,5 +1,5 @@
 # Fog custom enforced styles
-Metrics/LineLength:
+Layout/LineLength:
   Enabled: false
 
 Style/ConditionalAssignment:
@@ -94,7 +94,7 @@ Naming/PredicateName:
   - is_
   - has_
   - have_
-  NamePrefixBlacklist:
+  ForbiddenPrefixes:
   - is_
   Exclude:
   - spec/**/*
@@ -246,7 +246,7 @@ Style/WhenThen:
 Lint/EachWithObjectArgument:
   Description: Check for immutable argument given to each_with_object.
   Enabled: true
-Lint/HandleExceptions:
+Lint/SuppressedException:
   Description: Don't suppress exception.
   StyleGuide: https://github.com/bbatsov/ruby-style-guide#dont-hide-exceptions
   Enabled: false

data/CHANGELOG.md

@@ -6,6 +6,105 @@ This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html
 
 ## Next
 
+## 1.14.0
+
+### User-facing
+
+#### Added
+
+- \#520 Support passing object properties to #copy_object [mshibuya]
+
+#### Fixed
+
+- \#530 Unescape slashes in urls [krokodaxl]
+
+- \#528 Fix Ruby 3.0 kwargs error in `#copy_object` [deeeki]
+
+- \#521 Unlink file temp file immediately [stanhu]
+
+- \#527 \#523 Fix Ruby 3.0 kwargs failures [stanhu]
+
+### Development changes
+
+#### Fixed
+
+- \#525 - Bump actions/checkout from 2 to 2.3.4
+
+- \#524 - Bump actions/stale from 3 to 3.0.18
+
+
+## 1.13.0
+
+### User-facing
+
+### Fixed
+
+fix deprecated URI.escape usage to support Ruby 3.0
+fix apply_client_options def to support Ruby 3.0
+
+### Development Changes
+
+Add github actions config and dependabot
+Drop travis usage
+
+### Added
+
+## 1.12.1
+
+### User-facing
+
+#### Fixed
+
+\#513 - support passing other request options `StorageJSON#copy_object` [yosiat]
+
+### Development changes
+
+#### Added
+
+\#514 - Update .travis.yml to support PPC architecture testing [nageshlop]
+
+
+## 1.12.0
+
+### User-facing
+
+#### Added
+
+- \#509 Add ShieldedInstanceConfig support to `Server#insert` [lcy0321]
+
+#### Fixed
+
+- \#508 Fix GoogleXML::File#save incorrectly passing body to headers [stanhu]
+
+- \#506 Add Trufferuby head to CI [gogainda]
+
+### Development changes
+
+#### Fixed
+
+- \#510 Upgrade CI docker image to Ubuntu 18.04 [temikus]
+
+
+## 1.11.0
+
+### User-facing
+
+#### Added
+
+- \#503 - Add fallback URL signing mechanism via IAM SignBlob API [temikus]
+
+#### Fixed
+
+- \#498 Add `:idempotent` flag to Fog::Storage::GoogleXML::Real#head_object, fixing
+          `Excon::Error::Socket: end of file reached (EOFError)` in certain scenarios, see \#416 [temikus]
+- \#500 Set default options automatically if missing in `Pubsub#pull_subscription`
+
+### Development changes
+
+#### Fixed
+
+- \#501 DRY'ed up the retry methods in monitoring tests [temikus]
+- \#500 Cleanup unneeded constants in Server model, fix flaky PubSub tests [temikus]
 
 ## 1.10.0
 
@@ -390,4 +489,4 @@ We encourage people using 0.5.1 to upgrade.
 
 #### Added
 
-#### Fixed
+#### Fixed

data/README.md

@@ -1,6 +1,15 @@
+# ⚠️ 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://travis-ci.org/fog/fog-google.svg?branch=master)](https://travis-ci.org/fog/fog-google) [![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)
+[![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)
 
 The main maintainers for the Google sections are @icco, @Temikus and @plribeiro3000. Please send pull requests to them.
 
@@ -8,7 +17,7 @@ The main maintainers for the Google sections are @icco, @Temikus and @plribeiro3
 
 - As of **v1.0.0**, fog-google includes google-api-client as a dependency, there is no need to include it separately anymore.
 
-- Fog-google is currently supported on Ruby 2.3+ See [supported ruby versions](#supported-ruby-versions) for more info.
+- Fog-google is currently supported on Ruby 2.4+ See [supported ruby versions](#supported-ruby-versions) for more info.
 
 See **[MIGRATING.md](MIGRATING.md)** for migration between major versions.
 
@@ -27,8 +36,8 @@ As of 2017-12-15, we are still working on making Fog for Google Compute engine (
 
 ## SQL
 
-Fog implements [v1beta4](https://cloud.google.com/sql/docs/mysql/admin-api/v1beta4/) of the Google Cloud SQL Admin API. As of 2017-11-06, Cloud SQL is mostly feature-complete. Please [file issues](https://github.com/fog/fog-google/issues) for any anomalies you see or features you would like as we finish 
-adding remaining features. 
+Fog implements [v1beta4](https://cloud.google.com/sql/docs/mysql/admin-api/v1beta4/) of the Google Cloud SQL Admin API. As of 2017-11-06, Cloud SQL is mostly feature-complete. Please [file issues](https://github.com/fog/fog-google/issues) for any anomalies you see or features you would like as we finish
+adding remaining features.
 
 ## DNS
 
@@ -36,8 +45,8 @@ Fog implements [v1](https://cloud.google.com/dns/api/v1/) of the Google Cloud DN
 
 ## Monitoring
 
-Fog implements [v3](https://cloud.google.com/monitoring/api/v3/) of the Google Cloud Monitoring API. As of 2017-10-05, we believe Fog for Google Cloud Monitoring is feature complete for metric-related resources and are working on supporting groups. 
- 
+Fog implements [v3](https://cloud.google.com/monitoring/api/v3/) of the Google Cloud Monitoring API. As of 2017-10-05, we believe Fog for Google Cloud Monitoring is feature complete for metric-related resources and are working on supporting groups.
+
 We are always looking for people to improve our code and test coverage, so please [file issues](https://github.com/fog/fog-google/issues) for any anomalies you see or features you would like.
 
 ## Pubsub
@@ -94,12 +103,12 @@ cat .fog.example >> ~/.fog # appends the sample configuration
 vim ~/.fog                 # edit file with yout config
 ```
 
-As of `1.9.0` fog-google supports Google [application default credentials (ADC)](https://cloud.google.com/docs/authentication/production) 
+As of `1.9.0` fog-google supports Google [application default credentials (ADC)](https://cloud.google.com/docs/authentication/production)
 The auth method uses [Google::Auth.get_application_default](https://www.rubydoc.info/gems/googleauth/0.6.7/Google%2FAuth.get_application_default)
 under the hood.
 
 Example workflow for a GCE instance with [service account scopes](https://cloud.google.com/compute/docs/access/create-enable-service-accounts-for-instances)
-defined: 
+defined:
 
 ```
 > connection = Fog::Compute::Google.new(:google_project => "my-project", :google_application_default => true)
@@ -108,6 +117,43 @@ defined:
 => [  <Fog::Compute::Google::Server ...  ]
 ```
 
+#### CarrierWave integration
+
+It is common to integrate Fog with Carrierwave. Here's a minimal config that's commonly put in `config/initializers/carrierwave.rb`:
+
+```
+CarrierWave.configure do |config|
+    config.fog_provider = 'fog/google'
+    config.fog_credentials = {
+        provider: 'Google',
+        google_project: Rails.application.secrets.google_cloud_storage_project_name,
+        google_json_key_string: Rails.application.secrets.google_cloud_storage_credential_content
+        # can optionally use google_json_key_location if using an actual file;
+    }
+    config.fog_directory = Rails.application.secrets.google_cloud_storage_bucket_name
+end
+```
+
+This needs a corresponding secret in `config/secrets.yml`, e.g.:
+
+```
+development:
+    google_cloud_storage_project_name: your-project-name
+    google_cloud_storage_credential_content: '{
+        "type": "service_account",
+        "project_id": "your-project-name",
+        "private_key_id": "REDACTED",
+        "private_key": "-----BEGIN PRIVATE KEY-----REDACTED-----END PRIVATE KEY-----\n",
+        "client_email": "REDACTED@your-project-name.iam.gserviceaccount.com",
+        "client_id": "REDACTED",
+        "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/REDACTED%40your-project-name.iam.gserviceaccount.com"
+    }'
+    google_cloud_storage_bucket_name: your-bucket-name
+```
+
 #### SSH-ing into instances
 
 If you want to be able to bootstrap SSH-able instances, (using `servers.bootstrap`,) be sure you have a key in `~/.ssh/id_rsa` and `~/.ssh/id_rsa.pub`
@@ -128,10 +174,10 @@ $ bundle exec pry
 
 ## Supported Ruby Versions
 
-Fog-google is currently supported on Ruby 2.3+.
+Fog-google is currently supported on Ruby 2.4+.
 
 In general we support (and run our CI) for Ruby versions that are actively supported
-by Ruby Core - that is, Ruby versions that are not end of life. Older versions of 
+by Ruby Core - that is, Ruby versions that are not end of life. Older versions of
 Ruby _may_ still work, but are unsupported and not recommended. See https://www.ruby-lang.org/en/downloads/branches/
 for details about the Ruby support schedule.
 

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/fog-google.gemspec

@@ -18,16 +18,16 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   # As of 0.1.1
-  spec.required_ruby_version = "~> 2.0"
+  spec.required_ruby_version = ">= 2.0"
 
   # Locked until https://github.com/fog/fog-google/issues/417 is resolved
   spec.add_dependency "fog-core", "<= 2.1.0"
   spec.add_dependency "fog-json", "~> 1.2"
   spec.add_dependency "fog-xml", "~> 0.1.0"
 
-  # Hard Requirement as of 1.0
-  spec.add_dependency "google-api-client", ">= 0.32", "< 0.34"
-  
+  spec.add_dependency "google-api-client", ">= 0.44.2", "< 0.51"
+  spec.add_dependency "google-cloud-env", "~> 1.2"
+
   # Debugger
   spec.add_development_dependency "pry"
 

data/lib/fog/compute/google.rb

@@ -27,10 +27,6 @@ module Fog
                                           https://www.googleapis.com/auth/ndev.cloudman
                                           https://www.googleapis.com/auth/cloud-platform).freeze
       GOOGLE_COMPUTE_DEFAULT_NETWORK = "default".freeze
-      # TODO: Do we need those constants?
-      RUNNING = "RUNNING".freeze
-      PROVISIONING = "PROVISIONING".freeze
-      STAGING = "STAGING".freeze
 
       request_path "fog/compute/google/requests"
       request :add_backend_service_backends

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

@@ -38,7 +38,7 @@ module Fog
 
           data = service.insert_address(identity, region, attributes)
           operation = Fog::Compute::Google::Operations
-                      .new(:service => service)
+                      .new(service: service)
                       .get(data.name, nil, data.region)
           operation.wait_for { ready? }
           reload

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

@@ -13,10 +13,10 @@ module Fog
           }
 
           if region
-            data = service.list_addresses(region, opts).items || []
+            data = service.list_addresses(region, **opts).items || []
           else
             data = []
-            service.list_aggregated_addresses(opts).items.each_value do |scoped_list|
+            service.list_aggregated_addresses(**opts).items.each_value do |scoped_list|
               data.concat(scoped_list.addresses) if scoped_list && scoped_list.addresses
             end
           end
@@ -28,8 +28,8 @@ module Fog
             address = service.get_address(identity, region).to_h
             return new(address)
           elsif identity
-            response = all(:filter => "name eq #{identity}",
-                           :max_results => 1)
+            response = all(filter: "name eq #{identity}",
+                           max_results: 1)
             address = response.first unless response.empty?
             return address
           end
@@ -39,7 +39,7 @@ module Fog
         end
 
         def get_by_ip_address(ip_address)
-          addresses = service.list_aggregated_addresses(:filter => "address eq .*#{ip_address}").items
+          addresses = service.list_aggregated_addresses(filter: "address eq .*#{ip_address}").items
           address = addresses.each_value.select(&:addresses)
 
           return nil if address.empty?
@@ -47,7 +47,7 @@ module Fog
         end
 
         def get_by_name(ip_name)
-          names = service.list_aggregated_addresses(:filter => "name eq .*#{ip_name}").items
+          names = service.list_aggregated_addresses(filter: "name eq .*#{ip_name}").items
           name = names.each_value.select(&:addresses)
 
           return nil if name.empty?

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

@@ -29,7 +29,7 @@ module Fog
             :timeout_sec => timeout_sec
           }
 
-          data = service.insert_backend_service(name, options)
+          data = service.insert_backend_service(name, **options)
           operation = Fog::Compute::Google::Operations.new(:service => service).get(data.name)
           operation.wait_for { ready? }
           reload