ufo 6.3.7 → 6.3.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 564a94e07c4dcf5cdea7b63623f1c5f7741487132fb14d3cfab36ea4c2ccb487
-  data.tar.gz: bfd797914511f0ce5750cd0102a9b8d79be50a4daaf4ad7c9b76e0578eb7bccb
+  metadata.gz: 8d85a0063b688b43736f0b7e252e314d70d98d05871bd43238fb630b84336fea
+  data.tar.gz: 99baad01439788788a8a0683c03fbbbaa2af925ffc8cc09026c8d57b61e0f1fd
 SHA512:
-  metadata.gz: c01fae80702562184e0e4a7c43d33ec75ef23d70d94776a8262609278c6ffe3dc32dce11100760f6cb7f63988494c058823b8c3e652065e07c5e75ddcd3ca58c
-  data.tar.gz: b5d8b619743945fd793ee7e62c264a9dd17ea16cceb59ccf563ba3f35c7a158a42e1c901882788aea74e56a02c50eabea1c3e6391c833331c7840ad591186658
+  metadata.gz: b38a61b1adc53e520c526b0d8d72bae8812b0cb17cb58d77c17af1e6dc823a1f671b0725ef77ecb587a2f30aed6847e4f3a669d88a2f05489721b4651eae86d2
+  data.tar.gz: 2958ec8b2aa3c5b69ac348fad209a5964528d4e8cb1101507e7bbddbf504c23f407181d9c9e394ec73b2f117758beb7ddba76e6953b8f48d2d08776615213279

data/CHANGELOG.md

@@ -3,6 +3,16 @@
 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.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
+
+## [6.3.8] - 2022-05-02
+- [#174](https://github.com/tongueroo/ufo/pull/174) fix update rollback failed user friendly error message
+
 ## [6.3.7] - 2022-04-29
 - [#173](https://github.com/tongueroo/ufo/pull/173) fix when ssl certs not used
 

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

@@ -110,7 +110,7 @@ module Ufo::Cfn
       when /state and can not be updated/
         logger.info "The #{@stack_name} stack is in a state that cannot be updated. Deleted the stack and try again."
         logger.info "ERROR: #{e.message}"
-        if message.include?('UPDATE_ROLLBACK_FAILED')
+        if e.message.include?('UPDATE_ROLLBACK_FAILED')
           logger.info "You might be able to do a 'Continue Update Rollback' and skip some resources to get the stack back into a good state."
         end
         url = "https://console.aws.amazon.com/cloudformation/home?region=#{region}"

data/lib/ufo/cli/help/new/env_file.md

@@ -0,0 +1,11 @@
+## Examples
+
+Generate regular env file
+
+    $ ufo new env_file
+          create  .ufo/env_files/dev.env
+
+Generate secrets env file
+
+    $ ufo new env_file secrets
+          create  .ufo/env_files/dev.secrets

data/lib/ufo/cli/new/env_file.rb

@@ -12,7 +12,7 @@ class Ufo::CLI::New
   public
     def create_hook
       set_template_source("env_file")
-      template "file.#{type}", ".ufo/config/env_files/#{Ufo.env}.#{type}"
+      template "file.#{type}", ".ufo/env_files/#{Ufo.env}.#{type}"
     end
   end
 end

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/helpers/vars/builder.rb

@@ -41,7 +41,6 @@ module Ufo::TaskDefinition::Helpers::Vars
     end
 
     def show_layers(paths)
-      label = @ext.sub('.','').capitalize
       paths.each do |path|
         if ENV['UFO_LAYERS_ALL']
           logger.info "    #{path}"
@@ -85,12 +84,20 @@ module Ufo::TaskDefinition::Helpers::Vars
         value = item.delete(:value)
         arn = normalize_to_arn(item[:name], value)
         value = expansion(arn)
-        value = value.sub('parameter//','parameter/') # auto fix accidental leading slash for user
+        value = autofix(value)
         item[:valueFrom] = value
       end
       secrets
     end
 
+    def autofix(value)
+      value = value.sub('parameter//','parameter/') # auto fix accidental leading slash for user
+      if value.include?(':secret:') && value.count(':') == 7 # missing trailing ::
+        value += "::"
+      end
+      value
+    end
+
     def normalize_to_arn(name, value)
       case value
       when /^ssm:/i

data/lib/ufo/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ufo
 version: !ruby/object:Gem::Version
-  version: 6.3.7
+  version: 6.3.10
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-04-29 00:00:00.000000000 Z
+date: 2022-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-logs
@@ -564,6 +564,7 @@ files:
 - lib/ufo/cli/help/init.md
 - lib/ufo/cli/help/logs.md
 - lib/ufo/cli/help/new/boot_hook.md
+- lib/ufo/cli/help/new/env_file.md
 - lib/ufo/cli/help/new/hook.md
 - lib/ufo/cli/help/ps.md
 - lib/ufo/cli/help/releases.md