roadworker 0.5.11 → 0.5.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5826fc752a18415d0c92fb3426ef3357d4d460787d65df3a7f9b69d69ddfea2a
-  data.tar.gz: ecb791ea4220d52b3bf61e17ec66de21d91500dacde413c4704fa3d0d294fd2f
+  metadata.gz: 954087eeb0c2336152bcc1b2e5508ab1ac508e33df52c02feffb8cdb2973cd7d
+  data.tar.gz: 8d767b2ff8558de226cddfb43c662ce52952a75b7b5fabae89dd14638b555fb3
 SHA512:
-  metadata.gz: ad687493ff7fdd01196bc5028aaf32347ec83375c22cb65bcb3318e4a7576b772618ab7410d69d94f7410e85e1582d3f45da839122ddeae46a1af4f83851b5d0
-  data.tar.gz: 20a22e0f56076d934c84b88a29c54a19f54f9cfa1519339021f9affa294a25f81737b9c57882f32986cc8ce1903fb9c97cd9fdd06a769b7c7b87a044e1e9cd93
+  metadata.gz: 67903de0d8b95bd63d4dd0fe4d47a6a882574f10614e95824d30640f208619081a6ff2f21932c70720b9aeb9340527bf786e336d778f6c6fc057e055c62b71dc
+  data.tar.gz: ecce73635cdd3465a21070c16205f7e6df4f87ffd37e08c1c3bf3d9e126cbb85397ad58941f416eb912cf2a4475ef0ec011b88fc6e86e697ac5fea9da3ee3e2c

data/lib/roadworker/route53-wrapper.rb

@@ -212,10 +212,10 @@ module Roadworker
       def eql?(expected_record)
         Route53Wrapper::RRSET_ATTRS_WITH_TYPE.all? do |attribute|
           expected = expected_record.public_send(attribute)
-          expected = expected.sort_by {|i| i.to_s } if expected.kind_of?(Array)
+          expected = sort_rrset_values(attribute, expected) if expected.kind_of?(Array)
           expected = nil if expected.kind_of?(Array) && expected.empty?
           actual = self.public_send(attribute)
-          actual = actual.sort_by {|i| i.to_s } if actual.kind_of?(Array)
+          actual = sort_rrset_values(attribute, actual) if actual.kind_of?(Array)
           actual = nil if actual.kind_of?(Array) && actual.empty?
 
           if attribute == :geo_location and actual
@@ -384,6 +384,21 @@ module Roadworker
 
       private
 
+      def sort_rrset_values(attribute, values)
+        sort_lambda =
+          case attribute
+          when :resource_records
+            # After aws-sdk-core v3.44.1, Aws::Route53::Types::ResourceRecord#to_s returns filtered string
+            # like "{:value=>\"[FILTERED]\"}" (cf. https://github.com/aws/aws-sdk-ruby/pull/1941).
+            # To keep backward compatibility, sort by the value of resource record explicitly.
+            lambda { |i| i[:value] }
+          else
+            lambda { |i| i.to_s }
+          end
+
+        values.sort_by(&sort_lambda)
+      end
+
       def method_missing(method_name, *args)
         @resource_record_set.send(method_name, *args)
       end

data/lib/roadworker/version.rb

@@ -1,3 +1,3 @@
 module Roadworker
-  VERSION = "0.5.11"
+  VERSION = "0.5.12"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roadworker
 version: !ruby/object:Gem::Version
-  version: 0.5.11
+  version: 0.5.12
 platform: ruby
 authors:
 - winebarrel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-25 00:00:00.000000000 Z
+date: 2019-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-route53
@@ -251,8 +251,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Roadworker is a tool to manage Route53.