fog 1.24.0 → 1.25.0

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

@@ -0,0 +1,25 @@
+require 'fog/core/collection'
+require 'fog/google/models/dns/project'
+
+module Fog
+  module DNS
+    class Google
+      class Projects < Fog::Collection
+        model Fog::DNS::Google::Project
+
+        ##
+        # Fetches the representation of an existing Project
+        #
+        # @param [String] identity Project identity
+        # @return [Fog::DNS::Google::Project] Project resource
+        def get(identity)
+          if project = service.get_project(identity).body
+            new(project)
+          end
+        rescue Fog::Errors::NotFound
+          nil
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,112 @@
+require 'fog/core/model'
+
+module Fog
+  module DNS
+    class Google
+      ##
+      # Resource Record Sets resource
+      #
+      # @see https://cloud.google.com/dns/api/v1beta1/resourceRecordSets
+      class Record < Fog::Model
+        identity :name
+
+        attribute :kind
+        attribute :type
+        attribute :ttl
+        attribute :rrdatas
+
+        ##
+        # Deletes a previously created Resource Record Sets resource
+        #
+        # @param [Boolean] async If the operation must be asyncronous (true by default)
+        # @return [Boolean] If the Resource Record Set has been deleted
+        def destroy(async = true)
+          requires :name, :type, :ttl, :rrdatas
+
+          data = service.create_change(self.zone.id, [], [resource_record_set_format])
+          change = Fog::DNS::Google::Changes.new(:service => service, :zone => zone).get(data.body['id'])
+          unless async
+            change.wait_for { ready? }
+          end
+          true
+        end
+
+        ##
+        # Modifies a previously created Resource Record Sets resource
+        #
+        # @param [Hash] new_attributes Resource Record Set new attributes
+        # @return [Fog::DNS::Google::Record] Resource Record Sets resource
+        def modify(new_attributes)
+          requires :name, :type, :ttl, :rrdatas
+
+          deletions = resource_record_set_format
+          merge_attributes(new_attributes)
+
+          data = service.create_change(self.zone.id, [resource_record_set_format], [deletions])
+          change = Fog::DNS::Google::Changes.new(:service => service, :zone => zone).get(data.body['id'])
+          async = new_attributes.has_key?(:async) ? new_attributes[:async] : true
+          unless async
+            change.wait_for { ready? }
+          end
+          self
+        end
+
+        ##
+        # Reloads a Resource Record Sets resource
+        #
+        # @return [Fog::DNS::Google::Record] Resource Record Sets resource
+        def reload
+          requires :name, :type
+
+          data = collection.get(self.name, self.type)
+          merge_attributes(data.attributes)
+          self
+        end
+
+        ##
+        # Creates a new Resource Record Sets resource
+        #
+        # @return [Fog::DNS::Google::Record] Resource Record Sets resource
+        def save
+          requires :name, :type, :ttl, :rrdatas
+
+          data = service.create_change(self.zone.id, [resource_record_set_format], [])
+          change = Fog::DNS::Google::Changes.new(:service => service, :zone => zone).get(data.body['id'])
+          change.wait_for { !pending? }
+          self
+        end
+
+        ##
+        # Returns the Managed Zone of the Resource Record Sets resource
+        #
+        # @return [Fog::DNS::Google::Zone] Managed Zone of the Resource Record Sets resource
+        def zone
+          @zone
+        end
+
+        private
+
+        ##
+        # Assigns the Managed Zone of the Resource Record Sets resource
+        #
+        # @param [Fog::DNS::Google::Zone] new_zone Managed Zone of the Resource Record Sets resource
+        def zone=(new_zone)
+          @zone = new_zone
+        end
+
+        ##
+        # Resource Record Sets resource representation
+        #
+        def resource_record_set_format
+          {
+            'kind' => 'dns#resourceRecordSet',
+            'name' => self.name,
+            'type' => self.type,
+            'ttl'  => self.ttl,
+            'rrdatas' => self.rrdatas,
+          }
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,52 @@
+require 'fog/core/collection'
+require 'fog/google/models/dns/record'
+
+module Fog
+  module DNS
+    class Google
+      class Records < Fog::Collection
+        model Fog::DNS::Google::Record
+
+        attribute :zone
+
+        ##
+        # Enumerates Resource Record Sets that have been created but not yet deleted
+        #
+        # @return [Array<Fog::DNS::Google::Record>] List of Resource Record Sets resources
+        def all
+          requires :zone
+
+          data = service.list_resource_record_sets(zone.identity).body['rrsets'] || []
+          load(data)
+        rescue Fog::Errors::NotFound
+          []
+        end
+
+        ##
+        # Fetches the representation of an existing Resource Record Set
+        #
+        # @param [String] name Resource Record Set name
+        # @param [String] type Resource Record Set type
+        # @return [Fog::DNS::Google::Record] Resource Record Set resource
+        def get(name, type)
+          requires :zone
+
+          records = service.list_resource_record_sets(zone.identity, { :name => name, :type => type }).body['rrsets'] || []
+          records.any? ? new(records.first) : nil
+        rescue Fog::Errors::NotFound
+          nil
+        end
+
+        ##
+        # Creates a new instance of a Resource Record Set
+        #
+        # @return [Fog::DNS::Google::Record] Resource Record Set resource
+        def new(attributes = {})
+          requires :zone
+
+          super({ :zone => zone }.merge!(attributes))
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,74 @@
+require 'fog/core/model'
+
+module Fog
+  module DNS
+    class Google
+      ##
+      # Managed Zone resource
+      #
+      # @see https://developers.google.com/cloud-dns/api/v1beta1/managedZones
+      class Zone < Fog::Model
+        identity :id
+
+        attribute :creation_time, :aliases => 'creationTime'
+        attribute :description
+        attribute :domain, :aliases => 'dnsName'
+        attribute :kind
+        attribute :name
+        attribute :nameservers, :aliases => 'nameServers'
+
+        ##
+        # Enumerates the list of Changes for the Managed Zone
+        #
+        # @return Array<Fog::DNS::Google::Change>] List of Changes for the Managed Zone
+        def changes
+          @changes = begin
+            Fog::DNS::Google::Changes.new(
+              :service => service,
+              :zone => self
+            )
+          end
+        end
+
+        ##
+        # Deletes a previously created Managed Zone
+        #
+        # @return [Boolean] If the Managed Zone has been deleted
+        def destroy
+          requires :identity
+
+          service.delete_managed_zone(self.identity)
+          true
+        end
+
+        ##
+        # Enumerates the list of Resource Record Sets for the Managed Zone
+        #
+        # @return Array<Fog::DNS::Google::Record>] List of Resource Record Sets for the Managed Zone
+        def records
+          @records = begin
+            Fog::DNS::Google::Records.new(
+              :service => service,
+              :zone => self
+            )
+          end
+        end
+
+        ##
+        # Creates a new Managed Zone
+        #
+        # @return [Fog::DNS::Google::Zone] Managed Zone
+        # @raise [Fog::Errors::Error] If Managed Zone already exists
+        def save
+          requires :name, :domain, :description
+
+          raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if persisted?
+
+          data = service.create_managed_zone(self.name, self.domain, self.description)
+          merge_attributes(data.body)
+          self
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,34 @@
+require 'fog/core/collection'
+require 'fog/google/models/dns/zone'
+
+module Fog
+  module DNS
+    class Google
+      class Zones < Fog::Collection
+        model Fog::DNS::Google::Zone
+
+        ##
+        # Enumerates Managed Zones that have been created but not yet deleted
+        #
+        # @return [Array<Fog::DNS::Google::Zone>] List of Managed Zone resources
+        def all
+          data = service.list_managed_zones.body['managedZones'] || []
+          load(data)
+        end
+
+        ##
+        # Fetches the representation of an existing Managed Zone
+        #
+        # @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
+            new(zone)
+          end
+        rescue Fog::Errors::NotFound
+          nil
+        end
+      end
+    end
+  end
+end

data/lib/fog/google/models/storage/file.rb

@@ -4,7 +4,7 @@ module Fog
   module Storage
     class Google
       class File < Fog::Model
-        identity  :key,             :aliases => 'Key'
+        identity  :key,                 :aliases => 'Key'
 
         attribute :cache_control,       :aliases => 'Cache-Control'
         attribute :content_disposition, :aliases => 'Content-Disposition'

data/lib/fog/google/models/storage/files.rb

@@ -60,11 +60,7 @@ module Fog
         def get(key, options = {}, &block)
           requires :directory
           data = service.get_object(directory.key, key, options, &block)
-          file_data = {}
-          data.headers.each do |key, value|
-            file_data[key] = value
-          end
-          file_data.merge({
+          file_data = data.headers.merge({
             :body => data.body,
             :key  => key
           })

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

@@ -0,0 +1,64 @@
+module Fog
+  module DNS
+    class Google
+      ##
+      # Atomically updates a ResourceRecordSet collection.
+      #
+      # @see https://cloud.google.com/dns/api/v1beta1/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)
+        end
+      end
+
+      class Mock
+        def create_change(zone_name_or_id, additions = [], deletions = [])
+          if self.data[:managed_zones].has_key?(zone_name_or_id)
+            zone = self.data[:managed_zones][zone_name_or_id]
+          else
+            zone = self.data[:managed_zones].values.find { |zone| zone['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 = self.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|
+            self.data[:resource_record_sets][zone['id']] << add
+          end
+
+          id = self.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)
+        end
+      end
+    end
+  end
+end

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

@@ -2,48 +2,81 @@ require 'date'
 module Fog
   module DNS
     class Google
-
-      class Mock
-        def create_managed_zone(zone_name, dns_name, descr='')
-          id = Fog::Mock.random_numbers(19).to_s
-          object = {
-            "kind" => "dns#managedZone",
-            "id" => id,
-            "creationTime" => DateTime.now.strftime('%FT%T.%LZ'),
-            "name" => zone_name,
-            "dnsName" => dns_name,
-            "description" => descr,
-	    "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][:by_name][zone_name] = object
-          self.data[:managed_zones][:by_id][id] = object
-
-          build_excon_response(object)
-        end
-
-      end
-
+      ##
+      # Creates a new Managed Zone.
+      #
+      # @see https://developers.google.com/cloud-dns/api/v1beta1/managedZones/create
       class Real
-        def create_managed_zone(zone_name, dns_name, descr='')
+        def create_managed_zone(name, dns_name, description)
           api_method = @dns.managed_zones.create
           parameters = {
             'project' => @project,
           }
 
           body_object = {
-	    'name' => zone_name,
-	    'dnsName' => dns_name,
-	  }
-	  body_object['description'] = descr unless descr.nil?
+            'name' => name,
+            'dnsName' => dns_name,
+            'description' => description,
+          }
 
           request(api_method, parameters, body_object)
         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' => 21600,
+              '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' => 21600,
+              '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)
+        end
+      end
     end
   end
 end