ufo 1.6.2 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 719240a41b0030380ceb747403c3fb272120a9be
-  data.tar.gz: 8238a183e5602cc44f7681091a9bb823541f3ec5
+  metadata.gz: 2849f6fd26333671d12f542633c7a27819560d31
+  data.tar.gz: 5d9ae17fa3c35972c2a739cddc7020d82e9ff4c9
 SHA512:
-  metadata.gz: 5aa712d256743f80d959653230cfc4f5542ff98aa315ea33012c4e93ac4810206dee120ac39c9c4b26c5ce0957e5d6126915813d46e153405d36684c8004d003
-  data.tar.gz: 9e4707e07e52225a45f378a8f358d8033de2b39298b1014d03ebbd2b941ee157789ab28c8286dea1b77994e71a6f7dffb1ca4db5c974113443649080cc016f91
+  metadata.gz: 6d0cfef955d9f13cd416b94d9110fd45d6a9ec5e916bfc021c1f85efe94a3ac37068b9736c28526e681fc124dbd26b4c69fe0a26eb6b5c60f95f585cb2781cb0
+  data.tar.gz: e6c0e2c981e36b99b69e72273c1ea2ca2104651db6800013d36eca85324f1463327b0a4ca52015d98867b6f384b261710b9f01e912edb3649c3f71fce8702368

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.
 
+## [1.7.0]
+* automatically create task definintion log group
+
+## [1.6.3]
+* fix target_group_prompt
+
 ## [1.6.2]
 * update bin/deploy starter project script
 * update help menu

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ufo (1.5.0)
+    ufo (1.7.0)
       aws-sdk
       colorize
       deep_merge
@@ -20,14 +20,14 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    aws-sdk (2.9.37)
-      aws-sdk-resources (= 2.9.37)
-    aws-sdk-core (2.9.37)
+    aws-sdk (2.10.21)
+      aws-sdk-resources (= 2.10.21)
+    aws-sdk-core (2.10.21)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.9.37)
-      aws-sdk-core (= 2.9.37)
-    aws-sigv4 (1.0.0)
+    aws-sdk-resources (2.10.21)
+      aws-sdk-core (= 2.10.21)
+    aws-sigv4 (1.0.1)
     builder (3.2.3)
     byebug (9.0.6)
     codeclimate-test-reporter (1.0.8)
@@ -37,10 +37,10 @@ GEM
     diff-lcs (1.3)
     docile (1.1.5)
     hashie (3.5.5)
-    i18n (0.8.4)
+    i18n (0.8.6)
     jmespath (1.3.1)
     json (2.1.0)
-    minitest (5.10.2)
+    minitest (5.10.3)
     plissken (0.3.0)
       symbolize (~> 4.2)
     rake (12.0.0)

data/README.md

@@ -1,6 +1,12 @@
+<div align="center">
+  <img src="http://ufoships.com/img/logos/ufo-logo.png" />
+</div>
+
 # Ufo - Easy Way to Build and Ship Docker to AWS ECS
 
 [![CircleCI](https://circleci.com/gh/tongueroo/ufo.svg?style=svg)](https://circleci.com/gh/tongueroo/ufo)
+[![Join the chat at https://gitter.im/tongueroo/ufo](https://badges.gitter.im/tongueroo/ufo.svg)](https://gitter.im/tongueroo/ufo?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![Support](https://img.shields.io/badge/get-support-blue.svg)](https://boltops.com?utm_source=badge&utm_medium=badge&utm_campaign=ufo)
 
 Ufo is a tool that makes building and shipping Docker images to [AWS ECS](https://aws.amazon.com/ecs/) super easy.
 

data/docs/_config.yml

@@ -2,13 +2,14 @@
 title: Ufo
 email: tongueroo@gmail.com
 url: http://ufoships.com
-description: "An Easy Way to Build and Ship Docker Images to AWS ECS"
+description: "Easy Way to Build and Ship Docker Images to AWS ECS"
 keywords: "AWS EC2 Container Service, AWS ECS, UFO, Deploy to ECS, ufo ship"
 skills: ""
 meta_author: Tung Nguyen
 
 # Google webmaster tools
 google_verify:
+google_analytics: UA-98684555-4
 
 # https://ssl.bing.com/webmaster/configure/verify/ownership Option 2 content= goes here
 bing_verify:

data/docs/_docs/structure.md

@@ -2,7 +2,7 @@
 title: Structure
 ---
 
-Ufo creates a ufo folder within your project which contains the required files used by for ufo to build and deploy docker images to ECS.  The standard directory structure of the ufo folder looks like this:
+Ufo creates a ufo folder within your project which contains the required files used by ufo to build and deploy docker images to ECS.  The standard directory structure of the ufo folder looks like this:
 
 ```sh
 ufo
@@ -18,8 +18,8 @@ The table below covers the purpose of each folder and file.
 File / Directory  | Description
 ------------- | -------------
 <code>output/</code>  | The folder where the generated task definitions are written to.  The way the task definitions are generated are covered in [ufo tasks build]({% link _docs/tutorial-ufo-tasks-build.md %}).
-<code>settings.yml</code>  | Ufo's settings file, where you and adjust the default settings.
-<code>task_definitions.rb</code>  | This where you define the task definitions and specify the variables to be used for the ERB templates.
+<code>settings.yml</code>  | Ufo's settings file, where you and adjust the default [settings]({% link _docs/settings.md %}).
+<code>task_definitions.rb</code>  | This where you define the task definitions and specify the variables to be used by the ERB templates.
 <code>templates/</code>  | The ERB templates with the task definition json code.  The template are covered in more detail in [ufo tasks build]({% link _docs/tutorial-ufo-tasks-build.md %}).
 <code>templates/main.json.erb</code>  | This is the main and starter template task definition json file that ufo initially generates.
 

data/docs/_docs/ufo-init.md

@@ -2,7 +2,7 @@
 title: ufo init
 ---
 
-The `ufo init` command provides a way to quickly setup a project to be ufo ready. It creates a ufo with all the starter supporting files in order to use ufo.  This page demonstrates how to use `ufo init`.  The command has a few required options `--app`, `--env`, `--cluster`, and `--image`.
+The `ufo init` command provides a way to quickly setup a project to be ufo ready. It creates a ufo folder with all the starter supporting files in order to use ufo.  This page demonstrates how to use `ufo init`.  The command has a few required options `--app`, `--env`, `--cluster`, and `--image`.
 
 For this example we will use [tongueroo/hi](https://github.com/tongueroo/hi) which is a small test sinatra app.
 

data/docs/_includes/about.html

@@ -9,7 +9,7 @@
             </div>
             <div class="row">
                 <div class="col-lg-4 col-lg-offset-2">
-                    <p>Ufo is a tool that makes building and shipping Docker containers to AWS ECS super easy. At a basic level, ufo builds the docker container image, registers that image to ECS as a task definition, and then deploys that task definition to ECS by updating the service. Ufo provides a `ufo ship` command that deploys your code to ECS.</p>
+                    <p>Ufo is a tool that makes building and shipping Docker containers to AWS ECS super easy. At a basic level, ufo builds the docker container image, registers that image to ECS as a task definition, and then deploys that task definition to ECS by updating the service. Ufo provides a <code>ufo ship</code> command that deploys your code to ECS.</p>
                 </div>
                 <div class="col-lg-4">
                     <p>Ufo was built directly from real life production use cases after seeing the same patterns repeated over and over. Ufo allows you to write the AWS task definition json format file in ERB, an easy templating language.  This allows you to reuse the ufo tool with multiple applications and only put the truly application specific business logic in each app code base.</p>

data/docs/_includes/google_analytics.html

@@ -0,0 +1,10 @@
+<!-- Google analytics -->
+<script>
+  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+  })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+
+  ga('create', '{{ site.google_analytics }}', 'auto');
+  ga('send', 'pageview');
+</script>

data/docs/_includes/header.html

@@ -3,7 +3,7 @@
         <div class="container">
             <div class="row">
                 <div class="col-lg-12">
-                    <img class="img-responsive" src="/img/ufo.jpg" alt="">
+                    <img class="img-responsive" src="/img/logos/ufo-logo.png" alt="">
                     <div class="intro-text">
                         <span class="name">{{ site.title }}</span>
                         <hr class="star-light">

data/docs/_includes/js.html

@@ -26,3 +26,7 @@
     {% endif %}
 
     <script src="{{ "/js/nav.js" }}"></script>
+
+    {% if site.google_analytics and jekyll.environment == "production" %}
+    {% include google_analytics.html %}
+    {% endif %}

data/docs/_includes/nav.html

@@ -9,7 +9,7 @@
                     <span class="icon-bar"></span>
                     <span class="icon-bar"></span>
                 </button>
-                <a class="navbar-brand" href="/#page-top"><img class="navbar-logo" src="/img/logos/boltops-logo.png" />{{ site.title }}</a>
+                <a class="navbar-brand" href="/#page-top"><img class="navbar-logo" src="/img/logos/ufo-site-header.png" />{{ site.title }}</a>
             </div>
 
             <!-- Collect the nav links, forms, and other content for toggling -->

data/lib/ufo/aws_services.rb

@@ -13,5 +13,9 @@ module Ufo
     def ecr
       @ecr ||= Aws::ECR::Client.new
     end
+
+    def cloudwatchlogs
+      @cloudwatchlogs ||= Aws::CloudWatchLogs::Client.new
+    end
   end
 end

data/lib/ufo/cli.rb

@@ -49,6 +49,7 @@ module Ufo
 
       task_definition = options[:task] || service # convention
       Tasks::Builder.register(task_definition, options) if options[:tasks]
+      LogGroup.new(task_definition, options).create
       ship = Ship.new(service, task_definition, options)
       ship.deploy
 
@@ -65,6 +66,7 @@ module Ufo
         service_name, task_defintion_name = service.split(':')
         task_definition = task_defintion_name || service_name # convention
         Tasks::Builder.register(task_definition, options) if options[:tasks]
+        LogGroup.new(task_definition, options).create
         ship = Ship.new(service, task_definition, options)
         ship.deploy
       end

data/lib/ufo/log_group.rb

@@ -0,0 +1,33 @@
+# Use to automatically create the CloudWatch group
+module Ufo
+  class LogGroup
+    include AwsServices
+
+    def initialize(task_definition, options)
+      @task_definition, @options = task_definition, options
+    end
+
+    def create
+      puts "Ensuring log group for #{@task_definition} exists"
+      return if @options[:noop]
+      task_def = JSON.load(IO.read(task_def_path))
+      task_def["containerDefinitions"].each do |container_def|
+        begin
+          log_group_name = container_def["logConfiguration"]["options"]["awslogs-group"]
+        rescue NoMethodError
+          # silence when the logConfiguration is not specified
+        end
+
+        create_log_group(log_group_name) if log_group_name
+      end
+    end
+
+    def create_log_group(log_group_name)
+      cloudwatchlogs.create_log_group(log_group_name: log_group_name)
+    end
+
+    def task_def_path
+      "./ufo/output/#{@task_definition}.json"
+    end
+  end
+end

data/lib/ufo/settings.rb

@@ -15,7 +15,7 @@ module Ufo
         @data = YAML.load_file(settings_path)
         @data = user_settings.merge(@data)
       else
-        puts "ERROR: No settings file at #{settings_path}"
+        puts "ERROR: No settings file at #{settings_path}.  Are you sure you are in a project with ufo setup?"
         puts "Please create a settings file via: ufo init"
         exit 1
       end

data/lib/ufo/ship.rb

@@ -227,8 +227,9 @@ module Ufo
     # the ECS console.  `ufo scale` will allow you to updated the desired_count from the
     # CLI though.
     def create_service
+      puts "This service #{@service} does not yet exist in the #{@cluster} cluster.  This deploy will create it."
       container = container_info(@task_definition)
-      target_group = create_service_prompt(container)
+      target_group = target_group_prompt(container)
 
       message = "#{@service} service created on #{@cluster} cluster"
       if @options[:noop]
@@ -245,7 +246,7 @@ module Ufo
           task_definition: @task_definition
         }
         unless target_group.nil? || target_group.empty?
-          add_load_balancer!(container, options)
+          add_load_balancer!(container, options, target_group)
         end
         response = ecs.create_service(options)
         service = response.service # must set service here since this might never be called if @wait_for_deployment is false
@@ -285,14 +286,14 @@ module Ufo
     # Only support Application Load Balancer
     # Think there is an AWS bug that complains about not having the LB
     # name but you cannot pass both a LB Name and a Target Group.
-    def add_load_balancer!(container, options)
+    def add_load_balancer!(container, options, target_group)
       options.merge!(
         role: "ecsServiceRole", # assumption that we're using the ecsServiceRole
         load_balancers: [
           {
             container_name: container[:name],
             container_port: container[:port],
-            target_group_arn: @options[:target_group],
+            target_group_arn: target_group,
           }
         ]
       )
@@ -301,16 +302,17 @@ module Ufo
     # Returns the target_group.
     # Will only allow an target_group and the service to use a load balancer
     # if the container name is "web".
-    def create_service_prompt(container)
+    def target_group_prompt(container)
       return if @options[:noop]
+      # If a target_group is provided at the CLI return it right away.
+      return @options[:target_group] if @options[:target_group]
+      # Allows skipping the target group prompt.
       return unless @target_group_prompt
-      if container[:name] != "web" and @options[:target_group]
-        puts "WARNING: A --target-group #{@options[:target_group]} was provided but it will not be used because this not a web container.  Container name: #{container[:name].inspect}."
-      end
+
+      # If the container name is web then it is assume that this is a web service that
+      # needs a target group/elb.
       return unless container[:name] == 'web'
-      return @options[:target_group] if @options[:target_group]
 
-      puts "This service #{@service} does not yet exist in the #{@cluster} cluster.  This deploy will create it."
       puts "Would you like this service to be associated with an Application Load Balancer?"
       puts "If yes, please provide the Application Load Balancer Target Group ARN."
       puts "If no, simply press enter."

data/lib/ufo/version.rb

@@ -1,3 +1,3 @@
 module Ufo
-  VERSION = "1.6.2"
+  VERSION = "1.7.0"
 end

data/lib/ufo.rb

@@ -17,6 +17,7 @@ module Ufo
   autoload :Destroy, 'ufo/destroy'
   autoload :DSL, 'ufo/dsl'
   autoload :Scale, 'ufo/scale'
+  autoload :LogGroup, 'ufo/log_group'
 
   autoload :Docker, 'ufo/docker'
   autoload :Ecr, 'ufo/ecr'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ufo
 version: !ruby/object:Gem::Version
-  version: 1.6.2
+  version: 1.7.0
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-22 00:00:00.000000000 Z
+date: 2017-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -220,6 +220,7 @@ files:
 - docs/_includes/edit-on-github.html
 - docs/_includes/example.html
 - docs/_includes/footer.html
+- docs/_includes/google_analytics.html
 - docs/_includes/head.html
 - docs/_includes/header.html
 - docs/_includes/js.html
@@ -243,12 +244,14 @@ files:
 - docs/docs.md
 - docs/img/logos/boltops-logo-full.png
 - docs/img/logos/boltops-logo.png
+- docs/img/logos/ufo-logo.png
+- docs/img/logos/ufo-site-header.png
+- docs/img/logos/ufo.jpg
 - docs/img/tutorials/ecs-console-task-definitions.png
 - docs/img/tutorials/ecs-console-ufo-ship.png
 - docs/img/tutorials/ecs-console-ufo-ships.png
 - docs/img/tutorials/ufo-init.png
 - docs/img/tutorials/ufo-tasks-build.png
-- docs/img/ufo.jpg
 - docs/index.html
 - docs/js/bootstrap.js
 - docs/js/bootstrap.min.js
@@ -290,6 +293,7 @@ files:
 - lib/ufo/ecr/auth.rb
 - lib/ufo/ecr/cleaner.rb
 - lib/ufo/init.rb
+- lib/ufo/log_group.rb
 - lib/ufo/scale.rb
 - lib/ufo/settings.rb
 - lib/ufo/ship.rb