ecs_deployer 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 12a1a6119ccbfa559a988d6a7ccbc3804c8a746d
-  data.tar.gz: 6676d951da1365975628e81125c4d22437409094
+  metadata.gz: 766a0d93cdf1477bf6ffb712a215f11c760eb4e9
+  data.tar.gz: dc0faa2dc4f507e278ea14483ceba4e1580ab767
 SHA512:
-  metadata.gz: cc408464570b09cb10cc4a4be000212be87c6b121d62498566d751ae8104f26f24f1d9468a1ec5e5fe50dd14a637f17b14dacf2cdf8e0908727c23c993163af1
-  data.tar.gz: e8ab53a763ea7aba4e88419dbebaee9cce021f027f3200d2e64310f9dc7418288110378989eb81568d9e468d95912cc10e67ce5b0ae2ed26ad78cd69eaebd4e7
+  metadata.gz: 4c183066a8a94005bf1ee9cc687a328a91c07ee16f34749565cff92932abb13099ddf95682b15ffb280dfcb51a34055c00570e882b49e45df0b4d5d827cd8ccb
+  data.tar.gz: e862a11e30b72b8b8bce1c92c40a93c3e1882afe9f8033da25294c5faeaf96ec510256bab2a906180aa56135918da7fe6bf525d127a2bd94d908215327a317f6

data/README.md

@@ -19,13 +19,13 @@ gem 'ecs_deployer'
 
 And then execute:
 
-```
+```ruby
 $ bundle
 ```
 
 Or install it yourself as:
 
-```
+```ruby
 $ gem install ecs_deployer
 ```
 
@@ -34,7 +34,7 @@ $ gem install ecs_deployer
 Write task definition in YAML format.
 For available parameters see [Task Definition Parameters](http://docs.aws.amazon.com/AmazonECS/latest/developerguide/task_definition_parameters.html).
 
-```
+```yaml
 container_definitions:
 - name: wordpress
   links:
@@ -62,7 +62,7 @@ family: hello_world
 `environment` parameter supports KMS encrypted values.
 Encrypted values must be enclosed in `${XXX}`.
 
-```
+```yaml
 - environment:
   - name: MYSQL_ROOT_PASSWORD
     value: ${fiSAIfIFxd...}
@@ -76,36 +76,48 @@ Values are decrypted when task is created.
 
 This sample file is in `spec/fixtures/task.yml`.
 
-```
+```ruby
 deployer = EcsDeployer::Client.new
 deployer.register_task('development.yml')
 deployer.update_service('cluster', 'development')
 ```
 
+`{{xxx}}` parameter is construed variable.
+
+```yaml
+container_definitions:
+- name: wordpress
+  image: wordpress:{{tag}}
+```
+
+```ruby
+deployer.register_task('development.yml', tag: 'latest')
+```
+
 ### CLI
 
 #### Register new task
 
-```
+```ruby
 $ bundle exec ecs_deployer task-register --path=example/fixtures/task.yml
 ```
 
 #### Encrypt environment value
 
-```
+```ruby
 $ bundle exec ecs_deployer encrypt --master-key=master --value='test'
 Encrypted value: ${xxx}
 ```
 
 #### Decrypt environment value
 
-```
+```ruby
 $ bundle exec ecs_deployer decrypt --value='${xxx}'
 Decrypted value: xxx
 ```
 
 #### Update service
 
-```
+```ruby
 $ bundle exec ecs_deployer update-service --cluster=xxx --service=xxx --wait --timeout=600
 ```

data/example/sample.rb

@@ -4,5 +4,5 @@ require 'ecs_deployer'
 path = File.expand_path('../spec/fixtures/task.yml', File.dirname(File.realpath(__FILE__)))
 
 deployer = EcsDeployer::Client.new
-deployer.register_task(path)
+deployer.register_task(path, tag: 'latest')
 # deployer.update_service('sandbox', 'production')

data/lib/ecs_deployer/cli.rb

@@ -24,9 +24,10 @@ module EcsDeployer
 
     desc 'task_register', 'Create new task definition'
     option :path, required: true
+    option :replace_variables, type: :hash, default: {}
     def task_register
       path = File.expand_path(options[:path], Dir.pwd)
-      result = @deployer.register_task(path)
+      result = @deployer.register_task(path, options[:replace_variables])
 
       puts "Registered task: #{result}"
     end
@@ -54,7 +55,7 @@ module EcsDeployer
       puts "Encrypted value: #{@deployer.encrypt(options[:master_key], options[:value])}"
     end
 
-    desc 'encrypt', 'Decrypt value of argument with KMS.'
+    desc 'decrypt', 'Decrypt value of argument with KMS.'
     option :value, required: true
     def decrypt
       puts "Decrypted value: #{@deployer.decrypt(options[:value])}"

data/lib/ecs_deployer/client.rb

@@ -47,17 +47,21 @@ module EcsDeployer
     end
 
     # @param [String] path
+    # @param [Hash] params
     # @return [String]
-    def register_task(path)
+    def register_task(path, params = {})
       raise IOError, "File does not exist. [#{path}]" unless File.exist?(path)
 
-      register_task_hash(YAML.load(File.read(path)))
+      register_task_hash(YAML.load(File.read(path)), params)
     end
 
     # @param [Hash] task_definition
+    # @param [Hash] params
     # @return [String]
-    def register_task_hash(task_definition)
+    def register_task_hash(task_definition, replace_variables = {})
       task_definition = Oj.load(Oj.dump(task_definition), symbol_keys: true)
+
+      replace_parameter_variables!(task_definition, replace_variables)
       decrypt_environment_variables!(task_definition)
 
       result = @cli.register_task_definition(
@@ -115,6 +119,20 @@ module EcsDeployer
 
     private
 
+    # @param [Array, Hash] variables
+    # @param [Hash] replace_variables
+    def replace_parameter_variables!(variables, replace_variables = {})
+      for variable in variables do
+        if variable.class == Array || variable.class == Hash
+          replace_parameter_variables!(variable, replace_variables)
+        elsif variable.class == String
+          replace_variables.each do |replace_key, replace_value|
+            variable.gsub!("{{#{replace_key}}}", replace_value)
+          end
+        end
+      end
+    end
+
     # @param [Hash] task_definition
     def decrypt_environment_variables!(task_definition)
       raise TaskDefinitionValidateError, '\'container_definition\' is undefined.' unless task_definition.key?(:container_definitions)

data/lib/ecs_deployer/version.rb

@@ -1,3 +1,3 @@
 module EcsDeployer
-  VERSION = '1.0.1'.freeze
+  VERSION = '1.0.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecs_deployer
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - naomichi-y
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-25 00:00:00.000000000 Z
+date: 2017-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: runtime_command
@@ -222,7 +222,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Deploy application to ECS.