fog-google 0.6.0 → 1.0.0

data/lib/fog/dns/google/models/records.rb

@@ -13,9 +13,11 @@ module Fog
         def all
           requires :zone
 
-          data = service.list_resource_record_sets(zone.identity).body["rrsets"] || []
+          data = service.list_resource_record_sets(zone.identity)
+                        .to_h[:rrsets] || []
           load(data)
-        rescue Fog::Errors::NotFound
+        rescue ::Google::Apis::ClientError => e
+          raise e unless e.status_code == 404
           []
         end
 
@@ -28,9 +30,11 @@ module Fog
         def get(name, type)
           requires :zone
 
-          records = service.list_resource_record_sets(zone.identity, :name => name, :type => type).body["rrsets"] || []
+          records = service.list_resource_record_sets(zone.identity, :name => name, :type => type)
+                           .to_h[:rrsets] || []
           records.any? ? new(records.first) : nil
-        rescue Fog::Errors::NotFound
+        rescue ::Google::Apis::ClientError => e
+          raise e unless e.status_code == 404
           nil
         end
 

data/lib/fog/dns/google/models/zone.rb

@@ -63,7 +63,7 @@ module Fog
           raise Fog::Errors::Error.new("Resaving an existing object may create a duplicate") if persisted?
 
           data = service.create_managed_zone(name, domain, description)
-          merge_attributes(data.body)
+          merge_attributes(data.to_h)
           self
         end
       end

data/lib/fog/dns/google/models/zones.rb

@@ -9,7 +9,7 @@ module Fog
         #
         # @return [Array<Fog::DNS::Google::Zone>] List of Managed Zone resources
         def all
-          data = service.list_managed_zones.body["managedZones"] || []
+          data = service.list_managed_zones.managed_zones.to_h || []
           load(data)
         end
 
@@ -19,10 +19,11 @@ module Fog
         # @param [String] name_or_id Managed Zone name or identity
         # @return [Fog::DNS::Google::Zone] Managed Zone resource
         def get(name_or_id)
-          if zone = service.get_managed_zone(name_or_id).body
+          if zone = service.get_managed_zone(name_or_id).to_h
             new(zone)
           end
-        rescue Fog::Errors::NotFound
+        rescue ::Google::Apis::ClientError => e
+          raise e unless e.status_code == 404
           nil
         end
       end

data/lib/fog/dns/google/real.rb

@@ -4,14 +4,13 @@ module Fog
       class Real
         include Fog::Google::Shared
 
-        attr_accessor :client
         attr_reader :dns
 
         def initialize(options)
           shared_initialize(options[:google_project], GOOGLE_DNS_API_VERSION, GOOGLE_DNS_BASE_URL)
           options[:google_api_scope_url] = GOOGLE_DNS_API_SCOPE_URLS.join(" ")
-          @client = initialize_google_client(options)
-          @dns = @client.discovered_api("dns", api_version)
+          initialize_google_client(options)
+          @dns = ::Google::Apis::DnsV1::DnsService.new
         end
       end
     end

data/lib/fog/dns/google/requests/create_change.rb

@@ -7,56 +7,19 @@ module Fog
       # @see https://cloud.google.com/dns/api/v1/changes/create
       class Real
         def create_change(zone_name_or_id, additions = [], deletions = [])
-          api_method = @dns.changes.create
-          parameters = {
-            "project" => @project,
-            "managedZone" => zone_name_or_id
-          }
-
-          body = {
-            "additions" => additions,
-            "deletions" => deletions
-          }
-
-          request(api_method, parameters, body)
+          @dns.create_change(
+            @project, zone_name_or_id,
+            ::Google::Apis::DnsV1::Change.new(
+              :additions => additions,
+              :deletions => deletions
+            )
+          )
         end
       end
 
       class Mock
-        def create_change(zone_name_or_id, additions = [], deletions = [])
-          if data[:managed_zones].key?(zone_name_or_id)
-            zone = data[:managed_zones][zone_name_or_id]
-          else
-            zone = data[:managed_zones].values.detect { |z| z["name"] = zone_name_or_id }
-          end
-
-          unless zone
-            raise Fog::Errors::NotFound, "The 'parameters.managedZone' resource named '#{zone_name_or_id}' does not exist."
-          end
-
-          deletions.each do |del|
-            rrset = data[:resource_record_sets][zone["id"]].reject! { |r| r["name"] == del["name"] && r["type"] == del["type"] }
-            unless rrset
-              raise Fog::Errors::NotFound, "The 'entity.change.deletions[0]' resource named '#{del['name']} ('#{del['type']})' does not exist."
-            end
-          end
-
-          additions.each do |add|
-            data[:resource_record_sets][zone["id"]] << add
-          end
-
-          id = data[:changes][zone["id"]].max_by { |c| c["id"] }["id"]
-          data = {
-            "kind" => 'dns#change',
-            "id" => (id.to_i + 1).to_s,
-            "startTime" => DateTime.now.strftime("%FT%T.%LZ"),
-            "status" => "done",
-            "additions" => additions,
-            "deletions" => deletions
-          }
-          self.data[:changes][zone["id"]] << data
-
-          build_excon_response(data)
+        def create_change(_zone_name_or_id, _additions = [], _deletions = [])
+          Fog::Mock.not_implemented
         end
       end
     end

data/lib/fog/dns/google/requests/create_managed_zone.rb

@@ -8,73 +8,18 @@ module Fog
       # @see https://developers.google.com/cloud-dns/api/v1/managedZones/create
       class Real
         def create_managed_zone(name, dns_name, description)
-          api_method = @dns.managed_zones.create
-          parameters = {
-            "project" => @project
-          }
+          mngd_zone = ::Google::Apis::DnsV1::ManagedZone.new
+          mngd_zone.name = name
+          mngd_zone.dns_name = dns_name
+          mngd_zone.description = description
 
-          body_object = {
-            "name" => name,
-            "dnsName" => dns_name,
-            "description" => description
-          }
-
-          request(api_method, parameters, body_object)
+          @dns.create_managed_zone(@project, mngd_zone)
         end
       end
 
       class Mock
-        def create_managed_zone(name, dns_name, description)
-          id = Fog::Mock.random_numbers(19).to_s
-          data = {
-            "kind" => 'dns#managedZone',
-            "id" => id,
-            "creationTime" => DateTime.now.strftime("%FT%T.%LZ"),
-            "name" => name,
-            "dnsName" => dns_name,
-            "description" => description,
-            "nameServers" => [
-              "ns-cloud-e1.googledomains.com.",
-              "ns-cloud-e2.googledomains.com.",
-              "ns-cloud-e3.googledomains.com.",
-              "ns-cloud-e4.googledomains.com."
-            ]
-          }
-          self.data[:managed_zones][id] = data
-          self.data[:resource_record_sets][id] = [
-            {
-              "kind" => 'dns#resourceRecordSet',
-              "name" => dns_name,
-              "type" => "NS",
-              "ttl" => 21_600,
-              "rrdatas" => [
-                "ns-cloud-c1.googledomains.com.",
-                "ns-cloud-c2.googledomains.com.",
-                "ns-cloud-c3.googledomains.com.",
-                "ns-cloud-c4.googledomains.com."
-              ]
-            },
-            {
-              "kind" => 'dns#resourceRecordSet',
-              "name" => dns_name,
-              "type" => "SOA",
-              "ttl" => 21_600,
-              "rrdatas" => [
-                "ns-cloud-c1.googledomains.com. dns-admin.google.com. 0 21600 3600 1209600 300"
-              ]
-            }
-          ]
-          self.data[:changes][id] = [
-            {
-              "kind" => 'dns#change',
-              "id" => "0",
-              "startTime" => DateTime.now.strftime("%FT%T.%LZ"),
-              "status" => "done",
-              "additions" => self.data[:resource_record_sets][id]
-            }
-          ]
-
-          build_excon_response(data)
+        def create_managed_zone(_name, _dns_name, _description)
+          Fog::Mock.not_implemented
         end
       end
     end

data/lib/fog/dns/google/requests/delete_managed_zone.rb

@@ -7,27 +7,13 @@ module Fog
       # @see https://developers.google.com/cloud-dns/api/v1/managedZones/delete
       class Real
         def delete_managed_zone(name_or_id)
-          api_method = @dns.managed_zones.delete
-          parameters = {
-            "project" => @project,
-            "managedZone" => name_or_id
-          }
-
-          request(api_method, parameters)
+          @dns.delete_managed_zone(@project, name_or_id)
         end
       end
 
       class Mock
-        def delete_managed_zone(name_or_id)
-          if data[:managed_zones].key?(name_or_id)
-            data[:managed_zones].delete(name_or_id)
-          elsif zone = data[:managed_zones].values.detect { |z| z["name"] = name_or_id }
-            data[:managed_zones].delete(zone["id"])
-          else
-            raise Fog::Errors::NotFound, "The 'parameters.managedZone' resource named '#{name_or_id}' does not exist."
-          end
-
-          build_excon_response(nil)
+        def delete_managed_zone(_name_or_id)
+          Fog::Mock.not_implemented
         end
       end
     end

data/lib/fog/dns/google/requests/get_change.rb

@@ -7,34 +7,13 @@ module Fog
       # @see https://developers.google.com/cloud-dns/api/v1/changes/get
       class Real
         def get_change(zone_name_or_id, identity)
-          api_method = @dns.changes.get
-          parameters = {
-            "project" => @project,
-            "managedZone" => zone_name_or_id,
-            "changeId" => identity
-          }
-
-          request(api_method, parameters)
+          @dns.get_change(@project, zone_name_or_id, identity)
         end
       end
 
       class Mock
-        def get_change(zone_name_or_id, identity)
-          if data[:managed_zones].key?(zone_name_or_id)
-            zone = data[:managed_zones][zone_name_or_id]
-          else
-            zone = data[:managed_zones].values.detect { |z| z["name"] = zone_name_or_id }
-          end
-
-          unless zone
-            raise Fog::Errors::NotFound, "The 'parameters.managedZone' resource named '#{zone_name_or_id}' does not exist."
-          end
-
-          unless data = self.data[:changes][zone["id"]].detect { |c| c["id"] == identity }
-            raise Fog::Errors::NotFound, "The 'parameters.changeId' resource named '#{identity}' does not exist."
-          end
-
-          build_excon_response(data)
+        def get_change(_zone_name_or_id, _identity)
+          Fog::Mock.not_implemented
         end
       end
     end

data/lib/fog/dns/google/requests/get_managed_zone.rb

@@ -7,29 +7,13 @@ module Fog
       # @see https://developers.google.com/cloud-dns/api/v1/managedZones/get
       class Real
         def get_managed_zone(name_or_id)
-          api_method = @dns.managed_zones.get
-          parameters = {
-            "project" => @project,
-            "managedZone" => name_or_id
-          }
-
-          request(api_method, parameters)
+          @dns.get_managed_zone(@project, name_or_id)
         end
       end
 
       class Mock
-        def get_managed_zone(name_or_id)
-          if data[:managed_zones].key?(name_or_id)
-            data = self.data[:managed_zones][name_or_id]
-          else
-            data = self.data[:managed_zones].values.detect { |zone| zone["name"] = name_or_id }
-          end
-
-          unless data
-            raise Fog::Errors::NotFound, "The 'parameters.managedZone' resource named '#{name_or_id}' does not exist."
-          end
-
-          build_excon_response(data)
+        def get_managed_zone(_name_or_id)
+          Fog::Mock.not_implemented
         end
       end
     end

data/lib/fog/dns/google/requests/get_project.rb

@@ -8,33 +8,13 @@ module Fog
       # @see https://developers.google.com/cloud-dns/api/v1/projects/get
       class Real
         def get_project(identity)
-          api_method = @dns.projects.get
-          parameters = {
-            :project => identity
-          }
-
-          request(api_method, parameters)
+          @dns.get_project(identity)
         end
       end
 
       class Mock
-        def get_project(identity)
-          body = {
-            "kind" => 'dns#project',
-            "number" => Fog::Mock.random_numbers(12).to_s,
-            "id" => identity,
-            "quota" => {
-              "kind" => 'dns#quota',
-              "managedZones" => 100,
-              "rrsetsPerManagedZone" => 10_000,
-              "rrsetAdditionsPerChange" => 100,
-              "rrsetDeletionsPerChange" => 100,
-              "totalRrdataSizePerChange" => 10_000,
-              "resourceRecordsPerRrset" => 20
-            }
-          }
-
-          build_excon_response(body)
+        def get_project(_identity)
+          Fog::Mock.not_implemented
         end
       end
     end

data/lib/fog/dns/google/requests/list_changes.rb

@@ -6,34 +6,21 @@ module Fog
       #
       # @see https://developers.google.com/cloud-dns/api/v1/changes/list
       class Real
-        def list_changes(zone_name_or_id)
-          api_method = @dns.changes.list
-          parameters = {
-            "project" => @project,
-            "managedZone" => zone_name_or_id
-          }
-
-          request(api_method, parameters)
+        def list_changes(zone_name_or_id, max_results: nil, page_token: nil,
+                         sort_by: nil, sort_order: nil)
+          @dns.list_changes(
+            @project, zone_name_or_id,
+            :max_results => max_results,
+            :page_token => page_token,
+            :sort_by => sort_by,
+            :sort_order => sort_order
+          )
         end
       end
 
       class Mock
-        def list_changes(zone_name_or_id)
-          if data[:managed_zones].key?(zone_name_or_id)
-            zone = data[:managed_zones][zone_name_or_id]
-          else
-            zone = data[:managed_zones].values.detect { |z| z["name"] == zone_name_or_id }
-          end
-
-          unless zone
-            raise Fog::Errors::NotFound, "The 'parameters.managedZone' resource named '#{zone_name_or_id}' does not exist."
-          end
-
-          body = {
-            "kind" => 'dns#changesListResponse',
-            "changes" => data[:changes][zone["id"]]
-          }
-          build_excon_response(body)
+        def list_changes(_zone_name_or_id, _opts = {})
+          Fog::Mock.not_implemented
         end
       end
     end

data/lib/fog/dns/google/requests/list_managed_zones.rb

@@ -6,24 +6,17 @@ module Fog
       #
       # @see hhttps://developers.google.com/cloud-dns/api/v1/managedZones/list
       class Real
-        def list_managed_zones
-          api_method = @dns.managed_zones.list
-          parameters = {
-            "project" => @project
-          }
-
-          request(api_method, parameters)
+        def list_managed_zones(dns_name: nil, max_results: nil, page_token: nil)
+          @dns.list_managed_zones(@project,
+                                  :dns_name => dns_name,
+                                  :max_results => max_results,
+                                  :page_token => page_token)
         end
       end
 
       class Mock
-        def list_managed_zones
-          body = {
-            "kind" => 'dns#managedZonesListResponse',
-            "managedZones" => data[:managed_zones].values
-          }
-
-          build_excon_response(body)
+        def list_managed_zones(_opts = {})
+          Fog::Mock.not_implemented
         end
       end
     end

data/lib/fog/dns/google/requests/list_resource_record_sets.rb

@@ -6,43 +6,21 @@ module Fog
       #
       # @see https://developers.google.com/cloud-dns/api/v1/resourceRecordSets/list
       class Real
-        def list_resource_record_sets(zone_name_or_id, options = {})
-          api_method = @dns.resource_record_sets.list
-          parameters = {
-            "project" => @project,
-            "managedZone" => zone_name_or_id
-          }
-
-          [:name, :type].reject { |o| options[o].nil? }.each do |key|
-            parameters[key] = options[key]
-          end
-
-          request(api_method, parameters)
+        def list_resource_record_sets(zone_name_or_id, max_results: nil,
+                                      name: nil, page_token: nil, type: nil)
+          @dns.list_resource_record_sets(
+            @project, zone_name_or_id,
+            :max_results => max_results,
+            :name => name,
+            :page_token => page_token,
+            :type => type
+          )
         end
       end
 
       class Mock
-        def list_resource_record_sets(zone_name_or_id, options = {})
-          if data[:managed_zones].key?(zone_name_or_id)
-            zone = data[:managed_zones][zone_name_or_id]
-          else
-            zone = data[:managed_zones].values.detect { |z| z["name"] = zone_name_or_id }
-          end
-
-          unless zone
-            raise Fog::Errors::NotFound, "The 'parameters.managedZone' resource named '#{zone_name_or_id}' does not exist."
-          end
-
-          rrsets = data[:resource_record_sets][zone["id"]]
-          if options.key?(:name) && options.key?(:type)
-            rrsets.delete_if { |rrset| rrset["name"] != options[:name] || rrset["type"] != options[:type] }
-          end
-
-          body = {
-            "kind" => 'dns#resourceRecordSetsListResponse',
-            "rrsets" => rrsets
-          }
-          build_excon_response(body)
+        def list_resource_record_sets(_zone_name_or_id, _options = {})
+          Fog::Mock.not_implemented
         end
       end
     end