broadside 1.2.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b7fbecd294a0d531f7b4696f4c28813ebbd9217
-  data.tar.gz: 3cef0f9e73cc5b926822c3ee1de1049da0e1cc18
+  metadata.gz: 1de9e1e538f010d28635f3fa1729f4ea8325583f
+  data.tar.gz: c7c2c7d1a3dc580a76a9e4793509ad1eff6f9e68
 SHA512:
-  metadata.gz: f321bfeb3749dc7a0d395b3366fbb7fd9604edfd01a5a49918602e27154e4fdadc5b590149ff561d4d438386b25c95470add1e035d2cab365fca4b9a1a4c8c16
-  data.tar.gz: 4192fdd935b51ad184e161c51ff1859ad75bfe1d956428c0e7ca0b76bf57bf0033f5aa96d50079ffa1b51aab366b9fa69ba1ad05db19a73447ebba7f22b07b72
+  metadata.gz: 73310a4a5dbd7bd54cf6a9dfbd93933acd91ba8b050c947b1726d89f45ac19f4155f15e82cdd556416168919fd15336dbd6946b99ac24caaf1d82d69c49bf8f9
+  data.tar.gz: 3ab6ffad553c01486c59ce3e27fa7446ace9e9ec9a5124aad6c168049be839fe5e0ab0994e42a7841a4749aeb1e91516d3b07f05c84036023f5a0b07aeaf0549

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 1.4.0
+= [#42](https://github.com/lumoslabs/broadside/pull/42/files): Update the task definition when running bootstrap
+
+# 1.3.0
+- [#41](https://github.com/lumoslabs/broadside/pull/41/files): Introduce the concept of bootstrap commands, which are designed to be run when setting up a new server or environment.
+
 # 1.2.1
 - [#35](https://github.com/lumoslabs/broadside/pull/35/files): Allows logtail to display more than 10 lines
 

data/Gemfile

@@ -2,3 +2,7 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in broadside.gemspec
 gemspec
+
+group :development, :test do
+  gem 'pry-byebug'
+end

data/bin/broadside

@@ -44,6 +44,10 @@ end
 
 desc 'Bootstrap your service and task definition from the configured definition.'
 command :bootstrap do |b|
+  subcmd.desc 'Docker tag for application container'
+  subcmd.arg_name 'TAG'
+  subcmd.flag [:tag]
+
   add_shared_deploy_configs(b)
 end
 

data/lib/broadside/configuration/deploy_config.rb

@@ -24,15 +24,17 @@ module Broadside
         :instance,
         :lines,
         :predeploy_commands,
+        :bootstrap_commands,
         :service_config,
         :task_definition_config
       )
 
       TARGET_ATTRIBUTE_VALIDATIONS = {
         scale: ->(target_attribute) { validate_types([Fixnum], target_attribute) },
-        env_file: ->(target_attribute) { validate_types([String], target_attribute) },
+        env_file: ->(target_attribute) { validate_types([String, Array], target_attribute) },
         command: ->(target_attribute) { validate_types([Array, NilClass], target_attribute) },
         predeploy_commands: ->(target_attribute) { validate_predeploy_commands(target_attribute) },
+        bootstrap_commands: ->(target_attribute) { validate_bootstrap_commands(target_attribute) },
         service_config: ->(target_attribute) { validate_types([Hash, NilClass], target_attribute) },
         task_definition_config: ->(target_attribute) { validate_types([Hash, NilClass], target_attribute) }
       }
@@ -49,6 +51,7 @@ module Broadside
         @env_vars = nil
         @command = nil
         @predeploy_commands = DEFAULT_PREDEPLOY_COMMANDS
+        @bootstrap_commands = []
         @instance = 0
         @service_config = nil
         @task_definition_config = nil
@@ -77,46 +80,68 @@ module Broadside
       # Loads deploy target data using provided target
       def load_target!
         validate_targets!
-        env_file = Pathname.new(@targets[@target][:env_file])
-
-        unless env_file.absolute?
-          dir = config.file.nil? ? Dir.pwd : Pathname.new(config.file).dirname
-          env_file = env_file.expand_path(dir)
-        end
-
-        if env_file.exist?
-          vars = Dotenv.load(env_file)
-          @env_vars = vars.map { |k, v| { 'name'=> k, 'value' => v } }
-        else
-          raise ArgumentError, "Could not find file '#{env_file}' for loading environment variables !"
-        end
+        load_env_vars!
 
         @scale ||= @targets[@target][:scale]
         @command = @targets[@target][:command]
-        # TODO: what's up with predeploy_commands.  ||= []?
         @predeploy_commands = @targets[@target][:predeploy_commands] if @targets[@target][:predeploy_commands]
+        @bootstrap_commands = @targets[@target][:bootstrap_commands] if @targets[@target][:bootstrap_commands]
         @service_config = @targets[@target][:service_config]
         @task_definition_config = @targets[@target][:task_definition_config]
       end
 
-      private
+      def load_env_vars!
+        @env_vars ||= {}
+
+        [@targets[@target][:env_file]].flatten.each do |env_path|
+          env_file = Pathname.new(env_path)
 
-      def self.validate_types(types, target_attribute)
-        if types.include?(target_attribute.class)
-          nil
-        else
-          "'#{target_attribute}' must be of type [#{types.join('|')}], got '#{target_attribute.class}' !"
+          unless env_file.absolute?
+            dir = config.file.nil? ? Dir.pwd : Pathname.new(config.file).dirname
+            env_file = env_file.expand_path(dir)
+          end
+
+          if env_file.exist?
+            vars = Dotenv.load(env_file)
+            @env_vars.merge!(vars)
+          else
+            raise ArgumentError, "Could not find file '#{env_file}' for loading environment variables !"
+          end
         end
+
+        # convert env vars to format ecs expects
+        @env_vars = @env_vars.map { |k, v| { 'name' => k, 'value' => v } }
       end
 
-      def self.validate_predeploy_commands(commands)
-        return nil if commands.nil?
-        return 'predeploy_commands must be an array' unless commands.is_a?(Array)
+      private
+
+      class << self
+        def validate_types(types, target_attribute)
+          if types.include?(target_attribute.class)
+            nil
+          else
+            "'#{target_attribute}' must be of type [#{types.join('|')}], got '#{target_attribute.class}' !"
+          end
+        end
+
+        def validate_predeploy_commands(commands)
+          validate_commands(commands, 'predeploy_commands')
+        end
+
+        def validate_bootstrap_commands(commands)
+          validate_commands(commands, 'bootstrap_commands')
+        end
+
+        def validate_commands(commands, attribute_name)
+          return nil if commands.nil?
+          return "#{attribute_name} must be an array" unless commands.is_a?(Array)
+
+          messages = commands.reject { |cmd| cmd.is_a?(Array) }.map do |command|
+            "#{attribute_name} '#{command}' must be an array" unless command.is_a?(Array)
+          end
 
-        messages = commands.reject { |cmd| cmd.is_a?(Array) }.map do |command|
-          "predeploy_command '#{command}' must be an array" unless command.is_a?(Array)
+          messages.empty? ? nil : messages.join(', ')
         end
-        messages.empty? ? nil : messages.join(', ')
       end
     end
   end

data/lib/broadside/deploy/ecs_deploy.rb

@@ -48,6 +48,7 @@ module Broadside
     def bootstrap
       if EcsManager.get_latest_task_definition_arn(family)
         info("Task definition for #{family} already exists.")
+        run_bootstrap_commands
       else
         unless @deploy_config.task_definition_config
           raise ArgumentError, "No first task definition and no :task_definition_config in '#{family}' configuration"
@@ -61,6 +62,8 @@ module Broadside
             container_definitions: [DEFAULT_CONTAINER_DEFINITION.merge(container_definition)]
           )
         )
+
+        run_bootstrap_commands
       end
 
       if EcsManager.service_exists?(config.ecs.cluster, family)
@@ -75,6 +78,16 @@ module Broadside
       end
     end
 
+    def run_bootstrap_commands
+      update_task_revision
+
+      begin
+        @deploy_config.bootstrap_commands.each { |command| run_command(command) }
+      ensure
+        EcsManager.deregister_last_n_tasks_definitions(family, 1)
+      end
+    end
+
     def rollback(count = @deploy_config.rollback)
       super do
         begin
@@ -279,4 +292,4 @@ module Broadside
       )
     end
   end
-end
+end

data/lib/broadside/version.rb

@@ -1,3 +1,3 @@
 module Broadside
-  VERSION = '1.2.1'
+  VERSION = '1.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: broadside
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.4.0
 platform: ruby
 authors:
 - Matthew Leung
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-29 00:00:00.000000000 Z
+date: 2017-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -185,3 +185,4 @@ signing_key:
 specification_version: 4
 summary: A command-line tool for EC2 Container Service deployment.
 test_files: []
+has_rdoc: