record_store 6.5.3 → 6.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9af43560e4a84302824fb5b1abef5476bc0995e752d3960de068b45949b1d154
-  data.tar.gz: 4bc999da542a5484d7cf51a7bb652593c323fecac6d79d8e73ccbb62bd638ea0
+  metadata.gz: a0a988dc5071a5cba7b77105bfbd6a6a3bd85c7049faabccf84be00ceb4ea0cd
+  data.tar.gz: 980159cf5899746871435d7b8674d94c4143bd8c0d1f8fe3b43c5cb61e03a360
 SHA512:
-  metadata.gz: d72d0a1bffea56a12070eab25df96cd120f00107779063ae651a141310b369764eeaa5fa8993d77c67f81e2f4e98e16641e6d8dacde4f35fa09be4a6fe08236e
-  data.tar.gz: e84f52373f10caa1fa464845a13a33383c7461392f69c88c17c032f9d91e8b96ffcd87fc9f1fc798478b05b2de2660629e2d6d4b89e232b405d80009676eac5b
+  metadata.gz: 7be5a4503a83bca9e0f8c50fedfe7da0e8ed53cf99e40dd375d2b547df0ef740ca8e8138fd64cea3c4247230d3e7fb874824a908554976f0a3e62045d718a7ee
+  data.tar.gz: 0f10f66dc76a7a86cce97cb05fb50c977db2fa163fe8dc735b5dc108d0825feb5bfc6639c5aaa581f7edc829a8023e9cdb437e75619118e4bf52fde1c59bec3e

data/.github/workflows/ci.yml

@@ -11,7 +11,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ 2.7.1 ]
+        ruby: [ 2.7.1, 3.1.0 ]
     name: Test Ruby ${{ matrix.ruby }}
     steps:
       - uses: actions/checkout@v2

data/.rubocop.yml

@@ -1,19 +1,40 @@
-inherit_from:
-  - https://shopify.github.io/ruby-style-guide/rubocop.yml
+inherit_gem:
+  rubocop-shopify: rubocop.yml
 
 AllCops:
-  TargetRubyVersion: 2.4
+  TargetRubyVersion: 2.6.4
   Exclude:
     - vendor/**/*
   UseCache: true
   CacheRootDirectory: tmp/rubocop
 
+Naming/InclusiveLanguage:
+  Enabled: false
+
+Style/ClassAndModuleChildren:
+  Enabled: false
+
 Style/FrozenStringLiteralComment:
   Enabled: false
 
+Style/QuotedSymbols:
+  Enabled: false
+
 Style/MethodCallWithArgsParentheses:
   Include:
     - '**/*.rb'
 
-Style/ClassAndModuleChildren:
-  Enabled: false
+Style/StringLiterals:
+  Enabled: false
+
+Style/StringLiteralsInInterpolation:
+  Enabled: false
+
+Style/TrailingCommaInArrayLiteral:
+  Enabled: false
+
+Style/TrailingCommaInHashLiteral:
+  Enabled: false
+
+Style/WordArray:
+  Enabled: false

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # CHANGELOG
 
+## 6.5.5
+- Include DNSimple validation error details in exceptions
+
+## 6.5.4
+- Updates config path structure for build pipeline
+
 ## 6.5.3
 - Adds check for detecting shadowed records, used when a record being added to a zone in record-store will have no effect because it is shadowed by another record.
 

data/lib/record_store/cli.rb

@@ -7,7 +7,7 @@ module RecordStore
 
     def initialize(*args)
       super
-      RecordStore.config_path = options.fetch('config', "#{Dir.pwd}/template/config.yml")
+      RecordStore.config_path = options.fetch('config', "#{Dir.pwd}/config.yml")
     end
 
     def self.exit_on_failure?
@@ -193,14 +193,12 @@ module RecordStore
 
     desc 'secrets', 'Decrypts DynECT credentials'
     def secrets
-      environment = begin
-        if ENV['PRODUCTION']
-          'production'
-        elsif ENV['CI']
-          'ci'
-        else
-          'dev'
-        end
+      environment = if ENV['PRODUCTION']
+        'production'
+      elsif ENV['CI']
+        'ci'
+      else
+        'dev'
       end
 
       secrets = %x(ejson decrypt #{RecordStore.secrets_path.sub(/\.json\z/, ".#{environment}.ejson")})

data/lib/record_store/provider/dnsimple/patch_request_error_to_include_errors.rb

@@ -0,0 +1,20 @@
+module Dnsimple
+  class RequestError < Error
+    private
+
+    alias_method :original_message_from, :message_from
+
+    def message_from(http_response)
+      message = original_message_from(http_response)
+      return unless json_response?(http_response)
+
+      base_error = http_response.parsed_response.dig("errors", "base")&.join(", ")
+      message += ": #{base_error}" unless base_error.nil?
+      message
+    end
+
+    def json_response?(http_response)
+      http_response.headers["Content-Type"]&.start_with?("application/json")
+    end
+  end
+end

data/lib/record_store/provider/dnsimple.rb

@@ -1,5 +1,6 @@
 require 'dnsimple'
 require_relative 'dnsimple/patch_api_header'
+require_relative 'dnsimple/patch_request_error_to_include_errors'
 
 module RecordStore
   class Provider::DNSimple < Provider
@@ -20,12 +21,10 @@ module RecordStore
       def retrieve_current_records(zone:, stdout: $stdout)
         retry_on_connection_errors do
           session.zones.all_records(account_id, zone).data.map do |record|
-            begin
-              build_from_api(record, zone)
-            rescue StandardError
-              stdout.puts "Cannot build record: #{record}"
-              raise
-            end
+            build_from_api(record, zone)
+          rescue StandardError
+            stdout.puts "Cannot build record: #{record}"
+            raise
           end.compact
         end
       end

data/lib/record_store/provider/dynect.rb

@@ -36,11 +36,9 @@ module RecordStore
       def retrieve_current_records(zone:, stdout: $stdout)
         session.get_all_records(zone).body.fetch('data').flat_map do |_type, records|
           records.map do |record_body|
-            begin
-              build_from_api(record_body)
-            rescue StandardError
-              stdout.puts "Cannot build record: #{record_body}"
-            end
+            build_from_api(record_body)
+          rescue StandardError
+            stdout.puts "Cannot build record: #{record_body}"
           end
         end.compact
       end

data/lib/record_store/provider/google_cloud_dns.rb

@@ -22,13 +22,11 @@ module RecordStore
 
           # 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
+            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
 
@@ -44,12 +42,10 @@ module RecordStore
       private
 
       def session
-        @dns ||= begin
-          Google::Cloud::Dns.new(
-            project_id: secrets.fetch('project_id'),
-            credentials: Google::Cloud::Dns::Credentials.new(secrets),
-          )
-        end
+        @dns ||= Google::Cloud::Dns.new(
+          project_id: secrets.fetch('project_id'),
+          credentials: Google::Cloud::Dns::Credentials.new(secrets),
+        )
       end
 
       def secrets

data/lib/record_store/provider/ns1.rb

@@ -50,7 +50,7 @@ module RecordStore
       # Downloads all the records from the provider.
       #
       # Returns: an array of `Record` for each record in the provider's zone
-      def retrieve_current_records(zone:, stdout: $stdout) # rubocop:disable Lint/UnusedMethodArgument
+      def retrieve_current_records(zone:, stdout: $stdout)
         records_for_zone(zone)
           .flat_map { |short_record| build_from_api(short_record) }
           .compact

data/lib/record_store/provider.rb

@@ -3,6 +3,7 @@ require 'resolv'
 module RecordStore
   class Provider
     class Error < StandardError; end
+
     class UnparseableBodyError < Error; end
 
     class << self
@@ -152,24 +153,22 @@ module RecordStore
         )
 
         loop do
-          begin
-            return yield
-          rescue UnparseableBodyError
-            raise if max_retries <= 0
-            max_retries -= 1
-
-            waiter.wait(message: 'Waiting to retry after receiving an unparseable response')
-          rescue Net::OpenTimeout, Errno::ETIMEDOUT
-            raise if max_timeouts <= 0
-            max_timeouts -= 1
-
-            $stderr.puts('Retrying after a connection timeout')
-          rescue Errno::ECONNRESET
-            raise if max_conn_resets <= 0
-            max_conn_resets -= 1
-
-            waiter.wait
-          end
+          return yield
+        rescue UnparseableBodyError
+          raise if max_retries <= 0
+          max_retries -= 1
+
+          waiter.wait(message: 'Waiting to retry after receiving an unparseable response')
+        rescue Net::OpenTimeout, Errno::ETIMEDOUT
+          raise if max_timeouts <= 0
+          max_timeouts -= 1
+
+          $stderr.puts('Retrying after a connection timeout')
+        rescue Errno::ECONNRESET
+          raise if max_conn_resets <= 0
+          max_conn_resets -= 1
+
+          waiter.wait
         end
       end
     end

data/lib/record_store/version.rb

@@ -1,3 +1,3 @@
 module RecordStore
-  VERSION = '6.5.3'.freeze
+  VERSION = '6.5.8'.freeze
 end

data/lib/record_store/zone/config/implicit_record_template.rb

@@ -27,13 +27,13 @@ module RecordStore
             filepath = template_filepath_for(filename: filename)
             template_file = File.read(filepath)
 
-            template_file_yaml = YAML.load(template_file).deep_symbolize_keys
+            template_file_yaml = YAML.safe_load(template_file, permitted_classes: [Regexp]).deep_symbolize_keys
             filters_for_records_to_template = template_file_yaml[:each_record]
             filters_for_records_to_exclude = template_file_yaml[:except_record] || []
 
             new(template: ERB.new(template_file),
-                filters_for_records_to_template: filters_for_records_to_template,
-                filters_for_records_to_exclude: filters_for_records_to_exclude)
+              filters_for_records_to_template: filters_for_records_to_template,
+              filters_for_records_to_exclude: filters_for_records_to_exclude)
           end
 
           private
@@ -96,8 +96,9 @@ module RecordStore
         def template_record_for(record:, current_records:)
           context = TemplateContext.build(record: record, current_records: current_records)
 
-          YAML.load(
-            template.result(context.fetch_binding)
+          YAML.safe_load(
+            template.result(context.fetch_binding),
+            permitted_classes: [Regexp],
           ).deep_symbolize_keys
         end
       end

data/lib/record_store/zone/yaml_definitions.rb

@@ -31,7 +31,7 @@ module RecordStore
       end
 
       def write(name, config:, records:, format: :file)
-        raise ArgumentError, "format must be :directory or :file" unless %i(file directory).include?(format)
+        raise ArgumentError, "format must be :directory or :file" unless [:file, :directory].include?(format)
         name = name.chomp('.')
         zone_file = "#{RecordStore.zones_path}/#{name}.yml"
         zone = { name => { config: config.to_hash } }

data/lib/record_store/zone.rb

@@ -53,7 +53,7 @@ module RecordStore
         (ENV['RECORD_STORE_MAX_THREADS'] || DEFAULT_MAX_PARALLEL_THREADS).to_i
       end
 
-      def modified(verbose: false) # rubocop:disable Lint/UnusedMethodArgument
+      def modified(verbose: false)
         modified_zones = []
         mutex = Mutex.new
         zones = all
@@ -79,16 +79,14 @@ module RecordStore
 
     def initialize(name:, records: [], config: {}, abstract_syntax_trees: {})
       @name = Record.ensure_ends_with_dot(name)
-      @config = RecordStore::Zone::Config.new(config.deep_symbolize_keys)
+      @config = RecordStore::Zone::Config.new(**config.deep_symbolize_keys)
       @records = build_records(records)
       @abstract_syntax_trees = abstract_syntax_trees
     end
 
     def build_changesets(all: false)
-      @changesets ||= begin
-        providers.map do |provider|
-          Changeset.build_from(provider: provider, zone: self, all: all)
-        end
+      @changesets ||= providers.map do |provider|
+        Changeset.build_from(provider: provider, zone: self, all: all)
       end
     end
 

data/lib/record_store.rb

@@ -53,7 +53,7 @@ module RecordStore
     def zones_path
       @zones_path ||= Pathname.new(
         File.expand_path(config.fetch('zones_path'),
-        File.dirname(config_path)),
+          File.dirname(config_path)),
       ).realpath.to_s
     end
 
@@ -64,7 +64,7 @@ module RecordStore
     def implicit_records_templates_path
       @implicit_records_templates_path ||= Pathname.new(
         File.expand_path(config.fetch('implicit_records_templates_path'),
-        File.dirname(config_path)),
+          File.dirname(config_path)),
       ).realpath.to_s
     end
 

data/record_store.gemspec

@@ -39,7 +39,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'google-cloud-dns', '~> 0.31.0'
   spec.add_runtime_dependency 'ruby-limiter', '~> 1.0', '>= 1.0.1'
   spec.add_runtime_dependency 'ns1'
-  spec.add_runtime_dependency 'oci', '~> 2.6.0'
+  spec.add_runtime_dependency 'oci', '~> 2.14.0'
 
   spec.add_development_dependency 'byebug'
   spec.add_development_dependency 'rake'
@@ -48,6 +48,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'vcr'
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'webmock'
-  spec.add_development_dependency 'rubocop', '~> 1.0.0'
+  spec.add_development_dependency 'rubocop', '~> 1.18.0'
+  spec.add_development_dependency 'rubocop-shopify', '~> 2.2.0'
   spec.add_development_dependency 'minitest-focus'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: record_store
 version: !ruby/object:Gem::Version
-  version: 6.5.3
+  version: 6.5.8
 platform: ruby
 authors:
 - Willem van Bergen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-23 00:00:00.000000000 Z
+date: 2022-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -191,14 +191,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 2.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 2.14.0
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -303,14 +303,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.18.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.18.0
+- !ruby/object:Gem::Dependency
+  name: rubocop-shopify
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.2.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: minitest-focus
   requirement: !ruby/object:Gem::Requirement
@@ -357,6 +371,7 @@ files:
 - lib/record_store/provider.rb
 - lib/record_store/provider/dnsimple.rb
 - lib/record_store/provider/dnsimple/patch_api_header.rb
+- lib/record_store/provider/dnsimple/patch_request_error_to_include_errors.rb
 - lib/record_store/provider/dynect.rb
 - lib/record_store/provider/google_cloud_dns.rb
 - lib/record_store/provider/ns1.rb