zonesync 0.14.2 → 0.14.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 27283e7f0b1a63729264d144c0a5c4773005e5f97a142da59ca43bac1327122f
-  data.tar.gz: 4179d9f774c3950247525071bd0a207af9ddd8b9a1d5049181d33b08e1edb927
+  metadata.gz: 413d039b491283ed46fa0b03a08a5bbd8c02489798850119b27372f8017ea30e
+  data.tar.gz: 2ffb50fce0dc89cbf955d5528e280a167b5170bc994d17ed7d02495a9b53e337
 SHA512:
-  metadata.gz: 3a462d3158d821afe0c8a629b344139e9166c7d6f21844574ce6a6bdb52af66b81f5492eb97408e58c34ffd32ec583c2ba1215eced6d0fa981dde63034c8f48c
-  data.tar.gz: cbae6f2fcdc44409118d4ccd457f7022c29037c66222fa30d6e828f3336853b6c0160d1ee8a4bd0704d3ee47dfd81d9cf5318b68d25eaf0705a638aa52a90dcb
+  metadata.gz: '09fe6fd394d6ae175c9c0a5325206b3fc0c5fef6523fb8802a14d6e4b90d95d5282fb58de35bc6fceac4642df87021ac352b50368a2308fc0db8c7b0e190f350'
+  data.tar.gz: 1cb14bf843af73c34dd1c49205438e2e62e4d8e5f810932ff410dce2e5d7ab36768ef2c429852ce7f1b858958ab958839db0a0cdabc4bb707d54ceae1f3ff02b

data/README.md

@@ -110,6 +110,22 @@ Zonesync.call(source: "Zonefile", destination: "zonesync", dry_run: true)
 Zonesync.generate(source: "zonesync", destination: "Zonefile")
 ```
 
+### Cloudflare proxy status
+
+When using the Cloudflare provider, you can control whether a record is proxied through Cloudflare's CDN by adding a `cf_tags` comment to the record in your zone file:
+
+```
+www    IN A     192.0.2.1 ; cf_tags=cf-proxied:true
+mail   IN A     192.0.2.2 ; cf_tags=cf-proxied:false
+api    IN A     192.0.2.3
+```
+
+- `cf_tags=cf-proxied:true` — enable Cloudflare proxy (orange cloud)
+- `cf_tags=cf-proxied:false` — explicitly disable proxy (grey cloud)
+- No `cf_tags` — don't touch the proxied setting (use Cloudflare's default)
+
+When generating a zone file with `zonesync generate`, proxied records will automatically include the `cf_tags=cf-proxied:true` tag in their comments.
+
 ### Managing or avoiding conflicts with other people making edits to the DNS records
 
 Zonesync writes two additional TXT records: `zonesync_manifest` and `zonesync_checksum`. These two records together try to handle the situation where someone else makes edits directly to the DNS records managed by zonesync.

data/lib/zonesync/provider.rb

@@ -23,6 +23,13 @@ module Zonesync
       operations
     end
 
+    def apply(operations)
+      operations.each do |method, records|
+        yield method, records
+        send(method, *records)
+      end
+    end
+
     def diff(other)
       Diff.new(
         from: diffable_records,

data/lib/zonesync/record.rb

@@ -53,17 +53,12 @@ module Zonesync
 
     def conflicts_with?(other)
       return false unless name == other.name && type == other.type
+      Record.single_record_per_name?(type)
+    end
 
-      case type
-      when "CNAME", "SOA"
-        true
-      when "MX"
-        existing_priority = rdata.split(' ').first
-        new_priority = other.rdata.split(' ').first
-        existing_priority == new_priority
-      else
-        false
-      end
+    # A CNAME cannot coexist with any other data at its owner name.
+    def excludes?(other)
+      name == other.name && type != other.type && [type, other.type].include?("CNAME")
     end
 
     def self.single_record_per_name?(type)

data/lib/zonesync/route53.rb

@@ -33,46 +33,35 @@ module Zonesync
           *(remaining_records.any? ? [[remaining_records, "CREATE"]] : [])
         ]
 
-        http.post("", ERB.new(<<~XML, trim_mode: "-").result(binding))
-          <?xml version="1.0" encoding="UTF-8"?>
-          <ChangeResourceRecordSetsRequest xmlns="https://route53.amazonaws.com/doc/2013-04-01/">
-            <ChangeBatch>
-              <Changes>
-                <%- grouped.each do |records_list, action| -%>
-                <%- records_grouped = records_list.group_by { |r| [r.name, r.type, r.ttl] } -%>
-                <%- records_grouped.each do |(name, type, ttl), group_records| -%>
-                <Change>
-                  <Action><%= action %></Action>
-                  <ResourceRecordSet>
-                    <Name><%= name %></Name>
-                    <Type><%= type %></Type>
-                    <TTL><%= ttl %></TTL>
-                    <ResourceRecords>
-                      <%- group_records.each do |group_record| -%>
-                      <ResourceRecord>
-                        <Value><%= rdata_for_api(group_record) %></Value>
-                      </ResourceRecord>
-                      <%- end -%>
-                    </ResourceRecords>
-                  </ResourceRecordSet>
-                </Change>
-                <%- end -%>
-                <%- end -%>
-              </Changes>
-            </ChangeBatch>
-          </ChangeResourceRecordSetsRequest>
-        XML
+        post_changes(grouped)
 
         invalidate_cache!
       end
     end
 
+    def apply(operations, &block)
+      names = type_change_names(operations)
+      batched, rest = operations.partition do |method, (record)|
+        method != :change && names.include?(record.name)
+      end
+      batched.group_by { |_, (record)| record.name }.each do |name, ops|
+        ops.each(&block)
+        replace_at_name(name, ops)
+      end
+      super(rest, &block)
+    end
+
     def change(old_record, new_record)
-      existing_records = records.select do |r|
-        r.name == old_record.name && r.type == old_record.type
+      new_set = if old_record.manifest? || old_record.checksum?
+        # our metadata records are singletons, always replace
+        [new_record]
+      else
+        existing_records = records.select do |r|
+          r.name == old_record.name && r.type == old_record.type
+        end
+        (existing_records.reject { |r| r.identical_to?(old_record) } + [new_record]).uniq
       end
 
-      new_set = (existing_records.reject { |r| r == old_record } + [new_record]).uniq
       change_records("UPSERT", new_set)
       invalidate_cache!
     end
@@ -106,6 +95,61 @@ module Zonesync
       @zonefile = nil
     end
 
+    def type_change_names(operations)
+      removed = operations.filter_map { |method, (record)| record if method == :remove }
+      added = operations.filter_map { |method, (record)| record if method == :add }
+      added.select { |a| removed.any? { |r| r.excludes?(a) } }.map(&:name).uniq
+    end
+
+    def replace_at_name(name, ops)
+      removed = ops.filter_map { |method, (record)| record if method == :remove }
+      added = ops.filter_map { |method, (record)| record if method == :add }
+
+      deletes, creates = [], []
+      (removed + added).map(&:type).uniq.each do |type|
+        before = records.select { |r| r.name == name && r.type == type }
+        after = before.reject { |r| removed.any? { |x| x.identical_to?(r) } }
+        after += added.select { |r| r.type == type && after.none? { |x| x.identical_to?(r) } }
+        deletes.concat(before)
+        creates.concat(after)
+      end
+
+      post_changes([[deletes, "DELETE"], [creates, "CREATE"]])
+      invalidate_cache!
+    end
+
+    def post_changes(grouped)
+      http.post("", ERB.new(<<~XML, trim_mode: "-").result(binding))
+        <?xml version="1.0" encoding="UTF-8"?>
+        <ChangeResourceRecordSetsRequest xmlns="https://route53.amazonaws.com/doc/2013-04-01/">
+          <ChangeBatch>
+            <Changes>
+              <%- grouped.each do |records_list, action| -%>
+              <%- records_grouped = records_list.group_by { |r| [r.name, r.type, r.ttl] } -%>
+              <%- records_grouped.each do |(name, type, ttl), group_records| -%>
+              <Change>
+                <Action><%= action %></Action>
+                <ResourceRecordSet>
+                  <Name><%= name %></Name>
+                  <Type><%= type %></Type>
+                  <TTL><%= ttl %></TTL>
+                  <ResourceRecords>
+                    <%- group_records.each do |group_record| -%>
+                    <ResourceRecord>
+                      <Value><%= rdata_for_api(group_record) %></Value>
+                    </ResourceRecord>
+                    <%- end -%>
+                  </ResourceRecords>
+                </ResourceRecordSet>
+              </Change>
+              <%- end -%>
+              <%- end -%>
+            </Changes>
+          </ChangeBatch>
+        </ChangeResourceRecordSetsRequest>
+      XML
+    end
+
     def change_record(action, record)
       http.post("", <<~XML)
         <?xml version="1.0" encoding="UTF-8"?>

data/lib/zonesync/sync.rb

@@ -38,9 +38,10 @@ module Zonesync
         end
       end
 
-      operations.each do |method, records|
-        Logger.log(method, records, dry_run: dry_run)
-        destination.send(method, *records) unless dry_run
+      if dry_run
+        operations.each { |method, records| Logger.log(method, records, dry_run: true) }
+      else
+        destination.apply(operations) { |method, records| Logger.log(method, records) }
       end
     end
   end

data/lib/zonesync/validator.rb

@@ -89,6 +89,8 @@ module Zonesync
     end
 
     def validate_addition(record, force: false)
+      excluded_record = find_excluded_record(record)
+      return [excluded_record, record] if excluded_record
       return nil if manifest.matches?(record)
       return nil if force
 
@@ -106,6 +108,13 @@ module Zonesync
       [conflicting_record, record]
     end
 
+    def find_excluded_record(record)
+      removed = operations.filter_map { |method, (r)| r if method == :remove }
+      destination.records.find do |r|
+        r.excludes?(record) && removed.none? { |x| x.identical_to?(r) }
+      end
+    end
+
     def find_v2_conflict(record, expected_hashes)
       destination.records.find do |r|
         next if r.manifest? || r.checksum?

data/lib/zonesync/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Zonesync
-  VERSION = "0.14.2"
+  VERSION = "0.14.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zonesync
 version: !ruby/object:Gem::Version
-  version: 0.14.2
+  version: 0.14.4
 platform: ruby
 authors:
 - Micah Geisel
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-02-25 00:00:00.000000000 Z
+date: 2026-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor