lita-aws-ecs 0.1.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe16c0690b7a6a4b80c9f28bd514d25ed5222de0380add07b1c2974550d3b213
-  data.tar.gz: f17df8634a2dd3227fdf02a83a9a940cc0b1f2bd4e5f91c02c821730f4351b74
+  metadata.gz: 3a0d37de4fea3f2d4fe8ededcabf6d978ac6306507062a174e7045606f059301
+  data.tar.gz: 7e2c64de2166722f7745c6f8147376e006b3c54c483abfc895c586c31890b518
 SHA512:
-  metadata.gz: 248a2093cc7a02c60cd6eb7372f7daaeb3a7b63153283f8c23ee1c750f78d78630be2b89454638b3d6d0c0a1cc5972795787df5adf4607c610404d692073f7ab
-  data.tar.gz: cec1b562a39666c1ca59c445ac498640066dc6a2c7f7db09635857867f6c981153a8b53ed0f7591e1f1a6eb71a3fef8af192f8d1bea8dd3211072ff11d6982f4
+  metadata.gz: f3d4c682c52651cc161c5c210f0de05615670e4dfa9034bc04f3cb008a341a65edbd9ce774fb6a5ce7cad07b82455b9341e1718cc421bd0db3510302487fc9d4
+  data.tar.gz: 3416e1d7043934353a6243aa6443e696455d122136ca14be3f9910a5511e24686dd8bf9642bec2c17b7e8bc7b08a397b63f1a7c52b23f8bbd81d17373a296dc1

data/.circleci/config.yml

@@ -54,7 +54,7 @@ jobs:
           environment:
               RAILS_ENV: test
               COVERAGE: true
-              CODECOV_TOKEN: c8c31078-b811-4301-bd35-c36e14cfc075
+              CODECOV_TOKEN: 4d137656-ace8-424a-afc1-28e03b45b45a
           command: bundle exec rspec
 workflows:
   version: 2.1

data/CODE_OF_CONDUCT.md

@@ -55,7 +55,7 @@ further defined and clarified by project maintainers.
 ## Enforcement
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at unhappychoice@gmail.com. All
+reported by contacting the project team at seibii.it@seibii.com. All
 complaints will be reviewed and investigated and will result in a response that
 is deemed necessary and appropriate to the circumstances. The project team is
 obligated to maintain confidentiality with regard to the reporter of an incident.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    lita-aws-ecs (0.1.0)
+    lita-aws-ecs (1.0.0)
       aws-sdk-ecs (~> 1)
       lita (>= 4.7)
 

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2019 Yuji Ueki
+Copyright (c) 2019 Seibii, Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -1 +1,57 @@
+# lita-aws-ecs
+[![Gem Version](https://badge.fury.io/rb/lita-aws-ecs.svg)](https://badge.fury.io/rb/lita-aws-ecs)
+[![Circle CI](https://circleci.com/gh/seibii/lita-aws-ecs.svg?style=shield)](https://circleci.com/gh/seibii/lita-aws-ecs)
+[![Code Climate](https://codeclimate.com/github/seibii/lita-aws-ecs/badges/gpa.svg)](https://codeclimate.com/github/seibii/lita-aws-ecs)
+[![codecov](https://codecov.io/gh/seibii/lita-aws-ecs/branch/master/graph/badge.svg)](https://codecov.io/gh/seibii/lita-aws-ecs)
+[![Libraries.io dependency status for GitHub repo](https://img.shields.io/librariesio/github/seibii/lita-aws-ecs.svg)](https://libraries.io/github/seibii/lita-aws-ecs)
+![](http://ruby-gem-downloads-badge.herokuapp.com/lita-aws-ecs?type=total)
+![GitHub](https://img.shields.io/github/license/seibii/lita-aws-ecs.svg)
 
+`lita-aws-ecs` allows you to manage AWS ECS by commands. 
+
+## Installation
+
+Add lita-aws-ecs to your Lita instance's Gemfile:
+
+``` ruby
+gem "lita-aws-ecs"
+```
+
+## Configuration
+Set environment variables below.
+
+```
+AWS_REGION=us-east-1
+AWS_ACCESS_KEY_ID=xxxx
+AWS_SECRET_ACCESS_KEY=xxxx
+```
+
+or use config
+
+```
+Lita.config.handlers.aws_ecs.aws_region = 'us-east-1'
+Lita.config.handlers.aws_ecs.aws_access_key_id = 'xxxx'
+Lita.config.handlers.aws_ecs.aws_secret_access_key = 'xxxx'
+```
+
+## Usage
+
+```bash
+lita ecs clusters
+lita ecs cluster services ${cluster_name}
+lita ecs cluster tasks ${cluster_name}
+lita ecs service tasks ${service_name}
+lita ecs service update_task ${cluster_name} ${service_name} ${task_name:revision}
+```
+
+## Contributing
+
+Bug reports and pull requests are welcome on GitHub at https://github.com/seibii/lita-aws-ecs. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+
+## License
+
+The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
+
+## Code of Conduct
+
+Everyone interacting in the Lita::AWS::ECS project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/seibii/lita-aws-ecs/blob/master/CODE_OF_CONDUCT.md).

data/lib/lita/handlers/aws_ecs.rb

@@ -4,7 +4,7 @@ require 'aws-sdk-ecs'
 
 module Lita
   module Handlers
-    class AwsEcs < Handler # rubocop:disable Metrics/ClassLength
+    class AwsEcs < Handler
       config :aws_region
       config :aws_access_key_id
       config :aws_secret_access_key
@@ -21,8 +21,12 @@ module Lita
       cluster_services_help = { 'ecs cluster services ${cluster_name}' => 'List ecs cluster services' }
       route(/ecs cluster services\s+([a-zA-Z0-9 -~]+)\s*$/, help: cluster_services_help) do |response|
         cluster_name = response.matches.first[0]
-        cluster_services = client.list_services(cluster: cluster_name)
-        response.reply(render_template('cluster_services', cluster_services: cluster_services))
+        services = client.list_services(cluster: cluster_name)
+          &.service_arns
+          &.map { |service| [service, service_tasks(cluster_name, service)] }
+          &.to_h || {}
+
+        response.reply(render_template('cluster_services', cluster_name: cluster_name, services: services))
       rescue StandardError => e
         response.reply ':rage: Error has occurred'
         response.reply e.to_s
@@ -46,68 +50,38 @@ module Lita
             help: cluster_service_tasks_help) do |response|
         cluster_name = response.matches.first[0]
         service_name = response.matches.first[1]
-        service_tasks = service_tasks_array(cluster_name, service_name)
+        service_tasks = service_tasks(cluster_name, service_name)
         response.reply(render_template('service_tasks', service_tasks: service_tasks))
       rescue StandardError => e
         response.reply ':rage: Error has occurred'
         response.reply e.to_s
       end
 
-      cluster_service_tasks_help =
-        { 'ecs cluster component ${cluster_name}' => 'List cluster service name and task definition' }
-      route(/ecs cluster component\s+([a-zA-Z0-9 -~]+)\s*$/,
-            help: cluster_service_tasks_help) do |response|
-        cluster_name = response.matches.first[0]
-        services = client.list_services(cluster: cluster_name)
-        cluster_component = {}
-        services&.service_arns&.each do |service|
-          cluster_component[service] = service_tasks_array(cluster_name, service)
-        end
-        response
-          .reply(render_template(
-                   'cluster_component',
-                   cluster_name: cluster_name,
-                   cluster_component: cluster_component
-                 ))
-
-      rescue StandardError => e
-        response.reply ':rage: Error has occurred'
-        response.reply e.to_s
-      end
-
       clusters_service_update_help =
-        { 'ecs cluster service update ${cluster_name} ${service_name} ${task_name}' => 'Update ecs service' }
-      route(/ecs cluster service update\s+([a-zA-Z0-9 -~]+)\s+([a-zA-Z0-9 -~]+)\s+([a-zA-Z0-9 -~]+)\s*$/,
+        { 'ecs cluster service update_task ${cluster_name} ${service_name} ${task_name}' => 'Update ecs service' }
+      route(/ecs cluster service update_task\s+([a-zA-Z0-9 -~]+)\s+([a-zA-Z0-9 -~]+)\s+([a-zA-Z0-9 -~]+)\s*$/,
             help: clusters_service_update_help) do |response|
         cluster_name = response.matches.first[0]
         service_name = response.matches.first[1]
         task_name = response.matches.first[2]
-        service_update = client.update_service(
+        client.update_service(
           cluster: cluster_name,
           service: service_name,
           task_definition: task_name
         )
-        response.reply(render_template('service_update', service_update: service_update))
+        response.reply("Updated #{service_name} task to #{task_name} successfully.")
       rescue StandardError => e
         response.reply ':rage: Error has occurred'
         response.reply e.to_s
       end
 
-      private def service_tasks_array(cluster_name, service_name) # rubocop:disable Metrics/MethodLength
+      private def service_tasks(cluster_name, service_name)
         describe_services = client.describe_services(
           cluster: cluster_name,
-          services: [
-            service_name
-          ]
+          services: [service_name]
         )
 
-        describe_service_tasks = []
-        unless describe_services.nil?
-          describe_services.services.each do |describe_service|
-            describe_service_tasks.push(describe_service.task_definition)
-          end
-        end
-        describe_service_tasks
+        describe_services&.services&.map(&:task_definition) || []
       end
 
       private def client
@@ -117,6 +91,7 @@ module Lita
           secret_access_key: config.aws_secret_access_key || ENV['AWS_SECRET_ACCESS_KEY']
         )
       end
+
       Lita.register_handler(self)
     end
   end

data/lita-aws-ecs.gemspec

@@ -2,9 +2,9 @@
 
 Gem::Specification.new do |spec|
   spec.name          = 'lita-aws-ecs'
-  spec.version       = '0.1.0'
+  spec.version       = '1.0.0'
   spec.authors       = ['Teturo Nakamura']
-  spec.email         = ['notify_company_questionnaire']
+  spec.email         = ['seibii.it@seibii.com']
   spec.description   = 'Lita handler to manage ecs'
   spec.summary       = 'Lita handler to manage ecs'
   spec.homepage      = 'https://github.com/seibii/lita-aws-ecs'

data/spec/lita/handlers/aws_ecs_spec.rb

@@ -4,11 +4,10 @@ require 'spec_helper'
 describe Lita::Handlers::AwsEcs, lita_handler: true do # rubocop:disable Metrics/BlockLength
   describe 'Routing' do
     it { is_expected.to route('ecs clusters') }
-    it { is_expected.to route('ecs cluster services cluster') }
-    it { is_expected.to route('ecs cluster tasks cluster') }
-    it { is_expected.to route('ecs cluster service tasks cluster service') }
-    it { is_expected.to route('ecs cluster component cluster') }
-    it { is_expected.to route('ecs cluster service update cluster service task 1') }
+    it { is_expected.to route('ecs cluster services cluster_name') }
+    it { is_expected.to route('ecs cluster tasks cluster_name') }
+    it { is_expected.to route('ecs cluster service tasks cluster_name service_name') }
+    it { is_expected.to route('ecs cluster service update_task cluster_name service_name task_name 1') }
   end
 
   describe 'Behavior' do # rubocop:disable Metrics/BlockLength
@@ -63,15 +62,14 @@ describe Lita::Handlers::AwsEcs, lita_handler: true do # rubocop:disable Metrics
     end
 
     describe 'cluster services command' do # rubocop:disable Metrics/BlockLength
-      let(:ecs_response) {}
-
       before do
         allow_any_instance_of(Aws::ECS::Client)
-          .to receive_message_chain(:list_services) { ecs_response }
-        send_message 'ecs cluster services cluster'
+          .to receive_messages(list_services: services, describe_services: ecs_response)
+        send_message 'ecs cluster services cluster_name'
       end
 
       context 'with empty cluster services response' do
+        let(:services) {}
         let(:ecs_response) { [] }
         let(:reply_message) { "There are no services.\n" }
 
@@ -79,16 +77,23 @@ describe Lita::Handlers::AwsEcs, lita_handler: true do # rubocop:disable Metrics
       end
 
       context 'with cluster services response' do
-        let(:ecs_response) do
+        let!(:services) do
           JSON.parse(
             { service_arns: ['/service_name'] }
-            .to_json, object_class: OpenStruct
+              .to_json, object_class: OpenStruct
+          )
+        end
+        let!(:ecs_response) do
+          JSON.parse(
+            { services: [{ task_definition: '/task_name' }] }
+              .to_json, object_class: OpenStruct
           )
         end
         let(:reply_message) do
           <<~MESSAGE
             --------------------------------------------------------
-            name: service_name
+            service_name:  service_name
+            attached_task: task_name
             --------------------------------------------------------
           MESSAGE
         end
@@ -99,9 +104,10 @@ describe Lita::Handlers::AwsEcs, lita_handler: true do # rubocop:disable Metrics
       context 'when something raises error' do
         before do
           allow_any_instance_of(Aws::ECS::Client)
-            .to receive_message_chain(:update_service).and_raise(StandardError)
+            .to receive_message_chain(:describe_services).and_raise(StandardError)
         end
-
+        let(:services) { 'example' }
+        let(:ecs_response) { 'example' }
         let(:reply_message) { ':rage: Error has occurred' }
         it_behaves_like 'a command that replies message'
       end
@@ -193,89 +199,21 @@ describe Lita::Handlers::AwsEcs, lita_handler: true do # rubocop:disable Metrics
       end
     end
 
-    describe 'clusters component command' do # rubocop:disable Metrics/BlockLength
-      before do
-        allow_any_instance_of(Aws::ECS::Client)
-          .to receive_messages(list_services: services, describe_services: ecs_response)
-        send_message 'ecs cluster component cluster'
-      end
-
-      context 'with empty cluster component response' do
-        let(:services) {}
-        let(:ecs_response) { [] }
-        let(:reply_message) { "There are no cluster.\n" }
-
-        it_behaves_like 'a command that replies message'
-      end
-
-      context 'with cluster component response' do
-        let!(:services) do
-          JSON.parse(
-            { service_arns: ['/service_name'] }
-            .to_json, object_class: OpenStruct
-          )
-        end
-        let!(:ecs_response) do
-          JSON.parse(
-            { services: [{ task_definition: '/task_name' }] }
-            .to_json, object_class: OpenStruct
-          )
-        end
-        let(:reply_message) do
-          <<~MESSAGE
-            --------------------------------------------------------
-            name: cluster service_name task_name
-            --------------------------------------------------------
-          MESSAGE
-        end
-
-        it_behaves_like 'a command that replies message'
-      end
-
-      context 'when something raises error' do
-        before do
-          allow_any_instance_of(Aws::ECS::Client)
-            .to receive_message_chain(:describe_services).and_raise(StandardError)
-        end
-        let(:services) { 'example' }
-        let(:ecs_response) { 'example' }
-        let(:reply_message) { ':rage: Error has occurred' }
-        it_behaves_like 'a command that replies message'
-      end
-    end
-
-    describe 'clusters service update command' do # rubocop:disable Metrics/BlockLength
+    describe 'clusters service update_task command' do
       before do
         allow_any_instance_of(Aws::ECS::Client)
           .to receive_message_chain(:update_service) { ecs_response }
-        send_message 'ecs cluster service update cluster service task 1'
-      end
-
-      context 'with empty clusters service updat response' do
-        let(:ecs_response) { [] }
-        let(:reply_message) { "There are no services parameter.\n" }
-
-        it_behaves_like 'a command that replies message'
+        send_message 'ecs cluster service update_task cluster_name service_name task_name:1'
       end
 
-      context 'with clusters service updat response' do
+      context 'with clusters service update response' do
         let(:ecs_response) do
           JSON.parse(
             { service: { service_name: 'service_name', cluster_arn: 'cluster_name', task_definition: 'task_name' } }
             .to_json, object_class: OpenStruct
           )
         end
-        let(:reply_message) do
-          <<~MESSAGE
-            --------------------------------------------------------
-            **your update servise parameter
-            update service name    : service_name
-            service target cluster : cluster_name
-            service target task    : task_name
-            --------------------------------------------------------
-          MESSAGE
-        end
-
+        let(:reply_message) { 'Updated service_name task to task_name:1 successfully.' }
         it_behaves_like 'a command that replies message'
       end
 

data/templates/cluster_services.erb

@@ -1,10 +1,14 @@
-<% if @cluster_services.empty? %>
+<% if @services.empty? %>
 There are no services.
 <% else %>
-<% @cluster_services.service_arns.each do |service| %>
+<% @services.each do |service, tasks| %>
+<% tasks.sort.each do |task| %>
 --------------------------------------------------------
-<% /\// =~ service %>
-name: <%= $' %>
-<% end %>
+<% service = service.match(/\//)%>
+<% task = task.match(/\//)%>
+service_name:  <%= "#{service.post_match}" %>
+attached_task: <%= "#{task.post_match}" %>
 --------------------------------------------------------
-<% end %>
+<% end %>
+<% end %>
+<% end %>

data/templates/cluster_tasks.erb

@@ -1,7 +1,7 @@
 <% if @cluster_tasks.empty? %>
 There are no tasks.
 <% else %>
-<% @cluster_tasks.task_arns.each do |task| %>
+<% @cluster_tasks.task_arns.sort.each do |task| %>
 --------------------------------------------------------
 <% /\// =~ task %>
 name: <%= $' %>

data/templates/clusters.erb

@@ -1,7 +1,7 @@
 <% if @clusters.empty? %>
 There are no clusters.
 <% else %>
-<% @clusters.cluster_arns.each do |cluster| %>
+<% @clusters.cluster_arns.sort.each do |cluster| %>
 --------------------------------------------------------
 <% /\// =~ cluster %>
 name: <%= $' %>

data/templates/service_tasks.erb

@@ -1,7 +1,7 @@
 <% if @service_tasks.empty? %>
 There are no tasks.
 <% else %>
-<% @service_tasks.each do |task| %>
+<% @service_tasks.sort.each do |task| %>
 --------------------------------------------------------
 <% /\// =~ task %>
 name: <%= $' %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lita-aws-ecs
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Teturo Nakamura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-03 00:00:00.000000000 Z
+date: 2020-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-ecs
@@ -194,7 +194,7 @@ dependencies:
         version: '0'
 description: Lita handler to manage ecs
 email:
-- notify_company_questionnaire
+- seibii.it@seibii.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -218,15 +218,14 @@ files:
 - locales/en.yml
 - locales/ja.yml
 - pkg/lita-aws-ecs-0.1.0.gem
+- pkg/lita-aws-ecs-1.0.0.gem
 - spec/lita/handlers/aws_ecs_spec.rb
 - spec/spec_helper.rb
 - templates/.gitkeep
-- templates/cluster_component.erb
 - templates/cluster_services.erb
 - templates/cluster_tasks.erb
 - templates/clusters.erb
 - templates/service_tasks.erb
-- templates/service_update.erb
 homepage: https://github.com/seibii/lita-aws-ecs
 licenses:
 - MIT

data/templates/cluster_component.erb

@@ -1,13 +0,0 @@
-<% if @cluster_component.empty? %>
-There are no cluster.
-<% else %>
-<% @cluster_component.each do |service, tasks| %>
-<% tasks.each do |task| %>
---------------------------------------------------------
-<% service = service.match(/\//)%>
-<% task = task.match(/\//)%>
-name: <%= "#{@cluster_name} #{service.post_match} #{task.post_match}" %>
---------------------------------------------------------
-<% end %>
-<% end %>
-<% end %>

data/templates/service_update.erb

@@ -1,10 +0,0 @@
-<%if @service_update.empty?%>
-There are no services parameter.
-<% else %>
---------------------------------------------------------
-**your update servise parameter
-update service name    : <%= @service_update.service.service_name %>
-service target cluster : <%= @service_update.service.cluster_arn  %>
-service target task    : <%= @service_update.service.task_definition  %>
---------------------------------------------------------
-<%end %>