gcloud 0.11.0 → 0.12.0

data/lib/gcloud/resource_manager/project/list.rb

@@ -143,14 +143,14 @@ module Gcloud
 
         ##
         # @private New Projects::List from a response object.
-        def self.from_response resp, manager, filter = nil, max = nil
-          projects = new(Array(resp.data["projects"]).map do |gapi_object|
-            Project.from_gapi gapi_object, manager.connection
+        def self.from_gapi gapi_list, manager, filter = nil, max = nil
+          projects = new(Array(gapi_list.projects).map do |gapi_object|
+            Project.from_gapi gapi_object, manager.service
           end)
-          projects.instance_variable_set "@token",   resp.data["nextPageToken"]
-          projects.instance_variable_set "@manager", manager
-          projects.instance_variable_set "@filter",  filter
-          projects.instance_variable_set "@max",     max
+          projects.instance_variable_set :@token,   gapi_list.next_page_token
+          projects.instance_variable_set :@manager, manager
+          projects.instance_variable_set :@filter,  filter
+          projects.instance_variable_set :@max,     max
           projects
         end
 

data/lib/gcloud/resource_manager/project/updater.rb

@@ -14,7 +14,6 @@
 
 
 require "time"
-require "gcloud/resource_manager/errors"
 
 module Gcloud
   module ResourceManager
@@ -61,7 +60,7 @@ module Gcloud
         #   end
         #
         def name= new_name
-          gapi["name"] = new_name
+          gapi.name = new_name
         end
 
         ##
@@ -88,7 +87,7 @@ module Gcloud
         #   end
         #
         def labels
-          gapi["labels"]
+          gapi.labels
         end
 
         ##
@@ -115,17 +114,13 @@ module Gcloud
         #   end
         #
         def labels= new_labels
-          gapi["labels"] = new_labels
+          gapi.labels = new_labels
         end
 
         ##
         # @private Create an Updater object.
         def self.from_project project
-          dupe_gapi = project.gapi.dup
-          dupe_gapi = dupe_gapi.to_hash if dupe_gapi.respond_to? :to_hash
-          if dupe_gapi["labels"].respond_to? :to_hash
-            dupe_gapi["labels"] = dupe_gapi["labels"].to_hash
-          end
+          dupe_gapi = project.gapi.class.new project.gapi.to_h
           dupe_project = Project.from_gapi dupe_gapi, nil # no way to update
           Updater.new dupe_project
         end

data/lib/gcloud/resource_manager/service.rb

@@ -0,0 +1,127 @@
+# Copyright 2016 Google Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+require "gcloud/version"
+require "gcloud/errors"
+require "google/apis/cloudresourcemanager_v1"
+
+module Gcloud
+  module ResourceManager
+    ##
+    # @private
+    # Represents the service to Resource Manager, as well as expose the API
+    # calls.
+    class Service
+      ##
+      # Alias to the Google Client API module
+      API = Google::Apis::CloudresourcemanagerV1
+
+      attr_accessor :credentials
+
+      ##
+      # Creates a new Service instance.
+      def initialize credentials, retries: nil, timeout: nil
+        @credentials = credentials
+        @service = API::CloudResourceManagerService.new
+        @service.client_options.application_name    = "gcloud-ruby"
+        @service.client_options.application_version = Gcloud::VERSION
+        @service.request_options.retries = retries || 3
+        @service.request_options.timeout_sec = timeout if timeout
+        @service.authorization = @credentials.client
+      end
+
+      def service
+        return mocked_service if mocked_service
+        @service
+      end
+      attr_accessor :mocked_service
+
+      ##
+      # Returns API::ListProjectsResponse
+      def list_project filter: nil, token: nil, max: nil
+        service.list_projects page_token: token, page_size: max, filter: filter
+      end
+
+      ##
+      # Returns API::Project
+      def get_project project_id
+        service.get_project project_id
+      rescue Google::Apis::Error => e
+        raise Gcloud::Error.from_error(e)
+      end
+
+      ##
+      # Returns API::Project
+      def create_project project_id, name, labels
+        project_attrs = { projectId: project_id, name: name,
+                          labels: labels }.delete_if { |_, v| v.nil? }
+        service.create_project API::Project.new(project_attrs)
+      rescue Google::Apis::Error => e
+        raise Gcloud::Error.from_error(e)
+      end
+
+      ##
+      # Updated the project, given a API::Project.
+      # Returns API::Project
+      def update_project project_gapi
+        service.update_project project_gapi.project_id, project_gapi
+      rescue Google::Apis::Error => e
+        raise Gcloud::Error.from_error(e)
+      end
+
+      def delete_project project_id
+        service.delete_project project_id
+      rescue Google::Apis::Error => e
+        raise Gcloud::Error.from_error(e)
+      end
+
+      def undelete_project project_id
+        service.undelete_project project_id
+      rescue Google::Apis::Error => e
+        raise Gcloud::Error.from_error(e)
+      end
+
+      ##
+      # Returns API::Policy
+      def get_policy project_id
+        service.get_project_iam_policy "projects/#{project_id}"
+      rescue Google::Apis::Error => e
+        raise Gcloud::Error.from_error(e)
+      end
+
+      ##
+      # Returns API::Policy
+      def set_policy project_id, new_policy
+        req = API::SetIamPolicyRequest.new policy: new_policy
+        service.set_project_iam_policy "projects/#{project_id}", req
+      rescue Google::Apis::Error => e
+        raise Gcloud::Error.from_error(e)
+      end
+
+      ##
+      # Returns API::TestIamPermissionsResponse
+      def test_permissions project_id, permissions
+        req = API::TestIamPermissionsRequest.new permissions: permissions
+        service.test_project_iam_permissions "projects/#{project_id}", req
+      rescue Google::Apis::Error => e
+        raise Gcloud::Error.from_error(e)
+      end
+
+      def inspect
+        "#{self.class}"
+      end
+    end
+  end
+end

data/lib/gcloud/storage.rb

@@ -36,6 +36,9 @@ module Gcloud
   #   The default scope is:
   #
   #   * `https://www.googleapis.com/auth/devstorage.full_control`
+  # @param [Integer] retries Number of times to retry requests on server error.
+  #   The default value is `3`. Optional.
+  # @param [Integer] timeout Default timeout to use in requests. Optional.
   #
   # @return [Gcloud::Storage::Project]
   #
@@ -48,14 +51,21 @@ module Gcloud
   #   bucket = storage.bucket "my-bucket"
   #   file = bucket.file "path/to/my-file.ext"
   #
-  def self.storage project = nil, keyfile = nil, scope: nil
+  def self.storage project = nil, keyfile = nil, scope: nil, retries: nil,
+                   timeout: nil
     project ||= Gcloud::Storage::Project.default_project
+    project = project.to_s # Always cast to a string
+    fail ArgumentError, "project is missing" if project.empty?
+
     if keyfile.nil?
       credentials = Gcloud::Storage::Credentials.default scope: scope
     else
       credentials = Gcloud::Storage::Credentials.new keyfile, scope: scope
     end
-    Gcloud::Storage::Project.new project, credentials
+
+    Gcloud::Storage::Project.new(
+      Gcloud::Storage::Service.new(
+        project, credentials, retries: retries, timeout: timeout))
   end
 
   ##
@@ -66,7 +76,7 @@ module Gcloud
   # time, taking advantage of Google's own reliable and fast networking
   # infrastructure to perform data operations in a cost effective manner.
   #
-  # Gcloud's goal is to provide a API that is familiar and comfortable to
+  # The goal of gcloud-ruby is to provide a API that is comfortable to
   # Rubyists. Authentication is handled by {Gcloud#storage}. You can provide the
   # project and credential information to connect to the Storage service, or if
   # you are running on Google Compute Engine this configuration is taken care
@@ -279,33 +289,6 @@ module Gcloud
   #                    encryption_key_sha256: key_hash
   # ```
   #
-  # ### A note about large uploads
-  #
-  # You may encounter a Broken pipe (Errno::EPIPE) error when attempting to
-  # upload large files. To avoid this problem, add the
-  # [httpclient](https://rubygems.org/gems/httpclient) gem to your project, and
-  # the line (or lines) of configuration shown below. These lines must execute
-  # after you require gcloud but before you make your first gcloud connection.
-  # The first statement configures [Faraday](https://rubygems.org/gems/faraday)
-  # to use httpclient. The second statement, which should only be added if you
-  # are using a version of Faraday at or above 0.9.2, is a workaround for [this
-  # gzip issue](https://github.com/GoogleCloudPlatform/gcloud-ruby/issues/367).
-  #
-  # ```ruby
-  # require "gcloud"
-  #
-  # # Use httpclient to avoid broken pipe errors with large uploads
-  # Faraday.default_adapter = :httpclient
-  #
-  # # Only add the following statement if using Faraday >= 0.9.2
-  # # Override gzip middleware with no-op for httpclient
-  # Faraday::Response.register_middleware :gzip =>
-  #                                         Faraday::Response::Middleware
-  #
-  # gcloud = Gcloud.new
-  # storage = gcloud.storage
-  # ```
-  #
   # ## Downloading a File
   #
   # Files can be downloaded to the local file system. (See
@@ -444,24 +427,23 @@ module Gcloud
   # file.acl.public!
   # ```
   #
-  # ## Configuring Backoff
+  # ## Configuring retries and timeout
   #
-  # The {Gcloud::Backoff} class allows users to globally configure how Cloud API
-  # requests are automatically retried in the case of some errors, such as a
-  # `500` or `503` status code, or a specific internal error code such as
-  # `rateLimitExceeded`.
+  # You can configure how many times API requests may be automatically retried.
+  # When an API request fails, the response will be inspected to see if the
+  # request meets criteria indicating that it may succeed on retry, such as
+  # `500` and `503` status codes or a specific internal error code such as
+  # `rateLimitExceeded`. If it meets the criteria, the request will be retried
+  # after a delay. If another error occurs, the delay will be increased before a
+  # subsequent attempt, until the `retries` limit is reached.
   #
-  # If an API call fails, the response will be inspected to see if the call
-  # should be retried. If the response matches the criteria, then the request
-  # will be retried after a delay. If another error occurs, the delay will be
-  # increased incrementally before a subsequent attempt. The first retry will be
-  # delayed one second, the second retry two seconds, and so on.
+  # You can also set the request `timeout` value in seconds.
   #
   # ```ruby
   # require "gcloud"
-  # require "gcloud/backoff"
   #
-  # Gcloud::Backoff.retries = 5 # Raise the maximum number of retries from 3
+  # gcloud = Gcloud.new
+  # storage = gcloud.storage retries: 10, timeout: 120
   # ```
   #
   # See the [Storage status and error

data/lib/gcloud/storage/bucket.rb

@@ -17,7 +17,7 @@ require "gcloud/storage/bucket/acl"
 require "gcloud/storage/bucket/list"
 require "gcloud/storage/bucket/cors"
 require "gcloud/storage/file"
-require "gcloud/upload"
+require "pathname"
 
 module Gcloud
   module Storage
@@ -37,8 +37,8 @@ module Gcloud
     #
     class Bucket
       ##
-      # @private The Connection object.
-      attr_accessor :connection
+      # @private The Service object.
+      attr_accessor :service
 
       ##
       # @private The Google API Client object.
@@ -47,39 +47,39 @@ module Gcloud
       ##
       # @private Create an empty Bucket object.
       def initialize
-        @connection = nil
-        @gapi = {}
+        @service = nil
+        @gapi = Google::Apis::StorageV1::Bucket.new
       end
 
       ##
       # The kind of item this is.
       # For buckets, this is always `storage#bucket`.
       def kind
-        @gapi["kind"]
+        @gapi.kind
       end
 
       ##
       # The ID of the bucket.
       def id
-        @gapi["id"]
+        @gapi.id
       end
 
       ##
       # The name of the bucket.
       def name
-        @gapi["name"]
+        @gapi.name
       end
 
       ##
       # A URL that can be used to access the bucket using the REST API.
       def api_url
-        @gapi["selfLink"]
+        @gapi.self_link
       end
 
       ##
       # Creation time of the bucket.
       def created_at
-        @gapi["timeCreated"]
+        @gapi.time_created
       end
 
       ##
@@ -128,26 +128,15 @@ module Gcloud
       #   end
       #
       def cors
+        cors_builder = Bucket::Cors.from_gapi @gapi.cors_configurations
         if block_given?
-          cors_builder = Bucket::Cors.new @gapi["cors"]
           yield cors_builder
-          self.cors = cors_builder if cors_builder.changed?
+          if cors_builder.changed?
+            @gapi.cors_configurations = cors_builder.to_gapi
+            patch_gapi! :cors_configurations
+          end
         end
-        deep_dup_and_freeze @gapi["cors"]
-      end
-
-      ##
-      # Updates the CORS configuration for a static website served from the
-      # bucket.
-      #
-      # Accepts an array of hashes containing the attributes specified for the
-      # [resource description of
-      # cors](https://cloud.google.com/storage/docs/json_api/v1/buckets#cors).
-      #
-      # @see https://cloud.google.com/storage/docs/cross-origin Cross-Origin
-      #   Resource Sharing (CORS)
-      def cors= new_cors
-        patch_gapi! cors: new_cors
+        cors_builder.freeze # always return frozen objects
       end
 
       ##
@@ -158,7 +147,7 @@ module Gcloud
       #
       # @see https://cloud.google.com/storage/docs/concepts-techniques
       def location
-        @gapi["location"]
+        @gapi.location
       end
 
       ##
@@ -167,7 +156,7 @@ module Gcloud
       # @see https://cloud.google.com/storage/docs/access-logs Access Logs
       #
       def logging_bucket
-        @gapi["logging"]["logBucket"] if @gapi["logging"]
+        @gapi.logging.log_bucket if @gapi.logging
       end
 
       ##
@@ -178,7 +167,9 @@ module Gcloud
       # @param [String] logging_bucket The bucket to hold the logging output
       #
       def logging_bucket= logging_bucket
-        patch_gapi! logging_bucket: logging_bucket
+        @gapi.logging ||= Google::Apis::StorageV1::Bucket::Logging.new
+        @gapi.logging.log_bucket = logging_bucket
+        patch_gapi! :logging
       end
 
       ##
@@ -187,7 +178,7 @@ module Gcloud
       # @see https://cloud.google.com/storage/docs/access-logs Access Logs
       #
       def logging_prefix
-        @gapi["logging"]["logObjectPrefix"] if @gapi["logging"]
+        @gapi.logging.log_object_prefix if @gapi.logging
       end
 
       ##
@@ -201,7 +192,9 @@ module Gcloud
       # @see https://cloud.google.com/storage/docs/access-logs Access Logs
       #
       def logging_prefix= logging_prefix
-        patch_gapi! logging_prefix: logging_prefix
+        @gapi.logging ||= Google::Apis::StorageV1::Bucket::Logging.new
+        @gapi.logging.log_object_prefix = logging_prefix
+        patch_gapi! :logging
       end
 
       ##
@@ -209,7 +202,7 @@ module Gcloud
       # stored and determines the SLA and the cost of storage. Values include
       # `STANDARD`, `NEARLINE`, and `DURABLE_REDUCED_AVAILABILITY`.
       def storage_class
-        @gapi["storageClass"]
+        @gapi.storage_class
       end
 
       ##
@@ -217,7 +210,7 @@ module Gcloud
       # Versioning](https://cloud.google.com/storage/docs/object-versioning) is
       # enabled for the bucket.
       def versioning?
-        !@gapi["versioning"].nil? && @gapi["versioning"]["enabled"]
+        @gapi.versioning.enabled? unless @gapi.versioning.nil?
       end
 
       ##
@@ -228,7 +221,9 @@ module Gcloud
       # @return [Boolean]
       #
       def versioning= new_versioning
-        patch_gapi! versioning: new_versioning
+        @gapi.versioning ||= Google::Apis::StorageV1::Bucket::Versioning.new
+        @gapi.versioning.enabled = new_versioning
+        patch_gapi! :versioning
       end
 
       ##
@@ -239,7 +234,7 @@ module Gcloud
       #   How to Host a Static Website
       #
       def website_main
-        @gapi["website"]["mainPageSuffix"] if @gapi["website"]
+        @gapi.website.main_page_suffix if @gapi.website
       end
 
       ##
@@ -250,7 +245,9 @@ module Gcloud
       #   How to Host a Static Website
       #
       def website_main= website_main
-        patch_gapi! website_main: website_main
+        @gapi.website ||= Google::Apis::StorageV1::Bucket::Website.new
+        @gapi.website.main_page_suffix = website_main
+        patch_gapi! :website
       end
 
       ##
@@ -261,7 +258,7 @@ module Gcloud
       #   How to Host a Static Website
       #
       def website_404
-        @gapi["website"]["notFoundPage"] if @gapi["website"]
+        @gapi.website.not_found_page if @gapi.website
       end
 
       ##
@@ -272,12 +269,14 @@ module Gcloud
       #   How to Host a Static Website
       #
       def website_404= website_404
-        patch_gapi! website_404: website_404
+        @gapi.website ||= Google::Apis::StorageV1::Bucket::Website.new
+        @gapi.website.not_found_page = website_404
+        patch_gapi! :website
       end
 
       ##
       # Updates the bucket with changes made in the given block in a single
-      # PATCH request. The following attributes may be set: {#cors=},
+      # PATCH request. The following attributes may be set: {#cors},
       # {#logging_bucket=}, {#logging_prefix=}, {#versioning=},
       # {#website_main=}, and {#website_404=}. In addition, the #cors
       # configuration accessible in the block is completely mutable and will be
@@ -316,8 +315,10 @@ module Gcloud
       #   end
       #
       def update
-        updater = Updater.new @gapi["cors"]
+        updater = Updater.new @gapi
         yield updater
+        # Add check for mutable cors
+        updater.check_for_mutable_cors!
         patch_gapi! updater.updates unless updater.updates.empty?
       end
 
@@ -326,7 +327,7 @@ module Gcloud
       # The bucket must be empty before it can be deleted.
       #
       # The API call to delete the bucket may be retried under certain
-      # conditions. See {Gcloud::Backoff} to control this behavior.
+      # conditions. See {Gcloud#storage} to control this behavior.
       #
       # @return [Boolean] Returns `true` if the bucket was deleted.
       #
@@ -340,13 +341,9 @@ module Gcloud
       #   bucket.delete
       #
       def delete
-        ensure_connection!
-        resp = connection.delete_bucket name
-        if resp.success?
-          true
-        else
-          fail ApiError.from_response(resp)
-        end
+        ensure_service!
+        service.delete_bucket name
+        true
       end
 
       ##
@@ -398,7 +395,7 @@ module Gcloud
       #   end
       #
       def files prefix: nil, delimiter: nil, token: nil, max: nil, versions: nil
-        ensure_connection!
+        ensure_service!
         options = {
           prefix:    prefix,
           delimiter: delimiter,
@@ -406,10 +403,9 @@ module Gcloud
           max:       max,
           versions:  versions
         }
-        resp = connection.list_files name, options
-        fail ApiError.from_response(resp) unless resp.success?
-        File::List.from_response resp, connection, name, prefix, delimiter, max,
-                                 versions
+        gapi = service.list_files name, options
+        File::List.from_gapi gapi, service, name, prefix, delimiter, max,
+                             versions
       end
       alias_method :find_files, :files
 
@@ -449,15 +445,13 @@ module Gcloud
       #
       def file path, generation: nil, encryption_key: nil,
                encryption_key_sha256: nil
-        ensure_connection!
-        options = { generation: generation, encryption_key: encryption_key,
-                    encryption_key_sha256: encryption_key_sha256 }
-        resp = connection.get_file name, path, options
-        if resp.success?
-          File.from_gapi resp.data, connection
-        else
-          fail ApiError.from_response(resp)
-        end
+        ensure_service!
+        options = { generation: generation, key: encryption_key,
+                    key_sha256: encryption_key_sha256 }
+        gapi = service.get_file name, path, options
+        File.from_gapi gapi, service
+      rescue Gcloud::NotFoundError
+        nil
       end
       alias_method :find_file, :file
 
@@ -465,12 +459,6 @@ module Gcloud
       # Creates a new {File} object by providing a path to a local file to
       # upload and the path to store it with in the bucket.
       #
-      # A `chunk_size` value can be provided in the options to be used
-      # in resumable uploads. This value is the number of bytes per
-      # chunk and must be divisible by 256KB. If it is not divisible
-      # by 256KB then it will be lowered to the nearest acceptable
-      # value.
-      #
       # #### Customer-supplied encryption keys
       #
       # By default, Google Cloud Storage manages server-side encryption keys on
@@ -485,29 +473,6 @@ module Gcloud
       # files and buckets are also not encrypted, and you can read or update the
       # metadata of an encrypted file without providing the encryption key.
       #
-      # #### Troubleshooting large uploads
-      #
-      # You may encounter errors while attempting to upload large files. Below
-      # are a couple of common cases and their solutions.
-      #
-      # ##### Handling memory errors
-      #
-      # If you encounter a memory error such as `NoMemoryError`, try performing
-      # a resumable upload and setting the `chunk_size` option to a value that
-      # works for your environment, as explained in the final example above.
-      #
-      # ##### Handling broken pipe errors
-      #
-      # To avoid broken pipe (`Errno::EPIPE`) errors when uploading, add the
-      # [httpclient](https://rubygems.org/gems/httpclient) gem to your project,
-      # and the configuration shown below. These lines must execute after you
-      # require gcloud but before you make your first gcloud connection. The
-      # first statement configures [Faraday](https://rubygems.org/gems/faraday)
-      # to use httpclient. The second statement, which should only be added if
-      # you are using a version of Faraday at or above 0.9.2, is a workaround
-      # for [this gzip
-      # issue](https://github.com/GoogleCloudPlatform/gcloud-ruby/issues/367).
-      #
       # @param [String] file Path of the file on the filesystem to upload.
       # @param [String] path Path to store the file in Google Cloud Storage.
       # @param [String] acl A predefined set of access controls to apply to this
@@ -542,10 +507,6 @@ module Gcloud
       # @param [String] content_type The
       #   [Content-Type](https://tools.ietf.org/html/rfc2616#section-14.17)
       #   response header to be returned when the file is downloaded.
-      # @param [Integer] chunk_size The number of bytes per chunk in a resumable
-      #   upload. Must be divisible by 256KB. If it is not divisible by 265KB
-      #   then it will be lowered to the nearest acceptable value. If no value
-      #   is provided it will use {Gcloud::Upload.default_chunk_size}. Optional.
       # @param [String] crc32c The CRC32c checksum of the file data, as
       #   described in [RFC 4960, Appendix
       #   B](http://tools.ietf.org/html/rfc4960#appendix-B).
@@ -591,18 +552,6 @@ module Gcloud
       #   bucket.create_file "path/to/local.file.ext",
       #                      "destination/path/file.ext"
       #
-      # @example Specifying the chunk size as a number of bytes:
-      #   require "gcloud"
-      #
-      #   gcloud = Gcloud.new
-      #   storage = gcloud.storage
-      #
-      #   bucket = storage.bucket "my-bucket"
-      #
-      #   bucket.create_file "path/to/local.file.ext",
-      #                      "destination/path/file.ext",
-      #                      chunk_size: 1024*1024 # 1 MB chunk
-      #
       # @example Providing a customer-supplied encryption key:
       #   require "gcloud"
       #   require "digest/sha2"
@@ -627,39 +576,23 @@ module Gcloud
       #                      encryption_key: key,
       #                      encryption_key_sha256: key_hash
       #
-      # @example Avoiding broken pipe errors with large uploads:
-      #   require "gcloud"
-      #
-      #   # Use httpclient to avoid broken pipe errors with large uploads
-      #   Faraday.default_adapter = :httpclient
-      #
-      #   # Only add the following statement if using Faraday >= 0.9.2
-      #   # Override gzip middleware with no-op for httpclient
-      #   Faraday::Response.register_middleware :gzip =>
-      #                                           Faraday::Response::Middleware
-      #
-      #   gcloud = Gcloud.new
-      #   storage = gcloud.storage
-      #
       def create_file file, path = nil, acl: nil, cache_control: nil,
                       content_disposition: nil, content_encoding: nil,
-                      content_language: nil, content_type: nil, chunk_size: nil,
+                      content_language: nil, content_type: nil,
                       crc32c: nil, md5: nil, metadata: nil, encryption_key: nil,
                       encryption_key_sha256: nil
-        ensure_connection!
+        ensure_service!
         options = { acl: File::Acl.predefined_rule_for(acl), md5: md5,
                     cache_control: cache_control, content_type: content_type,
                     content_disposition: content_disposition, crc32c: crc32c,
-                    content_encoding: content_encoding, chunk_size: chunk_size,
+                    content_encoding: content_encoding,
                     content_language: content_language, metadata: metadata,
-                    encryption_key: encryption_key,
-                    encryption_key_sha256: encryption_key_sha256 }
+                    key: encryption_key, key_sha256: encryption_key_sha256 }
         ensure_file_exists! file
-        resumable = resumable_upload?(file)
-        resp = @connection.upload_file resumable, name, file, path, options
-
-        return File.from_gapi(resp.data, connection) if resp.success?
-        fail ApiError.from_response(resp)
+        # TODO: Handle file as an IO and path is missing more gracefully
+        path ||= Pathname(file).to_path
+        gapi = service.insert_file name, file, path, options
+        File.from_gapi gapi, service
       end
       alias_method :upload_file, :create_file
       alias_method :new_file, :create_file
@@ -760,13 +693,8 @@ module Gcloud
       ##
       # Reloads the bucket with current data from the Storage service.
       def reload!
-        ensure_connection!
-        resp = connection.get_bucket name
-        if resp.success?
-          @gapi = resp.data
-        else
-          fail ApiError.from_response(resp)
-        end
+        ensure_service!
+        @gapi = service.get_bucket name
       end
       alias_method :refresh!, :reload!
 
@@ -775,26 +703,27 @@ module Gcloud
       def self.from_gapi gapi, conn
         new.tap do |f|
           f.gapi = gapi
-          f.connection = conn
+          f.service = conn
         end
       end
 
       protected
 
       ##
-      # Raise an error unless an active connection is available.
-      def ensure_connection!
-        fail "Must have active connection" unless connection
+      # Raise an error unless an active service is available.
+      def ensure_service!
+        fail "Must have active connection" unless service
       end
 
-      def patch_gapi! options = {}
-        ensure_connection!
-        resp = connection.patch_bucket name, options
-        if resp.success?
-          @gapi = resp.data
-        else
-          fail ApiError.from_response(resp)
-        end
+      def patch_gapi! *attributes
+        attributes.flatten!
+        return if attributes.empty?
+        ensure_service!
+        patch_args = Hash[attributes.map do |attr|
+          [attr, @gapi.send(attr)]
+        end]
+        patch_gapi = Google::Apis::StorageV1::Bucket.new patch_args
+        @gapi = service.patch_bucket name, patch_gapi
       end
 
       ##
@@ -804,58 +733,41 @@ module Gcloud
         fail ArgumentError, "cannot find file #{file}"
       end
 
-      ##
-      # @private Determines if a resumable upload should be used.
-      def resumable_upload? file
-        ::File.size?(file).to_i > Upload.resumable_threshold
-      end
-
-      ##
-      # Given nil, empty array, a gapi array of hashes, or any value, returns a
-      # deeply dup'd and frozen array of simple hashes or values (not gapi
-      # objects.)
-      def deep_dup_and_freeze array
-        return [].freeze if array.nil? || array.empty?
-        array = Array(array.dup)
-        array = array.map do |h|
-          h = h.to_hash if h.respond_to? :to_hash
-          h.dup.freeze
-        end
-        array.freeze
-      end
-
       ##
       # Yielded to a block to accumulate changes for a patch request.
-      class Updater
+      class Updater < Bucket
         attr_reader :updates
         ##
         # Create an Updater object.
-        def initialize cors
-          @cors = cors ? Array(cors.dup) : []
-          @cors = @cors.map { |x| x.to_hash if x.respond_to? :to_hash }
-          @updates = {}
+        def initialize gapi
+          @updates = []
+          @gapi = gapi
+          @cors_builder = nil
         end
 
-        ATTRS = [:cors, :logging_bucket, :logging_prefix, :versioning,
-                 :website_main, :website_404]
+        def cors
+          # Same as Bucket#cors, but not frozen
+          @cors_builder ||= Bucket::Cors.from_gapi @gapi.cors_configurations
+          yield @cors_builder if block_given?
+          @cors_builder
+        end
 
-        ATTRS.each do |attr|
-          define_method "#{attr}=" do |arg|
-            updates[attr] = arg
-          end
+        ##
+        # @private Make sure any cors changes are saved
+        def check_for_mutable_cors!
+          return if @cors_builder.nil?
+          return unless @cors_builder.changed?
+          @gapi.cors_configurations = @cors_builder.to_gapi
+          patch_gapi! :cors_configurations
         end
 
+        protected
+
         ##
-        # Return CORS for mutation. Also adds CORS to @updates so that it
-        # is included in the patch request.
-        def cors
-          updates[:cors] ||= @cors
-          if block_given?
-            cors_builder = Bucket::Cors.new updates[:cors]
-            yield cors_builder
-            updates[:cors] = cors_builder if cors_builder.changed?
-          end
-          updates[:cors]
+        # Queue up all the updates instead of making them.
+        def patch_gapi! attribute
+          @updates << attribute
+          @updates.uniq!
         end
       end
     end