ecs_deployer 2.2.2 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 44c5cee885a21a7246c87d44fb432810dac14ec21fe2c706d8d0a5d5d05c95a4
-  data.tar.gz: 634d77479c637484e95a05a45fdabf838f57baa0c4933735aaf767d3f950a3a3
+SHA1:
+  metadata.gz: bd00fa1ac3cc92c3a9a53e46415a3ce7d14786b9
+  data.tar.gz: 5829d3e3415defebd527a82e4a1e27dd375b6a57
 SHA512:
-  metadata.gz: a3ff58103c942b69fdcc203a275aa1c097019dc20af226b9862858b64982123205a37fdbe011c0199c6664ebede7d1304e2ab45ab42968ea0f62f427f89ce2e0
-  data.tar.gz: add7ad99bf8d8bdfd832d6f743bdf968cdb7802e0c53f4190dbe5e20d1237fc5b9266be40dc78b48663951a72a7918eddfba6f9adda9788620b332f9343662f8
+  metadata.gz: a0421a84b469e591fe1cb8e5041b5f1b834622a2ac46338cf3fef7b1399561d043e13800ac8095c943b4c4b9128e76419a1f3ee78bad7a237c3511688569395a
+  data.tar.gz: 352529a94b8724e550d5cb6e797bf88f33e8edd90ee609e85ed3248e058f04230dcd44e8e14fe10c58a08e473d5741ed957a0c2c4cd50963e98c39ecb5724219

data/.circleci/config.yml

@@ -0,0 +1,30 @@
+version: 2
+jobs:
+  build:
+    docker:
+      - image: circleci/ruby:2.6.2
+        environment:
+          CC_TEST_REPORTER_ID: 1cb1989f71aaacc808297279555f70439ed7dcfe5fcf90248b8462c494d2cb1e
+    working_directory: ~/ecs_deployer
+    steps:
+      - checkout
+      - restore_cache:
+          key: bundle-{{ checksum "Gemfile.lock" }}
+      - run:
+          name: bundle install
+          command: bundle install --jobs=4
+      - save_cache:
+          key: bundle-{{ checksum "Gemfile.lock" }}
+          paths:
+            - vendor/bundle
+      - run:
+          name: Setup Code Climate
+          command: |
+            curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
+            chmod +x ./cc-test-reporter
+      - run:
+          name: rspec test
+          command: |
+            ./cc-test-reporter before-build
+            bundle exec rspec
+            ./cc-test-reporter after-build --coverage-input-type simplecov --exit-code $?

data/.dockerignore

@@ -0,0 +1 @@
+.git

data/.env.default

@@ -0,0 +1,9 @@
+AWS_ACCESS_KEY_ID=
+AWS_SECRET_ACCESS_KEY=
+AWS_REGION=ap-northeast-1
+ECS_CLUSTER=
+ECS_SERVICE=
+ECS_TASK_PATH=./spec/fixtures/task.yml
+ECS_SCHEDULED_TASK_TARGET_ID=
+ECS_SCHEDULED_TASK_RULE_ID=
+CLOUDWATCH_EVENT_ARN=

data/.gitignore

@@ -1,13 +1,13 @@
-/.bundle/
 /.yardoc
 /Gemfile.lock
 /_yardoc/
 /doc/
 /pkg/
 /spec/reports/
-/tmp/
-/vendor/
-config.local.yml
 
 # rspec failure tracking
-.rspec_status
+/.rspec_status
+
+/coverage
+.env
+/example/conf/task.yml

data/.rubocop.yml

@@ -2,7 +2,7 @@ AllCops:
   Exclude:
   - 'tmp/**/*'
   - 'vendor/**/*'
-Lint/RescueWithoutErrorClass:
+Style/RescueStandardError:
   Enabled: false
 Style/BlockComments:
   Enabled: false

data/Dockerfile

@@ -0,0 +1,7 @@
+FROM ruby:2.6.3-alpine3.10
+
+RUN apk add git build-base
+WORKDIR /app
+
+COPY . .
+RUN bundle install

data/README.md

@@ -73,40 +73,30 @@ Values are decrypted when task is created.
 
 ## Usage
 
-### API
+### Register new task
 
-Refer to [sample code](https://github.com/naomichi-y/ecs_deployer/tree/master/example).
-
-```ruby
-deployer.register_task('development.yml', tag: 'latest')
 ```
-
-### CLI
-
-#### Register new task
-
-```bash
 $ bundle exec ecs_deployer task-register --path=spec/fixtures/task.yml --replace-variables=tag:latest
 Registered task: arn:aws:ecs:ap-northeast-1:xxx:task-definition/nginx:latest
 ```
 
-#### Encrypt environment value
+### Encrypt environment value
 
-```bash
+```
 $ bundle exec ecs_deployer encrypt --master-key=master --value='test'
 Encrypted value: ${xxx}
 ```
 
-#### Decrypt environment value
+### Decrypt environment value
 
-```bash
+```
 $ bundle exec ecs_deployer decrypt --value='${xxx}'
 Decrypted value: xxx
 ```
 
-#### Update service
+### Update service
 
-```bash
+```
 $ bundle exec ecs_deployer update-service --cluster=xxx --service=xxx --wait --wait-timeout=600
 Start deploying...
 Deploying... [0/1] (20 seconds elapsed)
@@ -129,6 +119,18 @@ New task definition: arn:aws:ecs:ap-northeast-1:xxxx:task-definition/sandbox-dev
 Update service: arn:aws:ecs:ap-northeast-1:xxxx:service/development
 ```
 
+## SDK
+
+### Example
+```
+$ cp .env.default .env
+$ docker-compose-build
+
+$ docker-compose run --rm ruby bundle exec ruby example/register_task.rb
+$ docker-compose run --rm ruby bundle exec ruby example/update_service.rb
+$ docker-compose run --rm ruby bundle exec ruby example/update_scheduled_task.rb
+```
+
 ## License
 
 MIT

data/docker-compose.yml

@@ -0,0 +1,10 @@
+version: '3'
+services:
+  ruby:
+    container_name: ecs_deployer_ruby
+    build:
+      context: .
+    volumes:
+      - .:/app
+      - ${ECS_TASK_PATH}:/app/example/conf/task.yml
+    env_file: .env

data/ecs_deployer.gemspec

@@ -1,4 +1,4 @@
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'ecs_deployer/version'
 
@@ -29,15 +29,13 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'aws-sdk', '>= 2.9.0'
-  spec.add_dependency 'aws_config', '~> 0.1'
-  spec.add_dependency 'oj', '~> 3.0'
-  spec.add_dependency 'thor', '~> 0.19'
-  spec.add_development_dependency 'bundler', '~> 1.13'
+  spec.add_dependency 'aws-sdk', '>= 3.0.1'
+  spec.add_dependency 'oj', '~> 3.8.1'
+  spec.add_dependency 'thor', '~> 0.20.3'
+  spec.add_development_dependency 'bundler', '~> 1.17.2'
   spec.add_development_dependency 'codeclimate-test-reporter', '~> 1.0'
-  spec.add_development_dependency 'config', '~> 1.5.1'
-  spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_development_dependency 'rubocop', '~> 0.48'
-  spec.add_development_dependency 'simplecov', '~> 0.14'
+  spec.add_development_dependency 'rake', '~> 12.3.3'
+  spec.add_development_dependency 'rspec', '~> 3.8.0'
+  spec.add_development_dependency 'rubocop', '~> 0.74.0'
+  spec.add_development_dependency 'simplecov', '~> 0.17.0'
 end

data/example/register_task.rb

@@ -1,11 +1,5 @@
 require 'bundler/setup'
 require 'ecs_deployer'
-require 'config'
-
-Config.load_and_set_settings('config.yml', 'config.local.yml')
-
-task_path = File.expand_path(Settings.task_path)
-deployer = EcsDeployer::Client.new(Settings.cluster)
-task_definition = deployer.task.register(task_path, tag: 'latest')
 
+task_definition = EcsDeployer::Task::Client.new.register(File.expand_path('example/conf/task.yml'), tag: 'latest')
 puts task_definition.task_definition_arn

data/example/update_scheduled_task.rb

@@ -1,20 +1,16 @@
 require 'bundler/setup'
 require 'ecs_deployer'
-require 'config'
 
-Config.load_and_set_settings('config.yml', 'config.local.yml')
-task_path = File.expand_path(Settings.scheduled_task_path)
+task_definition = EcsDeployer::Task::Client.new.register(File.expand_path('example/conf/task.yml'), tag: 'latest')
 
-deployer = EcsDeployer::Client.new(Settings.cluster)
-task_definition = deployer.task.register(task_path, tag: 'latest')
-
-scheduled_task = deployer.scheduled_task
-target_builder = scheduled_task.target_builder(Settings.scheduled_task_target_id)
+scheduled_task = EcsDeployer::Client.new(ENV['ECS_CLUSTER']).scheduled_task
+target_builder = scheduled_task.target_builder(ENV['ECS_SCHEDULED_TASK_TARGET_ID'])
 target_builder.task_definition_arn = task_definition.task_definition_arn
 target_builder.override_container('rails', ['curl', 'http://153.122.13.159/'])
+target_builder.cloudwatch_event_role_arn = ENV['CLOUDWATCH_EVENT_ARN']
 
 task_definition = scheduled_task.update(
-  Settings.scheduled_task_rule,
+  ENV['ECS_SCHEDULED_TASK_RULE_ID'],
   'cron(* * * * ? *)',
   [target_builder.to_hash],
   description: 'Test task'

data/example/update_service.rb

@@ -1,13 +1,8 @@
 require 'bundler/setup'
 require 'ecs_deployer'
-require 'config'
 
-Config.load_and_set_settings('config.yml', 'config.local.yml')
-
-task_path = File.expand_path(Settings.task_path)
-
-deployer = EcsDeployer::Client.new(Settings.cluster)
-task_definition = deployer.task.register(task_path, tag: 'latest')
-service = deployer.service.update(Settings.service, task_definition)
+client = EcsDeployer::Client.new(ENV['ECS_CLUSTER'])
+task_definition = EcsDeployer::Task::Client.new.register(File.expand_path('example/conf/task.yml'), tag: 'latest')
+service = client.service.update(ENV['ECS_SERVICE'], task_definition)
 
 puts service.service_arn

data/lib/ecs_deployer/client.rb

@@ -8,7 +8,7 @@ module EcsDeployer
     # @return [EcsDeployer::Client]
     def initialize(cluster, logger = nil, aws_options = {})
       @cluster = cluster
-      @logger = logger.nil? ? Logger.new(nil) : logger
+      @logger = logger.nil? ? Logger.new(STDOUT) : logger
       @aws_options = aws_options
     end
 

data/lib/ecs_deployer/scheduled_task/target.rb

@@ -37,7 +37,7 @@ module EcsDeployer
           name: name,
           command: command
         }
-        container_override[:environment] = override_environments if override_environments.count > 0
+        container_override[:environment] = override_environments if override_environments.count.positive?
 
         @container_overrides << container_override
       end

data/lib/ecs_deployer/service/client.rb

@@ -47,6 +47,7 @@ module EcsDeployer
         )
         result[:services].each do |svc|
           next unless svc[:service_name] == service && svc[:status] == 'ACTIVE'
+
           status = svc
           break
         end
@@ -148,7 +149,7 @@ module EcsDeployer
             @logger.info LOG_SEPARATOR
           end
 
-          if result[:new_registerd_task_count] == desired_count && result[:current_task_count] == 0
+          if result[:new_registerd_task_count] == desired_count && result[:current_task_count].zero?
             @logger.info "Service update succeeded. [#{result[:new_registerd_task_count]}/#{desired_count}]"
             @logger.info "New task definition: #{task_definition_arn}"
 

data/lib/ecs_deployer/task/client.rb

@@ -52,7 +52,7 @@ module EcsDeployer
 
           task_definition = result[:task_definition].to_hash
 
-          delete_keys = [:task_definition_arn, :revision, :status, :requires_attributes, :compatibilities]
+          delete_keys = %i[task_definition_arn revision status requires_attributes compatibilities]
           delete_keys.each do |delete_key|
             task_definition.delete(delete_key)
           end
@@ -68,7 +68,7 @@ module EcsDeployer
       # @param [Array, Hash] variables
       # @param [Hash] replace_variables
       def replace_parameter_variables!(variables, replace_variables = {})
-        for variable in variables do
+        variables.each do |variable|
           if variable.class == Array || variable.class == Hash
             replace_parameter_variables!(variable, replace_variables)
           elsif variable.class == String
@@ -82,6 +82,7 @@ module EcsDeployer
       # @param [Hash] task_definition
       def decrypt_environment_variables!(task_definition)
         raise TaskDefinitionValidateError, '\'container_definition\' is undefined.' unless task_definition.key?(:container_definitions)
+
         task_definition[:container_definitions].each do |container_definition|
           next unless container_definition.key?(:environment)
 

data/lib/ecs_deployer/util/cipher.rb

@@ -3,7 +3,7 @@ require 'base64'
 module EcsDeployer
   module Util
     class Cipher
-      ENCRYPT_VARIABLE_PATTERN = /^\${(.+)}$/
+      ENCRYPT_VARIABLE_PATTERN = /^\${(.+)}$/.freeze
 
       # @param [Hash] aws_options
       # @return [EcsDeployer::Util::Cipher]

data/lib/ecs_deployer/version.rb

@@ -1,3 +1,3 @@
 module EcsDeployer
-  VERSION = '2.2.2'.freeze
+  VERSION = '2.3.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecs_deployer
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.3.0
 platform: ruby
 authors:
 - naomichi-y
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-13 00:00:00.000000000 Z
+date: 2019-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -16,70 +16,56 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.9.0
+        version: 3.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.9.0
-- !ruby/object:Gem::Dependency
-  name: aws_config
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 3.0.1
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.8.1
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: 0.20.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: 0.20.3
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: 1.17.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: 1.17.2
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
@@ -94,76 +80,62 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: config
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.5.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.5.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.8.0
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.48'
+        version: 0.74.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.48'
+        version: 0.74.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: 0.17.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: 0.17.0
 description: Deploy Docker container on AWS ECS.
 email:
 - n.yamakita@gmail.com
@@ -172,17 +144,21 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
+- ".dockerignore"
+- ".env.default"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
+- Dockerfile
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/console
 - bin/setup
-- circle.yml
 - config.yml
+- docker-compose.yml
 - ecs_deployer.gemspec
 - example/register_task.rb
 - example/update_scheduled_task.rb
@@ -218,7 +194,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: Deploy application to ECS.

data/circle.yml

@@ -1,7 +0,0 @@
-machine:
-  ruby:
-    version: 2.4.0
-test:
-  override:
-    - bundle exec rspec
-    - bundle exec codeclimate-test-reporter tmp/coverage/.resultset.json