awspec 1.18.0 → 1.18.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 282551e2308dd0173e1945a36abc52c0f7c5836b9a070a73c071385d268b4c21
-  data.tar.gz: bc12a2007ec95614d27b9d963cf204bcc0f10424fe063d620591e5ddf684a84f
+  metadata.gz: caa6a43b5cba1728d82811cc636ba64e94dd1d524dd35c719fa09663d8484c6c
+  data.tar.gz: e98167e9eaac8f5620a56b5f4b49e6495f116ad377a634e0fd2fdceb6996adc2
 SHA512:
-  metadata.gz: 05bbe8f18a6d921cfa135a2704a643a8ff6970d1975de78af029e1f93214d3ef6ef19199acccde8bba8535a29bc0b4aee9949287647eeae94d9a957aa2a64c7d
-  data.tar.gz: ddf9edd8742c58ffae8a106f1fe86e41dc38aa8fac3a7b31ed0a2826341a8eb916bb8e8673367f8e2d7149b35cb0530eeb0140e7eae68db55b4f7aa0fc9d999d
+  metadata.gz: 66a145fcc87b19afa3fc52ee2cb1f06b71c6d8b98708cfa23bdf1d90e83cc87f26e22288577c97804203461c029d49324ca58c97b7f060db28f1dd71826043a7
+  data.tar.gz: 7f1788ca6a3b1e86bd8377c5b342687ace58ad7ecd0764c020a594f5b30c90a57279b0988b8c819c4dfdbb4bb92cbf6266397d95738b69644a12da1a58fcfadf

data/lib/awspec/generator/spec/route53_hosted_zone.rb

@@ -20,7 +20,11 @@ module Awspec::Generator
         name = record_set.name.gsub(/\\052/, '*') # wildcard support
         if !record_set.resource_records.empty?
           template = <<-'EOF'
+<% if record_set[:failover] -%>
+it { should have_record_set('<%= name %>').<%= type %>('<%= v %>').ttl(<%= record_set.ttl %>).failover('<%= record_set.failover %>') }
+<%- else -%>
 it { should have_record_set('<%= name %>').<%= type %>('<%= v %>').ttl(<%= record_set.ttl %>) }
+<% end -%>
 EOF
           v = record_set.resource_records.map { |r| r.value }.join("\n")
           type = record_set.type.downcase
@@ -29,7 +33,11 @@ EOF
           dns_name = record_set.alias_target.dns_name
           hosted_zone_id = record_set.alias_target.hosted_zone_id
           template = <<-'EOF'
+<% if record_set[:failover] -%>
+it { should have_record_set('<%= name %>').alias('<%= dns_name %>', '<%= hosted_zone_id %>').failover('<%= record_set.failover %>') }
+<%- else -%>
 it { should have_record_set('<%= name %>').alias('<%= dns_name %>', '<%= hosted_zone_id %>') }
+<% end -%>
 EOF
         end
         ERB.new(template, nil, '-').result(binding)

data/lib/awspec/matcher/have_record_set.rb

@@ -33,4 +33,9 @@ RSpec::Matchers.define :have_record_set do |name|
   chain :type do |type|
     @type = type
   end
+
+  chain :failover do |record_type|
+    @options = {} if @options.nil?
+    @options[:record_type] = record_type
+  end
 end

data/lib/awspec/stub/route53_hosted_zone.rb

@@ -26,6 +26,28 @@ Aws.config[:route53] = {
             }
           ]
         },
+        {
+          name: 'failover.example.com.',
+          type: 'A',
+          ttl: 3600,
+          resource_records: [
+            {
+              value: '123.456.7.891'
+            }
+          ],
+          failover: 'PRIMARY'
+        },
+        {
+          name: 'failover.example.com.',
+          type: 'A',
+          ttl: 3600,
+          resource_records: [
+            {
+              value: '123.456.7.892'
+            }
+          ],
+          failover: 'SECONDARY'
+        },
         {
           name: '\052.example.com.',
           type: 'CNAME',
@@ -93,6 +115,28 @@ Aws.config[:route53] = {
             hosted_zone_id: 'Z2ABCDEFGHIJKL',
             dns_name: 's3-website-us-east-1.amazonaws.com.',
             evaluate_target_health: false
+          },
+          failover: 'SECONDARY'
+        },
+        {
+          name: 's3.example.com.',
+          type: 'A',
+          resource_records: [],
+          alias_target: {
+            hosted_zone_id: 'Z2FDTNDATAQYW2',
+            dns_name: 'abcdefghijklmn.cloudfront.net.',
+            evaluate_target_health: false
+          },
+          failover: 'PRIMARY'
+        },
+        {
+          name: 'alias.example.com.',
+          type: 'A',
+          resource_records: [],
+          alias_target: {
+            hosted_zone_id: 'Z2FDTNDATAQYW2',
+            dns_name: 'opqrstuvwxyz.cloudfront.net.',
+            evaluate_target_health: false
           }
         },
         {

data/lib/awspec/type/route53_hosted_zone.rb

@@ -17,25 +17,47 @@ module Awspec::Type
 
       record_sets = resource_via_client_record_sets.select { |record| record.name == name }
       # Check if the given record is registered regardless of type and value
-      return !record_sets.empty? if (type || value).nil?
+      return !record_sets.empty? if type.nil? && value.nil? && options.nil?
 
       record_sets.select! { |record_set| record_set.type.casecmp(type) == 0 }
-      return !record_sets.empty? unless value
+      return !record_sets.empty? if value.nil? && options.nil? || value.nil? && options.empty?
+
+      return match_failover_record(record_sets, name, value, options) if options[:record_type]
 
       record_sets.each do |record_set|
-        if !record_set.resource_records.empty?
-          sorted = record_set.resource_records.map { |r| r.value }.sort.join("\n")
-          ttl = options[:ttl] || record_set[:ttl]
-          record_set.name == name && \
+        return match_record(record_set, name, value, options) unless record_set.resource_records.empty?
+        return match_alias_record(record_set, name, options)
+      end
+    end
+
+    private
+
+    def match_failover_record(record_sets, name, value, options)
+      record_sets.select! { |record_set| record_set.failover == options[:record_type] }
+      return false if record_sets.empty?
+      record_sets.each do |record_set|
+        return match_alias_record(record_set, name, options) if value.nil?
+        return match_record(record_set, name, value, options)
+      end
+    end
+
+    def match_record(record_set, name, value, options)
+      sorted = record_set.resource_records.map { |r| r.value }.sort.join("\n")
+
+      if !options.empty? && options[:ttl]
+        return (record_set.name == name && \
           value.split("\n").sort.join("\n") == sorted && \
-          record_set.ttl == ttl
-        else
-          # ALIAS
-          record_set.name == name && \
-          record_set.alias_target.dns_name == options[:alias_dns_name] && \
-          record_set.alias_target.hosted_zone_id == options[:alias_hosted_zone_id]
-        end
+          record_set.ttl == options[:ttl])
       end
+
+      record_set.name == name && \
+        value.split("\n").sort.join("\n") == sorted
+    end
+
+    def match_alias_record(record_set, name, options)
+      record_set.name == name && \
+      record_set.alias_target.dns_name == options[:alias_dns_name] && \
+      record_set.alias_target.hosted_zone_id == options[:alias_hosted_zone_id]
     end
   end
 end

data/lib/awspec/version.rb

@@ -1,3 +1,3 @@
 module Awspec
-  VERSION = '1.18.0'
+  VERSION = '1.18.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: awspec
 version: !ruby/object:Gem::Version
-  version: 1.18.0
+  version: 1.18.1
 platform: ruby
 authors:
 - k1LoW
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-17 00:00:00.000000000 Z
+date: 2019-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk