putpaws 0.0.6 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0880d0887eb118ff264bf873fdbe215e039329e9dfc58d004885c7f728f5730a'
-  data.tar.gz: 25114357952cb895486c6068e1115cf2d8baea0d3a23b20c7e5d569e73acbb93
+  metadata.gz: e5383c31d8b2b94dcb948e565f9ab5784137a0b946aa53e2ade93fc5e1bf3152
+  data.tar.gz: 30babace1c15c9675752567795e4c43414be155cc0f9affccfdb8bd8907a215d
 SHA512:
-  metadata.gz: e3a52e4bb01dc8d0825a96b52083935f9b630256576a36f780fbefea1d8925a0a3a71ecf1be7524026032d38d9ea4a682d6bd11d79294f52c33ea04f9ffefb80
-  data.tar.gz: 584f4a1b234e0561e5ed0278c8c00410df99577926e4a087671e378b41f3f7541d20a9b6ca857dbd9d26eb51e604960b2f1a5439ea16bfcfcc6eba7590fef1ea
+  metadata.gz: f506cafed6700e2fc5bff6334e7e3374e528652740de99c03a36e89a031603b891b77133b5264fff51f8d1d3bc7db22f8549c88a32658f87883249c8cfe9d331
+  data.tar.gz: 941ceaa13526fd71c3a37d5d6541490950472dea6bff75aff2b495acc10adb41f46b270e14a6c279d542863792594896443aeca882655321b856a745c38306e0

data/lib/putpaws/cloud_watch/log_command.rb

@@ -12,9 +12,9 @@ module Putpaws::CloudWatch
 
     def self.config(config, type: "default")
       if type == "build"
-        new(config.build_log_command_params)
+        new(**config.build_log_command_params)
       else
-        new(config.log_command_params)
+        new(**config.log_command_params)
       end
     end
 

data/lib/putpaws/ecs/task_command.rb

@@ -1,9 +1,10 @@
 require 'aws-sdk-ecs'
+require 'aws-sdk-ssm'
 
 module Putpaws::Ecs
   class TaskCommand
     def self.config(config)
-      new(config.ecs_command_params)
+      new(**config.ecs_command_params)
     end
 
     attr_reader :ecs_client
@@ -27,11 +28,35 @@ module Putpaws::Ecs
       }
     end
 
-    def get_attach_command(container: 'app')
+    def get_session_target(container: 'app')
       raise "ECS Task Not Set" unless ecs_task
       ctn = ecs_task.containers.detect{|c| c.name == container}
       task_id = ecs_task.task_arn.split('/').last
       raise "Container: #{container} not found" unless ctn
+      "ecs:#{cluster}_#{task_id}_#{ctn.runtime_id}"
+    end
+
+    def get_port_forwarding_command(container: nil, remote_port:, remote_host:, local_port: nil)
+      container ||= 'app'
+      target = get_session_target(container: container)
+      ssm_client = Aws::SSM::Client.new({region: region})
+      local_port ||= (1050..1079).map(&:to_s).shuffle.first
+      puts "Starting to use local port: #{local_port}"
+      res = ssm_client.start_session({
+        target: target,
+        document_name: "AWS-StartPortForwardingSessionToRemoteHost",
+        parameters: {
+          portNumber: [remote_port],
+          localPortNumber: [local_port],
+          host: [remote_host]
+        }
+      })
+      build_session_manager_plugin_command(session: res, target: target)
+    end
+
+    def get_attach_command(container: nil)
+      container ||= 'app'
+      target = get_session_target(container: container)
       res = ecs_client.execute_command({
         cluster: cluster,
         container: container,
@@ -39,17 +64,26 @@ module Putpaws::Ecs
         interactive: true,
         task: ecs_task.task_arn,
       })
+      build_session_manager_plugin_command(session: res.session, target: target)
+    end
 
+    def build_session_manager_plugin_command(session:, target:)
       ssm_region = ENV['AWS_REGION_SSM'] || @region
-      
+
       # https://github.com/aws/aws-cli/blob/2a6136010d8656a605d41d1e7b5fdab3c2930cad/awscli/customizations/ecs/executecommand.py#L105
-      session_json = {
-        "SessionId" => res.session.session_id,
-        "StreamUrl" => res.session.stream_url,
-        "TokenValue" => res.session.token_value,
-      }.to_json
+      session_json = if session.respond_to?(:session_id)
+        {
+          "SessionId" => session.session_id,
+          "StreamUrl" => session.stream_url,
+          "TokenValue" => session.token_value,
+        }.to_json
+      elsif session.is_a?(Hash)
+        session.to_json
+      else
+        session
+      end
       target_json = {
-        "Target" => "ecs:#{cluster}_#{task_id}_#{ctn.runtime_id}"
+        "Target" => target
       }.to_json
       cmd = [
         "session-manager-plugin",

data/lib/putpaws/ecs/tasks/ecs_task.rake

@@ -22,7 +22,28 @@ namespace :ecs do
     ecs_task = fetch(:ecs_task)
     aws = Putpaws::Ecs::TaskCommand.config(fetch(:app))
     aws.ecs_task = ecs_task
-    cmd = aws.get_attach_command
+    cmd = aws.get_attach_command(container: ENV['container'])
+    puts cmd
+    system(cmd)
+  end
+
+  desc "Run port forwarding session. You need to enable ECS Exec on a specified task and also install session-manager-plugin."
+  task forward: :set_task do
+    ecs_task = fetch(:ecs_task)
+    aws = Putpaws::Ecs::TaskCommand.config(fetch(:app))
+    aws.ecs_task = ecs_task
+
+    remote_host, remote_port = (ENV['remote'] || '').split(':').map(&:strip)
+    _, local_port = (ENV['local'] || '').split(':').map(&:strip)
+    if remote_host.nil? or remote_port.nil?
+      raise "Remote Host, Port is required: (Ex) remote=192.168.1.1:80"
+    end
+    cmd = aws.get_port_forwarding_command(
+      container: ENV['container'],
+      remote_host: remote_host,
+      remote_port: remote_port,
+      local_port: local_port
+    )
     puts cmd
     system(cmd)
   end

data/lib/putpaws/scheduler/schedule_command.rb

@@ -3,7 +3,7 @@ require 'aws-sdk-scheduler'
 module Putpaws::Scheduler
   class ScheduleCommand
     def self.config(config)
-      new(config.log_command_params)
+      new(**config.log_command_params)
     end
 
     attr_reader :client

data/lib/putpaws/version.rb

@@ -1,3 +1,3 @@
 module Putpaws
-  VERSION = "0.0.6"
+  VERSION = "0.0.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: putpaws
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.8
 platform: ruby
 authors:
 - metheglin
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-18 00:00:00.000000000 Z
+date: 2024-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: aws-sdk-ssm
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: aws-sdk-ecs
   requirement: !ruby/object:Gem::Requirement
@@ -117,7 +131,7 @@ homepage: https://rubygems.org/gems/putpaws
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -132,8 +146,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.4.10
+signing_key:
 specification_version: 4
 summary: Put your paws up!!
 test_files: []