record_store 4.0.7 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14801b495fb7de3854e5f838fea6791715079740
-  data.tar.gz: 53b62b55f069d0d470898c33f2e22cac15d67afa
+  metadata.gz: b7441e669b753089b80477c648aeb7eed36e6044
+  data.tar.gz: 67c570fbf7975638b488d38926ea570506a8e622
 SHA512:
-  metadata.gz: 355693401b9a272fc59db7884bba3e076b33a630391459379fb740f7083e2c6c7d7963eb4f54849fe33fbb75eee8562dc4ce4f59617392bfafcc14d03a834b6b
-  data.tar.gz: a351738260067279c92f5177dcf1d2cea0b142739b90ace40b0aeedde4bd092ee7eb0582f6b2bdadfb9d1c6754252041e2d692f997cf4c89f206d561108b68ce
+  metadata.gz: 648f8eeb88a0cc3a0493e724065758fffda49518a913c35353f0898bd2bff0a6363d2bf8b49e872bcea820a7d06b92ddf42e8eeb56fc08c93b69bbdfd5cb60bc
+  data.tar.gz: 8cafafb749bf746dafab7105ac21d8f598c6fcb7bee387f4f58b30aa2a33ab93737dcc371cfe663c42f0f882aae683b82dd4b7f9869010a5521423d5c198feab

data/Gemfile

@@ -9,10 +9,13 @@ gem 'fog'
 gem 'fog-json'
 gem 'fog-xml'
 gem 'fog-dynect', '~> 0.2.0'
+gem 'fog-dnsimple', '~> 2.0.0'
+gem 'google-cloud-dns'
 
 group :test do
   gem 'mocha'
   gem 'vcr'
+  gem 'webmock'
 end
 
 group :development do

data/Gemfile.lock

@@ -10,10 +10,18 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
     builder (3.2.3)
     coderay (1.1.1)
+    crack (0.4.3)
+      safe_yaml (~> 1.0.0)
+    declarative (0.0.10)
+    declarative-option (0.1.0)
     ejson (1.0.2)
     excon (0.57.0)
+    faraday (0.13.1)
+      multipart-post (>= 1.2, < 3)
     fission (0.5.0)
       CFPropertyList (~> 2.2)
     fog (1.33.0)
@@ -56,6 +64,9 @@ GEM
       builder
       excon (~> 0.49)
       formatador (~> 0.2)
+    fog-dnsimple (2.0.0)
+      fog-core (>= 1.38, < 3)
+      fog-json (~> 1.0)
     fog-dynect (0.2.0)
       fog-core
       fog-json
@@ -112,29 +123,84 @@ GEM
       fog-core
       nokogiri (>= 1.5.11, < 2.0.0)
     formatador (0.2.5)
+    google-api-client (0.17.4)
+      addressable (~> 2.5, >= 2.5.1)
+      googleauth (>= 0.5, < 0.7.0)
+      httpclient (>= 2.8.1, < 3.0)
+      mime-types (~> 3.0)
+      representable (~> 3.0)
+      retriable (>= 2.0, < 4.0)
+    google-cloud-core (1.1.0)
+      google-cloud-env (~> 1.0)
+    google-cloud-dns (0.27.0)
+      google-api-client (~> 0.17.0)
+      google-cloud-core (~> 1.1)
+      googleauth (~> 0.6.2)
+      zonefile (~> 1.04)
+    google-cloud-env (1.0.1)
+      faraday (~> 0.11)
+    googleauth (0.6.2)
+      faraday (~> 0.12)
+      jwt (>= 1.4, < 3.0)
+      logging (~> 2.0)
+      memoist (~> 0.12)
+      multi_json (~> 1.11)
+      os (~> 0.9)
+      signet (~> 0.7)
+    hashdiff (0.3.7)
+    httpclient (2.8.3)
     i18n (0.8.4)
     inflecto (0.0.2)
     ipaddress (0.8.3)
+    jwt (2.1.0)
+    little-plugger (1.1.4)
+    logging (2.2.2)
+      little-plugger (~> 1.1)
+      multi_json (~> 1.10)
+    memoist (0.16.0)
     metaclass (0.0.4)
     method_source (0.8.2)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
     mini_portile2 (2.3.0)
     minitest (5.10.2)
     mocha (1.2.1)
       metaclass (~> 0.0.1)
     multi_json (1.12.1)
+    multipart-post (2.0.0)
     nokogiri (1.8.1)
       mini_portile2 (~> 2.3.0)
+    os (0.9.6)
     pry (0.10.4)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
+    public_suffix (3.0.1)
     rake (12.0.0)
+    representable (3.0.4)
+      declarative (< 0.1.0)
+      declarative-option (< 0.2.0)
+      uber (< 0.2.0)
+    retriable (3.1.1)
+    safe_yaml (1.0.4)
+    signet (0.8.1)
+      addressable (~> 2.3)
+      faraday (~> 0.9)
+      jwt (>= 1.5, < 3.0)
+      multi_json (~> 1.10)
     slop (3.6.0)
     thor (0.19.4)
     thread_safe (0.3.6)
     tzinfo (1.2.3)
       thread_safe (~> 0.1)
-    vcr (3.0.3)
+    uber (0.1.0)
+    vcr (4.0.0)
+    webmock (3.2.1)
+      addressable (>= 2.3.6)
+      crack (>= 0.3.2)
+      hashdiff
+    zonefile (1.06)
 
 PLATFORMS
   ruby
@@ -144,14 +210,17 @@ DEPENDENCIES
   activesupport (~> 4.2)
   ejson
   fog
+  fog-dnsimple (~> 2.0.0)
   fog-dynect (~> 0.2.0)
   fog-json
   fog-xml
+  google-cloud-dns
   mocha
   pry
   rake
   thor
   vcr
+  webmock
 
 BUNDLED WITH
    1.16.0

data/lib/record_store.rb

@@ -28,6 +28,7 @@ require 'record_store/changeset'
 require 'record_store/provider'
 require 'record_store/provider/dynect'
 require 'record_store/provider/dnsimple'
+require 'record_store/provider/google_cloud_dns'
 require 'record_store/cli'
 
 module RecordStore

data/lib/record_store/changeset.rb

@@ -16,7 +16,6 @@ module RecordStore
       end
 
       def self.update(id, record)
-        raise ArgumentError.new('id cannot be nil') if id.nil?
         new(type: :update, record: record, id: id)
       end
 

data/lib/record_store/cli.rb

@@ -120,7 +120,7 @@ module RecordStore
     def download
       name = options.fetch('name')
       abort 'Please omit the period at the end of the zone' if name.ends_with?('.')
-      abort 'Zone with this name already exists in zones/' if File.exists?("#{RecordStore.zones_path}/#{name}.yml")
+      abort 'Zone with this name already exists in zones/' if File.exist?("#{RecordStore.zones_path}/#{name}.yml")
 
       provider = options.fetch('provider', Provider.provider_for(name))
       if provider.nil?
@@ -239,7 +239,7 @@ module RecordStore
         assert_empty_diff
         puts "Deploy will cause no changes, no need to validate initial state"
       rescue SystemExit
-        if File.exists?(File.expand_path(SKIP_CHECKS, Dir.pwd))
+        if File.exist?(File.expand_path(SKIP_CHECKS, Dir.pwd))
           puts "Found '#{SKIP_CHECKS}', skipping predeploy validations"
         else
           puts "Checkout git SHA #{ENV['LAST_DEPLOYED_SHA']}"

data/lib/record_store/provider.rb

@@ -8,7 +8,7 @@ module RecordStore
 
         begin
           ns_server = dns.getresource(zone_name, Resolv::DNS::Resource::IN::SOA).mname.to_s
-        rescue Resolv::ResolvError => e
+        rescue Resolv::ResolvError
           abort "Domain doesn't exist"
         end
 
@@ -17,6 +17,8 @@ module RecordStore
           'DNSimple'
         when /dynect\.net\z/
           'DynECT'
+        when /googledomains\.com\z/
+          'GoogleCloudDNS'
         else
           nil
         end
@@ -96,7 +98,7 @@ module RecordStore
       end
 
       def secrets
-        @secrets ||= if File.exists?(RecordStore.secrets_path)
+        @secrets ||= if File.exist?(RecordStore.secrets_path)
           JSON.parse(File.read(RecordStore.secrets_path))
         else
           raise "You don't have a secrets.json file set up!"

data/lib/record_store/provider/dnsimple.rb

@@ -15,7 +15,7 @@ module RecordStore
           record.type,
           record_hash.fetch(:content),
           ttl: record_hash.fetch(:ttl),
-          priority: record_hash.fetch(:prio, nil)
+          priority: record_hash.fetch(:priority, nil)
         )
 
         if record.type == 'ALIAS'
@@ -38,16 +38,14 @@ module RecordStore
 
       # returns an array of Record objects that match the records which exist in the provider
       def retrieve_current_records(zone:, stdout: $stdout)
-        session.list_records(zone).body.map do |record|
-          record_body = record.fetch('record')
-
+        session.list_records(zone).body["data"].map do |record_body|
           begin
             build_from_api(record_body, zone)
           rescue StandardError
             stdout.puts "Cannot build record: #{record_body}"
             raise
           end
-        end.select(&:present?)
+        end.compact
       end
 
       # Returns an array of the zones managed by provider as strings
@@ -64,8 +62,8 @@ module RecordStore
       def session_params
         {
           provider: 'DNSimple',
-          dnsimple_email: secrets.fetch('email'),
           dnsimple_token: secrets.fetch('api_token'),
+          dnsimple_account: secrets.fetch('account_id'),
         }
       end
 
@@ -74,7 +72,7 @@ module RecordStore
       end
 
       def build_from_api(api_record, zone)
-        record_type = api_record.fetch('record_type')
+        record_type = api_record.fetch('type')
         record = {
           record_id: api_record.fetch('id'),
           ttl: api_record.fetch('ttl'),
@@ -91,7 +89,7 @@ module RecordStore
         when 'CNAME'
           record.merge!(cname: api_record.fetch('content'))
         when 'MX'
-          record.merge!(preference: api_record.fetch('prio'), exchange: api_record.fetch('content'))
+          record.merge!(preference: api_record.fetch('priority'), exchange: api_record.fetch('content'))
         when 'NS'
           record.merge!(nsdname: api_record.fetch('content'))
         when 'SPF', 'TXT'
@@ -100,7 +98,7 @@ module RecordStore
           weight, port, host = api_record.fetch('content').split(' ')
 
           record.merge!(
-            priority: api_record.fetch('prio').to_i,
+            priority: api_record.fetch('priority').to_i,
             weight: weight.to_i,
             port: port.to_i,
             target: Record.ensure_ends_with_dot(host),
@@ -129,7 +127,7 @@ module RecordStore
         when 'CNAME'
           record_hash[:content] = record.cname.chomp('.')
         when 'MX'
-          record_hash[:prio] = record.preference
+          record_hash[:priority] = record.preference
           record_hash[:content] = record.exchange.chomp('.')
         when 'NS'
           record_hash[:content] = record.nsdname.chomp('.')
@@ -137,7 +135,7 @@ module RecordStore
           record_hash[:content] = record.txtdata.gsub('\;', ';')
         when 'SRV'
           record_hash[:content] = "#{record.weight} #{record.port} #{record.target.chomp('.')}"
-          record_hash[:prio] = record.priority
+          record_hash[:priority] = record.priority
         end
 
         record_hash

data/lib/record_store/provider/dynect.rb

@@ -48,11 +48,11 @@ module RecordStore
           records.map do |record_body|
             begin
               build_from_api(record_body)
-            rescue StandardError => e
+            rescue StandardError
               stdout.puts "Cannot build record: #{record_body}"
             end
           end
-        end.select(&:present?)
+        end.compact
       end
 
       # Returns an array of the zones managed by provider as strings

data/lib/record_store/provider/google_cloud_dns.rb

@@ -0,0 +1,121 @@
+require 'google/cloud/dns'
+
+module RecordStore
+  class Provider::GoogleCloudDNS < Provider
+    class << self
+      def apply_changeset(changeset, stdout = $stdout)
+        zone = session.zone(convert_to_name(changeset.zone))
+
+        deletions = convert_records_to_gcloud_record_sets(zone, changeset.current_records)
+        additions = convert_records_to_gcloud_record_sets(zone, changeset.desired_records)
+
+        # The Google API library will handle applying the changeset transactioanlly
+        zone.update(additions, deletions)
+      end
+
+      # returns an array of Record objects that match the records which exist in the provider
+      def retrieve_current_records(zone:, stdout: $stdout)
+        gcloud_record_sets = session.zone(convert_to_name(zone)).records
+
+        records = gcloud_record_sets.map do |record_set|
+          next if record_set.type == 'SOA'
+
+          # Unroll each record set into multiple records
+          record_set.data.map do |record|
+            begin
+              record_set_member = record_set.dup
+              record_set_member.data = [record]
+              build_from_api(record_set_member)
+            rescue StandardError
+              stdout.puts "Cannot build record: #{record}"
+            end
+          end
+        end
+
+        # We need to filter out for nil records (i.e. since skip the SOA record)
+        records.flatten.compact
+      end
+
+      # Returns an array of the zones managed by provider as strings
+      def zones
+        session.zones.map { |zone| zone.gapi.dns_name }
+      end
+
+      private
+
+      def session
+        @dns ||= begin
+          Google::Cloud::Dns.new({
+            project_id: secrets.fetch('project_id'),
+            credentials: Google::Cloud::Dns::Credentials.new(secrets),
+          })
+        end
+      end
+
+      def secrets
+        super.fetch('google_cloud_dns')
+      end
+
+      def convert_to_name(zone)
+        zone.gsub('.', '-')
+      end
+
+      # Google's API operates on resource record sets instead of individual
+      # records. A resource record set is a single object that has the rdata
+      # for all resource records with the same fully qualified domain name and
+      # record type. See https://cloud.google.com/dns/api/v1/resourceRecordSets
+      #
+      # This methods takes an array of records and builds Google API
+      # ResourceRecordSets objects.
+      def convert_records_to_gcloud_record_sets(zone, records)
+        record_sets = records.group_by do |record|
+          [record.type, record.fqdn]
+        end
+
+
+        record_sets.map do |(rr_type, rr_fqdn), records_for_set|
+          zone.record(rr_fqdn, rr_type, records_for_set[0].ttl, records_for_set.map(&:rdata_txt))
+        end
+      end
+
+      def build_from_api(record)
+        record_params = {
+          id: record.object_id,
+          ttl: record.ttl,
+          fqdn: record.name,
+        }
+
+        return if record.type == 'SOA'
+
+        case record.type
+        when 'A', 'AAAA'
+          record_params.merge!(address: record.data[0])
+        when 'CNAME'
+          record_params.merge!(cname: record.data[0])
+        when 'MX'
+          preference, exchange = record.data[0].split(' ')
+          record_params.merge!(preference: preference, exchange: exchange)
+        when 'NS'
+          record_params.merge!(nsdname: record.data[0])
+        when 'SPF', 'TXT'
+          record_params.merge!(txtdata: record.data[0].gsub(';', '\;'))
+        when 'SRV'
+          priority, weight, port, target = record.data[0].split(' ')
+
+          record_params.merge!(
+            priority: priority.to_i,
+            weight: weight.to_i,
+            port: port.to_i,
+            target: target,
+          )
+        end
+
+        unless record_params.fetch(:fqdn).ends_with?('.')
+          record_params[:fqdn] += '.'
+        end
+
+        Record.const_get(record.type).new(record_params)
+      end
+    end
+  end
+end

data/lib/record_store/record.rb

@@ -56,6 +56,19 @@ module RecordStore
       "#{type},#{fqdn}"
     end
 
+    def rdata
+      raise NotImplementedError
+    end
+
+    def rdata_txt
+      raise NotImplementedError
+    end
+
+    def to_s
+      rr_type = self.class.name.demodulize
+      "[#{rr_type}Record] #{fqdn} #{ttl} IN #{rr_type} #{rdata_txt}"
+    end
+
     protected
 
     def validate_label_length

data/lib/record_store/record/a.rb

@@ -10,21 +10,21 @@ module RecordStore
       @address = record.fetch(:address)
     end
 
-    def to_s
-      "[ARecord] #{fqdn} #{ttl} IN A #{address}"
-    end
-
     def rdata
       { address: address }
     end
 
+    def rdata_txt
+      address
+    end
+
     private
 
     def valid_address?
       begin
         ip = IPAddr.new(address)
         errors.add(:address, 'is not an IPv4 address') unless ip.ipv4?
-      rescue IPAddr::InvalidAddressError => e
+      rescue IPAddr::InvalidAddressError
         errors.add(:address, 'is invalid')
       end
     end

data/lib/record_store/record/aaaa.rb

@@ -10,21 +10,21 @@ module RecordStore
       @address = record.fetch(:address)
     end
 
-    def to_s
-      "[AAAARecord] #{fqdn} #{ttl} IN AAAA #{address}"
-    end
-
     def rdata
       { address: address }
     end
 
+    def rdata_txt
+      address
+    end
+
     private
 
     def valid_address?
       begin
         ip = IPAddr.new(address)
         errors.add(:address, 'is not an IPv6 address') unless ip.ipv6?
-      rescue IPAddr::InvalidAddressError => e
+      rescue IPAddr::InvalidAddressError
         errors.add(:address, 'is invalid')
       end
     end

data/lib/record_store/record/alias.rb

@@ -14,8 +14,8 @@ module RecordStore
       { alias: self.alias }
     end
 
-    def to_s
-      "[ALIASRecord] #{fqdn} #{ttl} IN ALIAS #{self.alias}"
+    def rdata_txt
+      self.alias
     end
 
     def validate_circular_reference

data/lib/record_store/record/cname.rb

@@ -14,8 +14,8 @@ module RecordStore
       { cname: cname }
     end
 
-    def to_s
-      "[CNAMERecord] #{fqdn} #{ttl} IN CNAME #{cname}"
+    def rdata_txt
+      cname
     end
 
     def validate_circular_reference

data/lib/record_store/record/mx.rb

@@ -8,7 +8,7 @@ module RecordStore
     def initialize(record)
       super
       @exchange = Record.ensure_ends_with_dot(record.fetch(:exchange))
-      @preference = record.fetch(:preference)
+      @preference = Integer(record.fetch(:preference))
     end
 
     def rdata
@@ -18,8 +18,8 @@ module RecordStore
       }
     end
 
-    def to_s
-      "[MXRecord] #{fqdn} #{ttl} IN MX #{preference} #{exchange}"
+    def rdata_txt
+      "#{preference} #{exchange}"
     end
   end
 end

data/lib/record_store/record/ns.rb

@@ -13,8 +13,8 @@ module RecordStore
       { nsdname: nsdname }
     end
 
-    def to_s
-      "[NSRecord] #{fqdn} #{ttl} IN NS #{nsdname}"
+    def rdata_txt
+      nsdname
     end
   end
 end

data/lib/record_store/record/spf.rb

@@ -10,11 +10,15 @@ module RecordStore
     end
 
     def to_s
-      "[SPFRecord] #{fqdn} #{ttl} IN SPF \"#{txtdata}\""
+      "[SPFRecord] #{fqdn} #{ttl} IN SPF \"#{rdata_txt}\""
     end
 
     def rdata
       { txtdata: txtdata }
     end
+
+    def rdata_txt
+      txtdata
+    end
   end
 end

data/lib/record_store/record/srv.rb

@@ -15,13 +15,12 @@ module RecordStore
       @target   = record.fetch(:target)
     end
 
-    def to_s
-      "[SRVRecord] #{fqdn} #{ttl} IN SRV #{priority} #{weight} #{port} #{target}"
-    end
-
     def rdata
       { priority: priority, port: port, weight: weight, target: target }
     end
 
+    def rdata_txt
+      "#{priority} #{weight} #{port} #{target}"
+    end
   end
 end

data/lib/record_store/record/txt.rb

@@ -11,13 +11,17 @@ module RecordStore
     end
 
     def to_s
-      "[TXTRecord] #{fqdn} #{ttl} IN TXT \"#{txtdata}\""
+      "[TXTRecord] #{fqdn} #{ttl} IN TXT \"#{rdata_txt}\""
     end
 
     def rdata
       { txtdata: txtdata }
     end
 
+    def rdata_txt
+      txtdata
+    end
+
     private
 
     def escaped_semicolons

data/lib/record_store/version.rb

@@ -1,3 +1,3 @@
 module RecordStore
-  VERSION = '4.0.7'.freeze
+  VERSION = '5.0.0'.freeze
 end

data/template/secrets.json

@@ -5,7 +5,19 @@
     "password": "dynect_password"
   },
   "dnsimple": {
-    "email": "dnsimple_email",
+    "account_id": "dnsimple_email",
     "api_token": "dnsimple_api_token"
+  },
+  "google_cloud_dns": {
+    "type": "type",
+    "project_id": "project_id",
+    "private_key_id": "private_key_id",
+    "private_key": "-----BEGIN RSA PRIVATE KEY-----\nMIICWgIBAAKBgGsd4RrLAgGKI3cRmywv1FXoAzNG3pgh1X/xjeDu5Fnjr8bvDGog\nctx9iyr5p7NbazgAQxaBWXAgr9p0jjkWzSaTCNskSuk/jJwwn4VQbfXKkyNNaIuc\nk2xn++JJ7Dv4+ODJupP3+A1QUH/uzsGi7xGGNzkC1ojSZlT40OxDrP1VAgMBAAEC\ngYA0xQ2Gg4hDdegu2m+VfyKeB6S7+CfkzpY9Z6S7sTSxy+dmm5GEHuQ3F2oeC8vA\nIkNZ3VcvmR2UjaXUeyMtoLwDpmboRPm3SEtITReSBQGLTeeFymJwIPks0VXckOTh\nrhbyK7StiJ/0jWNtted0vBPEjEAuP6tyURpbVGIBQ1V+aQJBALv6sWWZOKVVThNc\nOGpnBAzTWGQMgp9nD+7rwbAbzRD3hvW5ln6O94a0XPWg9WD++gHDVr9OU7Ooe63O\n/0qw3EcCQQCR4IyjUqYzBZWyD+EKugNtc8VAOrJsYIE+gkajiikjV4nbj8CVg/CO\nunLrkDGAHTgzfY2tTyI6gQt2ctbfFRODAkB8Kl5tBqVVCCDXRu340mzpb9yN0Xmi\ngvgST+WTRvnQQEAEJX9Tv2mer5pLoPMUC7fl3Dp7iOhe3mY7a2RT2LjXAkAVNUg9\nFm8DS/SPhq95F8IXz5UF2YLHLuCbbeVHMXb5pGhue1/MXPpERecfSD9qGNVq5v4K\nDE81oj1AY0HJ/Q5xAkAYOrEnGeJSjLhvJYfMJOAjf39pJs0Kh/2C7HySaILNWt3f\nK590FbFkwBw+bmylpnOxa2jJpzt7F3gGIast6on3\n-----END RSA PRIVATE KEY-----",
+    "client_email": "client_email",
+    "client_id": "client_id",
+    "auth_uri": "https://accounts.google.com/o/oauth2/auth",
+    "token_uri": "https://accounts.google.com/o/oauth2/token",
+    "auth_provider_x509_cert_url": "auth_provider_x509_cert_url",
+    "client_x509_cert_url": "client_x509_cert_url"
   }
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: record_store
 version: !ruby/object:Gem::Version
-  version: 4.0.7
+  version: 5.0.0
 platform: ruby
 authors:
 - Willem van Bergen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-08 00:00:00.000000000 Z
+date: 2018-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -221,6 +221,7 @@ files:
 - lib/record_store/provider.rb
 - lib/record_store/provider/dnsimple.rb
 - lib/record_store/provider/dynect.rb
+- lib/record_store/provider/google_cloud_dns.rb
 - lib/record_store/record.rb
 - lib/record_store/record/a.rb
 - lib/record_store/record/aaaa.rb