record_store 6.7.2 → 7.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c762762d3971455c63709b625c961d42b12259c948cc5a545f6c4292b44e272
-  data.tar.gz: 053b903ae49f503befa5bbf13faa61efd70cd0b7563783bd0392e7764bf4ad3e
+  metadata.gz: 5380713a7eb24d7be7ea68e2d6e2691bc929bccc22cf5098ce805665b1f2493b
+  data.tar.gz: 7a4a1354479436ed184cad12e3eb8d434c0e8fa610bbd734d66ca494bb4c5365
 SHA512:
-  metadata.gz: 4fa1daf0d8996c1b2210330fb0f3fceee62b3f80532ad98da723adcbf969f9ed44a18e2693ffb020bffcd4a4529f569b33b9326280c7873e57a619772e118494
-  data.tar.gz: 54e9194a2fc1697bd6ce341df1bea0dcf389d2e63b60b63d71025e2964bac6a750473649208b463b1fcb4e478da1b25287098a16a130c371f1adf0bd605c0cd9
+  metadata.gz: 0e5bfe2bf6e97fc9a771c2472bfc4d49d94333bde7bd40c01b67203a674df743be0fc9db80cff14c126aa1d4a9b295d7028c954b372f2b033e0c56feeb1fe6b1
+  data.tar.gz: b49194a0c1e24f3a3929832c561236c9828c75ee97859233a8ce127cd7f7321526359d43f01f3653962778354b330a095dd94675aeaebb0195afa5bfe60fe1ab

data/.github/workflows/ci.yml

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

data/.rubocop.yml

@@ -2,7 +2,6 @@ inherit_gem:
   rubocop-shopify: rubocop.yml
 
 AllCops:
-  TargetRubyVersion: 2.6.4
   Exclude:
     - vendor/**/*
   UseCache: true

data/.ruby-version

@@ -0,0 +1 @@
+3.2.1

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # CHANGELOG
 
+## 7.0.1
+- Allow an underscore in the middle of a CNAME record
+
+## 7.0.0
+- Validate that there are no A/AAAA record conflicts with ALIAS records
+
 ## 6.7.2
 - Fix ActiveModel::Error usage for validate_records (behaviour change in ActiveModel 7)
 

data/dev.yml

@@ -2,7 +2,7 @@
 name: recordstore
 
 up:
-  - ruby: 3.2.1
+  - ruby
   - bundler
 
 commands:

data/lib/record_store/cli.rb

@@ -149,7 +149,7 @@ module RecordStore
 
     option :name, desc: 'Zone to download', aliases: '-n', type: :string, required: true
     option :provider, desc: 'Provider in which this zone exists', aliases: '-p', type: :string
-    desc 'download', 'Downloads all records from zone and creates YAML zone definition in zones/ '\
+    desc 'download', 'Downloads all records from zone and creates YAML zone definition in zones/ ' \
       'e.g. record-store download --name=shopify.io'
     def download
       name = options.fetch('name')

data/lib/record_store/record.rb

@@ -1,6 +1,6 @@
 module RecordStore
   class Record
-    FQDN_REGEX  = /\A(\*\.)?([a-z0-9_]+(-[a-z0-9]+)*\._?)+[a-z]{2,}\.\Z/i
+    FQDN_REGEX  = /\A(\*\.)?([a-z0-9_]+(-[_a-z0-9]+)*\._?)+[a-z]{2,}\.\Z/i
     CNAME_REGEX = /\A(\*\.)?([a-z0-9_]+((-|--)?[a-z0-9]+)*\._?)+[a-z]{2,}\.\Z/i
 
     include ActiveModel::Validations

data/lib/record_store/version.rb

@@ -1,3 +1,3 @@
 module RecordStore
-  VERSION = '6.7.2'.freeze
+  VERSION = '7.0.1'.freeze
 end

data/lib/record_store/zone.rb

@@ -22,6 +22,7 @@ module RecordStore
     validate :validate_can_handle_alias_records
     validate :validate_no_duplicate_keys
     validate :validate_zone_record_not_shadowed
+    validate :validate_alias_has_no_conflicts
 
     class << self
       def download(name, provider_name, **write_options)
@@ -265,6 +266,27 @@ module RecordStore
       end
     end
 
+    # CNAME conflict is handled by validate_cname_records_for_same_fqdn
+    ALIAS_CONFLICTS = [
+      "A",
+      "AAAA",
+    ]
+
+    def validate_alias_has_no_conflicts
+      alias_records = records.select { |record| record.is_a?(Record::ALIAS) }
+
+      alias_records.each do |alias_record|
+        records.each do |record|
+          next unless ALIAS_CONFLICTS.include?(record.type)
+          next unless record.fqdn == alias_record.fqdn
+
+          errors.add(:records, "#{record.type} record conflicts with ALIAS:\n" \
+            "- #{alias_record}\n" \
+            "- #{record}")
+        end
+      end
+    end
+
     def validate_provider_can_handle_zone_records
       record_types = records.map(&:type).to_set
       return unless config.valid?
@@ -312,8 +334,8 @@ module RecordStore
           .select { |record| record.match?(/^([a-zA-Z0-9\-_]+)#{Regexp.escape(suffix)}$/) }
         terminal_records.each do |terminal_record|
           non_terminal = terminal_record.partition('.').last
-          errors.add(:records, "found empty non-terminal #{non_terminal} "\
-            "(caused by existing records #{wildcard} and #{terminal_record})")\
+          errors.add(:records, "found empty non-terminal #{non_terminal} " \
+            "(caused by existing records #{wildcard} and #{terminal_record})") \
             unless intermediate_records.include?(non_terminal)
         end
       end

data/record_store.gemspec

@@ -9,8 +9,8 @@ Gem::Specification.new do |spec|
   spec.email       = ['willem@railsdoctors.com', 'emil@shopify.com']
 
   spec.summary     = 'Manage DNS using git'
-  spec.description = "Manage DNS through a git-based workflow. If you're looking for the original 'record_store',"\
-    " that has been renamed to 'sequel_record_store'."
+  spec.description = "Manage DNS through a git-based workflow. If you're looking for the original 'record_store', " \
+    "that has been renamed to 'sequel_record_store'."
   spec.homepage    = 'https://github.com/Shopify/record_store'
   spec.license     = 'MIT'
 
@@ -24,20 +24,20 @@ Gem::Specification.new do |spec|
   spec.executables = ['record-store']
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '>= 2.0'
+  spec.required_ruby_version = '>= 3.0.0'
 
   spec.add_runtime_dependency 'activemodel', '>= 4.2'
   spec.add_runtime_dependency 'activesupport', '>= 4.2'
   spec.add_runtime_dependency 'ejson'
   spec.add_runtime_dependency 'thor', '>= 0.20.3', '< 1.4.0'
 
-  spec.add_runtime_dependency 'dnsimple', '>= 4.4', '< 8.9'
+  spec.add_runtime_dependency 'dnsimple', '>= 4.4', '< 9.1'
   spec.add_runtime_dependency 'fog-dynect', '>= 0.4', '< 0.6'
   spec.add_runtime_dependency 'fog-json'
   spec.add_runtime_dependency 'fog-xml'
   spec.add_runtime_dependency 'google-cloud-dns', '~> 0.31'
   spec.add_runtime_dependency 'ns1'
-  spec.add_runtime_dependency 'oci', '~> 2.14.0'
+  spec.add_runtime_dependency 'oci', '>= 2.14', '< 2.22'
   spec.add_runtime_dependency 'ruby-limiter', '>= 1.0.1', '< 3'
 
   spec.add_development_dependency 'bundler'
@@ -46,8 +46,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'mocha'
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rubocop', '~> 1.60.2'
-  spec.add_development_dependency 'rubocop-shopify', '~> 2.14.0'
+  spec.add_development_dependency 'rubocop', '~> 1.64.0'
+  spec.add_development_dependency 'rubocop-shopify', '~> 2.15.1'
   spec.add_development_dependency 'vcr'
   spec.add_development_dependency 'webmock'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: record_store
 version: !ruby/object:Gem::Version
-  version: 6.7.2
+  version: 7.0.1
 platform: ruby
 authors:
 - Willem van Bergen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-02-12 00:00:00.000000000 Z
+date: 2024-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -82,7 +82,7 @@ dependencies:
         version: '4.4'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8.9'
+        version: '9.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -92,7 +92,7 @@ dependencies:
         version: '4.4'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8.9'
+        version: '9.1'
 - !ruby/object:Gem::Dependency
   name: fog-dynect
   requirement: !ruby/object:Gem::Requirement
@@ -173,16 +173,22 @@ dependencies:
   name: oci
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.14'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 2.14.0
+        version: '2.22'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.14'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 2.14.0
+        version: '2.22'
 - !ruby/object:Gem::Dependency
   name: ruby-limiter
   requirement: !ruby/object:Gem::Requirement
@@ -293,28 +299,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.60.2
+        version: 1.64.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.60.2
+        version: 1.64.0
 - !ruby/object:Gem::Dependency
   name: rubocop-shopify
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.0
+        version: 2.15.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.0
+        version: 2.15.1
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
@@ -360,6 +366,7 @@ files:
 - ".gitignore"
 - ".rubocop-https---shopify-github-io-ruby-style-guide-rubocop-yml"
 - ".rubocop.yml"
+- ".ruby-version"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
@@ -432,14 +439,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.6
+rubygems_version: 3.5.13
 signing_key: 
 specification_version: 4
 summary: Manage DNS using git