provider-dsl 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d6d3a2df6de7252734eb5eab9cf357e048cb436
-  data.tar.gz: 74a064161f77165989cd33a498ff0f5881c2f012
+  metadata.gz: 1ee0ecca0a46ac35eb09fb34ebe4c2d68358122e
+  data.tar.gz: 196c04c12434340acecfd98b424fa286954a346e
 SHA512:
-  metadata.gz: 9f3f4977f9bab464fb01966961fc0119bf5a826cb837a9e29d8313e09b657c965bd90343299bd3a689fd89c2866e2be04067ee37ece5885431450ab93672e24d
-  data.tar.gz: 7b3daa40d77fc8ce17be86421e8f2a851f1fee1d7fbe20e7e9797bd7f068a047721e455bcae350559a2ac5b4d8ede59b64c7850cf8800c4fb744a2fed06bb4a5
+  metadata.gz: 4078c18ce5bf90cf359dbba37dc44873c6557cb5211d76856b82c332f356e9b5f3670b767352a7f28c7d732e60c898bb8c8481661fa213a8191000626ab90059
+  data.tar.gz: adcd112cf12eaae3f38692c5ec8739b8424d66a5e65afee60d87770d25ddf9b73ae39a3abb88fdfb65f9618890aef00e4333e30c56ca6f39cb69ae7dece8d7c3

data/lib/provider_dsl/dsl.rb

@@ -1,25 +1,25 @@
-require 'provider_dsl/gandi'
+require 'provider_dsl/gandi_provider'
+require 'provider_dsl/google_cloud_provider'
 require 'provider_dsl/log'
 
 module ProviderDSL
   # The DSL processor
   class DSL
-    def initialize
-      @logger = Log.instance
-    end
-
     def execute(glob = nil, &block)
       Dir[glob].each do |filename|
-        @logger.log("DSL processing #{filename}")
+        Log.instance.log("DSL processing #{filename}")
         instance_eval(File.read(filename))
-        @logger.log("DSL completed processing #{filename}")
+        Log.instance.log("DSL completed processing #{filename}")
       end if glob.is_a?(String)
       instance_eval(&block) if block_given?
     end
 
-    def gandi(parameters, &block)
-      parameters[:session_factory] = GandiSessionFactory.new unless parameters.key?(:session_factory)
-      Gandi.new(parameters, &block)
+    def gandi(api_key, parameters = {}, &block)
+      GandiProvider.new(api_key, parameters, &block)
+    end
+
+    def gcloud(project_name, key_filename, parameters = {}, &block)
+      GoogleCloudProvider.new(project_name, key_filename, parameters, &block)
     end
   end
 end

data/lib/provider_dsl/{gandi.rb → gandi_provider.rb}

@@ -1,24 +1,23 @@
 require 'gandi'
 require 'provider_dsl/gandi_proxy'
 require 'provider_dsl/zone'
+require 'provider_dsl/record'
 require 'provider_dsl/log'
 
 module ProviderDSL
   # Gandi session factory
   class GandiSessionFactory
     def instance(api_key, environment)
-      ::Gandi::Session.new(api_key, env: environment)
+      Gandi::Session.new(api_key, env: environment)
     end
   end
 
   # Manage a domain on Gandi
-  class Gandi
+  class GandiProvider
     attr_reader :name_servers, :zone_name
 
-    def initialize(parameters = {}, &block)
-      session_factory = parameters[:session_factory]
-      api_key = parameters[:api_key]
-      raise 'Gandi API key is not a valid string' unless api_key.is_a?(String)
+    def initialize(api_key, parameters = {}, &block)
+      session_factory = parameters[:session_factory] || GandiSessionFactory.new
       environment = parameters[:environment] || :production
       @domain_name = parameters[:domain_name]
       @logger = Log.instance
@@ -36,34 +35,38 @@ module ProviderDSL
       instance_eval(&block) if block_given?
     end
 
-    def execute(&block)
-      instance_eval(&block)
-    end
-
     def zone(zone_name, parameters = {}, &block)
       @logger.log("Zone: #{zone_name}")
       original_zone = @session.domain.zone.list.select { |data| data['name'] == zone_name }
       if original_zone.count.zero?
         zone_id = nil
-        original_zone = nil
+        original_zone = []
       else
         zone_id = original_zone.first['id']
-        original_zone = @session.domain.zone.record.list(zone_id, 0).map { |record| Hash[record] }
+        original_zone = @session.domain.zone.record.list(zone_id, 0).map do |record|
+          Record.new(record['name'], record['type'], record['value'], record['ttl'])
+        end
       end
       if block_given?
-        zone = Zone.new(original_zone.nil? ? [] : original_zone, parameters)
+        zone = Zone.new(original_zone, parameters)
         zone.create(&block)
-        zone_id = original_zone.nil? ? @session.domain.zone.create(name: zone_name).id : zone_id
-        if original_zone.nil? || zone.changed?
+        zone_id = original_zone.empty? ? @session.domain.zone.create(name: zone_name).id : zone_id
+        if original_zone.empty? || zone.changed?
           @logger.log("Zone records:\n#{zone.to_s('  ')}")
+          gandi_zone = []
+          zone.records.each do |record|
+            record.values.each do |value|
+              gandi_zone << { name: record.name, type: record.type, value: value, ttl: record.ttl }
+            end
+          end
           version = @session.domain.zone.version.new(zone_id)
-          @session.domain.zone.record.set(zone_id, version, zone.hash)
+          @session.domain.zone.record.set(zone_id, version, gandi_zone)
           @session.domain.zone.version.set(zone_id, version)
           @logger.log("Created version #{version} of zone #{zone_name}")
         else
           @logger.log("Zone #{zone_name} is unchanged")
         end
-      elsif original_zone.nil?
+      elsif original_zone.empty?
         raise "Zone #{zone_name} is undefined"
       end
       return unless @domain_name

data/lib/provider_dsl/gem_description.rb

@@ -1,7 +1,7 @@
 module ProviderDSL
   module GemDescription
     NAME = 'provider-dsl'.freeze
-    VERSION = '1.0.2'.freeze
+    VERSION = '1.0.3'.freeze
     SUMMARY = 'A DSL for interacting with various service provider APIs'.freeze
     PAGE = 'https://github.com/sappho/gem-provider_dsl'.freeze
     AUTHORS = ['Andrew Heald'].freeze

data/lib/provider_dsl/google_cloud_provider.rb

@@ -0,0 +1,100 @@
+require 'google/cloud'
+require 'provider_dsl/zone'
+require 'provider_dsl/record'
+require 'provider_dsl/log'
+
+module ProviderDSL
+  # Google Cloud session factory
+  class GCloudSessionFactory
+    def instance(project_name, key_filename, parameters)
+      Google::Cloud.new(
+        project_name, key_filename,
+        timeout: parameters[:timeout] || 0, retries: parameters[:retries] || 0
+      )
+    end
+  end
+
+  # Manage a domain on Google Cloud
+  class GoogleCloudProvider
+    EXCLUDE = %w(SOA NS).freeze
+
+    def initialize(project_name, key_filename, parameters = {}, &block)
+      session_factory = parameters[:session_factory] || GCloudSessionFactory.new
+      @logger = Log.instance
+      @logger.log("Processing Google Cloud project #{project_name}")
+      @dns = session_factory.instance(project_name, key_filename, parameters).dns
+      instance_eval(&block) if block_given?
+    end
+
+    def zone(domain_name, description, parameters = {}, &block)
+      zone_name = domain_name.tr('.', '-')
+      zone_style_domain_name = "#{domain_name}."
+      domain_name_regex = Regexp.quote(zone_style_domain_name)
+      @logger.log("Zone: #{zone_name} for domain #{domain_name}")
+      if @dns.zones.select { |zone| zone.name == zone_name }.count.zero?
+        gcloud_zone = nil
+        zone = Zone.new([], parameters)
+      else
+        gcloud_zone = @dns.zone(zone_name)
+        records = gcloud_zone.records
+        records = records.map do |record|
+          unless record.name =~ /^(|([a-zA-Z0-9\-\.]+)\.)#{domain_name_regex}$/
+            raise "Google Cloud returned invalid record name #{record.name}"
+          end
+          name = Regexp.last_match(1).empty? ? '@' : Regexp.last_match(2)
+          data = record.data.map do |value|
+            if %w(CNAME MX).include?(record.type)
+              if value =~ /^((|[0-9]+ +)[a-zA-Z0-9\-\.]+)\.#{domain_name_regex}$/
+                value = Regexp.last_match(1)
+              end
+            end
+            value
+          end
+          EXCLUDE.include?(record.type) ? nil : Record.new(name, record.type, data, record.ttl)
+        end
+        zone = Zone.new(records.select { |record| record }, parameters)
+      end
+      zone.create(&block)
+      if gcloud_zone.nil? || zone.changed?
+        @logger.log("Zone records:\n#{zone.to_s('  ')}")
+        unless gcloud_zone
+          gcloud_zone = @dns.create_zone(zone_name, zone_style_domain_name, description: description)
+          @logger.log("Created zone #{zone_name}")
+        end
+        deletions = []
+        additions = []
+        zone.removed_records.each do |record|
+          # gcloud_zone.remove(record.name, record.type)
+          deletions << dns_record(record, zone_style_domain_name)
+          @logger.log("Removing #{record}")
+        end
+        zone.new_or_changed_records.each do |record|
+          # gcloud_zone.replace(record.name, record.type, record.ttl, record.values)
+          additions << dns_record(record, zone_style_domain_name)
+          @logger.log("Creating or replacing #{record}")
+        end
+        gcloud_zone.update(additions, deletions)
+      else
+        @logger.log("Zone #{zone_name} is unchanged")
+      end
+    end
+
+    private
+
+    def dns_record(record, zone_style_domain_name)
+      name = record.name != '@' ? "#{record.name}.#{zone_style_domain_name}" : zone_style_domain_name
+      if %w(CNAME MX).include?(record.type)
+        data = record.values.map do |value|
+          if value.end_with?('.')
+            value
+          else
+            "#{value == '@' ? '' : "#{name}."}#{zone_style_domain_name}"
+          end
+        end
+      else
+        data = record.values
+      end
+      Google::Cloud::Dns::Record.new(name, record.type, record.ttl, data)
+    end
+  end
+end

data/lib/provider_dsl/record.rb

@@ -1,18 +1,34 @@
 module ProviderDSL
   # Manage a DNS record
   class Record
-    attr_reader :name, :type, :value, :ttl, :hash
+    attr_reader :name, :type, :values, :ttl
 
-    def initialize(name, type, value, ttl)
+    def initialize(name, type, values, ttl)
       @name = name
       @type = type
-      @value = value
+      @values = Array(values).map do |value|
+        case type
+        when 'AAAA'
+          raise "#{value} is not a valid IPv6 address" unless IPAddress.valid_ipv6?(value)
+          IPAddress(value).compressed
+        when 'A'
+          raise "#{value} is not a valid IPv4 address" unless IPAddress.valid_ipv4?(value)
+          IPAddress(value).octets.join('.')
+        when 'CNAME', 'MX', 'TXT'
+          value
+        else
+          raise "Record #{name} #{type} has unhandled type"
+        end
+      end.uniq.sort
       @ttl = ttl
-      @hash = { name: name, type: type, value: value, ttl: ttl }
+      raise "No values for record #{self}" if @values.empty?
+      return unless type == 'CNAME'
+      raise "Record #{self} must have only one value" if @values.count != 1
+      raise "Record #{self} is invalid on the naked domain" if name == '@'
     end
 
     def to_s
-      "#{ttl} #{name} #{type} #{value}"
+      "#{ttl} #{name} #{type} #{values}"
     end
 
     def ==(other)
@@ -20,7 +36,11 @@ module ProviderDSL
     end
 
     def ===(other)
-      name == other.name && type == other.type && value == other.value
+      same_name_and_type(other) && values == other.values
+    end
+
+    def same_name_and_type(other)
+      name == other.name && type == other.type
     end
   end
 end

data/lib/provider_dsl/zone.rb

@@ -9,14 +9,12 @@ module ProviderDSL
 
     def initialize(original_records, parameters = {})
       @logger = Log.instance
-      @original_records = original_records.map do |record|
-        if record.is_a?(Hash)
-          Record.new(record['name'], record['type'], record['value'], record['ttl'])
-        else
-          record
-        end
+      @original_records = []
+      @records = []
+      original_records.each do |record|
+        @original_records = add(@original_records, record)
+        @records = add(@records, record) if parameters[:inherit_records]
       end
-      @records = parameters[:inherit_records] ? @original_records.clone : []
       @names = []
       name
       ttl
@@ -43,26 +41,15 @@ module ProviderDSL
     end
 
     def aaaa(ip_addresses)
-      record('AAAA', ip_addresses) do |ip_address|
-        raise "#{ip_address} is not a valid IPv6 address" unless IPAddress.valid_ipv6?(ip_address)
-        IPAddress(ip_address).compressed
-      end
+      record('AAAA', ip_addresses)
     end
 
     def a(ip_addresses)
-      record('A', ip_addresses) do |ip_address|
-        raise "#{ip_address} is not a valid IPv4 address" unless IPAddress.valid_ipv4?(ip_address)
-        IPAddress(ip_address).octets.join('.')
-      end
+      record('A', ip_addresses)
     end
 
     def cname(value)
-      value = String(value)
-      raise "CNAME #{value} cannot be defined for a naked domain" if @name == '@'
-      record('CNAME', value) do
-        @records = records.select { |other| !(other.type == 'CNAME' && other.name == @name) }
-        value
-      end
+      record('CNAME', value)
     end
 
     def mx(values)
@@ -73,24 +60,22 @@ module ProviderDSL
       record('TXT', values)
     end
 
-    def new_records
+    def new_or_changed_records
       records.select { |record| @original_records.select { |original| original == record }.count.zero? }
     end
 
     def removed_records
-      @original_records.select { |original| records.select { |record| original == record }.count.zero? }
+      @original_records.select do |original|
+        records.select { |record| original == record }.count.zero?
+      end
     end
 
     def changed?
-      !(new_records + removed_records).count.zero?
+      !(new_or_changed_records + removed_records).count.zero?
     end
 
     def to_s(prefix = '', suffix = '')
-      "#{prefix}#{sorted_records.join("#{suffix}\n#{prefix}")}#{suffix}"
-    end
-
-    def hash
-      sorted_records.map(&:hash)
+      "#{prefix}#{records.join("#{suffix}\n#{prefix}")}#{suffix}"
     end
 
     private
@@ -105,23 +90,25 @@ module ProviderDSL
       if keepers > 0
         raise "Keeper ? flag is inconsistently used for #{@name} #{type} #{values}" if keepers != 1 || values.count != 1
         @original_records.select { |original| original.name == @name && original.type == type }.each do |original|
-          add(original)
+          @records = add(@records, original)
         end
       else
-        values.each do |value|
-          value = yield(value) if block_given?
-          add(Record.new(@name, type, value, @ttl))
-        end
+        @records =
+          add(@records, Record.new(@name, type, values.map { |value| block_given? ? yield(value) : value }, @ttl))
       end
     end
 
-    def add(record)
+    def add(records, record)
       @logger.log("Adding #{record}")
-      @records = records.select { |other| !(record === other) } + [record]
-    end
-
-    def sorted_records
-      records.sort_by { |record| [record.name, record.type, record.value] }
+      values = record.values
+      records = records.select do |other|
+        match = record.same_name_and_type(other)
+        values = other.values + values if match
+        !match
+      end
+      values = values.last if record.type == 'CNAME'
+      records << Record.new(record.name, record.type, values, record.ttl)
+      records.sort_by { |sort| [sort.name, sort.type] }
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: provider-dsl
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Andrew Heald
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-29 00:00:00.000000000 Z
+date: 2016-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -100,6 +100,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.3.27
+- !ruby/object:Gem::Dependency
+  name: gcloud
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.21.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.21.0
+- !ruby/object:Gem::Dependency
+  name: google-cloud-error_reporting
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.21.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.21.0
 - !ruby/object:Gem::Dependency
   name: map
   requirement: !ruby/object:Gem::Requirement
@@ -122,9 +150,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/provider_dsl/dsl.rb
-- lib/provider_dsl/gandi.rb
+- lib/provider_dsl/gandi_provider.rb
 - lib/provider_dsl/gandi_proxy.rb
 - lib/provider_dsl/gem_description.rb
+- lib/provider_dsl/google_cloud_provider.rb
 - lib/provider_dsl/log.rb
 - lib/provider_dsl/rate_limiter.rb
 - lib/provider_dsl/record.rb