ufo 6.3.4 → 6.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c98f420b247f0c49a22f00a8f700ac37b89c610a32a32d6368532411dd93dc13
-  data.tar.gz: 4e2413294c3541dcfe6f207136fd2f466b3d723603d58bc97830f9aec2753a19
+  metadata.gz: 564a94e07c4dcf5cdea7b63623f1c5f7741487132fb14d3cfab36ea4c2ccb487
+  data.tar.gz: bfd797914511f0ce5750cd0102a9b8d79be50a4daaf4ad7c9b76e0578eb7bccb
 SHA512:
-  metadata.gz: f0d8d600619c3b76738d0d1d909f4158904ea2483257755342e8b2121f9b6d96ae6cbfddaa2774e9ad67a258ebfd18ddd2cc0ea54f7be297de9f6c2635ba3bae
-  data.tar.gz: 6f187d51020fd603d6b664763ff2930d6e1c0d883369acfa51d76d879c53cac87be348f14655ac92fc1ce9a5775a0c92298e04f6fda64c185b78ea29e5520e93
+  metadata.gz: c01fae80702562184e0e4a7c43d33ec75ef23d70d94776a8262609278c6ffe3dc32dce11100760f6cb7f63988494c058823b8c3e652065e07c5e75ddcd3ca58c
+  data.tar.gz: b5d8b619743945fd793ee7e62c264a9dd17ea16cceb59ccf563ba3f35c7a158a42e1c901882788aea74e56a02c50eabea1c3e6391c833331c7840ad591186658

data/CHANGELOG.md

@@ -3,6 +3,15 @@
 All notable changes to this project will be documented in this file.
 This project *tries* to adhere to [Semantic Versioning](http://semver.org/), even before v1.0.
 
+## [6.3.7] - 2022-04-29
+- [#173](https://github.com/tongueroo/ufo/pull/173) fix when ssl certs not used
+
+## [6.3.6] - 2022-04-29
+- [#172](https://github.com/tongueroo/ufo/pull/172) support multiple ssl certs
+
+## [6.3.5] - 2022-04-28
+- [#171](https://github.com/tongueroo/ufo/pull/171) default unhealthy_threshold_count = 3
+
 ## [6.3.4] - 2022-04-27
 - [#168](https://github.com/tongueroo/ufo/pull/168) ufo ps: show multiple container names
 - [#169](https://github.com/tongueroo/ufo/pull/169) ufo logs improvements

data/lib/ufo/cfn/stack/builder/resources/listener_certificate.rb

@@ -0,0 +1,32 @@
+class Ufo::Cfn::Stack::Builder::Resources
+  class ListenerCertificate < ListenerSsl
+    def build
+      return unless certificates && certificates.size >= 1 # already removed firt cert
+      {
+        Type: "AWS::ElasticLoadBalancingV2::ListenerCertificate",
+        Condition: "CreateElbIsTrue",
+        Properties: properties,
+      }
+    end
+
+    def properties
+      {
+        Certificates: certificates,
+        ListenerArn: {Ref: "ListenerSsl"}
+      }
+    end
+
+    def certificates
+      ssl = Ufo.config.elb.ssl
+      if ssl.certificates
+        certs = normalize(ssl.certificates)
+        # CloudFormation has weird interface
+        # Only one cert allowed at the AWS::ElasticLoadBalancingV2::Listener
+        # https://stackoverflow.com/questions/54447250/how-to-set-multiple-certificates-for-awselasticloadbalancingv2listener
+        # Also note the docs say "You can specify one certificate per resource."
+        # But tested and multiple certs here work
+        certs[1..-1] # dont include the first one
+      end
+    end
+  end
+end

data/lib/ufo/cfn/stack/builder/resources/listener_ssl.rb

@@ -7,7 +7,10 @@ class Ufo::Cfn::Stack::Builder::Resources
 
     def properties
       props = super
-      props[:Certificates] = certificates
+      # CloudFormation has weird interface
+      # Only one cert allowed at the AWS::ElasticLoadBalancingV2::Listener
+      # https://stackoverflow.com/questions/54447250/how-to-set-multiple-certificates-for-awselasticloadbalancingv2listener
+      props[:Certificates] = [certificates.first] # first one only
       props
     end
 

data/lib/ufo/cfn/stack/builder/resources.rb

@@ -10,6 +10,7 @@ class Ufo::Cfn::Stack::Builder
         ElbSecurityGroup: SecurityGroup::Elb.build(@options),
         ExecutionRole: IamRoles::ExecutionRole.build(@options),
         Listener: Listener.build(@options),
+        ListenerCertificate: ListenerCertificate.build(@options),
         ListenerSsl: ListenerSsl.build(@options),
         TargetGroup: TargetGroup.build(@options),
         TaskDefinition: TaskDefinition.build(@options),

data/lib/ufo/config.rb

@@ -70,7 +70,7 @@ module Ufo
       config.elb.health_check_interval_seconds = 10 # keep at 10 in case of network ELB, which is min 10
       config.elb.health_check_path = nil # When nil its AWS default /
       config.elb.healthy_threshold_count = 3 # The AWS usual default is 5
-      config.elb.unhealthy_threshold_count = 2
+      config.elb.unhealthy_threshold_count = 3
 
       config.elb.port = 80 # default listener port
       config.elb.redirect = ActiveSupport::OrderedOptions.new

data/lib/ufo/version.rb

@@ -1,3 +1,3 @@
 module Ufo
-  VERSION = "6.3.4"
+  VERSION = "6.3.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ufo
 version: !ruby/object:Gem::Version
-  version: 6.3.4
+  version: 6.3.7
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-04-27 00:00:00.000000000 Z
+date: 2022-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-logs
@@ -516,6 +516,7 @@ files:
 - lib/ufo/cfn/stack/builder/resources/iam_roles/execution_role.rb
 - lib/ufo/cfn/stack/builder/resources/iam_roles/task_role.rb
 - lib/ufo/cfn/stack/builder/resources/listener.rb
+- lib/ufo/cfn/stack/builder/resources/listener_certificate.rb
 - lib/ufo/cfn/stack/builder/resources/listener_ssl.rb
 - lib/ufo/cfn/stack/builder/resources/scaling/base.rb
 - lib/ufo/cfn/stack/builder/resources/scaling/policy.rb