awspec 1.12.2 → 1.12.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bea4be54a18a5fb915b47cdeef3174dc314feb94a2a193e82f463b50c54e91c6
-  data.tar.gz: 346800faf49554d1b01c8bacd82bf0a967dd602699291f62e53e7fc1e5f9a481
+  metadata.gz: '041964ce50cedf17352bafd32bc143f586f8ac3496c80732ccb44ffa30dac6cd'
+  data.tar.gz: 8ba9b3557ea32878bdaf2023d778ef9f04bab50a8bf6d37b976c1b2fafa14055
 SHA512:
-  metadata.gz: 8383e825eef4f83551d0fd18b476b453a927df08955686c9bd3558f1657784409b9a9781ad54b2a029040172d885c1c2fbbed2ab1231d687cd21f7688852e85d
-  data.tar.gz: 628351ed78a11d1f4cbb3d7a9317b92302f7513ca7cd81403344e49462af19ca3d60503dd8cdc288c189e0484735194616c1fe363ffdf671122af80345c7d2c1
+  metadata.gz: 45f7c9e672e463d7f2679bca302d75a3e369b156781c4dcc6da2d60849591f244f19d17df137dfd2392b55561dd733a8c091d9ced7f2c7e65499df9cd7ee3287
+  data.tar.gz: 41eb787850fa0ede4a07966f4f1d0ce5a55dde05b8c695c83196f21d37b9e4a69676b48811e76916671ee56d8c887a7e2d0a81c833df2be6b0f8735e4e189009

data/doc/resource_types.md

@@ -85,6 +85,8 @@ end
 
 ### be_pending_validation, be_issued, be_inactive, be_expired, be_validation_timed_out, be_revoked, be_failed
 
+### have_domain_name
+
 ### have_domain_validation_option
 
 ```ruby

data/lib/awspec/generator/doc/type/acm.rb

@@ -5,7 +5,7 @@ module Awspec::Generator
         def initialize
           super
           @type_name = 'Acm'
-          @type = Awspec::Type::Acm.new('example.com')
+          @type = Awspec::Type::Acm.new('example.jp')
           @ret = @type.resource_via_client
           @matchers = [
             Awspec::Type::Acm::STATUSES.map { |status| 'be_' + status.downcase }.join(', ')

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

@@ -16,12 +16,21 @@ describe acm('<%= certificate.domain_name %>') do
 <%- if certificate.status == 'ISSUED' -%>
   it { should be_issued }
 <% end -%>
+  it { should have_domain_name('<%= certificate.domain_name %>') }
+  its(:certificate_arn) { should eq '<%= certificate.certificate_arn %>' }
   its(:type) { should eq '<%= certificate.type %>' }
 <%- certificate.domain_validation_options.each do |domain_validation_option| -%>
 <%- unless domain_validation_option.validation_status.nil? -%>
-  it { should have_domain_validation_option(domain_name: '<%= domain_validation_option.domain_name %>', validation_method: '<%= domain_validation_option.validation_method%>', validation_status: '<%= domain_validation_option.validation_status %>') }
+  it do
+    should have_domain_validation_option(domain_name: '<%= domain_validation_option.domain_name %>',
+                                         validation_method: '<%= domain_validation_option.validation_method%>',
+                                         validation_status: '<%= domain_validation_option.validation_status %>')
+  end
 <%- else -%>
-  it { should have_domain_validation_option(domain_name: '<%= domain_validation_option.domain_name %>', validation_method: '<%= domain_validation_option.validation_method%>') }
+  it do
+    should have_domain_validation_option(domain_name: '<%= domain_validation_option.domain_name %>',
+                                         validation_method: '<%= domain_validation_option.validation_method%>')
+  end
 <%- end -%>
 <%- end -%>
 end

data/lib/awspec/helper/finder/acm.rb

@@ -1,15 +1,37 @@
 module Awspec::Helper
   module Finder
     module Acm
-      def find_certificate(domain)
-        cert = acm_client.list_certificates.certificate_summary_list.find { |c| c[:domain_name] == domain }
+      def find_certificate(id)
+        selected = []
+        loop do
+          req = {}
+          res = acm_client.list_certificates(req)
+          selected += res.certificate_summary_list.select do |c|
+            c.certificate_arn == id || c.domain_name == id
+          end
+          break if res.next_token.nil?
+          req[:next_token] = res.next_token
+        end
+
+        cert = selected.single_resource(id)
         acm_client.describe_certificate({ certificate_arn: cert.certificate_arn }).certificate
       end
 
       def select_all_certificates
+        certs = []
+        loop do
+          req = {}
+          res = acm_client.list_certificates(req)
+          res.certificate_summary_list.each do |c|
+            certs << c.certificate_arn
+          end
+          break if res.next_token.nil?
+          req[:next_token] = res.next_token
+        end
+
         certificates = []
-        acm_client.list_certificates.certificate_summary_list.each do |cert|
-          certificates << acm_client.describe_certificate({ certificate_arn: cert.certificate_arn }).certificate
+        certs.each do |cert|
+          certificates << acm_client.describe_certificate({ certificate_arn: cert }).certificate
         end
         certificates
       end

data/lib/awspec/stub/acm.rb

@@ -2,20 +2,29 @@ Aws.config[:acm] = {
   stub_responses: {
     list_certificates: {
       certificate_summary_list: [
+        {
+          certificate_arn: 'arn:aws:acm:region:123456789010:certificate/12345678-1234-1234-1234-123456789000',
+          domain_name: 'example.jp'
+        },
         {
           certificate_arn: 'arn:aws:acm:region:123456789010:certificate/12345678-1234-1234-1234-123456789010',
           domain_name: 'example.com'
+        },
+        {
+          certificate_arn: 'arn:aws:acm:region:123456789010:certificate/12345678-1234-1234-1234-123456789011',
+          domain_name: 'example.com'
         }
-      ]
+      ],
+      next_token: nil
     },
     describe_certificate: {
       certificate: {
-        certificate_arn: 'arn:aws:acm:region:123456789010:certificate/12345678-1234-1234-1234-123456789010',
-        domain_name: 'example.com',
+        certificate_arn: 'arn:aws:acm:region:123456789010:certificate/12345678-1234-1234-1234-123456789000',
+        domain_name: 'example.jp',
         status: 'ISSUED',
         type: 'AMAZON_ISSUED',
         domain_validation_options: [
-          domain_name: 'example.com',
+          domain_name: 'example.jp',
           validation_status: 'SUCCESS',
           validation_method: 'DNS'
         ]

data/lib/awspec/type/acm.rb

@@ -24,6 +24,11 @@ module Awspec::Type
       end
     end
 
+    def has_domain_name?(domain)
+      resource_via_client.domain_name == domain && \
+      resource_via_client.certificate_arn == id
+    end
+
     def has_domain_validation_option?(domain_name:, validation_method:, validation_status: nil)
       resource_via_client.domain_validation_options.find do |domain_validation_option|
         validation_status ||= domain_validation_option.validation_status

data/lib/awspec/version.rb

@@ -1,3 +1,3 @@
 module Awspec
-  VERSION = '1.12.2'
+  VERSION = '1.12.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: awspec
 version: !ruby/object:Gem::Version
-  version: 1.12.2
+  version: 1.12.3
 platform: ruby
 authors:
 - k1LoW
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-21 00:00:00.000000000 Z
+date: 2018-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk