fog-google 1.12.1 → 1.16.0

data/test/integration/monitoring/test_metric_descriptors.rb

@@ -68,7 +68,7 @@ class TestMetricDescriptors < FogIntegrationTest
       :labels => [label]
     }
 
-    created = @client.create_metric_descriptor(options)
+    created = @client.create_metric_descriptor(**options)
 
     # Check created metric descriptor
     assert_equal(_full_name(metric_type), created.name)

data/test/integration/storage/storage_shared.rb

@@ -86,9 +86,14 @@ class StorageShared < FogIntegrationTest
     "hello world"
   end
 
-  def some_temp_file
+  def binary_file_content
+    "PK\x03\x04\x14\x00\x00\x00\b\x00\x18\x89\x8AM\xE7!\xB7\x1C\x1C\x15j\x00\xB4\xB9".force_encoding(Encoding::ASCII_8BIT)
+  end
+
+  def some_temp_file(content = temp_file_content)
     @some_temp_file ||= Tempfile.new("fog-google-storage").tap do |t|
-      t.write(temp_file_content)
+      t.binmode
+      t.write(content)
       t.close
     end
     File.open(@some_temp_file.path, "r")

data/test/integration/storage/test_objects.rb

@@ -34,13 +34,15 @@ class TestStorageRequests < StorageShared
 
   def test_put_object_paperclip
     object_name = new_object_name
-    paperclip_file = OpenStruct.new(:path => some_temp_file,
+    paperclip_file = OpenStruct.new(:path => some_temp_file(binary_file_content),
                                     :content_type => "image/png")
     @client.put_object(some_bucket_name, object_name, paperclip_file, :content_type => "image/png")
 
     object = @client.get_object(some_bucket_name, object_name)
 
     assert_equal(object_name, object[:name])
+    assert_equal(Encoding::ASCII_8BIT, object[:body].encoding)
+    assert_equal(binary_file_content, object[:body])
     assert_equal("image/png", object[:content_type])
   end
 
@@ -113,6 +115,26 @@ class TestStorageRequests < StorageShared
     assert_kind_of(Net::HTTPOK, response)
   end
 
+  def test_copy_object_with_request_options
+    assert_raises(Google::Apis::AuthorizationError) do
+      target_object_name = new_object_name
+
+      @client.copy_object(some_bucket_name, some_object_name,
+                          some_bucket_name, target_object_name, authorization: false)
+    end
+  end
+
+  def test_copy_object_with_object_property
+    target_object_name = new_object_name
+
+    @client.copy_object(some_bucket_name, some_object_name,
+                        some_bucket_name, target_object_name, content_type: 'text/plain')
+
+    object = @client.get_object(some_bucket_name, target_object_name)
+
+    assert_equal("text/plain", object[:content_type])
+  end
+
   def test_list_objects
     expected_object = some_object_name
 

data/test/unit/storage/test_json_requests.rb

@@ -41,4 +41,12 @@ class UnitTestJsonRequests < MiniTest::Test
     assert_match(/just%20some%20file\.json/, url,
                  "space should be escaped with '%20'")
   end
+
+  def test_unescaped_slashes_in_url
+    url = @client.get_object_https_url("bucket",
+                                      "a/b/c.ext",
+                                      Time.now + 2 * 60)
+    assert_match(/a\/b\/c/, url,
+                 "slashes should not be escaped with '%2F'")
+  end
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: fog-google
 version: !ruby/object:Gem::Version
-  version: 1.12.1
+  version: 1.16.0
 platform: ruby
 authors:
 - Nat Welch
 - Artem Yakimenko
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-17 00:00:00.000000000 Z
+date: 2021-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core
@@ -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.51'
+        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.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
@@ -211,11 +289,15 @@ files:
 - ".codecov.yml"
 - ".editorconfig"
 - ".fog.example"
+- ".github/dependabot.yml"
+- ".github/scripts/setup_creds.sh"
+- ".github/workflows/integration.yml"
+- ".github/workflows/stale.yml"
+- ".github/workflows/unit.yml"
 - ".gitignore"
 - ".hound.yml"
 - ".rubocop.yml"
 - ".ruby-gemset"
-- ".travis.yml"
 - CHANGELOG.md
 - CONTRIBUTING.md
 - CONTRIBUTORS.md
@@ -225,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
@@ -765,13 +837,13 @@ homepage: https://github.com/fog/fog-google
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
@@ -780,8 +852,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: Module for the 'fog' gem to support Google.
 test_files:

data/.travis.yml

@@ -1,33 +0,0 @@
-language: ruby
-cache: bundler
-sudo: false
-matrix:
-  fast_finish: true
-  include:
-    - rvm: 2.4
-    - rvm: 2.5
-    - rvm: 2.6
-    - rvm: 2.7
-    - rvm: jruby-9.2
-    - rvm: jruby-head
-    - rvm: truffleruby-head
- # ppc64le support code
-    - rvm: 2.4
-      arch: ppc64le
-    - rvm: 2.5
-      arch: ppc64le
-    - rvm: 2.6
-      arch: ppc64le
-    - rvm: 2.7
-      arch: ppc64le
-    - rvm: jruby-9.2
-      arch: ppc64le
-    - rvm: jruby-head
-      arch: ppc64le
-  allow_failures:
-    - rvm: jruby-head
-    - rvm: truffleruby-head
-    - rvm: jruby-head
-      arch: ppc64le
-notifications:
-  email: false

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