certman 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '087eb221a45056f14751bf7896d99645c3dc31be'
-  data.tar.gz: dd1693769ace09e80d6ad0c95363fde58d27e4e8
+  metadata.gz: 9ef3fe64e1dce859da78da61b05d16eadea7831f
+  data.tar.gz: 49dcc2814216eaac91207f92c504da4a1b7032ec
 SHA512:
-  metadata.gz: 6046fc4421e11441b9098c6039d3bbeb89edf4192d6fbeb3429333c9d66aa863c01921f7b71cbc03578064a0e0ccacc2b8327777fbb2da74debf902643754f64
-  data.tar.gz: 9416242570398ad5f2273b620542b50c8aa0ab90f450d8d257906c6f178203944ec796af2b4c6dc145cf182df8bf5ce792e8e8bb63d2a99672821a02c4c9e8ec
+  metadata.gz: da29279cf87464bf77418c21a3db658c21c95eba43346a6ee34bc117b649ac637c55ac979ef18a79cbc3f600c2a71bc2062d1a1fe6125607c396e43d8b93c869
+  data.tar.gz: 0e01313f8299bb3029c3671f4cf20ca669c94994aea35ee030bd9a982331da72f457b2da5a43719f3f5c1a11970adad9639bbd3cb0a99bf3014f91619ec6b849

data/lib/certman/client.rb

@@ -8,6 +8,7 @@ module Certman
 
     def initialize(domain)
       @do_rollback = false
+      @cname_exists = false
       @domain = domain
       @cert_arn = nil
       @savepoint = []
@@ -76,21 +77,28 @@ module Certman
 
     def check_resource
       s = spinner('[ACM] Check Certificate')
-      check_certificate
+      raise 'Certificate already exist' if check_certificate
       s.success
 
       s = spinner('[Route53] Check Hosted Zone')
-      check_hosted_zone
+      raise "Hosted Zone #{root_domain} does not exist" unless check_hosted_zone
       s.success
 
       s = spinner('[Route53] Check TXT Record')
-      check_txt_rset
+      raise "_amazonses.#{email_domain} TXT already exist" if check_txt_rset
       s.success
 
       s = spinner('[Route53] Check MX Record')
-      check_mx_rset
+      raise "#{email_domain} MX already exist" if check_mx_rset
       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
+      end
+
       true
     end
 
@@ -185,10 +193,20 @@ module Certman
                        end
     end
 
+    def root_domain
+      PublicSuffix.domain(@domain)
+    end
+
     def email_domain
+      return root_domain if @cname_exists
       @domain.sub(/\A(www|\*)\./, '')
     end
 
+    def validation_domain
+      return root_domain if @cname_exists
+      @domain
+    end
+
     def rule_name
       @rule_name ||= if "RuleCertman_#{email_domain}".length < 64
                        "RuleCertman_#{email_domain}"

data/lib/certman/resource/acm.rb

@@ -8,7 +8,7 @@ module Certman
           domain_validation_options: [
             {
               domain_name: @domain,
-              validation_domain: @domain
+              validation_domain: validation_domain
             }
           ]
         )
@@ -27,7 +27,7 @@ module Certman
         current_cert = acm.list_certificates.certificate_summary_list.find do |cert|
           cert.domain_name == @domain
         end
-        raise 'Certificate already exist' if current_cert
+        current_cert
       end
 
       def acm

data/lib/certman/resource/route53.rb

@@ -3,7 +3,6 @@ module Certman
     # rubocop:disable Metrics/ModuleLength
     module Route53
       def create_txt_rset
-        root_domain = PublicSuffix.domain(@domain)
         @hosted_zone = route53.list_hosted_zones.hosted_zones.find do |zone|
           PublicSuffix.domain(zone.name) == root_domain
         end
@@ -103,7 +102,6 @@ module Certman
       end
 
       def check_hosted_zone
-        root_domain = PublicSuffix.domain(@domain)
         @hosted_zone_id = nil
         hosted_zone = route53.list_hosted_zones.hosted_zones.find do |zone|
           if PublicSuffix.domain(zone.name) == root_domain
@@ -111,7 +109,7 @@ module Certman
             next true
           end
         end
-        raise "Hosted Zone #{root_domain} does not exist" unless hosted_zone
+        hosted_zone
       end
 
       def check_txt_rset
@@ -120,7 +118,7 @@ module Certman
           record_name: "_amazonses.#{email_domain}.",
           record_type: 'TXT'
         )
-        raise "_amazonses.#{email_domain} TXT already exist" unless res.record_data.empty?
+        !res.record_data.empty?
       end
 
       def check_mx_rset
@@ -129,7 +127,16 @@ module Certman
           record_name: "#{email_domain}.",
           record_type: 'MX'
         )
-        raise "#{email_domain} MX already exist" unless res.record_data.empty?
+        !res.record_data.empty?
+      end
+
+      def check_cname_rset
+        res = route53.test_dns_answer(
+          hosted_zone_id: @hosted_zone_id,
+          record_name: "#{email_domain}.",
+          record_type: 'CNAME'
+        )
+        !res.record_data.empty?
       end
 
       def route53

data/lib/certman/version.rb

@@ -1,3 +1,3 @@
 module Certman
-  VERSION = '0.5.0'
+  VERSION = '0.6.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: certman
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - k1LoW