sprinkle_dns 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1fab0389257851cf18cca41f85ba7902d2d6991599f6f41467612fad0861f754
-  data.tar.gz: daa92a1e2c7a5ad893c606bfadc181e355c76622ee55bc905f8a1afcda734f2a
+  metadata.gz: e7508012e43f792a2fec3f28c908c672476b684286c4cd726a7572a6c85abade
+  data.tar.gz: e95768f7c91d4cd0e6cff0204c2e4994734f4b8c37423fe639c5ddd0c858778f
 SHA512:
-  metadata.gz: c2e87abb06df0034e18b215e688fd6808452fbb95fa105d95a4ab6f1532b4bdc7d35db72ae0ef8afda82f6d445dcfc21e200cb7bb07ca70cb83d1711555aaa22
-  data.tar.gz: c26276c21b51b54b22a589fcfe622bee85261cf20f9907b36ea7792a300ea81e2e31a830ae8967b0e35c89ada0636f0b8c347261c3fe6b1c2710d483f6b066fb
+  metadata.gz: 4c20c1b83672ded307e65e0405da4c68f7c7acde3178d531f80c4e8dd462ed717e0d1e2c8802c5aab74729287d6c886686dd68ee432b07c120b63d940dfa333d
+  data.tar.gz: 9a7ebc53c0d8f123150ecd1a7b1db0c0cca0ab2c409cd2179b7470cfa35dfc08f5180f07f7db25e3473819417745ed3d153dc31a7eeaff8ef91bc95591b568bd

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sprinkle_dns (1.0.0)
+    sprinkle_dns (1.0.1)
       aws-sdk-route53 (~> 1.21)
 
 GEM

data/README.md

@@ -60,6 +60,7 @@ client = SprinkleDNS::Route53Client.new(ACCESS_KEY_ID, SECRET_ACCESS_KEY)
 sdns = SprinkleDNS::Client.new(client,
   dry_run: false,
   diff: true,
+  show_untouched: false,
   force: true,
   delete: false,
   interactive_progress: true,
@@ -73,6 +74,7 @@ Here is a table that shows the different configuration options:
 |------------------------|-----------------------------------------------------------------------------------------------------------|---------------|
 | `dry_run`              | Do not make any changes, just compare and exit, useful with `diff: true`.                                 | `true`        |
 | `diff`                 | Prints a diff to list the changes that are going to be made.                                              | `true`        |
+| `show_untouched`       | Specifies whether or not the diff should show untouched records or not.                                   | `false`       |
 | `force`                | Do not ask before changes are made, just apply.                                                           | `false`       |
 | `delete`               | Specifies whether unreferenced entries should be deleted.                                                 | `false`       |
 | `interactive_progress` | Shows interactive progress whilst changes are being applied, nice for your terminal, not for your CI-job. | `true`        |

data/lib/sprinkle_dns/cli/hosted_zone_diff.rb

@@ -35,7 +35,9 @@ module SprinkleDNS::CLI
           elsif to_delete.include?(entry)
             entries << entry_to_struct('-', entry, hosted_zone)
           else
-            entries << entry_to_struct(nil, entry, hosted_zone)
+            if configuration.show_untouched?
+              entries << entry_to_struct(nil, entry, hosted_zone)
+            end
           end
         end
       end

data/lib/sprinkle_dns/client.rb

@@ -17,7 +17,7 @@ module SprinkleDNS
   class Client
     attr_reader :wanted_hosted_zones, :config
 
-    def initialize(dns_provider, dry_run: false, diff: true, force: true, delete: false, interactive_progress: true, create_hosted_zones: false)
+    def initialize(dns_provider, dry_run: false, diff: true, force: true, delete: false, interactive_progress: true, create_hosted_zones: false, show_untouched: false)
       @config = SprinkleDNS::Config.new(
         dry_run: dry_run,
         diff: diff,
@@ -25,6 +25,7 @@ module SprinkleDNS
         delete: delete,
         interactive_progress: interactive_progress,
         create_hosted_zones: create_hosted_zones,
+        show_untouched: show_untouched,
       )
       @dns_provider = dns_provider
       @wanted_hosted_zones = []
@@ -95,16 +96,21 @@ module SprinkleDNS
       unless @config.force?
         changes = hosted_zones.map{|h| SprinkleDNS::EntryPolicyService.new(h, @config)}.collect{|eps| eps.entries_to_change}.sum
 
-        messages = []
-
-        messages << "#{missing_hosted_zones.size} hosted-zone(s) to create" if missing_hosted_zones.any?
-        messages << "#{changes} change(s) to make" if changes > 0
-        print messages.join(' and ').concat(". Continue? (y/N)")
-
-        case gets.strip
-        when 'y', 'Y'
-          # continue
+        if missing_hosted_zones.any? || changes > 0
+          messages = []
+          messages << "#{missing_hosted_zones.size} hosted-zone(s) to create" if missing_hosted_zones.any?
+          messages << "#{changes} change(s) to make" if changes > 0
+          print messages.join(' and ').concat(". Continue? (y/N)")
+
+          case gets.strip
+          when 'y', 'Y'
+            # continue
+          else
+            puts ".. exiting!"
+            return [hosted_zones, nil]
+          end
         else
+          puts "No changes to make, everything up to date!"
           puts ".. exiting!"
           return [hosted_zones, nil]
         end

data/lib/sprinkle_dns/config.rb

@@ -1,12 +1,13 @@
 module SprinkleDNS
   class Config
-    def initialize(dry_run: true, diff: true, force: false, delete: false, interactive_progress: true, create_hosted_zones: false)
+    def initialize(dry_run: true, diff: true, force: false, delete: false, interactive_progress: true, create_hosted_zones: false, show_untouched: false)
       @dry_run = dry_run
       @diff = diff
       @force = force
       @delete = delete
       @interactive_progress = interactive_progress
       @create_hosted_zones = create_hosted_zones
+      @show_untouched = show_untouched
 
       raise SettingNotBoolean.new('dry_run is not a boolean') unless [true, false].include?(dry_run)
       raise SettingNotBoolean.new('diff is not a boolean') unless [true, false].include?(diff)
@@ -14,6 +15,7 @@ module SprinkleDNS
       raise SettingNotBoolean.new('delete is not a boolean') unless [true, false].include?(delete)
       raise SettingNotBoolean.new('interactive_progress is not a boolean') unless [true, false].include?(interactive_progress)
       raise SettingNotBoolean.new('create_hosted_zones is not a boolean') unless [true, false].include?(create_hosted_zones)
+      raise SettingNotBoolean.new('show_untouched is not a boolean') unless [true, false].include?(show_untouched)
     end
 
     def dry_run?
@@ -39,5 +41,9 @@ module SprinkleDNS
     def create_hosted_zones?
       @create_hosted_zones
     end
+
+    def show_untouched?
+      @show_untouched
+    end
   end
 end

data/lib/sprinkle_dns/hosted_zone_entry.rb

@@ -61,8 +61,8 @@ module SprinkleDNS
 
     def new_value(new_entry)
       if new_entry.class == SprinkleDNS::HostedZoneEntry
-        @changed_value = true if @value != new_entry.value
-        @changed_ttl   = true if @ttl   != new_entry.ttl
+        @changed_value = true if @value.sort != new_entry.value.sort
+        @changed_ttl   = true if @ttl != new_entry.ttl
       else
         @changed_value = true
         @changed_ttl   = true

data/lib/sprinkle_dns/version.rb

@@ -1,3 +1,3 @@
 module SprinkleDNS
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/spec/unit/sprinkle_dns_spec.rb

@@ -122,6 +122,95 @@ RSpec.describe SprinkleDNS::Client do
     end
   end
 
+  context 'comparing should ignore ordering' do
+    it 'for MX-records' do
+      hz = SprinkleDNS::HostedZone.new('rubyisms.co.uk.')
+
+      e1 = SprinkleDNS::HostedZoneEntry.new('MX', 'rubyisms.co.uk.', [
+        "10 aspmx2.googlemail.com.",
+        "5 alt1.aspmx.l.google.com",
+        "1 aspmx.l.google.com.",
+        "5 alt2.aspmx.l.google.com.",
+        "10 aspmx3.googlemail.com.",
+      ], 3600, hz.name)
+      # We are emulating that these records are already live, mark them as persisted
+      [e1].each do |persisted|
+        persisted.persisted!
+        hz.resource_record_sets << persisted
+      end
+
+      r42c = SprinkleDNS::MockClient.new([hz])
+      sdns = SprinkleDNS::Client.new(r42c)
+
+      sdns.entry('MX', 'rubyisms.co.uk.', [
+        '1 aspmx.l.google.com',
+        '5 alt2.aspmx.l.google.com',
+        '5 alt1.aspmx.l.google.com',
+        '10 aspmx3.googlemail.com',
+        '10 aspmx2.googlemail.com',
+      ], 3600)
+
+      existing_hosted_zones, _ = sdns.compare
+      policy_service = SprinkleDNS::EntryPolicyService.new(hz, sdns.config)
+
+      expect(policy_service.entries_to_create.size).to eq 0
+      expect(policy_service.entries_to_update.size).to eq 0
+      expect(policy_service.entries_to_delete.size).to eq 0
+    end
+
+    it 'for TXT-records' do
+      hz = SprinkleDNS::HostedZone.new('pythonisms.co.uk.')
+
+      e1 = SprinkleDNS::HostedZoneEntry.new('TXT', 'pythonisms.co.uk.', [
+        %q("google-site-verification=FK82Vlp1w5rz0HkTMo6PW8aHU2IIvEsPKARoFlSoDPs"),
+        %q("google-site-verification=HdPsn7e-9AQy0sD671kRWzLuORYI2apSPMpzhp_1LVQ"),
+        %q("google-site-verification=1Vm7qTouRoz66EhSn1fFMLCnx3MQfznsti2zo8UYYiI"),
+        %q("google-site-verification=IiD31xJH-gQmUkpg95z7u8CS2K7bjdwzbsGvPIFLIAk"),
+        %q("google-site-verification=s3KCcWO7nu5LGleqnaHoi8pE0lw2gPf8gKTTM6YKbjs"),
+        %q("google-site-verification=kIfG408ueAdqMx8n0-UP2hXep1ONimdgF6glDaXWglo"),
+        %q("google-site-verification=p72jEH3LGN8T8Nqy8iCS5BZE8MU7FpVSvAhwSIZUFAE"),
+        %q("google-site-verification=tZOAzOQJQA-vY2epnHzLJWlRWIClTqUTV-5f9scFtr0"),
+        %q("google-site-verification=_7tC6N0vfhR_tqWQ_gK4kZlCNEtmV7Fy4PGkRuMvoKA"),
+        %q("google-site-verification=V7KRnRTW8fqQXUhEpFA2o7WkY6MVusthznsZRvEFmwM"),
+        %q("v=spf1 include:_spf.google.com include:support.zendesk.com include:mail.zendesk.com include:servers.mcsv.net include:spf.mandrillapp.com include:sendgrid.net ~all"),
+        %q("google-site-verification=ZIZaEr9kOQqbelfUaa-4Li-Sih1VjNtlkwXr6p9pTQA"),
+        %q("google-site-verification=fqE3nRX4hvcaQNMbF8arnHNAk5VRUsD8j5BYf-61nL4"),
+      ], 3600, hz.name)
+      # We are emulating that these records are already live, mark them as persisted
+      [e1].each do |persisted|
+        persisted.persisted!
+        hz.resource_record_sets << persisted
+      end
+
+      r42c = SprinkleDNS::MockClient.new([hz])
+      sdns = SprinkleDNS::Client.new(r42c)
+
+      entries = [
+        %q{"v=spf1 include:_spf.google.com include:support.zendesk.com include:mail.zendesk.com include:servers.mcsv.net include:spf.mandrillapp.com include:sendgrid.net ~all"},
+        %q{"google-site-verification=V7KRnRTW8fqQXUhEpFA2o7WkY6MVusthznsZRvEFmwM"},
+        %q{"google-site-verification=_7tC6N0vfhR_tqWQ_gK4kZlCNEtmV7Fy4PGkRuMvoKA"},
+        %q{"google-site-verification=tZOAzOQJQA-vY2epnHzLJWlRWIClTqUTV-5f9scFtr0"},
+        %q{"google-site-verification=p72jEH3LGN8T8Nqy8iCS5BZE8MU7FpVSvAhwSIZUFAE"},
+        %q{"google-site-verification=kIfG408ueAdqMx8n0-UP2hXep1ONimdgF6glDaXWglo"},
+        %q{"google-site-verification=s3KCcWO7nu5LGleqnaHoi8pE0lw2gPf8gKTTM6YKbjs"},
+        %q{"google-site-verification=IiD31xJH-gQmUkpg95z7u8CS2K7bjdwzbsGvPIFLIAk"},
+        %q{"google-site-verification=1Vm7qTouRoz66EhSn1fFMLCnx3MQfznsti2zo8UYYiI"},
+        %q("google-site-verification=HdPsn7e-9AQy0sD671kRWzLuORYI2apSPMpzhp_1LVQ"),
+        %q("google-site-verification=FK82Vlp1w5rz0HkTMo6PW8aHU2IIvEsPKARoFlSoDPs"),
+        %q("google-site-verification=ZIZaEr9kOQqbelfUaa-4Li-Sih1VjNtlkwXr6p9pTQA"),
+        %q("google-site-verification=fqE3nRX4hvcaQNMbF8arnHNAk5VRUsD8j5BYf-61nL4"),
+      ]
+      sdns.entry('TXT', 'pythonisms.co.uk.', entries, 3600)
+
+      existing_hosted_zones, _ = sdns.compare
+      policy_service = SprinkleDNS::EntryPolicyService.new(hz, sdns.config)
+
+      expect(policy_service.entries_to_create.size).to eq 0
+      expect(policy_service.entries_to_update.size).to eq 0
+      expect(policy_service.entries_to_delete.size).to eq 0
+    end
+  end
+
   context 'delete config option' do
     before(:all) do
       @hz01 = SprinkleDNS::HostedZone.new('colourful.co.uk.')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sprinkle_dns
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Kasper Grubbe