gcloud 0.11.0 → 0.12.0

data/lib/gcloud/dns/service.rb

@@ -0,0 +1,167 @@
+# 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/dns_v1"
+
+module Gcloud
+  module Dns
+    ##
+    # @private
+    # Represents the service to DNS, exposing the API calls.
+    class Service
+      ##
+      # Alias to the Google Client API module
+      API = Google::Apis::DnsV1
+
+      attr_accessor :project
+      attr_accessor :credentials
+
+      ##
+      # Creates a new Service instance.
+      def initialize project, credentials, retries: nil, timeout: nil
+        @project = project
+        @credentials = credentials
+        @service = API::DnsService.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 Google::Apis::DnsV1::Project
+      def get_project project_id = @project
+        service.get_project project_id
+      rescue Google::Apis::Error => e
+        raise Gcloud::Error.from_error(e)
+      end
+
+      ##
+      # Returns Google::Apis::DnsV1::ManagedZone
+      def get_zone zone_id
+        service.get_managed_zone @project, zone_id
+      rescue Google::Apis::Error => e
+        raise Gcloud::Error.from_error(e)
+      end
+
+      ##
+      # Returns Google::Apis::DnsV1::ListManagedZonesResponse
+      def list_zones token: nil, max: nil
+        service.list_managed_zones @project, max_results: max, page_token: token
+      rescue Google::Apis::Error => e
+        raise Gcloud::Error.from_error(e)
+      end
+
+      ##
+      # Returns Google::Apis::DnsV1::ManagedZone
+      def create_zone zone_name, zone_dns, description: nil,
+                      name_server_set: nil
+        managed_zone = Google::Apis::DnsV1::ManagedZone.new(
+          kind: "dns#managedZone",
+          name: zone_name,
+          dns_name: zone_dns,
+          description: (description || ""),
+          name_server_set: name_server_set
+        )
+        service.create_managed_zone @project, managed_zone
+      rescue Google::Apis::Error => e
+        raise Gcloud::Error.from_error(e)
+      end
+
+      def delete_zone zone_id
+        service.delete_managed_zone @project, zone_id
+      rescue Google::Apis::Error => e
+        raise Gcloud::Error.from_error(e)
+      end
+
+      ##
+      # Returns Google::Apis::DnsV1::Change
+      def get_change zone_id, change_id
+        service.get_change @project, zone_id, change_id
+      rescue Google::Apis::Error => e
+        raise Gcloud::Error.from_error(e)
+      end
+
+      ##
+      # Returns Google::Apis::DnsV1::ListChangesResponse
+      def list_changes zone_id, token: nil, max: nil, order: nil, sort: nil
+        service.list_changes @project, zone_id, max_results: max,
+                                                page_token: token,
+                                                sort_by: sort,
+                                                sort_order: order
+      rescue Google::Apis::Error => e
+        raise Gcloud::Error.from_error(e)
+      end
+
+      ##
+      # Returns Google::Apis::DnsV1::Change
+      def create_change zone_id, additions, deletions
+        change = Google::Apis::DnsV1::Change.new(
+          kind: "dns#change",
+          additions: Array(additions),
+          deletions: Array(deletions)
+        )
+        service.create_change @project, zone_id, change
+      rescue Google::Apis::Error => e
+        raise Gcloud::Error.from_error(e)
+      end
+
+      ##
+      # Returns Google::Apis::DnsV1::ListResourceRecordSetsResponse
+      def list_records zone_id, name = nil, type = nil, token: nil, max: nil
+        service.list_resource_record_sets @project, zone_id, max_results: max,
+                                                             name: name,
+                                                             page_token: token,
+                                                             type: type
+      rescue Google::Apis::Error => e
+        raise Gcloud::Error.from_error(e)
+      end
+
+      ##
+      # Fully Qualified Domain Name
+      def self.fqdn name, origin_dns
+        name = name.to_s.strip
+        return name if self.ip_addr? name
+        name = origin_dns if name.empty?
+        name = origin_dns if name == "@"
+        name = "#{name}.#{origin_dns}" unless name.include? "."
+        name = "#{name}." unless name.end_with? "."
+        name
+      end
+
+      require "ipaddr"
+
+      def self.ip_addr? name
+        IPAddr.new name
+        true
+      rescue IPAddr::Error
+        false
+      end
+
+      def inspect
+        "#{self.class}(#{@project})"
+      end
+    end
+  end
+end

data/lib/gcloud/dns/zone.rb

@@ -44,8 +44,8 @@ module Gcloud
     #
     class Zone
       ##
-      # @private The Connection object.
-      attr_accessor :connection
+      # @private The Service object.
+      attr_accessor :service
 
       ##
       # @private The Google API Client object.
@@ -54,7 +54,7 @@ module Gcloud
       ##
       # @private Create an empty Zone object.
       def initialize
-        @connection = nil
+        @service = nil
         @gapi = {}
       end
 
@@ -62,7 +62,7 @@ module Gcloud
       # Unique identifier for the resource; defined by the server.
       #
       def id
-        @gapi["id"]
+        @gapi.id
       end
 
       ##
@@ -72,14 +72,14 @@ module Gcloud
       # dashes.
       #
       def name
-        @gapi["name"]
+        @gapi.name
       end
 
       ##
       # The DNS name of this managed zone, for instance "example.com.".
       #
       def dns
-        @gapi["dnsName"]
+        @gapi.dns_name
       end
 
       ##
@@ -87,7 +87,7 @@ module Gcloud
       # the user's convenience. Has no effect on the managed zone's function.
       #
       def description
-        @gapi["description"]
+        @gapi.description
       end
 
       ##
@@ -95,7 +95,7 @@ module Gcloud
       # server.
       #
       def name_servers
-        Array(@gapi["nameServers"])
+        Array(@gapi.name_servers)
       end
 
       ##
@@ -104,14 +104,14 @@ module Gcloud
       # ManagedZones. Most users will leave this field unset.
       #
       def name_server_set
-        @gapi["nameServerSet"]
+        @gapi.name_server_set
       end
 
       ##
       # The time that this resource was created on the server.
       #
       def created_at
-        Time.parse @gapi["creationTime"]
+        Time.parse @gapi.creation_time
       rescue
         nil
       end
@@ -144,13 +144,9 @@ module Gcloud
       def delete force: false
         clear! if force
 
-        ensure_connection!
-        resp = connection.delete_zone id
-        if resp.success?
-          true
-        else
-          fail ApiError.from_response(resp)
-        end
+        ensure_service!
+        service.delete_zone id
+        true
       end
 
       ##
@@ -191,13 +187,11 @@ module Gcloud
       #   end
       #
       def change change_id
-        ensure_connection!
-        resp = connection.get_change id, change_id
-        if resp.success?
-          Change.from_gapi resp.data, self
-        else
-          nil
-        end
+        ensure_service!
+        gapi = service.get_change id, change_id
+        Change.from_gapi gapi, self
+      rescue Gcloud::NotFoundError
+        nil
       end
       alias_method :find_change, :change
       alias_method :get_change, :change
@@ -248,18 +242,14 @@ module Gcloud
       #   end
       #
       def changes token: nil, max: nil, order: nil
-        ensure_connection!
+        ensure_service!
         # Fix the sort options
         order = adjust_change_sort_order order
         sort  = "changeSequence" if order
         # Continue with the API call
-        resp = connection.list_changes id, token: token, max: max,
-                                           order: order, sort: sort
-        if resp.success?
-          Change::List.from_response resp, self, max, order
-        else
-          fail ApiError.from_response(resp)
-        end
+        gapi = service.list_changes id, token: token, max: max,
+                                        order: order, sort: sort
+        Change::List.from_gapi gapi, self, max, order
       end
       alias_method :find_changes, :changes
 
@@ -313,16 +303,12 @@ module Gcloud
       #   end
       #
       def records name = nil, type = nil, token: nil, max: nil
-        ensure_connection!
+        ensure_service!
 
         name = fqdn(name) if name
 
-        resp = connection.list_records id, name, type, token: token, max: max
-        if resp.success?
-          Record::List.from_response resp, self, name, type, max
-        else
-          fail ApiError.from_response(resp)
-        end
+        gapi = service.list_records id, name, type, token: token, max: max
+        Record::List.from_gapi gapi, self, name, type, max
       end
       alias_method :find_records, :records
 
@@ -707,7 +693,7 @@ module Gcloud
       #   zone.fqdn "mail.example.com." #=> "mail.example.com."
       #
       def fqdn domain_name
-        Connection.fqdn domain_name, dns
+        Service.fqdn domain_name, dns
       end
 
       ##
@@ -715,7 +701,7 @@ module Gcloud
       def self.from_gapi gapi, conn
         new.tap do |f|
           f.gapi = gapi
-          f.connection = conn
+          f.service = conn
         end
       end
 
@@ -723,20 +709,15 @@ module Gcloud
 
       ##
       # Raise an error unless an active connection is available.
-      def ensure_connection!
-        fail "Must have active connection" unless connection
+      def ensure_service!
+        fail "Must have active connection" unless service
       end
 
       def create_change additions, deletions
-        ensure_connection!
-        resp = connection.create_change id,
-                                        additions.map(&:to_gapi),
-                                        deletions.map(&:to_gapi)
-        if resp.success?
-          Change.from_gapi resp.data, self
-        else
-          fail ApiError.from_response(resp)
-        end
+        ensure_service!
+        gapi = service.create_change id, additions.map(&:to_gapi),
+                                     deletions.map(&:to_gapi)
+        Change.from_gapi gapi, self
       end
 
       def increment_soa to_add, to_remove, soa_serial

data/lib/gcloud/dns/zone/list.rb

@@ -70,13 +70,9 @@ module Gcloud
         #
         def next
           return nil unless next?
-          ensure_connection!
-          resp = @connection.list_zones token: token, max: @max
-          if resp.success?
-            Zone::List.from_response resp, @connection, @max
-          else
-            fail ApiError.from_response(resp)
-          end
+          ensure_service!
+          gapi = @service.list_zones token: token, max: @max
+          Zone::List.from_gapi gapi, @service, @max
         end
 
         ##
@@ -148,14 +144,14 @@ module Gcloud
         end
 
         ##
-        # @private New Zones::List from a response object.
-        def self.from_response resp, conn, max = nil
-          zones = new(Array(resp.data["managedZones"]).map do |gapi_object|
-            Zone.from_gapi gapi_object, conn
+        # @private New Zones::List from a ListManagedZonesResponse object.
+        def self.from_gapi gapi, conn, max = nil
+          zones = new(Array(gapi.managed_zones).map do |g|
+            Zone.from_gapi g, conn
           end)
-          zones.instance_variable_set "@token",      resp.data["nextPageToken"]
-          zones.instance_variable_set "@connection", conn
-          zones.instance_variable_set "@max",        max
+          zones.instance_variable_set "@token",   gapi.next_page_token
+          zones.instance_variable_set "@service", conn
+          zones.instance_variable_set "@max",     max
           zones
         end
 
@@ -163,8 +159,8 @@ module Gcloud
 
         ##
         # Raise an error unless an active connection is available.
-        def ensure_connection!
-          fail "Must have active connection" unless @connection
+        def ensure_service!
+          fail "Must have active connection" unless @service
         end
       end
     end

data/lib/gcloud/errors.rb

@@ -15,35 +15,47 @@
 
 module Gcloud
   ##
-  # Base Gcloud exception class.
+  # Base gcloud-ruby exception class.
   class Error < StandardError
-    ##
-    # The inner error object.
-    attr_reader :inner
-
-    ##
-    # Create a new error object.
-    def initialize message = nil, error = nil
-      super message
-      @inner = error
-    end
-
-    # @private Create a new error object.
+    # @private Create a new error object from a client error
     def self.from_error error
-      klass_for(error).new error.message, error
+      klass = if error.respond_to? :code
+                grpc_error_class_for error.code
+              elsif error.respond_to? :status_code
+                gapi_error_class_for error.status_code
+              else
+                self
+              end
+      klass.new error.message
     end
 
-    # @private Identify the subclass for an error
-    def self.klass_for error
-      return self.class unless error.is_a? GRPC::BadStatus
+    # @private Identify the subclass for a gRPC error
+    def self.grpc_error_class_for grpc_error_code
       # The gRPC status code 0 is for a successful response.
       # So there is no error subclass for a 0 status code, use current class.
-      [self.class, CanceledError, UnknownError, InvalidArgumentError,
+      [self, CanceledError, UnknownError, InvalidArgumentError,
        DeadlineExceededError, NotFoundError, AlreadyExistsError,
        PermissionDeniedError, ResourceExhaustedError, FailedPreconditionError,
        AbortedError, OutOfRangeError, UnimplementedError, InternalError,
        UnavailableError, DataLossError, UnauthenticatedError
-      ][error.code] || self.class
+      ][grpc_error_code] || self
+    end
+
+    # @private Identify the subclass for a Google API Client error
+    def self.gapi_error_class_for http_status_code
+      # The http status codes mapped to their error classes.
+      { 400 => InvalidArgumentError, # FailedPreconditionError/OutOfRangeError
+        401 => UnauthenticatedError,
+        403 => PermissionDeniedError,
+        404 => NotFoundError,
+        409 => AlreadyExistsError, # AbortedError
+        429 => ResourceExhaustedError,
+        499 => CanceledError,
+        500 => InternalError, # UnknownError/DataLossError
+        501 => UnimplementedError,
+        503 => UnavailableError,
+        504 => DeadlineExceededError
+      }[http_status_code] || self
     end
   end