smdev 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6fe50e69b90b235fbc3901bc01411e560676f55443f2f3cb1a064f4c400f0183
-  data.tar.gz: eb6ade0d5e8b4c649da5707c51e70bba39ed9ae50cfc939b84fb5b76d0b4d1cf
+  metadata.gz: 61964b5c32328c5e2265a32622cb85c366a70780eeaab4b95e154577942602b9
+  data.tar.gz: 39c56ddd43405021c465494bf439e174681e431146e59a808937f0c6592a2f97
 SHA512:
-  metadata.gz: be026965b5d6a63e10f2742dfe7bafa4ef693cdbb34c7087e345e0f1e04f0597ea232958befb26c58093b67bbc95e41d951e2d6c1e20537dece8a147d1e1d782
-  data.tar.gz: 4fb3be2d42430d9338c8f5865e0bf35ff88fecfd891be0d3b71b867f8d0f98250f4651930cb253a67ce29bd2113927410b6b4e72abc27148f309c8cee501e790
+  metadata.gz: 54d844cb8292bea2cf364c473809f385bba2375d4bedede0927192c620e33bc685289831b1f7973a17a19d7b8471acfda9cf46de845367b7f2d2ab15ee3994e5
+  data.tar.gz: 123be6e3958715b82e1c0ae92c25e9a63f580ad0cbf55f43a2369ee1dbea782fe6d3b7dbb71e551ce4b66ef767ec817097ea0a8d6cd39ade8d3818c14482d13d

data/lib/smdev/ecs_exec.rb

@@ -0,0 +1,92 @@
+require 'open3'
+
+module Smdev
+  module EcsExec
+    def self.ssh(options)
+      cluster_name = self.cluster_name(options)
+      return if cluster_name == nil
+      puts "Found cluster #{cluster_name}"
+
+      service_name = self.service_name(options, cluster_name)
+      return if service_name == nil
+      puts "Found service #{service_name}"
+
+      task_arn = self.task_arn(cluster_name, service_name)
+      puts "Found first task #{task_arn}"
+      command = options[:command]
+
+      execute_command_cmd = %W[
+          aws ecs execute-command
+          --cluster #{cluster_name}
+          --task #{task_arn}
+          --interactive
+          --command \"#{command}\"
+        ].join(' ')
+
+      puts "Running \"#{command}\""
+      exec(execute_command_cmd)
+    end
+
+    def self.cluster_name(options)
+      cluster = options[:cluster]
+      command = "aws ecs list-clusters | grep #{cluster}"
+      stdout, stderr, status = Open3.capture3(command)
+
+      if status.success?
+        match = stdout.match(/cluster\/([^"]+)/)
+        cluster_name = match[1] if match
+
+        return cluster_name
+      else
+        if stderr != ""
+          puts "Error executing command: #{stderr}"
+        else
+          puts "Could not find cluster whose name contains \"#{cluster}\""
+        end
+      end
+    end
+
+    def self.service_name(options, cluster_name)
+      service = options[:service]
+      command = "aws ecs list-services --cluster #{cluster_name} | grep #{service}"
+      stdout, stderr, status = Open3.capture3(command)
+
+      if status.success?
+        match = stdout.match(/#{cluster_name}\/([^"]+)/)
+        service_name = match[1] if match
+
+        return service_name
+      else
+        if stderr != ""
+          puts "Error executing command: #{stderr}"
+        else
+          puts "Could not find service whose name contains \"#{service}\""
+        end
+      end
+    end
+
+    def self.task_arn(cluster_name, service_name)
+      list_tasks_cmd = "aws ecs list-tasks --cluster #{cluster_name} --service-name #{service_name}"
+      stdout, stderr, status = Open3.capture3(list_tasks_cmd)
+
+      if status.success?
+        begin
+          tasks = JSON.parse(stdout)
+          task_arn = tasks['taskArns'][0]
+
+          if task_arn.nil? || task_arn.empty?
+            puts 'No task ARN found.'
+            exit 1
+          end
+          return task_arn
+        rescue JSON::ParserError
+          puts 'Error parsing JSON'
+          exit 1
+        end
+      else
+        puts "Error executing command: #{stderr}"
+        exit 1
+      end
+    end
+  end
+end

data/lib/smdev.rb

@@ -2,7 +2,7 @@
 require 'io/console'
 require 'octokit'
 require 'optparse'
-require 'smdev/rails_console'
+require 'smdev/ecs_exec'
 
 module Smdev
   class CLI
@@ -11,7 +11,9 @@ module Smdev
       commands = ["local_app_setup : Install local requirements for application. (Rails Only Currently)\n",
                   "system_install : Install Homebrew, Ruby, PostgreSQL, and Ruby on Rails\n",
                   "checkout_repos : Checkout all repositories for StrongMind\n",
-                  "console : Open a rails console\n"]
+                  "console : Open a rails console on ECS\n",
+                  "ssh : Open a bash shell on ECS\n"
+      ]
 
       OptionParser.new do |opts|
         opts.banner = "Usage: smdev.rb [options] <command>"
@@ -24,12 +26,16 @@ module Smdev
           options[:https] = true
         end
 
-        opts.on("-e", "--env ENVIRONMENT", "Set the environment for the rails console") do |env|
-          options[:env] = env
+        opts.on("-r", "--cluster CLUSTER", "Lookup this cluster for the ECS execute (defaults to the name of your current folder)") do |cluster|
+          options[:cluster] = cluster
         end
 
-        opts.on("-a", "--app APP_NAME", "Set the app name for the rails console") do |app|
-          options[:app] = app
+        opts.on("-v", "--service SERVICE", "Lookup this service for the ECS execute (defaults to \"prod-worker\")") do |svc|
+          options[:service] = svc
+        end
+
+        opts.on("-c", "--command COMMAND", "Set the command for the ECS execute (defaults to a bash shell when you use 'ssh' and rails console when you use 'console')") do |ecs_command|
+          options[:command] = ecs_command
         end
 
         opts.on("-h", "--help", "Prints this help message") do
@@ -61,10 +67,11 @@ module Smdev
       when "checkout_repos"
         checkout_repos(options)
       when "console"
-        options[:env] ||= "development"
-        options[:app] ||= Dir.pwd.split('/').last
-        puts "Opening a rails console to #{options[:app]} (#{options[:env]})"
-        Smdev::RailsConsole.console(options)
+        options[:command] = "rails c"
+        open_ssh(options)
+      when "ssh"
+        options[:command] ||= "/bin/sh"
+        open_ssh(options)
       else
         puts "Invalid command: #{command}.  Use --help for a list of commands."
       end
@@ -196,5 +203,13 @@ module Smdev
       end
 
     end
+
+    private
+
+    def open_ssh(options)
+      options[:service] ||= "prod-worker"
+      options[:cluster] ||= Dir.pwd.split('/').last
+      Smdev::EcsExec.ssh(options)
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smdev
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Derek Neighbors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-10-11 00:00:00.000000000 Z
+date: 2023-10-12 00:00:00.000000000 Z
 dependencies: []
 description: StrongMind Development Tool
 email: derek.neighbors@strongmind.com
@@ -19,7 +19,7 @@ extra_rdoc_files: []
 files:
 - bin/smdev
 - lib/smdev.rb
-- lib/smdev/rails_console.rb
+- lib/smdev/ecs_exec.rb
 homepage: https://github.com/StrongMind/Helpers/tree/main/smdev
 licenses:
 - MIT

data/lib/smdev/rails_console.rb

@@ -1,87 +0,0 @@
-require 'open3'
-require 'pty'
-
-module Smdev
-  module RailsConsole
-    def self.console(options)
-      cluster_name = self.cluster_name(options)
-      container_name = cluster_name
-      task_arn = self.tasks_list(cluster_name)
-
-      execute_command_cmd = %W[
-          aws ecs execute-command
-          --cluster #{container_name}
-          --task #{task_arn}
-          --container #{container_name}
-          --interactive
-          --command \"rails c\"
-        ].join(' ')
-
-      begin
-        PTY.spawn(execute_command_cmd) do |stdout, stdin, pid|
-          begin
-            # Use IO.select for bi-directional IO
-            loop do
-              r, w, e = IO.select([stdout, $stdin], [stdin], [])
-
-              # If there's something to read from stdout, print it
-              if r.include? stdout
-                output = stdout.read_nonblock(4096)
-                print output
-              end
-
-              # If there's input from the terminal, send it to stdin
-              if r.include? $stdin
-                input = $stdin.getc
-                stdin.write(input) if w.include? stdin
-              end
-            end
-          rescue Errno::EIO, EOFError
-            # End of file or error. Exit loop.
-          end
-        end
-      rescue PTY::ChildExited => e
-        puts "The child process exited with status #{e.status.exitstatus}"
-      end
-
-    end
-
-    def self.cluster_name(options)
-      command = "aws ecs list-clusters | grep #{options[:app]} | grep #{options[:env]}  | grep web"
-      stdout, stderr, status = Open3.capture3(command)
-
-      if status.success?
-        match = stdout.match(/cluster\/([^"]+)/)
-        cluster_name = match[1] if match
-
-        return cluster_name
-      else
-        puts "Error executing command: #{stderr}"
-      end
-    end
-
-    def self.tasks_list(cluster_name)
-      list_tasks_cmd = "aws ecs list-tasks --cluster #{cluster_name}"
-      stdout, stderr, status = Open3.capture3(list_tasks_cmd)
-
-      if status.success?
-        begin
-          tasks = JSON.parse(stdout)
-          task_arn = tasks['taskArns'][0]
-
-          if task_arn.nil? || task_arn.empty?
-            puts 'No task ARN found.'
-            exit 1
-          end
-          return task_arn
-        rescue JSON::ParserError
-          puts 'Error parsing JSON'
-          exit 1
-        end
-      else
-        puts "Error executing command: #{stderr}"
-        exit 1
-      end
-    end
-  end
-end