certman 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: afe7de198a051fa8fc8e85e76521eb231d6acfc8
-  data.tar.gz: 2e56cf7d1d91ba4456cdcbfa095a84476291d37f
+  metadata.gz: 5fb0672b4747cfec0f8607cd81af9f9bdb06b50b
+  data.tar.gz: 1ac80795546083e8f5f1250016a0e4b0c33e8d6a
 SHA512:
-  metadata.gz: c6ebd365a7ebff46be9a0e6ee995190e6c0d6cf327d12419246d0fa3e3d76a1425a5563b85a6d8c215748935ecc0c235c15e53e2cb7d4aaf191f374d6656a06c
-  data.tar.gz: e6be25afe25f5adf314457fe50751ea2acf804c47e8d406c9c298848da871594c53c8a7db75a30c116ae3c3cf3acaf0ce307e57a304b0c55ccfc6d56f90d4242
+  metadata.gz: c52b0049736f4d17baf9e678eb08b5d14c4d3e6d8a007f5178fa5b296b8040c51c02ec5d5475de981795e51b155290333e47eec25ebe295e0be272ff8d0dbaeb
+  data.tar.gz: d23a89e90b39181aa0561e460ff1e45cfa018fe7826ac036361a97538436e1a37e4afb73deee0c2a3f793cc36bd41d954802a733e35f84907e7dadea2bbc113b

data/lib/certman/cli.rb

@@ -7,11 +7,9 @@ module Certman
       prompt = TTY::Prompt.new
       return unless prompt.yes?(pastel.red("NOTICE! Your selected region is *#{Aws.config[:region]}*. \
 Certman create certificate on *#{Aws.config[:region]}*. OK?"))
-      unless Certman::Resource::SES::REGIONS.include?(Aws.config[:region])
-        return unless prompt.yes?(pastel.red('NOTICE! Certman use *us-east-1* S3/SES. OK?'))
-      end
-      return unless prompt.yes?(pastel.red('NOTICE! When requesting, Certman replace Active Receipt Rule Set. OK?'))
       client = Certman::Client.new(domain)
+      return unless prompt.yes?(pastel.red("NOTICE! Certman use *#{client.region_by_hash}* S3/SES. OK?"))
+      return unless prompt.yes?(pastel.red('NOTICE! When requesting, Certman replace Active Receipt Rule Set. OK?'))
       Signal.trap(:INT) do
         puts ''
         puts pastel.red('Rollback start.')

data/lib/certman/client.rb

@@ -17,7 +17,7 @@ module Certman
     def request(remain_resources = false)
       check_resource
 
-      enforce_region_to_us_east_1 do
+      enforce_region_by_hash do
         step('[S3] Create Bucket for SES inbound', :s3_bucket) do
           create_bucket
         end
@@ -30,35 +30,31 @@ module Certman
         create_txt_rset
       end
 
-      enforce_region_to_us_east_1 do
+      enforce_region_by_hash do
         step('[SES] Check Domain Identity Status *verified*', nil) do
           check_domain_identity_verified
         end
-      end
 
-      step('[Route53] Create MX Record Set', :route53_mx) do
-        create_mx_rset
-      end
+        step('[Route53] Create MX Record Set', :route53_mx) do
+          create_mx_rset
+        end
 
-      enforce_region_to_us_east_1 do
-        step('[SES] Create Receipt Rule Set', :ses_rule_set) do
-          create_rule_set
+        unless active_rule_set_exist?
+          step('[SES] Create and Active Receipt Rule Set', :ses_rule_set) do
+            create_and_active_rule_set
+          end
         end
 
         step('[SES] Create Receipt Rule', :ses_rule) do
           create_rule
         end
-
-        step('[SES] Replace Active Receipt Rule Set', :ses_replace_active_rule_set) do
-          replace_active_rule_set
-        end
       end
 
       step('[ACM] Request Certificate', :acm_certificate) do
         request_certificate
       end
 
-      enforce_region_to_us_east_1 do
+      enforce_region_by_hash do
         step('[S3] Check approval mail (will take about 30 min)', nil) do
           check_approval_mail
         end
@@ -76,27 +72,35 @@ module Certman
     end
 
     def check_resource
+      pastel = Pastel.new
+
       s = spinner('[ACM] Check Certificate')
-      raise 'Certificate already exist' if check_certificate
+      raise 'Certificate already exist' if certificate_exist?
       s.success
 
       s = spinner('[Route53] Check Hosted Zone')
-      raise "Hosted Zone #{root_domain} does not exist" unless check_hosted_zone
+      raise "Hosted Zone #{root_domain} does not exist" unless hosted_zone_exist?
       s.success
 
       s = spinner('[Route53] Check TXT Record')
-      raise "_amazonses.#{email_domain} TXT already exist" if check_txt_rset
+      raise "_amazonses.#{email_domain} TXT already exist" if txt_rset_exist?
       s.success
 
-      s = spinner('[Route53] Check MX Record')
-      raise "#{email_domain} MX already exist" if check_mx_rset
-      s.success
+      enforce_region_by_hash do
+        s = spinner('[Route53] Check MX Record')
+        raise "#{email_domain} MX already exist" if mx_rset_exist?
+        if cname_rset_exist?
+          puts pastel.cyan("\n#{email_domain} CNAME already exist. Use #{root_domain}")
+          @cname_exists = true
+          check_resource
+        end
+        s.success
 
-      if check_cname_rset
-        pastel = Pastel.new
-        puts pastel.cyan("#{email_domain} CNAME already exist. Use #{root_domain}")
-        @cname_exists = true
-        check_resource
+        s = spinner('[SES] Check Active Rule Set')
+        if active_rule_set_exist?
+          puts pastel.cyan("\nActive Rule Set already exist. Use #{@current_active_rule_set_name}")
+        end
+        s.success
       end
 
       true
@@ -108,11 +112,9 @@ module Certman
 
     private
 
-    def enforce_region_to_us_east_1
+    def enforce_region_by_hash
       region = Aws.config[:region]
-      unless Certman::Resource::SES::REGIONS.include?(Aws.config[:region])
-        Aws.config[:region] = 'us-east-1'
-      end
+      Aws.config[:region] = region_by_hash
       yield
       Aws.config[:region] = region
     end
@@ -134,16 +136,17 @@ module Certman
     end
 
     def cleanup_resources
+      pastel = Pastel.new
       @savepoint.reverse.each do |state|
         case state
         when :s3_bucket
-          enforce_region_to_us_east_1 do
+          enforce_region_by_hash do
             s = spinner('[S3] Delete Bucket')
             delete_bucket
             s.success
           end
         when :ses_domain_identity
-          enforce_region_to_us_east_1 do
+          enforce_region_by_hash do
             s = spinner('[SES] Delete Verified Domain Identiry')
             delete_domain_identity
             s.success
@@ -153,27 +156,28 @@ module Certman
           delete_txt_rset
           s.success
         when :route53_mx
-          s = spinner('[Route53] Delete MX Record Set')
-          delete_mx_rset
-          s.success
+          enforce_region_by_hash do
+            s = spinner('[Route53] Delete MX Record Set')
+            delete_mx_rset
+            s.success
+          end
         when :ses_rule_set
-          enforce_region_to_us_east_1 do
+          enforce_region_by_hash do
             s = spinner('[SES] Delete Receipt Rule Set')
-            delete_rule_set
-            s.success
+            if rule_exist?
+              puts pastel.cyan("\nReceipt Rule exist. Can not delete Receipt Rule Set.")
+              s.error
+            else
+              delete_rule_set
+              s.success
+            end
           end
         when :ses_rule
-          enforce_region_to_us_east_1 do
+          enforce_region_by_hash do
             s = spinner('[SES] Delete Receipt Rule')
             delete_rule
             s.success
           end
-        when :ses_replace_active_rule_set
-          enforce_region_to_us_east_1 do
-            s = spinner('[SES] Revert Active Receipt Rule Set')
-            revert_active_rue_set
-            s.success
-          end
         when :acm_certificate
           if @do_rollback
             s = spinner('[ACM] Delete Certificate')
@@ -216,11 +220,8 @@ module Certman
     end
 
     def rule_set_name
-      @rule_set_name ||= if "RuleSetCertman_#{email_domain}".length < 64
-                           "RuleSetCertman_#{email_domain}"
-                         else
-                           "RuleSetCertman_#{Digest::SHA1.hexdigest(email_domain)}"
-                         end
+      @rule_set_name ||= @current_active_rule_set_name
+      @rule_set_name ||= Certman::Resource::SES::RULE_SET_NAME_BY_CERTMAN
     end
 
     def spinner(message)

data/lib/certman/resource/acm.rb

@@ -31,7 +31,7 @@ module Certman
         acm.delete_certificate(certificate_arn: current_cert.certificate_arn)
       end
 
-      def check_certificate
+      def certificate_exist?
         current_cert = acm.list_certificates.certificate_summary_list.find do |cert|
           cert.domain_name == @domain
         end

data/lib/certman/resource/route53.rb

@@ -101,7 +101,7 @@ module Certman
         )
       end
 
-      def check_hosted_zone
+      def hosted_zone_exist?
         @hosted_zone_id = nil
         hosted_zone = route53.list_hosted_zones.hosted_zones.find do |zone|
           if PublicSuffix.domain(zone.name) == root_domain
@@ -112,7 +112,7 @@ module Certman
         hosted_zone
       end
 
-      def check_txt_rset
+      def txt_rset_exist?
         res = route53.test_dns_answer(
           hosted_zone_id: @hosted_zone_id,
           record_name: "_amazonses.#{email_domain}.",
@@ -121,7 +121,7 @@ module Certman
         !res.record_data.empty?
       end
 
-      def check_mx_rset
+      def mx_rset_exist?
         res = route53.test_dns_answer(
           hosted_zone_id: @hosted_zone_id,
           record_name: "#{email_domain}.",
@@ -130,7 +130,7 @@ module Certman
         !res.record_data.empty?
       end
 
-      def check_cname_rset
+      def cname_rset_exist?
         res = route53.test_dns_answer(
           hosted_zone_id: @hosted_zone_id,
           record_name: "#{email_domain}.",

data/lib/certman/resource/ses.rb

@@ -2,12 +2,24 @@ module Certman
   module Resource
     module SES
       REGIONS = %w(us-east-1 us-west-2 eu-west-1)
+      RULE_SET_NAME_BY_CERTMAN = 'RuleSetByCertman'
+
+      def region_by_hash
+        key = Digest::SHA1.hexdigest(@domain).to_i(16) % REGIONS.length
+        REGIONS[key]
+      end
 
       def create_domain_identity
         res = ses.verify_domain_identity(domain: email_domain)
         @token = res.verification_token
       end
 
+      def active_rule_set_exist?
+        @current_active_rule_set_name = nil
+        res = ses.describe_active_receipt_rule_set
+        @current_active_rule_set_name = res.metadata.name if res.metadata
+      end
+
       def check_domain_identity_verified
         is_break = false
         100.times do
@@ -31,8 +43,9 @@ module Certman
         ses.delete_identity(identity: email_domain)
       end
 
-      def create_rule_set
+      def create_and_active_rule_set
         ses.create_receipt_rule_set(rule_set_name: rule_set_name)
+        ses.set_active_receipt_rule_set(rule_set_name: rule_set_name)
       end
 
       def create_rule
@@ -55,14 +68,15 @@ module Certman
         )
       end
 
-      def replace_active_rule_set
-        @current_rule_set_name = nil
+      def rule_exist?
         res = ses.describe_active_receipt_rule_set
-        @current_rule_set_name = res.metadata.name if res.metadata
-        ses.set_active_receipt_rule_set(rule_set_name: rule_set_name)
+        res.rules && !res.rules.empty?
       end
 
       def delete_rule_set
+        res = ses.describe_active_receipt_rule_set
+        return if res.rules && res.rules.length > 1
+        ses.set_active_receipt_rule_set(rule_set_name: nil)
         ses.delete_receipt_rule_set(rule_set_name: rule_set_name)
       end
 
@@ -73,10 +87,6 @@ module Certman
         )
       end
 
-      def revert_active_rue_set
-        ses.set_active_receipt_rule_set(rule_set_name: @current_rule_set_name)
-      end
-
       def ses
         @ses ||= Aws::SES::Client.new
       end

data/lib/certman/version.rb

@@ -1,3 +1,3 @@
 module Certman
-  VERSION = '0.6.1'
+  VERSION = '0.7.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: certman
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - k1LoW
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-19 00:00:00.000000000 Z
+date: 2017-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -256,7 +256,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: CLI tool for AWS Certificate Manager.