From b09d95c113fc02af8711bc96917b02cb0ced08e0 Mon Sep 17 00:00:00 2001 From: "apurvis@lumoslabs.com" Date: Sun, 26 Feb 2017 11:01:39 -0800 Subject: [PATCH 1/8] Make boostrap command optional; raise errors as needed --- lib/broadside/ecs/ecs_deploy.rb | 2 ++ lib/broadside/gli/commands.rb | 1 + 2 files changed, 3 insertions(+) diff --git a/lib/broadside/ecs/ecs_deploy.rb b/lib/broadside/ecs/ecs_deploy.rb index 1a655d5..aea0068 100644 --- a/lib/broadside/ecs/ecs_deploy.rb +++ b/lib/broadside/ecs/ecs_deploy.rb @@ -26,6 +26,8 @@ def full def bootstrap if EcsManager.get_latest_task_definition_arn(family) info "Task definition for #{family} already exists." + if @target.bootstrap_commands && !@target.tag + raise ConfigurationError, 'Bootstraping a task_definition requires a --tag option' else raise ConfigurationError, "No :task_definition_config for #{family}" unless @target.task_definition_config info "Creating an initial task definition for '#{family}' from the config..." diff --git a/lib/broadside/gli/commands.rb b/lib/broadside/gli/commands.rb index b3247db..8238c0d 100644 --- a/lib/broadside/gli/commands.rb +++ b/lib/broadside/gli/commands.rb @@ -25,6 +25,7 @@ def add_command_flags(cmd) desc 'Bootstrap your service and task definition from the configured definition.' command :bootstrap do |bootstrap| add_target_flag(bootstrap) + bootstrap.arg 'tag' :optional bootstrap.action do |_, options, _| Broadside::EcsDeploy.new(options).bootstrap From cc6af8f69188b6a49b25c26424dd342f82f95744 Mon Sep 17 00:00:00 2001 From: "apurvis@lumoslabs.com" Date: Sun, 26 Feb 2017 11:14:08 -0800 Subject: [PATCH 2/8] Fix spec --- lib/broadside/ecs/ecs_deploy.rb | 2 +- lib/broadside/gli/commands.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/broadside/ecs/ecs_deploy.rb b/lib/broadside/ecs/ecs_deploy.rb index aea0068..f0bf682 100644 --- a/lib/broadside/ecs/ecs_deploy.rb +++ b/lib/broadside/ecs/ecs_deploy.rb @@ -26,7 +26,7 @@ def full def bootstrap if EcsManager.get_latest_task_definition_arn(family) info "Task definition for #{family} already exists." - if @target.bootstrap_commands && !@target.tag + elsif @target.bootstrap_commands && !@target.tag raise ConfigurationError, 'Bootstraping a task_definition requires a --tag option' else raise ConfigurationError, "No :task_definition_config for #{family}" unless @target.task_definition_config diff --git a/lib/broadside/gli/commands.rb b/lib/broadside/gli/commands.rb index 8238c0d..c546019 100644 --- a/lib/broadside/gli/commands.rb +++ b/lib/broadside/gli/commands.rb @@ -24,8 +24,8 @@ def add_command_flags(cmd) desc 'Bootstrap your service and task definition from the configured definition.' command :bootstrap do |bootstrap| - add_target_flag(bootstrap) bootstrap.arg 'tag' :optional + add_target_flag(bootstrap) bootstrap.action do |_, options, _| Broadside::EcsDeploy.new(options).bootstrap From f6ca6b8c7a5dd5646feab8047c7aa115113c9249 Mon Sep 17 00:00:00 2001 From: "apurvis@lumoslabs.com" Date: Sun, 26 Feb 2017 15:21:22 -0800 Subject: [PATCH 3/8] Make the flag show up in help and actually be optional --- lib/broadside/gli/commands.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/broadside/gli/commands.rb b/lib/broadside/gli/commands.rb index 8b2c096..6d30208 100644 --- a/lib/broadside/gli/commands.rb +++ b/lib/broadside/gli/commands.rb @@ -25,7 +25,9 @@ def add_command_flags(cmd) desc 'Bootstrap your service and task definition from the configured definition.' command :bootstrap do |bootstrap| bootstrap.desc 'Optionally configured tag - without it you cannot bootstrap a task_definition' - bootstrap.arg 'tag' :optional + bootstrap.arg_name 'TAG' + bootstrap.flag 'tag', :optional + add_target_flag(bootstrap) bootstrap.action do |_, options, _| From 60e4143b50dbab57a92275bdc245c7c48716d06b Mon Sep 17 00:00:00 2001 From: "apurvis@lumoslabs.com" Date: Sun, 5 Mar 2017 12:55:47 -0800 Subject: [PATCH 4/8] Misspelling --- lib/broadside/ecs/ecs_deploy.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/broadside/ecs/ecs_deploy.rb b/lib/broadside/ecs/ecs_deploy.rb index f21adef..de9e0b7 100644 --- a/lib/broadside/ecs/ecs_deploy.rb +++ b/lib/broadside/ecs/ecs_deploy.rb @@ -27,7 +27,7 @@ def bootstrap if EcsManager.get_latest_task_definition_arn(family) info "Task definition for #{family} already exists." elsif @target.bootstrap_commands && !@target.tag - raise ConfigurationError, 'Bootstraping a task_definition requires a --tag option' + raise ConfigurationError, 'Bootstrapping a task_definition requires a --tag option' else raise ConfigurationError, "No :task_definition_config for #{family}" unless @target.task_definition_config info "Creating an initial task definition for '#{family}' from the config..." From 2d32f12793bfd959c5b3cc99cfd44c1ad4df406e Mon Sep 17 00:00:00 2001 From: "apurvis@lumoslabs.com" Date: Sun, 5 Mar 2017 12:56:15 -0800 Subject: [PATCH 5/8] Version --- lib/broadside/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/broadside/version.rb b/lib/broadside/version.rb index 913ed39..84242cc 100644 --- a/lib/broadside/version.rb +++ b/lib/broadside/version.rb @@ -1,3 +1,3 @@ module Broadside - VERSION = '3.0.5'.freeze + VERSION = '3.0.6'.freeze end From 4885793b492001bd9c8701ccb6a8aff2fc62483d Mon Sep 17 00:00:00 2001 From: "apurvis@lumoslabs.com" Date: Sun, 5 Mar 2017 12:59:10 -0800 Subject: [PATCH 6/8] Changelog --- CHANGELOG.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3d2fa1f..ceab3c9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +# 3.0.6 +- `--tag` option is optional while bootstrapping + +# 3.0.5 +- Make `update_service` work correctly for services configured with load balancers + +# 3.0.4 +- `--tag` option required during bootstrapping + # 3.0.3 - update of GLI specifications, adding on to 3.0.2 From 9b7dc9ff15e3a3603c9034e2845bcdc160ceaea0 Mon Sep 17 00:00:00 2001 From: "apurvis@lumoslabs.com" Date: Mon, 6 Mar 2017 15:53:46 -0800 Subject: [PATCH 7/8] Always raise ConfigurationError if bootstrapping a task_definition without a --tag --- lib/broadside/ecs/ecs_deploy.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/broadside/ecs/ecs_deploy.rb b/lib/broadside/ecs/ecs_deploy.rb index de9e0b7..900a46f 100644 --- a/lib/broadside/ecs/ecs_deploy.rb +++ b/lib/broadside/ecs/ecs_deploy.rb @@ -26,10 +26,9 @@ def full def bootstrap if EcsManager.get_latest_task_definition_arn(family) info "Task definition for #{family} already exists." - elsif @target.bootstrap_commands && !@target.tag - raise ConfigurationError, 'Bootstrapping a task_definition requires a --tag option' else raise ConfigurationError, "No :task_definition_config for #{family}" unless @target.task_definition_config + raise ConfigurationError, 'Bootstrapping a task_definition requires a --tag option' unless @target.tag info "Creating an initial task definition for '#{family}' from the config..." EcsManager.ecs.register_task_definition( From 9ad6353ac75bc17e29c07e551899b58979d04a6e Mon Sep 17 00:00:00 2001 From: "apurvis@lumoslabs.com" Date: Mon, 6 Mar 2017 15:55:42 -0800 Subject: [PATCH 8/8] changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ceab3c9..92c0e5d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,5 @@ # 3.0.6 -- `--tag` option is optional while bootstrapping +- `--tag` option is optional while bootstrapping if you already have a configured `task_definition` # 3.0.5 - Make `update_service` work correctly for services configured with load balancers