fog-google 1.2.2 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c887d0e4ec298a9bae19c3635d07d50c5087127f
-  data.tar.gz: 7eb641c583f2f23f672412761f37597cc1f61f35
+  metadata.gz: 25266cee5f8d646f7c52eb9b8f5040bb44ccc3a8
+  data.tar.gz: 4c63ac801d14caa7b5c5f2f545ebd5dcc5d1835e
 SHA512:
-  metadata.gz: 3bb2bc0e0bebc53d38bca1ffb78f6a427096d0db14ff3d45f9957d2a4d9ff29e2e7ab4d4a2effe0b3f1a448e69ecd051e1d7a4ebb4f014a64bb436e286e1b301
-  data.tar.gz: 55d52662b1df470355ad29f35cfa88b406006c5da95153db7cdbc458bc3424ec9275accf55a1ff81df9aa8b66d53102ef07a53f5f6f54f1412151fc5c89c7cd3
+  metadata.gz: a3f4e3e6c0e68f49849008d7acae31157b8ace0fbec57a3f2d04a0d8b5ca9c38e86728b9ba16323e5304443dc1eab1b7f41e71659056915b66f8179d52b443dc
+  data.tar.gz: 61d194a1b0f993e4169bb8e368df19c4e3612bc53ade56be246a6356675593e7f6acdd42882c337c22fb37b412151098cdae6a0288bdffa7b7354e57bf87b210

data/CONTRIBUTORS.md

@@ -1,6 +1,7 @@
 With also previous help from unnamed Google employees and [Fog contributors](https://github.com/fog/fog/blob/master/CONTRIBUTORS.md)
 
 * Akshay Moghe <amoghe@maginatics.com>
+* Alessio Caiazza <acaiazza@gitlab.com>
 * Alex Coomans <alex@alexcoomans.com>
 * Alexander Kolesen <akolesen@iron.io>
 * Alexander Lomov <lomov.as@gmail.com>

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

@@ -425,10 +425,9 @@ module Fog
 
           options = attributes.reject { |_, v| v.nil? }
 
-          if service_accounts && service_accounts[:scopes]
-            options[:service_accounts] = service_accounts.merge(
-              :scopes => map_scopes(service_accounts[:scopes])
-            )
+          if service_accounts && service_accounts[0]
+            service_accounts[0][:scopes] = map_scopes(service_accounts[0][:scopes])
+            options[:service_accounts] = service_accounts
           end
 
           if attributes[:external_ip]

data/lib/fog/google/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Google
-    VERSION = "1.2.2".freeze
+    VERSION = "1.3.0".freeze
   end
 end

data/lib/fog/storage/google_json.rb

@@ -44,6 +44,7 @@ module Fog
       request :copy_object
       request :delete_bucket
       request :delete_object
+      request :delete_object_url
       request :get_bucket
       request :get_bucket_acl
       request :get_object

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

@@ -0,0 +1,39 @@
+module Fog
+  module Storage
+    class GoogleJSON
+      class Real
+        # Get an expiring object url from Google Storage for deleting an object
+        # https://cloud.google.com/storage/docs/access-control#Signed-URLs
+        #
+        # @param bucket_name [String] Name of bucket containing object
+        # @param object_name [String] Name of object to get expiring url for
+        # @param expires [Time] Expiry time for this URL
+        #
+        # @return [String] Expiring object https URL
+        def delete_object_url(bucket_name, object_name, expires)
+          raise ArgumentError.new("bucket_name is required") unless bucket_name
+          raise ArgumentError.new("object_name is required") unless object_name
+          https_url({
+                      :headers  => {},
+                      :host     => @host,
+                      :method   => "DELETE",
+                      :path     => "#{bucket_name}/#{object_name}"
+                    }, expires)
+        end
+      end
+
+      class Mock
+        def delete_object_url(bucket_name, object_name, expires)
+          raise ArgumentError.new("bucket_name is required") unless bucket_name
+          raise ArgumentError.new("object_name is required") unless object_name
+          https_url({
+                      :headers  => {},
+                      :host     => @host,
+                      :method   => "DELETE",
+                      :path     => "#{bucket_name}/#{object_name}"
+                    }, expires)
+        end
+      end
+    end
+  end
+end

data/lib/fog/storage/google_xml.rb

@@ -18,6 +18,7 @@ module Fog
       request :copy_object
       request :delete_bucket
       request :delete_object
+      request :delete_object_url
       request :get_bucket
       request :get_bucket_acl
       request :get_object

data/lib/fog/storage/google_xml/requests/delete_object_url.rb

@@ -0,0 +1,42 @@
+module Fog
+  module Storage
+    class GoogleXML
+      class Real
+        # Get an expiring object url from Google Storage for deleting an object
+        #
+        # ==== Parameters
+        # * bucket_name<~String> - Name of bucket containing object
+        # * object_name<~String> - Name of object to get expiring url for
+        # * expires<~Time> - An expiry time for this url
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~String> - url for object
+        #
+        def delete_object_url(bucket_name, object_name, expires)
+          raise ArgumentError.new("bucket_name is required") unless bucket_name
+          raise ArgumentError.new("object_name is required") unless object_name
+          https_url({
+                      :headers  => {},
+                      :host     => @host,
+                      :method   => "DELETE",
+                      :path     => "#{bucket_name}/#{object_name}"
+                    }, expires)
+        end
+      end
+
+      class Mock
+        def delete_object_url(bucket_name, object_name, expires)
+          raise ArgumentError.new("bucket_name is required") unless bucket_name
+          raise ArgumentError.new("object_name is required") unless object_name
+          https_url({
+                      :headers  => {},
+                      :host     => @host,
+                      :method   => "DELETE",
+                      :path     => "#{bucket_name}/#{object_name}"
+                    }, expires)
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog-google
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.3.0
 platform: ruby
 authors:
 - Nat Welch
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-14 00:00:00.000000000 Z
+date: 2018-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core
@@ -599,6 +599,7 @@ files:
 - lib/fog/storage/google_json/requests/copy_object.rb
 - lib/fog/storage/google_json/requests/delete_bucket.rb
 - lib/fog/storage/google_json/requests/delete_object.rb
+- lib/fog/storage/google_json/requests/delete_object_url.rb
 - lib/fog/storage/google_json/requests/get_bucket.rb
 - lib/fog/storage/google_json/requests/get_bucket_acl.rb
 - lib/fog/storage/google_json/requests/get_object.rb
@@ -627,6 +628,7 @@ files:
 - lib/fog/storage/google_xml/requests/copy_object.rb
 - lib/fog/storage/google_xml/requests/delete_bucket.rb
 - lib/fog/storage/google_xml/requests/delete_object.rb
+- lib/fog/storage/google_xml/requests/delete_object_url.rb
 - lib/fog/storage/google_xml/requests/get_bucket.rb
 - lib/fog/storage/google_xml/requests/get_bucket_acl.rb
 - lib/fog/storage/google_xml/requests/get_object.rb
@@ -719,7 +721,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Module for the 'fog' gem to support Google.