ecs-rails 0.0.6 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 28b6dcfb2734b269fbb5da27e70b0e7b43e63cbfb025f904724f804108b21573
-  data.tar.gz: 47e6dc119ec99803eb887f8f1170e6766c28f7c086cbc1b22e7fbdc6d01c6323
+  metadata.gz: cbc8985f5cda19d87cfcce63d4c9f41e9f8ee2b5bd044cc25e3078e94eb9df55
+  data.tar.gz: 7cc2193739fe260fbc5e8f21a0ec16ed75d3bdb5dabfa7b2a3288fa6360b05ad
 SHA512:
-  metadata.gz: 726c40bafbb598ce2673eeaf48b075b12ddd8f79a0fcdaba2c00c3a2c0acf953508d3783495dc6087fa520f73e4895c8733fb6f85caed5807306a7f97cdcacc7
-  data.tar.gz: e474ae8db2e7eb9b660c5a81e9dd9a76524cc769a50d56b45843b3b30fc65ef55773165552c5c726be704d8b722b3c57dd52bac68b79cad774b1fc17626431ef
+  metadata.gz: 934f84d9dad3623f110250f043d1a0030f9313859449b2b15a94e7ecd0fad7f3339f8f8d6165f4cb3dced1e7fa4a076e0cbdcaab05789506e45159b38fc9bb04
+  data.tar.gz: c2ddb51f5d6e50905702c6d464db9092a9712e0db7271d3055f0920c2a6f69a35dc5fb48f8da66ef8f255f2255a0eb05b4a56377cf85d3023c82ca35ab50c6f8

data/ecs-rails.gemspec

@@ -3,26 +3,27 @@
 require_relative 'lib/ecs-rails/version'
 
 Gem::Specification.new do |s|
-  s.name        = "ecs-rails"
+  s.name        = 'ecs-rails'
   s.version     = EcsRails::VERSION
-  s.summary     = "Connect to your AWS ECS tasks"
-  s.description = "Connect to your AWS ECS tasks"
+  s.summary     = 'Connect to your AWS ECS tasks'
+  s.description = 'Connect to your AWS ECS tasks'
   s.authors     = ["Franck D'agostini"]
-  s.email       = "franck.dagostini@gmail.com"
-  s.homepage    = "https://rubygems.org/gems/ecs-rails"
-  s.license       = "MIT"
+  s.email       = 'franck.dagostini@gmail.com'
+  s.homepage    = 'https://rubygems.org/gems/ecs-rails'
+  s.license = 'MIT'
   s.required_ruby_version = '>= 2.7.0'
   s.require_paths = ['lib']
 
   s.files = `git ls-files -z`.split("\x0")
 
-  s.executables   = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  s.executables = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
 
   s.add_development_dependency 'byebug', '~> 11.1'
   s.add_development_dependency 'rspec', '~> 3.6', '>= 3.6.0'
 
-  s.add_runtime_dependency "aws-sdk-ecs", "~> 1.132", "> 1.132"
-  s.add_runtime_dependency "aws-sdk-ec2", "~> 1.425", "> 1.425"
-  s.add_runtime_dependency "tty-prompt", "~> 0.23", "> 0.23"
-  s.add_runtime_dependency "activesupport", "> 5.2"
+  s.add_runtime_dependency 'activesupport', '> 5.2'
+  s.add_runtime_dependency 'aws-sdk-ec2', '~> 1.425', '> 1.425'
+  s.add_runtime_dependency 'aws-sdk-ecs', '~> 1.132', '> 1.132'
+  s.add_runtime_dependency 'openssl', '>= 3.2.1'
+  s.add_runtime_dependency 'tty-prompt', '~> 0.23', '> 0.23'
 end

data/lib/ecs-rails/client.rb

@@ -1,20 +1,17 @@
 module EcsRails
   class Client
-
     def client
       Aws::ECS::Client.new(aws_credentials)
     end
 
     private
 
-      def aws_credentials
-        @aws_credentials ||= {
-          region: ENV['AWS_REGION'],
-          access_key_id: ENV['AWS_ACCESS_KEY_ID'],
-          secret_access_key: ENV['AWS_SECRET_ACCESS_KEY']
-        }
-      end
-
+    def aws_credentials
+      @aws_credentials ||= {
+        region: ENV['AWS_REGION'],
+        access_key_id: ENV['AWS_ACCESS_KEY_ID'],
+        secret_access_key: ENV['AWS_SECRET_ACCESS_KEY']
+      }
+    end
   end
 end
-

data/lib/ecs-rails/task_selector.rb

@@ -1,6 +1,5 @@
 module EcsRails
   class TaskSelector
-
     def initialize(client, cluster_name, service_name)
       @client = client
       @cluster_name = cluster_name
@@ -13,7 +12,8 @@ module EcsRails
 
       service_descriptions.each do |service|
         service.deployments.each do |deployment|
-          task_arns = client.list_tasks(cluster: cluster_name, service_name: service.service_name, desired_status: 'RUNNING').task_arns
+          task_arns = client.list_tasks(cluster: cluster_name, service_name: service.service_name,
+                                        desired_status: 'RUNNING').task_arns
           next if task_arns.empty?
 
           tasks = client.describe_tasks(cluster: cluster_name, tasks: task_arns).tasks
@@ -22,12 +22,12 @@ module EcsRails
           tasks_for_deployment = tasks.select { |task| task.task_definition_arn == deployment.task_definition }
 
           if tasks_for_deployment.empty?
-            puts("      No tasks found for this deployment.")
+            puts('      No tasks found for this deployment.')
           elsif tasks_for_deployment.size == 1
             puts("      Task: #{task_arns.first}")
-              return task_arns.first
+            return task_arns.first
           else
-            ask_for_task(tasks_for_deployment)
+            return ask_for_task(tasks_for_deployment)
           end
         end
       end
@@ -35,13 +35,13 @@ module EcsRails
 
     private
 
-      attr_reader :client, :cluster_name, :service_name
+    attr_reader :client, :cluster_name, :service_name
 
-      def ask_for_task(tasks)
-        prompt = TTY::Prompt.new
-        choices = tasks.map { |task| task.split('/').last }
-        choice = prompt.enum_select("Select a task:", choices)
-        tasks.grep(Regexp.new(choice)).first
-      end
+    def ask_for_task(tasks)
+      prompt = TTY::Prompt.new
+      choices = tasks.map { |task| task.task_arn.split('/').last }
+      choice = prompt.enum_select('Select a task:', choices)
+      tasks.find { |task| task.task_arn.include?(choice) }.task_arn
+    end
   end
 end

data/lib/ecs-rails/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EcsRails
-  VERSION = '0.0.6'
+  VERSION = '0.0.8'
 end

data/spec/ecs-rails/task_selector_spec.rb

@@ -0,0 +1,96 @@
+require 'spec_helper'
+
+RSpec.describe EcsRails::TaskSelector do
+  let(:client) { instance_double(Aws::ECS::Client) }
+  let(:cluster_name) { 'test-cluster' }
+  let(:service_name) { 'test-service' }
+  let(:selector) { described_class.new(client, cluster_name, service_name) }
+
+  describe '#call' do
+    let(:service) { instance_double(Aws::ECS::Types::Service, service_name: service_name, deployments: [deployment]) }
+    let(:deployment) { instance_double(Aws::ECS::Types::Deployment, task_definition: 'task-def-arn') }
+    let(:task_arn) { 'arn:aws:ecs:us-east-1:123456789:task/cluster/abc123' }
+
+    before do
+      allow(client).to receive(:describe_services)
+        .with(cluster: cluster_name, services: [service_name])
+        .and_return(instance_double(Aws::ECS::Types::DescribeServicesResponse, services: [service]))
+    end
+
+    context 'when there are no running tasks' do
+      before do
+        allow(client).to receive(:list_tasks)
+          .with(cluster: cluster_name, service_name: service_name, desired_status: 'RUNNING')
+          .and_return(instance_double(Aws::ECS::Types::ListTasksResponse, task_arns: []))
+      end
+
+      it 'does not return a task ARN' do
+        result = selector.call
+        expect(result).not_to be_a(String)
+      end
+    end
+
+    context 'when there is one running task' do
+      let(:task) { instance_double(Aws::ECS::Types::Task, task_definition_arn: 'task-def-arn', task_arn: task_arn) }
+
+      before do
+        allow(client).to receive(:list_tasks)
+          .with(cluster: cluster_name, service_name: service_name, desired_status: 'RUNNING')
+          .and_return(instance_double(Aws::ECS::Types::ListTasksResponse, task_arns: [task_arn]))
+
+        allow(client).to receive(:describe_tasks)
+          .with(cluster: cluster_name, tasks: [task_arn])
+          .and_return(instance_double(Aws::ECS::Types::DescribeTasksResponse, tasks: [task]))
+      end
+
+      it 'returns the task ARN' do
+        expect(selector.call).to eq(task_arn)
+      end
+    end
+
+    context 'when there are multiple running tasks' do
+      let(:task_arn_1) { 'arn:aws:ecs:us-east-1:123456789:task/cluster/abc123' }
+      let(:task_arn_2) { 'arn:aws:ecs:us-east-1:123456789:task/cluster/def456' }
+      let(:task_1) { instance_double(Aws::ECS::Types::Task, task_definition_arn: 'task-def-arn', task_arn: task_arn_1) }
+      let(:task_2) { instance_double(Aws::ECS::Types::Task, task_definition_arn: 'task-def-arn', task_arn: task_arn_2) }
+      let(:prompt) { instance_double(TTY::Prompt) }
+
+      before do
+        allow(client).to receive(:list_tasks)
+          .with(cluster: cluster_name, service_name: service_name, desired_status: 'RUNNING')
+          .and_return(instance_double(Aws::ECS::Types::ListTasksResponse, task_arns: [task_arn_1, task_arn_2]))
+
+        allow(client).to receive(:describe_tasks)
+          .with(cluster: cluster_name, tasks: [task_arn_1, task_arn_2])
+          .and_return(instance_double(Aws::ECS::Types::DescribeTasksResponse, tasks: [task_1, task_2]))
+
+        allow(TTY::Prompt).to receive(:new).and_return(prompt)
+        allow(prompt).to receive(:enum_select).with('Select a task:', %w[abc123 def456]).and_return('abc123')
+      end
+
+      it 'prompts the user to select a task and returns the selected task ARN' do
+        expect(selector.call).to eq(task_arn_1)
+      end
+    end
+
+    context 'when tasks do not match the deployment task definition' do
+      let(:task_arn) { 'arn:aws:ecs:us-east-1:123456789:task/cluster/abc123' }
+      let(:task) { instance_double(Aws::ECS::Types::Task, task_definition_arn: 'different-task-def', task_arn: task_arn) }
+
+      before do
+        allow(client).to receive(:list_tasks)
+          .with(cluster: cluster_name, service_name: service_name, desired_status: 'RUNNING')
+          .and_return(instance_double(Aws::ECS::Types::ListTasksResponse, task_arns: [task_arn]))
+
+        allow(client).to receive(:describe_tasks)
+          .with(cluster: cluster_name, tasks: [task_arn])
+          .and_return(instance_double(Aws::ECS::Types::DescribeTasksResponse, tasks: [task]))
+      end
+
+      it 'does not return a task ARN' do
+        result = selector.call
+        expect(result).not_to be_a(String)
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ecs-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.8
 platform: ruby
 authors:
 - Franck D'agostini
@@ -44,25 +44,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.6.0
 - !ruby/object:Gem::Dependency
-  name: aws-sdk-ecs
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.132'
     - - ">"
       - !ruby/object:Gem::Version
-        version: '1.132'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.132'
     - - ">"
       - !ruby/object:Gem::Version
-        version: '1.132'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: aws-sdk-ec2
   requirement: !ruby/object:Gem::Requirement
@@ -84,39 +78,59 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.425'
 - !ruby/object:Gem::Dependency
-  name: tty-prompt
+  name: aws-sdk-ecs
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.23'
+        version: '1.132'
     - - ">"
       - !ruby/object:Gem::Version
-        version: '0.23'
+        version: '1.132'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.23'
+        version: '1.132'
     - - ">"
       - !ruby/object:Gem::Version
-        version: '0.23'
+        version: '1.132'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: openssl
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.2.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.2.1
+- !ruby/object:Gem::Dependency
+  name: tty-prompt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.23'
     - - ">"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '0.23'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.23'
     - - ">"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '0.23'
 description: Connect to your AWS ECS tasks
 email: franck.dagostini@gmail.com
 executables:
@@ -146,6 +160,7 @@ files:
 - lib/ecs-rails/task_selector.rb
 - lib/ecs-rails/version.rb
 - spec/ecs-rails/ecs_rails_configuration_spec.rb
+- spec/ecs-rails/task_selector_spec.rb
 - spec/fixtures/ecs-rails.yml
 - spec/spec_helper.rb
 homepage: https://rubygems.org/gems/ecs-rails