certman 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 575499cac9cd4bb14138b16b937aae013476c528
-  data.tar.gz: dd0c6f14de66920eeb1b36dee892ac03f4405f81
+  metadata.gz: '087eb221a45056f14751bf7896d99645c3dc31be'
+  data.tar.gz: dd1693769ace09e80d6ad0c95363fde58d27e4e8
 SHA512:
-  metadata.gz: 4238eca9021a551b89b3c59d58060207f4ebeaef66612e847d58c53d808397e52478655973a32468d068e104575eee52e658b9c41b49a5df4a8974d235636b38
-  data.tar.gz: bfb1d95d2220fc9089ae5bcba1fe81a131cb39fd55e2949a7c424914871edff9d1944c7e6bda9dad6109e38b7f9acde2fd2a407b150581d345dc52a45eb4773d
+  metadata.gz: 6046fc4421e11441b9098c6039d3bbeb89edf4192d6fbeb3429333c9d66aa863c01921f7b71cbc03578064a0e0ccacc2b8327777fbb2da74debf902643754f64
+  data.tar.gz: 9416242570398ad5f2273b620542b50c8aa0ab90f450d8d257906c6f178203944ec796af2b4c6dc145cf182df8bf5ce792e8e8bb63d2a99672821a02c4c9e8ec

data/lib/certman/client.rb

@@ -166,31 +166,42 @@ module Certman
             revert_active_rue_set
             s.success
           end
+        when :acm_certificate
+          if @do_rollback
+            s = spinner('[ACM] Delete Certificate')
+            delete_certificate
+            @cert_arn = nil
+            s.success
+          end
         end
       end
     end
 
     def bucket_name
-      @bucket_name ||= if "#{@domain}-certman".length < 63
-                         "#{@domain}-certman"
+      @bucket_name ||= if "#{email_domain}-certman".length < 63
+                         "#{email_domain}-certman"
                        else
-                         "#{Digest::SHA1.hexdigest(@domain)}-certman"
+                         "#{Digest::SHA1.hexdigest(email_domain)}-certman"
                        end
     end
 
+    def email_domain
+      @domain.sub(/\A(www|\*)\./, '')
+    end
+
     def rule_name
-      @rule_name ||= if "RuleCertman_#{@domain}".length < 64
-                       "RuleCertman_#{@domain}"
+      @rule_name ||= if "RuleCertman_#{email_domain}".length < 64
+                       "RuleCertman_#{email_domain}"
                      else
-                       "RuleCertman_#{Digest::SHA1.hexdigest(@domain)}"
+                       "RuleCertman_#{Digest::SHA1.hexdigest(email_domain)}"
                      end
     end
 
     def rule_set_name
-      @rule_set_name ||= if "RuleSetCertman_#{@domain}".length < 64
-                           "RuleSetCertman_#{@domain}"
+      @rule_set_name ||= if "RuleSetCertman_#{email_domain}".length < 64
+                           "RuleSetCertman_#{email_domain}"
                          else
-                           "RuleSetCertman_#{Digest::SHA1.hexdigest(@domain)}"
+                           "RuleSetCertman_#{Digest::SHA1.hexdigest(email_domain)}"
                          end
     end
 

data/lib/certman/resource/route53.rb

@@ -13,7 +13,7 @@ module Certman
               {
                 action: 'CREATE',
                 resource_record_set: {
-                  name: "_amazonses.#{@domain}",
+                  name: "_amazonses.#{email_domain}",
                   resource_records: [
                     {
                       value: '"' + @token + '"'
@@ -37,7 +37,7 @@ module Certman
               {
                 action: 'CREATE',
                 resource_record_set: {
-                  name: @domain,
+                  name: email_domain,
                   resource_records: [
                     {
                       value: "10 inbound-smtp.#{Aws.config[:region]}.amazonaws.com"
@@ -61,7 +61,7 @@ module Certman
               {
                 action: 'DELETE',
                 resource_record_set: {
-                  name: "_amazonses.#{@domain}",
+                  name: "_amazonses.#{email_domain}",
                   resource_records: [
                     {
                       value: '"' + @token + '"'
@@ -85,7 +85,7 @@ module Certman
               {
                 action: 'DELETE',
                 resource_record_set: {
-                  name: @domain,
+                  name: email_domain,
                   resource_records: [
                     {
                       value: "10 inbound-smtp.#{Aws.config[:region]}.amazonaws.com"
@@ -117,19 +117,19 @@ module Certman
       def check_txt_rset
         res = route53.test_dns_answer(
           hosted_zone_id: @hosted_zone_id,
-          record_name: "_amazonses.#{@domain}.",
+          record_name: "_amazonses.#{email_domain}.",
           record_type: 'TXT'
         )
-        raise "_amazonses.#{@domain} TXT already exist" unless res.record_data.empty?
+        raise "_amazonses.#{email_domain} TXT already exist" unless res.record_data.empty?
       end
 
       def check_mx_rset
         res = route53.test_dns_answer(
           hosted_zone_id: @hosted_zone_id,
-          record_name: "#{@domain}.",
+          record_name: "#{email_domain}.",
           record_type: 'MX'
         )
-        raise "#{@domain} MX already exist" unless res.record_data.empty?
+        raise "#{email_domain} MX already exist" unless res.record_data.empty?
       end
 
       def route53

data/lib/certman/resource/ses.rb

@@ -4,7 +4,7 @@ module Certman
       REGIONS = %w(us-east-1 us-west-2 eu-west-1)
 
       def create_domain_identity
-        res = ses.verify_domain_identity(domain: @domain)
+        res = ses.verify_domain_identity(domain: email_domain)
         @token = res.verification_token
       end
 
@@ -13,10 +13,10 @@ module Certman
         100.times do
           res = ses.get_identity_verification_attributes(
             identities: [
-              @domain
+              email_domain
             ]
           )
-          if res.verification_attributes[@domain].verification_status == 'Success'
+          if res.verification_attributes[email_domain].verification_status == 'Success'
             # success
             is_break = true
             break
@@ -28,7 +28,7 @@ module Certman
       end
 
       def delete_domain_identity
-        ses.delete_identity(identity: @domain)
+        ses.delete_identity(identity: email_domain)
       end
 
       def create_rule_set
@@ -38,7 +38,7 @@ module Certman
       def create_rule
         ses.create_receipt_rule(
           rule: {
-            recipients: ["admin@#{@domain}"],
+            recipients: ["admin@#{email_domain}"],
             actions: [
               {
                 s3_action: {

data/lib/certman/version.rb

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

metadata

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