ufo 5.0.2 → 5.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d69cb0cf10e5170348b79e5ca64a6a593196c7e820a50d2c76e3ba667a4093cb
-  data.tar.gz: 60f41ec8d10fdf1a17265c6a6f3ad7a95777943c6246e7ee04be038241bdd2bb
+  metadata.gz: 0c57c6028e4210f60469d12a9c8fcf7fad4e5b200d8a6fef3b19401323bf612e
+  data.tar.gz: 8ccb219639a58f509502b3ed451cb120dfbc83dc4b4fd892e1f82eb0f0fdd40e
 SHA512:
-  metadata.gz: '08b075b165b296f5efd8c45493bd5d0f71db161272a9fd7f41dfd91f9ed18d92287179029ac961f7b892c8c92e86f0a856b85fbe87d595c011cc04de89cd92e3'
-  data.tar.gz: ed0559461a50e6701d93b37bc5484c7366ddf7f9ad56f613b728b43ee1c06a3f9863bab267793f6d6977a2ce9a4ce5aac689a606021390ad69e1bb2ca3ea8cf4
+  metadata.gz: 405616d32c0e9d9d6a630497388040df553ac825e64f94f221495401c75c62a02e6df9b820f2d138380c68d2cc2607afee8258ef0cd4503a9a0c68f429c85bc3
+  data.tar.gz: 92b2942e8524d8eb760ff43b279c7c41ab8ec02b4381e671a6c2068389966aae14c7dc53aeb663c7d2a43b48672a2e0b1ef6f44e079dc80f2b11c10ac54c87c9

data/CHANGELOG.md

@@ -3,6 +3,19 @@
 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.
 
+## [5.0.6] - 2021-12-16
+- [#120](https://github.com/tongueroo/ufo/pull/120) new stack_naming: append_ufo_env default to fix append_env bug
+- [#122](https://github.com/tongueroo/ufo/pull/122) require active_support all
+
+## [5.0.5] - 2021-01-23
+- allow base profile without a default profile
+
+## [5.0.4] - 2021-01-23
+- [#119](https://github.com/tongueroo/ufo/pull/119) layer base profiles with env-specific or default profile
+
+## [5.0.3] - 2020-12-10
+- [#118](https://github.com/tongueroo/ufo/pull/118) update aws-mfa-secure with require singleton fix
+
 ## [5.0.2]
 - #111 Add support of credsStore
 - #112 Add support for bridge network mode

data/README.md

@@ -10,6 +10,8 @@
 
 [![BoltOps Badge](https://img.boltops.com/boltops/badges/boltops-badge.png)](https://www.boltops.com)
 
+Please **watch/star** this repo to help grow and support the project.
+
 Ufo is a tool that builds Docker images and deploys them to [AWS ECS](https://aws.amazon.com/ecs/).  The main command is `ufo ship`.  Here's summary of what it does:
 
 1. Builds a docker image.

data/docs/.gitignore

@@ -2,3 +2,4 @@ _site
 .sass-cache
 .jekyll-metadata
 Gemfile.lock
+_config-dev.yml

data/docs/Gemfile

@@ -1,3 +1,4 @@
 source "https://rubygems.org"
 
 gem "jekyll"
+gem "webrick"

data/docs/_config.yml

@@ -71,3 +71,5 @@ defaults:
 
 plugins_dir:
  - jekyll-coffeescript
+
+ads_url: "https://ads.boltops.com"

data/docs/_includes/banner/foot.html

@@ -0,0 +1,2 @@
+<div id="foot-banner" class="foot-banner">
+</div>

data/docs/_includes/banner/head.html

@@ -0,0 +1,5 @@
+{% assign buildtime = "now" | date: "%Y%m%d%H%M%S" %}
+<link rel="preload" href="{{ site.ads_url }}/ads/{{ site.time | date: '%s' }}.js" as="script" />
+<script data-cfasync="false" async src="{{ site.ads_url }}/ads/{{ site.time | date: '%s' }}.js"></script>
+
+<div id="head-banner" class="head-banner"></div>

data/docs/_includes/cfn-customize.md

@@ -36,4 +36,18 @@ Here's a list of the resources in the [cfn/stack.yml](https://github.com/tonguer
 * Listener
 * TargetGroup
 
+## Layering Support
+
+The `base.yml` profile files always get evaluated and env-specific ENV.yml file are layered or merged together. This miminizes duplication.  For example, these files are merged:
+
+* .ufo/settings/cfn/base.yml
+* .ufo/settings/cfn/development.yml
+
+The settings in `development.yml` override the settings in `base.yml`. Here's another example:
+
+* .ufo/settings/network/base.yml
+* .ufo/settings/network/development.yml
+
+Note, this feature is available in v5.0.5+.
+
 For the most up to date list check out the [cfn/stack.yml](https://github.com/tongueroo/ufo/blob/master/lib/cfn/stack.yml) source code directly.

data/docs/_includes/footer.html

@@ -6,11 +6,12 @@
                     <div class="footer-col col-md-4">
                         <h3>More Tools</h3>
                         <ul class="list-unstyled tools">
-                            <li><a href="http://rubyonjets.com">Jets</a></li>
-                            <li><a href="http://lono.cloud">Lono</a></li>
-                            <li><a href="http://sonic-screwdriver.cloud">Sonic</a></li>
-                            <li><a href="http://jack-eb.com">Jack</a></li>
-                            <li><a href="https://boltops.com/toolbelt">Toolbelt</a></li>
+                            <li><a href="https://terraspace.cloud">Terraspace</a></li>
+                            <li><a href="https://kubes.guru">Kubes</a></li>
+                            <li><a href="https://rubyonjets.com">Jets</a></li>
+                            <li><a href="https://lono.cloud">Lono</a></li>
+                            <li><a href="https://sonic-screwdriver.cloud">Sonic</a></li>
+                            <li><a href="https://jack-eb.com">Jack</a></li>
                         </ul>
                     </div>
                     <div class="footer-col col-md-4">
@@ -41,10 +42,3 @@
             </div>
         </div>
     </footer>
-
-    <!-- Scroll to Top Button (Only visible on small and extra-small screen sizes) -->
-    <div class="scroll-top page-scroll visible-xs visible-sm">
-        <a id="next" class="btn btn-primary" href="#page-top">
-            <i class="fa fa-chevron-up"></i>
-        </a>
-    </div>

data/docs/_layouts/default.html

@@ -2,10 +2,12 @@
 <html>
     {% include head.html %}
     <body id="page-top" class="index">
+    {% include banner/head.html %}
     {% include nav.html %}
     {% include content.html %}
     {% include footer.html %}
     {% include modals.html %}
+    {% include banner/foot.html %}
     {% include js.html %}
     </body>
 </html>

data/docs/bin/web

@@ -1,4 +1,4 @@
 #!/bin/bash -ex
 
 bundle exec jekyll clean
-exec bundle exec jekyll serve --host 0.0.0.0 "$@"
+exec bundle exec jekyll serve --trace --config _config.yml,_config-dev.yml "$@"

data/lib/template/.ufo/settings.yml.tt

@@ -12,8 +12,8 @@ base:
   # There are some cavaets with this. Updating properties on resources that require
   # replacment might not work. For example, adding and removing a load balancer.
   # In these cases, you must delete the entire ecs service and recreate it.
-  stack_naming: append_env
-  auto_camelize: false # new default setting in ufo v5
+  stack_naming: append_ufo_env # new default setting in ufo v5.0.6
+  auto_camelize: false         # new default setting in ufo v5
 
 development:
   # cluster: development

data/lib/ufo/setting/profile.rb

@@ -12,6 +12,7 @@ class Ufo::Setting
         @profile, # user specified
         Ufo.env, # conventional based on env
         "default", # fallback to default
+        "base", # finally fallback to base
       ].compact.uniq
       paths = names.map { |name| "#{Ufo.root}/.ufo/settings/#{@type}/#{name}.yml" }
       found = paths.find { |p| File.exist?(p) }
@@ -21,8 +22,23 @@ class Ufo::Setting
       end
 
       text = RenderMePretty.result(found)
-      YAML.load(text).deep_symbolize_keys
+      specific_data = yaml_load(text)
+
+      base = "#{Ufo.root}/.ufo/settings/#{@type}/base.yml"
+      base_data = if File.exist?(base)
+                    text = RenderMePretty.result(base)
+                    yaml_load(text)
+                  else
+                    {}
+                  end
+
+      base_data.deep_merge(specific_data)
     end
     memoize :data
+
+    def yaml_load(text)
+      result = YAML.load(text) # yaml file can contain nothing but comments
+      result.is_a?(Hash) ? result.deep_symbolize_keys : {}
+    end
   end
 end

data/lib/ufo/stack/helper.rb

@@ -28,10 +28,17 @@ class Ufo::Stack
       parts = case settings[:stack_naming]
       when "prepend_cluster" # ufo v4.3 and below
         [cluster, service, Ufo.env_extra] # legacy
-      when "append_env", "append_cluster" # ufo v4.5
+      when "append_cluster" # ufo v4.5
         # append_env will be removed in the next major version in favor of append_cluster to avoid confusion with
         # append_ufo_env
         [service, cluster, Ufo.env_extra]
+      when "append_env" # ufo v5.0.3 and below: append_env is a bug, it appends cluster name instead of env name
+        puts "WARN: Deprecation: The append_env is depreciated .ufo/settings.yaml".color(:yellow)
+        puts "It appends the cluster env instead of the UFO_ENV env. This is unexpected behavior. "
+        puts "To been fix this, please `stack_naming: append_ufo_env` instead. "
+        [service, cluster, Ufo.env_extra] # bug - kept for backward compatibility
+      when "append_ufo_env"  # v5.1.0 fixes bug where append_env would append cluster name instead
+        [service, Ufo.env, Ufo.env_extra]
       when "append_nothing", "prepend_nothing"
         [service, Ufo.env_extra]
       else # new default. ufo v4.5 and above

data/lib/ufo/version.rb

@@ -1,3 +1,3 @@
 module Ufo
-  VERSION = "5.0.2"
+  VERSION = "5.0.6"
 end

data/lib/ufo.rb

@@ -1,7 +1,7 @@
 $stdout.sync = true unless ENV["UFO_STDOUT_SYNC"] == "0"
 
 $:.unshift(File.expand_path('../', __FILE__))
-require 'active_support/core_ext/class'
+require 'active_support/all'
 require 'deep_merge/rails_compat'
 require 'fileutils'
 require 'memoist'

data/ufo.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "aws-logs"
-  spec.add_dependency "aws-mfa-secure"
+  spec.add_dependency "aws-mfa-secure", "~> 0.4.3"
   spec.add_dependency "aws-sdk-cloudformation"
   spec.add_dependency "aws-sdk-cloudwatchlogs"
   spec.add_dependency "aws-sdk-ec2"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ufo
 version: !ruby/object:Gem::Version
-  version: 5.0.2
+  version: 5.0.6
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-08-02 00:00:00.000000000 Z
+date: 2021-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-logs
@@ -28,16 +28,16 @@ dependencies:
   name: aws-mfa-secure
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.3
 - !ruby/object:Gem::Dependency
   name: aws-sdk-cloudformation
   requirement: !ruby/object:Gem::Requirement
@@ -398,6 +398,8 @@ files:
 - docs/_docs/upgrading/upgrade5.md
 - docs/_docs/variables.md
 - docs/_includes/about.html
+- docs/_includes/banner/foot.html
+- docs/_includes/banner/head.html
 - docs/_includes/cfn-customize.md
 - docs/_includes/commands.html
 - docs/_includes/contact.html
@@ -715,7 +717,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.32
 signing_key: 
 specification_version: 4
 summary: AWS ECS Deploy Tool