ufo 6.1.1 → 6.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5020109f777d82ca7e1d2c85acfd6c5fe91b4501a3b78892160a8c9783c129c
-  data.tar.gz: 0c5868cba614746690366be6512b33c5cc272d16d5a0ac0529933bebf83b28c3
+  metadata.gz: dbdb67f6df0ebbfb4054ad63a4fe615f1ecf52ef6141252bb4088f999b10a88c
+  data.tar.gz: 794d980bc87422f13acf68cbf9a323507230b9b7a479c1b58355e591122c5572
 SHA512:
-  metadata.gz: 98130a5759ba72f0a6ce637607ba4b67814fb8822f735f679de8ea6b82204e17eb2943329e39f33265833373627a36dedb9adb1f555999220eb814e7c28dc3c5
-  data.tar.gz: 64f93d8b076e60f301b5e848e0e1f860d91bed832ecffedb5c95a93b1df743b2853049ec84d9d9995a16df222a6f9930fdb2026d9d3d24e784d20900b3f06208
+  metadata.gz: 3cc7abf022ff951920d04a42e7eb5a5d0961f6da8a1e1f87036a790675b0cd8760df270663b0f1c8dbcd13dc31d621cead338834c458dab350805dd1b6bf32a8
+  data.tar.gz: dadacc6d60113cafa04841065373c1792a6129de9561408450f71d5125f98924d436e3ede2436dc40193f83db15f5c654a39c1d072507dc05e5902cf5444cc02

data/CHANGELOG.md

@@ -3,6 +3,13 @@
 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.1.2] - 2022-03-14
+- [#148](https://github.com/tongueroo/ufo/pull/148) Acm cert and user messaging improvements with config
+- acm_cert helper improvements: warn when not found and only create ssl listener if cert is found
+- improve squeezer: prevent infinite loop for edge case when data is [nil]
+- messaging improvements: provide exact line of context of the config with the issue
+- update dsl_evaluator dependency to at least 0.3.0
+
 ## [6.1.1] - 2022-03-14
 - [#146](https://github.com/tongueroo/ufo/pull/146) dont set default vpc explicitly, instead use implicit setting
 - [#147](https://github.com/tongueroo/ufo/pull/147) explicitly set default vpc when not set cloudformation resources expect it

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

@@ -27,11 +27,11 @@ class Ufo::Cfn::Stack::Builder::Resources
     # nil on purpose
     def certificates
       ssl = Ufo.config.elb.ssl
-      normalize(ssl.certificates)
+      normalize(ssl.certificates) if ssl.certificates
     end
 
     def normalize(*certs)
-      certs = certs.flatten
+      certs = certs.flatten.compact
       certs.map do |cert|
         if cert.is_a?(String)
           {CertificateArn: cert}

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

@@ -59,7 +59,8 @@ class Ufo::Cfn::Stack
 
     # if the configuration is set to anything then enable it
     def create_listener_ssl?
-      Ufo.config.elb.ssl.enabled
+      elb = Ufo.config.elb
+      elb.ssl.enabled && elb.ssl.certificates
     end
 
     def create_elb?

data/lib/ufo/core.rb

@@ -16,7 +16,6 @@ module Ufo
       if @@config_loaded
         config.app
       else
-        call_line = caller.find {|l| l.include?('.ufo') }
         puts "ERROR: Using Ufo.app or :APP expansion very early in the UFO boot process".color(:red)
         puts <<~EOL.color(:red)
           The Ufo.app or :APP expansions are not yet available at this point
@@ -25,11 +24,9 @@ module Ufo
           1. Use the UFO_APP env var to set it, which allows it to be used.
           2. Hard code your actual app name.
 
-          Called from:
-
-              #{call_line}
-
         EOL
+        call_line = caller.find {|l| l.include?('.ufo') }
+        DslEvaluator.print_code(call_line)
         exit 1
       end
     end

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

@@ -1,12 +1,23 @@
 module Ufo::TaskDefinition::Helpers
   module Acm
+    include Ufo::Utils::CallLine
+    include Ufo::Utils::Pretty
+
     # 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
+      if cert
+        cert.certificate_arn
+      else
+        # Logger causes infinite loop when waf helper used in .ufo/
+        logger.warn "WARN: ACM cert not found: #{domain}".color(:yellow)
+        call_line = ufo_config_call_line
+        DslEvaluator.print_code(call_line)
+        nil
+      end
     end
 
     # TODO: handle when there are lots of certs by paging

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

@@ -11,14 +11,9 @@ module Ufo::TaskDefinition::Helpers
       resp = ecr.describe_repositories(repository_names: [name])
       resp.repositories.first
     rescue Aws::ECR::Errors::RepositoryNotFoundException => e
-      call_line = ufo_config_call_line
       logger.warn "WARN: #{e.class} #{e.message}".color(:yellow)
-      logger.warn <<~EOL
-        Called from
-
-            #{call_line}
-
-      EOL
+      call_line = ufo_config_call_line
+      DslEvaluator.print_code(call_line)
       nil
     end
   end

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

@@ -19,15 +19,9 @@ module Ufo::TaskDefinition::Helpers
         web_acl.arn
       else
         # Logger causes infinite loop when waf helper used in .ufo/
-        call_line = ufo_config_call_line
         logger.warn "WARN: Web ACL not found: #{name}".color(:yellow)
-        logger.info <<~EOL
-          Called from:
-
-              #{call_line}
-
-          Are you sure it's a regional WAF ACL?
-        EOL
+        call_line = ufo_config_call_line
+        DslEvaluator.print_code(call_line)
       end
     end
   end

data/lib/ufo/utils/call_line.rb

@@ -3,8 +3,7 @@ module Ufo::Utils
     include Pretty
 
     def ufo_config_call_line
-      call_line = caller.find { |l| l.include?('.ufo/') }
-      pretty_path(call_line)
+      caller.find { |l| l.include?('.ufo/') }
     end
   end
 end

data/lib/ufo/utils/squeezer.rb

@@ -9,7 +9,9 @@ module Ufo::Utils
 
       case data
       when Array
-        data.map! { |v| squeeze(v) }
+        # .compact prevents infinite loop when data = [nil] on accident
+        # IE: config.elb.ssl.certificates = acm_cert("domain.not.found")
+        data.compact.map! { |v| squeeze(v) }
       when Hash
         data.each_with_object({}) do |(k,v), squeezed|
           # only remove nil and empty Array values within Hash structures

data/lib/ufo/version.rb

@@ -1,3 +1,3 @@
 module Ufo
-  VERSION = "6.1.1"
+  VERSION = "6.1.2"
 end

data/spec/ufo/utils/squeezer_spec.rb

@@ -0,0 +1,21 @@
+describe Ufo::Utils::Squeezer do
+  subject { Ufo::Utils::Squeezer.new(data) }
+
+  context("Array with nil") do
+    let(:data) { [nil] }
+    # Prevents infinite loop
+    it "remove nil" do
+      squeezed = subject.squeeze
+      expect(squeezed).to eq []
+    end
+  end
+
+  context("Hash with nil value") do
+    let(:data) { {a: 1, b: nil } }
+    # Prevents infinite loop
+    it "remove nil" do
+      squeezed = subject.squeeze
+      expect(squeezed).to eq(a: 1)
+    end
+  end
+end

data/ufo.gemspec

@@ -34,7 +34,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "cfn-status"
   spec.add_dependency "cli-format"
   spec.add_dependency "deep_merge"
-  spec.add_dependency "dsl_evaluator", ">= 0.2.5" # for DslEvaluator.print_code
+  spec.add_dependency "dsl_evaluator", ">= 0.3.0" # for DslEvaluator.print_code
   spec.add_dependency "memoist"
   spec.add_dependency "plissken"
   spec.add_dependency "rainbow"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ufo
 version: !ruby/object:Gem::Version
-  version: 6.1.1
+  version: 6.1.2
 platform: ruby
 authors:
 - Tung Nguyen
@@ -240,14 +240,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.5
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.5
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: memoist
   requirement: !ruby/object:Gem::Requirement
@@ -653,6 +653,7 @@ files:
 - spec/ufo/iam_role/builder_spec.rb
 - spec/ufo/iam_role/dsl_spec.rb
 - spec/ufo/logs_spec.rb
+- spec/ufo/utils/squeezer_spec.rb
 - ufo.gemspec
 homepage: http://ufoships.com
 licenses:
@@ -699,3 +700,4 @@ test_files:
 - spec/ufo/iam_role/builder_spec.rb
 - spec/ufo/iam_role/dsl_spec.rb
 - spec/ufo/logs_spec.rb
+- spec/ufo/utils/squeezer_spec.rb