ufo 6.0.2 → 6.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 55bfd2df0ae0be2b6c5794b147c767f1a2e2d798f68b6a0c6a34154133adf73b
-  data.tar.gz: 5c4ea4f15b55c194f0def295653a1b3278f4a0553fb8acc83ff1a1bc7a19a6ff
+  metadata.gz: 731c8ef178a8fe9586b08eef48c7cdc4b1014e58b601155a46bed1f0c5657afa
+  data.tar.gz: 1654ffccfb5a57827b63e4cf8777f2ff0884e52a4e29ee0591296947443e8189
 SHA512:
-  metadata.gz: e0d1c61ec52f1ae980eeca81eb7c7e8b90f3c1bd815ec3a700457ddc4a48de984d5c6c0db18271b6252e39c9f9e364640ce676c5b5a08b029e73016dcf5a78c4
-  data.tar.gz: c979b7f7174b98c9308d10650e467208e5c9bb30af2dc6b0b9153860ca8f0d61aee42314d3472b0ec05f6ce3b8756f9fbbaae40434fc9e5220c968a9f7f928dd
+  metadata.gz: ebf9a0cbd7b7d2b532c85a8776180475d38ae5fdb4bd2b0dd1cc4ce93df3546b9af65385e3632cc936a0825e1252377c354ed4c409cb8f9723bcf0baa9a09134
+  data.tar.gz: '0913ec88f24b35bd34208cdbc286fcd1a1ad021538feebb66e7d9fff7bfb2eaeba7d902f5581a3003a1dc92f8a491b09bb9aab25fc0b21f4c788194c5b487f4a'

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.0.5] - 2022-03-07
+- change default config.ship.docker.quiet = true
+
+## [6.0.4] - 2022-03-07
+- ufo ps: use stopped at for old_age filter
+
+## [6.0.3] - 2022-03-07
+- [#133](https://github.com/tongueroo/ufo/pull/133) improve ufo central and add helpers
+
 ## [6.0.2] - 2022-03-06
 - [#128](https://github.com/tongueroo/ufo/pull/128) cleanup region with aws_data
 - [#129](https://github.com/tongueroo/ufo/pull/129) Scale and Ps Edge Cases

data/lib/ufo/aws_services.rb

@@ -1,3 +1,4 @@
+require "aws-sdk-acm"
 require "aws-sdk-applicationautoscaling"
 require "aws-sdk-cloudformation"
 require "aws-sdk-cloudwatchlogs"
@@ -14,6 +15,11 @@ module Ufo
   module AwsServices
     extend Memoist
 
+    def acm
+      Aws::ACM::Client.new(aws_options)
+    end
+    memoize :acm
+
     def applicationautoscaling
       Aws::ApplicationAutoScaling::Client.new(aws_options)
     end

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

@@ -32,8 +32,23 @@ class Ufo::Cfn::Stack::Builder::Resources
 
       props[:TargetType] = "ip" if vars[:container][:network_mode] == "awsvpc"
       props[:HealthCheckPort] = vars[:container][:port] if vars[:elb_type] == "network" && vars[:network_mode] == "awsvpc"
+      props[:HealthCheckPath] = health_check_path
+      props[:HealthCheckIntervalSeconds] = health_check_interval_seconds
+      props[:HealthyThresholdCount] = healthy_threshold_count
+      props[:UnhealthyThresholdCount] = unhealthy_threshold_count
 
       props
     end
+
+    meths = %w[
+      health_check_interval_seconds
+      health_check_path
+      healthy_threshold_count
+      unhealthy_threshold_count
+    ]
+    delegate *meths, to: :elb
+    def elb
+      Ufo.config.elb
+    end
   end
 end

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

@@ -24,6 +24,9 @@ class Ufo::Cfn::Stack
       path = ".ufo/output/template.yml"
       IO.write("#{Ufo.root}/#{path}", text)
       logger.info "Template built:        #{path}"
+      # Only basic YAML validation. Doesnt check for everything CloudFormation checks.
+      # For CloudFormation checks handled with an exception handler in Cfn::Stack#print_code(exception)
+      Ufo::Yaml.validate!(path)
       text
     end
   end

data/lib/ufo/cfn/stack.rb

@@ -130,6 +130,22 @@ module Ufo::Cfn
       when /No updates are to be performed/
         logger.info "There are no updates to be performed. Exiting.".color(:yellow)
         exit 1
+      when /YAML not well-formed/ # happens if a value is a serialize Ruby Object. See: https://gist.github.com/tongueroo/737531d0bc8c92d92b5cd00493e15d9e
+        # e.message: Template format error: YAML not well-formed. (line 207, column 9)
+        print_code(e)
+      else
+        raise
+      end
+    end
+
+    def print_code(exception)
+      path = ".ufo/output/template.yml"
+      md = exception.message.match(/line (\d+),/)
+      line_number = md[1]
+      logger.error "Template for debugging: #{path}"
+      if md
+        DslEvaluator.print_code(path, line_number)
+        exit 1
       else
         raise
       end

data/lib/ufo/cli/central/base.rb

@@ -0,0 +1,12 @@
+class Ufo::CLI::Central
+  class Base
+    include Ufo::Utils::Execute
+    include Ufo::Utils::Logging
+    include Ufo::Utils::Pretty
+    include Ufo::Utils::Sure
+
+    def initialize(options={})
+      @options = options
+    end
+  end
+end

data/lib/ufo/cli/central/clean.rb

@@ -0,0 +1,10 @@
+class Ufo::CLI::Central
+  class Clean < Base
+    def run
+      path = "#{ENV['HOME']}/.ufo/central"
+      sure?("Will remove folder with repo caches: #{pretty_home(path)}")
+      FileUtils.rm_rf(path)
+      logger.info "Removed: #{pretty_home(path)}"
+    end
+  end
+end

data/lib/ufo/cli/central/update.rb

@@ -1,18 +1,10 @@
 class Ufo::CLI::Central
-  class Update
-    include Ufo::Utils::Logging
-    include Ufo::Utils::Execute
-    include Ufo::Utils::Sure
-
-    def initialize(options={})
-      @options = options
-    end
-
+  class Update < Base
     def run
       validate!
       action = File.exist?(".ufo") ? "update" : "create"
       sure?("Will #{action} the .ufo symlink") # IE: Will create the .ufo symlink
-      logger.info "Updating .ufo with #{repo}"
+      logger.info "Updating .ufo with #{central_repo}"
       FileUtils.mkdir_p(tmp_area)
       pull
       symlink
@@ -22,50 +14,85 @@ class Ufo::CLI::Central
     def pull
       logger.debug "Within #{tmp_area}"
       Dir.chdir(tmp_area) do
-        if File.exist?(repo_name)
-          execute "cd #{repo_name} && git pull"
+        if File.exist?(repo)
+          execute "cd #{repo} && git pull"
         else
-          execute "git clone #{repo}"
+          execute "git clone #{central_repo}"
         end
       end
     end
 
     # Always update the symlink in case use changes UFO_CENTRAL_REPO
     def symlink
-      src = "#{tmp_area}/#{repo_name}"
-      src += "/#{folder}" if folder
+      src = "#{tmp_area}/#{repo}"
+      src += "/#{central_folder}" if central_folder
 
       FileUtils.mv(".ufo", ".ufo.bak") if File.exist?(".ufo") && File.directory?(".ufo")
 
       # FileUtils.ln_s(target, link, options)
       # ~/.ufo/central/repo -> .ufo
-      FileUtils.ln_s(src, ".ufo", verbose: true)
+      FileUtils.ln_sf(src, ".ufo", verbose: false) # force in case of existing broken symlink
       FileUtils.rm_rf(".ufo.bak")
 
+      report_broken_symlink
+
       logger.info "The .ufo symlink has been updated"
+      logger.info "Symlink: .ufo -> #{pretty_home(src)}"
+    end
+
+    def report_broken_symlink
+      return unless File.symlink?('.ufo')
+
+      message =<<~EOL.color(:red)
+        ERROR: The .ufo symlink appears to pointing to a missing folder.
+        Please double check that the folder exist in the repo/
+      EOL
+      begin
+        target = File.readlink('.ufo')
+        unless File.exist?(target)
+          logger.error message
+          logger.error "Symlink: .ufo -> #{target}"
+          exit 1
+        end
+      rescue Errno::EEXIST
+        logger.error message
+        exit 1
+      end
     end
 
     def validate!
-      return if repo
+      return if central_repo
       logger.info "ERROR: Please set the env var: UFO_CENTRAL_REPO".color(:red)
       logger.info "The ufo central update command requires it."
       exit 1
     end
 
-    def repo_name
-      File.basename(repo)
+    # Assume github.com:org/repo. May not work for private "ssh://host:repo" style repos
+    # See: https://terraspace.cloud/docs/terrafile/sources/ssh/
+    # Will consider PRs.
+    #
+    # org is used for path to ~/.ufo/central/org/repo
+    #
+    def org
+      base = central_repo.split('/')[-2] # 1. git@github.com:org/repo 2. repo (for case of https://github.com/org/repo)
+      base.gsub!(/.*:/,'') # git@github.com:org/repo => org/repo
+      base
     end
 
     def repo
+      File.basename(central_repo)
+    end
+
+    def central_repo
       ENV['UFO_CENTRAL_REPO']
     end
 
-    def folder
+    def central_folder
       ENV['UFO_CENTRAL_FOLDER']
     end
 
     def tmp_area
-      "#{ENV['HOME']}/.ufo/central"
+      "#{ENV['HOME']}/.ufo/central/#{org}"
     end
 
     def check_gitignore

data/lib/ufo/cli/central.rb

@@ -8,5 +8,12 @@ class Ufo::CLI
     def update
       Update.new(options).run
     end
+
+    desc "clean", "remove ~/.ufo/central"
+    long_desc Help.text("central/clean")
+    opts.yes
+    def clean
+      Clean.new(options).run
+    end
   end
 end

data/lib/ufo/cli/clean.rb

@@ -1,5 +1,3 @@
-require "fileutils"
-
 class Ufo::CLI
   class Clean < Base
     def run

data/lib/ufo/cli/ps/task.rb

@@ -50,10 +50,12 @@ class Ufo::CLI::Ps
     #  stopped_at=2018-07-05 22:03:45 -0700,
     def hide?
       return false if @options[:status] == "stopped"
-      started_at = time(@task["started_at"])
-      return false unless started_at # edge case when started_at not yet set
+      # Went back and forth with stopped_at vs started_at
+      # Seems like stopped_at is better as when ECS is trying to scale it leaves a lot of tasks
+      stopped_at = time(@task["stopped_at"])
+      return false unless stopped_at
       time = Time.now - 60 * Ufo.config.ps.hide_age
-      status == "STOPPED" && started_at < time
+      status == "STOPPED" && stopped_at < time
     end
 
     def status

data/lib/ufo/config.rb

@@ -56,20 +56,26 @@ module Ufo
       config.ecs.scheduling_strategy = "REPLICA"
 
       config.elb = ActiveSupport::OrderedOptions.new
-      config.elb.subnet_mappings = nil # static IP addresses for network load balancer
+      config.elb.default_actions = nil # full override
       config.elb.enabled = "auto" # "auto", true or false
+
+      config.elb.health_check_interval_seconds = 10
+      config.elb.health_check_path = nil # When nil its AWS default /
+      config.elb.healthy_threshold_count = 5
+      config.elb.unhealthy_threshold_count = 2
+
       config.elb.port = 80 # default listener port
-      config.elb.ssl = ActiveSupport::OrderedOptions.new
-      config.elb.ssl.certificates = nil
-      config.elb.ssl.enabled = false
-      config.elb.ssl.port = 443
-      config.elb.type = "application"
-      config.elb.default_actions = nil # full override
       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.ssl = ActiveSupport::OrderedOptions.new
+      config.elb.ssl.certificates = nil
+      config.elb.ssl.enabled = false
+      config.elb.ssl.port = 443
+      config.elb.subnet_mappings = nil # static IP addresses for network load balancer
+      config.elb.type = "application"
 
       config.exec = ActiveSupport::OrderedOptions.new
       config.exec.command = "/bin/bash" # aws ecs execute-command cli
@@ -104,7 +110,7 @@ module Ufo
 
       config.ship = ActiveSupport::OrderedOptions.new
       config.ship.docker = ActiveSupport::OrderedOptions.new
-      config.ship.docker.quiet = true # only affects ufo ship docker commands output
+      config.ship.docker.quiet = false # only affects ufo ship docker commands output
 
       config.state = ActiveSupport::OrderedOptions.new
       config.state.reminder = true

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

@@ -0,0 +1,18 @@
+module Ufo::TaskDefinition::Helpers
+  module Acm
+    # returns cert arn
+    def acm_cert(domain)
+      certs = acm_certs
+      cert = certs.find do |c|
+        c.domain_name == domain
+      end
+      cert.certificate_arn if cert
+    end
+
+    # TODO: handle when there are lots of certs by paging
+    def acm_certs
+      resp = acm.list_certificates
+      resp.certificate_summary_list
+    end
+  end
+end

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

@@ -0,0 +1,13 @@
+module Ufo::TaskDefinition::Helpers
+  module Ecr
+    def ecr_repo(name)
+      repository = ecr_repository(name)
+      repository.repository_uri
+    end
+
+    def ecr_repository(name)
+      resp = ecr.describe_repositories(repository_names: [name])
+      resp.repositories.first
+    end
+  end
+end

data/lib/ufo/utils/pretty.rb

@@ -4,6 +4,11 @@ module Ufo::Utils
       path.sub("#{Ufo.root}/",'').sub(/^\.\//,'')
     end
 
+    # Replace HOME with ~ - different from the main pretty_path
+    def pretty_home(path)
+      path.sub(ENV['HOME'], '~')
+    end
+
     # http://stackoverflow.com/questions/4175733/convert-duration-to-hoursminutesseconds-or-similar-in-rails-3-or-ruby
     def pretty_time(total_seconds)
       minutes = (total_seconds / 60) % 60

data/lib/ufo/version.rb

@@ -1,3 +1,3 @@
 module Ufo
-  VERSION = "6.0.2"
+  VERSION = "6.0.5"
 end

data/lib/ufo/yaml/validator.rb

@@ -1,5 +1,7 @@
 class Ufo::Yaml
   class Validator
+    include Ufo::Utils::Logging
+
     def initialize(path)
       @path = path
     end
@@ -18,34 +20,16 @@ class Ufo::Yaml
     end
 
     def handle_yaml_syntax_error(e, path)
-      io = StringIO.new
-      io.puts "Invalid yaml. Output written for debugging: #{path}".color(:red)
-      io.puts "ERROR: #{e.message}".color(:red)
+      logger.error "ERROR: #{e.message}".color(:red)
+      logger.error "Invalid yaml. Output written for debugging: #{path}".color(:red)
 
       # Grab line info.  Example error:
       #   ERROR: (<unknown>): could not find expected ':' while scanning a simple key at line 2 column 1
       md = e.message.match(/at line (\d+) column (\d+)/)
       line = md[1].to_i
 
-      lines = IO.read(path).split("\n")
-      context = 5 # lines of context
-      top, bottom = [line-context-1, 0].max, line+context-1
-      spacing = lines.size.to_s.size
-      lines[top..bottom].each_with_index do |line_content, index|
-        line_number = top+index+1
-        if line_number == line
-          io.printf("%#{spacing}d %s\n".color(:red), line_number, line_content)
-        else
-          io.printf("%#{spacing}d %s\n", line_number, line_content)
-        end
-      end
-
-      if ENV['LONO_TEST']
-        io.string
-      else
-        puts io.string
-        exit 1
-      end
+      DslEvaluator.print_code(path, line_number)
+      exit 1
     end
   end
 end

data/lib/ufo/yaml.rb

@@ -8,6 +8,10 @@ module Ufo
         Validator.new(path).validate!
         Loader.new(text).load
       end
+
+      def validate!(path)
+        Validator.new(path).validate!
+      end
     end
   end
 end

data/ufo.gemspec

@@ -20,14 +20,15 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "aws-logs"
   spec.add_dependency "aws-mfa-secure", ">= 0.4.3"
+  spec.add_dependency "aws-sdk-acm"
   spec.add_dependency "aws-sdk-applicationautoscaling"
   spec.add_dependency "aws-sdk-cloudformation"
   spec.add_dependency "aws-sdk-cloudwatchlogs"
   spec.add_dependency "aws-sdk-ec2"
   spec.add_dependency "aws-sdk-ecr"
   spec.add_dependency "aws-sdk-ecs"
-  spec.add_dependency "aws-sdk-ssm"
   spec.add_dependency "aws-sdk-elasticloadbalancingv2"
+  spec.add_dependency "aws-sdk-ssm"
   spec.add_dependency "aws_data"
   spec.add_dependency "cfn-status"
   spec.add_dependency "cli-format"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ufo
 version: !ruby/object:Gem::Version
-  version: 6.0.2
+  version: 6.0.5
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-03-06 00:00:00.000000000 Z
+date: 2022-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-logs
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.3
+- !ruby/object:Gem::Dependency
+  name: aws-sdk-acm
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: aws-sdk-applicationautoscaling
   requirement: !ruby/object:Gem::Requirement
@@ -123,7 +137,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: aws-sdk-ssm
+  name: aws-sdk-elasticloadbalancingv2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -137,7 +151,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: aws-sdk-elasticloadbalancingv2
+  name: aws-sdk-ssm
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -484,6 +498,8 @@ files:
 - lib/ufo/cli/build.rb
 - lib/ufo/cli/cancel.rb
 - lib/ufo/cli/central.rb
+- lib/ufo/cli/central/base.rb
+- lib/ufo/cli/central/clean.rb
 - lib/ufo/cli/central/update.rb
 - lib/ufo/cli/clean.rb
 - lib/ufo/cli/destroy.rb
@@ -570,8 +586,10 @@ files:
 - lib/ufo/task_definition/erb/json.rb
 - lib/ufo/task_definition/erb/yaml.rb
 - lib/ufo/task_definition/helpers.rb
+- lib/ufo/task_definition/helpers/acm.rb
 - lib/ufo/task_definition/helpers/aws_data_helper.rb
 - lib/ufo/task_definition/helpers/core.rb
+- lib/ufo/task_definition/helpers/ecr.rb
 - lib/ufo/task_definition/helpers/ssm.rb
 - lib/ufo/task_definition/helpers/ssm/fetcher.rb
 - lib/ufo/task_definition/helpers/stack_output.rb