ufo 6.3.9 → 6.3.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58373df3fe5245cc8c487d83eaa62a958ab71bb9a6173b674944ddca94207901
-  data.tar.gz: 4a1bcee32eecc7fbfa36d596ca6d53817cab81536f4abb03a005c0d5e691536a
+  metadata.gz: 96dbe1f1087d3b65bc76c0cc1372429ea662eb75d91d9b3942c0e27a49809531
+  data.tar.gz: e427dd248adee498f897614b5dace90fa5b61ddda04a86ad7ef6990ab87c790c
 SHA512:
-  metadata.gz: f93554b98a650697c44f96f612610d48156048ef804cede7fdb9b26da8ef60f761a5a44e7cad3e4695ddbebda98398f187bd465a5e230d3e291c6f6aa84b84cd
-  data.tar.gz: 88083854a58d89275af4d3de81d9b1a906dc57d56760fe5c28e953487c17bfb22f54a226ea6abf3197acbc57854d07ef65855915bc9e5614ff2c0897f17ac41b
+  metadata.gz: 32763a18f438116170d9a3d2f7b7e45c6eb3f50ceeb2f714a49412eaf9aa236870c36d0e81b9c8242ef2f35ba01db429b0d12930613e65c093abd4b7ad15a35a
+  data.tar.gz: 3f9aa0e0724e55d4eb79432c7752ddb70d98081bcaea516761652afae0d6ce2b90385f6fa8515acd07335f179498a026e7b7bb990a4d29d11b030325d0d7687f

data/.github/FUNDING.yml

@@ -0,0 +1 @@
+github: boltops-tools

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.12] - 2022-07-11
+- [#179](https://github.com/tongueroo/ufo/pull/179) auto continue_update_rollback and retry once
+
+## [6.3.11] - 2022-07-09
+- [#178](https://github.com/tongueroo/ufo/pull/178) use .ufo/tmp folder instead of /tmp/ufo
+
+## [6.3.10] - 2022-06-23
+- [#177](https://github.com/tongueroo/ufo/pull/177) Enabled support for gRPC
+
 ## [6.3.9] - 2022-05-09
 - [#175](https://github.com/tongueroo/ufo/pull/175) Secrets autofix and add missing trailing ::
 - new env_file

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

@@ -6,11 +6,16 @@ class Ufo::Cfn::Stack::Builder::Resources
         Properties: properties
       }
 
-      attrs[:DependsOn] = "Listener" if vars[:create_elb]
+      attrs[:DependsOn] = depends_on
 
       attrs
     end
 
+    def depends_on
+      return unless vars[:create_elb]
+      vars[:create_listener] ? "Listener" : "ListenerSsl"
+    end
+
     def properties
       props = {
         Cluster: @cluster,

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

@@ -14,7 +14,7 @@ class Ufo::Cfn::Stack::Builder::Resources
         Tags: [
           {Key: "Name", Value: @stack_name}
         ],
-        Scheme: "internet-facing"
+        Scheme: Ufo.config.elb.scheme
       }
 
       props[:SecurityGroups] = security_groups(:elb) if vars[:elb_type] == "application"

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

@@ -1,6 +1,7 @@
 class Ufo::Cfn::Stack::Builder::Resources
   class Listener < Base
     def build
+      return unless vars[:create_listener]
       {
         Type: "AWS::ElasticLoadBalancingV2::Listener",
         Condition: "CreateElbIsTrue",
@@ -18,11 +19,11 @@ class Ufo::Cfn::Stack::Builder::Resources
     end
 
     def protocol
-      vars[:default_listener_protocol]
+      Ufo.config.elb.protocol || vars[:default_listener_protocol]
     end
 
     def port
-      80
+      Ufo.config.elb.port
     end
 
     def default_actions

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

@@ -2,7 +2,11 @@ class Ufo::Cfn::Stack::Builder::Resources
   class ListenerSsl < Listener
     def build
       return unless vars[:create_listener_ssl]
-      super
+      {
+        Type: "AWS::ElasticLoadBalancingV2::Listener",
+        Condition: "CreateElbIsTrue",
+        Properties: properties,
+      }
     end
 
     def properties

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

@@ -18,7 +18,6 @@ class Ufo::Cfn::Stack::Builder::Resources
           }
         ],
         Protocol: vars[:default_target_group_protocol],
-        Port: 80,
         HealthCheckIntervalSeconds: 10,
         HealthyThresholdCount: 2,
         UnhealthyThresholdCount: 2,
@@ -36,6 +35,9 @@ class Ufo::Cfn::Stack::Builder::Resources
       props[:HealthCheckIntervalSeconds] = health_check_interval_seconds
       props[:HealthyThresholdCount] = healthy_threshold_count
       props[:UnhealthyThresholdCount] = unhealthy_threshold_count
+      props[:Matcher] = matcher
+      props[:ProtocolVersion] = protocol_version
+      props[:Port] = port
 
       props
     end
@@ -45,6 +47,9 @@ class Ufo::Cfn::Stack::Builder::Resources
       health_check_path
       healthy_threshold_count
       unhealthy_threshold_count
+      matcher
+      protocol_version
+      port
     ]
     delegate *meths, to: :elb
     def elb

data/lib/ufo/cfn/stack/vars.rb

@@ -8,6 +8,7 @@ class Ufo::Cfn::Stack
         cluster: @cluster,
         container: container,
         create_elb: create_elb?, # helps set Ecs DependsOn
+        create_listener: create_listener?,
         create_listener_ssl: create_listener_ssl?,
         create_route53: create_route53?,
         default_listener_protocol: default_listener_protocol,
@@ -58,6 +59,10 @@ class Ufo::Cfn::Stack
       elb_type == 'network' ? 'TCP' : 'HTTP'
     end
 
+    def create_listener?
+      Ufo.config.elb.listener.enabled
+    end
+
     # if the configuration is set to anything then enable it
     def create_listener_ssl?
       elb = Ufo.config.elb

data/lib/ufo/cfn/stack.rb

@@ -55,9 +55,32 @@ module Ufo::Cfn
       logger.info "#{action[0..-2].capitalize}ing stack #{@stack_name.color(:green)}"
       cfn.send("#{action}_stack", stack_options) # Example: cfn.send("update_stack", stack_options)
     rescue Aws::CloudFormation::Errors::ValidationError => e
+      try_continue_update_rollback = continue_update_rollback(e)
+      try_continue_update_rollback && retry
       handle_stack_error(e)
     end
 
+    # Super edge case where stack is in UPDATE_ROLLBACK_FAILED. Can reproduce by:
+    #
+    #   1. spinning ECS cluster down to 0 and deploying with ufo ship
+    #   2. after 3h will timeout and fail and goes into UPDATE_ROLLBACK_FAILED
+    #
+    # Screenshot: https://capture.dropbox.com/Pdr8gijnaQvoMp2y
+    #
+    # Will auto-retry once
+    #
+    def continue_update_rollback(e)
+      if e.message.include?('UPDATE_ROLLBACK_FAILED') && !@continue_update_rollback_tried
+        logger.info "Stack in UPDATE_ROLLBACK_FAILED"
+        logger.info "Trying a continue_update_rollback and will retry again once"
+        cfn.continue_update_rollback(stack_name: @stack_name)
+        status.wait
+        @continue_update_rollback_tried ||= true
+      else
+        false
+      end
+    end
+
     def stack_options
       options = {
         capabilities: ["CAPABILITY_IAM", "CAPABILITY_NAMED_IAM"],

data/lib/ufo/config.rb

@@ -72,12 +72,18 @@ module Ufo
       config.elb.healthy_threshold_count = 3 # The AWS usual default is 5
       config.elb.unhealthy_threshold_count = 3
 
+      config.elb.listener = ActiveSupport::OrderedOptions.new
+      config.elb.listener.enabled = true
+      config.elb.matcher = nil
       config.elb.port = 80 # default listener port
+      config.elb.protocol = nil
+      config.elb.protocol_version = nil
       config.elb.redirect = ActiveSupport::OrderedOptions.new
       config.elb.redirect.code = 302  # IE: 302 or 301
       config.elb.redirect.enabled = false
       config.elb.redirect.port = 443
       config.elb.redirect.protocol = "HTTPS"
+      config.elb.scheme = "internet-facing"
       config.elb.ssl = ActiveSupport::OrderedOptions.new
       config.elb.ssl.certificates = nil
       config.elb.ssl.enabled = false

data/lib/ufo/task_definition/erb.rb

@@ -41,7 +41,7 @@ class Ufo::TaskDefinition
     def evaluate_code
       path = @task_definition.path
       text = RenderMePretty.result(path, context: self)
-      rendered_path = "/tmp/ufo/task_definition#{File.extname(path)}"
+      rendered_path = "#{Ufo.root}/.ufo/tmp/task_definition#{File.extname(path)}"
       FileUtils.mkdir_p(File.dirname(rendered_path))
       IO.write(rendered_path, text)
 

data/lib/ufo/task_definition/helpers/stack_output.rb

@@ -2,6 +2,7 @@ module Ufo::TaskDefinition::Helpers
   module StackOutput
     include Ufo::AwsServices
     include Ufo::Concerns::Names
+    include Ufo::Utils::Logging
 
     def stack_output(name)
       stack_name, output_key = name.split(".")

data/lib/ufo/version.rb

@@ -1,3 +1,3 @@
 module Ufo
-  VERSION = "6.3.9"
+  VERSION = "6.3.12"
 end

data/lib/ufo/yaml.rb

@@ -2,7 +2,7 @@ module Ufo
   class Yaml
     class << self
       def load(text)
-        path = "/tmp/ufo/temp.yml"
+        path = "#{Ufo.root}/.ufo/tmp/temp.yml"
         FileUtils.mkdir_p(File.dirname(path))
         IO.write(path, text)
         Validator.new(path).validate!

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ufo
 version: !ruby/object:Gem::Version
-  version: 6.3.9
+  version: 6.3.12
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-05-09 00:00:00.000000000 Z
+date: 2022-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-logs
@@ -460,6 +460,7 @@ files:
 - ".cody/acceptance/project.rb"
 - ".cody/shared/script/install.sh"
 - ".cody/shared/script/install/ufo.sh"
+- ".github/FUNDING.yml"
 - ".github/ISSUE_TEMPLATE.md"
 - ".github/ISSUE_TEMPLATE/bug_report.md"
 - ".github/ISSUE_TEMPLATE/documentation.md"