ufo 4.5.2 → 4.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87163ab28792dadd633294978d4add5e0aec9c88e8d9063a9ae5661dc5d08964
-  data.tar.gz: 9259a17a58ddacf67007d2bc59b6ab2a9bbc48e70ea6d646675ac4e0ceb95e38
+  metadata.gz: 882615890a0eb95cf707cb6c001833e5b8631b8bacc75422712c0adc225f49af
+  data.tar.gz: c0cafd3bc2b4886ebf74eb1fd4a660d51571cdb332ca68504e17e05f39b8e94f
 SHA512:
-  metadata.gz: 4f0ca5903c773c9203f56529799e400a94ab2a48d8f7a89ed76e6c13dc68f2b91dc849b449af7c534d3ab0eda9800c64c495a889831d3bcba74d9e50cf756218
-  data.tar.gz: e93e17948eb44453f94816a64a2bd96b9d5f306fd1f4aa7473047b4714df175bf4d1cbb55592a7494e76c9a3ed00d351840246a6989d92933f3318438ad3873d
+  metadata.gz: 893d769390f42685a3046d44e8399f63548a971dd324462c0c7ddff7b000cd829ae7a48266ad51581747d3a0d52f0105d1cfb4e579390cac90c1e20f70ddec68
+  data.tar.gz: 53f5cb6aa31c5c08bb0c1ec24eb0994084b79f7f397ba5bb6d17db1b4aa3eb237c899cce34faf165838d373d0286dfcadf00b49e305cf2f621078e24533e3370

data/CHANGELOG.md

@@ -3,6 +3,12 @@
 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.
 
+## [4.5.3]
+- fix error exit code when unable to find task definition
+- fix upgrade for empty base setting
+- improve ufo destroy confirm message
+- #82 allow prepend_cluster
+
 ## [4.5.2]
 - add append_nothing option
 

data/docs/_docs/extras/dockerfile-erb.md

@@ -3,11 +3,11 @@ title: Dynamic Dockerfile.erb
 nav_order: 32
 ---
 
-Sometimes you may need a little more dynamic control of your Dockerfile. For these cases, ufo supports dynamically creating a Dockerfile from a Dockerfile.erb.  If Dockerfile.erb exists, ufo uses it to generate a Dockerfile as a part of the build process.  These means that you should update the source Dockerfile.erb instead, as the Dockerfile will be overwritten.  If Dockerfile.erb does not exist, then ufo will use the Dockerfile as-is.
+Sometimes you may need a little more dynamic control of your Dockerfile. For these cases, ufo supports dynamically creating a Dockerfile from a Dockerfile.erb.  If Dockerfile.erb exists, ufo uses it to generate a Dockerfile as a part of the build process.  These means that you should update the source Dockerfile.erb instead, as the Dockerfile will be overwritten.  If Dockerfile.erb does not exist, then ufo will use the Dockerfile instead.
 
 ## Example
 
-The Dockerfile.erb has access to variables defined in `dockerfile_variables.yml`. The variables should defined underneath an `UFO_ENV` key. Examples:
+The Dockerfile.erb has access to variables defined in `dockerfile_variables.yml`. The variables should be defined underneath a `UFO_ENV` key. Examples:
 
 .ufo/settings/dockerfile_variables.yml:
 
@@ -29,7 +29,7 @@ FROM <%= @base_image %>
 CMD ["bin/web"]
 ```
 
-When `UFO_ENV=production`, it'll produced the following.
+When `UFO_ENV=production`, it'll produce the following.
 
 Dockerfile:
 
@@ -39,11 +39,11 @@ FROM 778899001122.dkr.ecr.us-west-1.amazonaws.com/demo/sinatr:base-2019-06-10T03
 CMD ["bin/web"]
 ```
 
-The above example is demonstrates a good use-case. You may want a different FROM statement in your Dockerfile on a per-environment basis.  In this case, we're using different ECR repositories from different AWS accounts for development vs production. The FROM statement changes based on which AWS account you're using.
+The above example demonstrates a good use-case. You may want a different FROM statement in your Dockerfile on a per-environment basis.  In this case, we're using different ECR repositories from different AWS accounts for development vs. production. The FROM statement changes based on which AWS account you're using.
 
 ## General Steps
 
-The generl steps are:
+The general steps are:
 
 1. Create a Dockerfile.erb with `<%= @base_image %>`
 2. Run: `ufo docker base` to generate `dockerfile_variables.yml`
@@ -55,6 +55,6 @@ Remember when using the Dockerfile.erb, the Dockerfile is generated and overwrit
 
 Why not use [build args](https://www.jeffgeerling.com/blog/2017/use-arg-dockerfile-dynamic-image-specification)?
 
-Ufo uses a yaml file so users will not have to remember to provide the build arg. It is also easy to update the `dockerfile_variables.yml` with the `ufo docker base` command.
+Ufo uses a YAML file so users will not have to remember to provide the build arg. It is also easy to update the `dockerfile_variables.yml` with the `ufo docker base` command.
 
 {% include prev_next.md %}

data/docs/_docs/upgrading/upgrade4.5.md

@@ -45,8 +45,6 @@ Version | Setting
 4.4 | stack_naming: append_cluster
 4.5 | stack_naming: append_ufo_env
 
-Support for `prepend_cluster` may be **removed** in future versions.
-
 ## Reasoning
 
 CloudFormation names the resources it creates with the beginning portion of the stack name. When the stack name prepends the environment then resources like ELBs a little bit harder to identify since they might be named something like this `product-Elb-K0LFFQ9LK50W`. It makes it harder to distinguish ELBs from different apps created by ufo.

data/lib/ufo/base.rb

@@ -27,5 +27,9 @@ No CloudFormation stack named #{@stack_name.color(:green)} found.
 Are sure it exists?
       EOL
     end
+
+    def full_service
+      [@service, Ufo.env_extra].compact.join("-")
+    end
   end
 end

data/lib/ufo/core.rb

@@ -11,7 +11,7 @@ module Ufo
         puts "ERROR: Unable to find the task definition at #{task_definition_path}.".color(:red)
         puts "Are you sure you have defined it in ufo/template_definitions.rb and it has been generated correctly in .ufo/output?".color(:red)
         puts "If you are calling `ufo deploy` directly, you might want to generate the task definition first with `ufo tasks build`."
-        exit
+        exit 1
       end
     end
 

data/lib/ufo/destroy.rb

@@ -32,8 +32,8 @@ module Ufo
 
     def are_you_sure?
       return true if @options[:sure]
-      puts "You are about to destroy #{@service.color(:green)} service on the #{@cluster.color(:green)} cluster."
-      print "Are you sure you want to do this? (y/n) "
+      puts "You are about to destroy the #{@stack_name.color(:green)} stack. This contains the #{@service.color(:green)} service on the #{@cluster.color(:green)} cluster."
+      print "Are you sure you want to do this? (y/N) "
       answer = $stdin.gets.strip
       answer =~ /^y/
     end

data/lib/ufo/ps.rb

@@ -29,7 +29,7 @@ module Ufo
 
     def summary
       return unless @options[:summary]
-      puts "=> Service: #{@service}"
+      puts "=> Service: #{full_service}"
       puts "   Service name: #{service.service_name}"
       puts "   Status: #{service.status}"
       puts "   Running count: #{service.running_count}"

data/lib/ufo/scale.rb

@@ -18,7 +18,7 @@ module Ufo
         cluster: @cluster,
         desired_count: @count
       )
-      puts "Scale #{@service.color(:green)} service in #{@cluster.color(:green)} cluster to #{@count}" unless @options[:mute]
+      puts "Scale #{full_service.color(:green)} service in #{@cluster.color(:green)} to #{@count}" unless @options[:mute]
     end
 
     def service_exists?

data/lib/ufo/stack/helper.rb

@@ -17,8 +17,7 @@ class Ufo::Stack
     end
 
     def adjust_stack_name(cluster, service)
-      upgraded_namings = %w[append_ufo_env append_env append_cluster append_nothing prepend_nothing]
-      unless upgraded_namings.include?(settings[:stack_naming])
+      if settings[:stack_naming].nil?
         puts "WARN: In ufo v4.5 the UFO_ENV value gets appends to the end of the CloudFormation stack name.  This means a new stack gets created. You must upgrade to using the new stack and delete the old stack manually.  More info: https://ufoships.com/docs/upgrading/upgrade4.5/".color(:yellow)
         puts "To get rid of this warning you can add `stack_naming: append_ufo_env` to your `.ufo/settings.yml config. New versions of ufo init do this automatically."
         puts "Pausing for 20 seconds."
@@ -26,17 +25,16 @@ class Ufo::Stack
       end
 
       parts = case settings[:stack_naming]
-      when "append_ufo_env" # ufo v4.6
-        [service, Ufo.env, Ufo.env_extra]
+      when "prepend_cluster" # ufo v4.3 and below
+        [cluster, service, Ufo.env_extra] # legacy
       when "append_env", "append_cluster" # ufo v4.5
-        # append_env will be removed in the next major version in favor of apend_cluster.
-        # To avoid confusiong with append_ufo_env
+        # 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_nothing", "prepend_nothing"
         [service, Ufo.env_extra]
-      else
-        # legacy, to be removed in next major version
-        [cluster, service, Ufo.env_extra]
+      else # new default. ufo v4.5 and above
+        [service, Ufo.env, Ufo.env_extra]
       end
       parts.reject {|x| x==''}.compact.join('-') # stack_name
     end

data/lib/ufo/upgrade/upgrade43to45.rb

@@ -16,6 +16,7 @@ class Ufo::Upgrade
       end
 
       puts "Upgrading to ufo v4.5..."
+      settings["base"] ||= {}
       settings["base"]["stack_naming"] = "append_ufo_env"
       text = YAML.dump(settings)
       IO.write(settings_path, text)

data/lib/ufo/version.rb

@@ -1,3 +1,3 @@
 module Ufo
-  VERSION = "4.5.2"
+  VERSION = "4.5.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ufo
 version: !ruby/object:Gem::Version
-  version: 4.5.2
+  version: 4.5.3
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-14 00:00:00.000000000 Z
+date: 2019-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-cloudformation