putpaws 0.0.1 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ac7d1e3c9a05d7cabf6ed3ddb76b68eebf5e238ee14cd2d220bfeaf88226570
-  data.tar.gz: cbcff987bb94042328f0b65d5f693d8aabd75231db1766456d4fe4ed803433e8
+  metadata.gz: bc81dde13186441af99e515508a418fddfda5abac1636ef734ca05b5796df3a7
+  data.tar.gz: fd003a6a360a6859026f8003471d5755645dcca68e359f6d16de91f16eb2e483
 SHA512:
-  metadata.gz: 76acfa6f6d0b7a514c31a0f63819cc6e1ea587a48a07a465a321afc6743bdc2b645a1d1f22aa2eb3c7c460e44cdf11d51abbc6bc11f5efbc222950a4231ae56e
-  data.tar.gz: daeea4af00b61ebd35b17daf562343b8839791d94dbb5ae356635d3f39d8d09d754ef971b325e979a24c846c1ea0efe878b0c910c54459a507306759a4448d47
+  metadata.gz: 1d119637b098227c69d9c96eb258e9c0a04cd5a1a67840a5006a76014c7deca0ef3c6e750b9e2aa2791b5703eebcbdc4475548dafdcf97f145eed9ab9872d4ec
+  data.tar.gz: e7e6bf5cb5a343a23285dfed9c849267f421170406a9e437a3aee614455f756ebb15ffcf50447e9dd88d7f6f95f7aab4fcf710ffeab6fb788bc4b0af26915dcb

data/lib/Putpawsfile

@@ -3,4 +3,5 @@ require "putpaws/setup"
 
 require "putpaws/hello"
 require "putpaws/ecs/ecs_task"
-require "putpaws/cloud_watch/log_task"
+require "putpaws/cloud_watch/log_task"
+require "putpaws/scheduler/scheduler_task"

data/lib/putpaws/all.rb

@@ -5,6 +5,7 @@ require "putpaws/version"
 require "putpaws/application"
 
 require "putpaws/application_config"
+require "putpaws/schedule_config"
 
 module Putpaws
 end

data/lib/putpaws/application_config.rb

@@ -1,10 +1,13 @@
 require 'json'
 require 'pathname'
+require "putpaws/schedule_config"
 
 class Putpaws::ApplicationConfig < Struct.new(
   :name, :region, 
   :cluster, :service, :task_name_prefix, :ecs_region,
   :log_group_prefix, :log_region,
+  :build_project, :build_log_group_prefix, :build_region,
+  :schedules,
   keyword_init: true)
   def self.load(path_prefix: '.putpaws')
     @application_data ||= begin
@@ -45,4 +48,15 @@ class Putpaws::ApplicationConfig < Struct.new(
       log_group_prefix: log_group_prefix,
     }
   end
+
+  def build_log_command_params
+    {
+      region: build_region || region,
+      log_group_prefix: build_log_group_prefix,
+    }
+  end
+
+  def schedules
+    @schedules ||= (self[:schedules] || []).map{|x| Putpaws::ScheduleConfig.find(x)}.compact
+  end
 end

data/lib/putpaws/cloud_watch/log_command.rb

@@ -10,8 +10,12 @@ module Putpaws::CloudWatch
       'w' => 60 * 60 * 24 * 7,
     }
 
-    def self.config(config)
-      new(config.log_command_params)
+    def self.config(config, type: "default")
+      if type == "build"
+        new(config.build_log_command_params)
+      else
+        new(config.log_command_params)
+      end
     end
 
     def self.parse_unit_time(ut)

data/lib/putpaws/cloud_watch/tasks/log_task.rake

@@ -1,20 +1,27 @@
-require "tty-prompt"
+require "putpaws/prompt"
 require "putpaws/cloud_watch/log_command"
 require "putpaws/cloud_watch/default_log_formatter"
 
 namespace :log do
   desc "Set Log Group."
   task :set_log_group do
-    aws = Putpaws::CloudWatch::LogCommand.config(fetch(:app))
+    app = fetch(:app)
+    prompt = Putpaws::Prompt.safe
+    log_type = if app.build_log_group_prefix
+      prompt.select("Choose log type", ["default", "build"])
+    else
+      "default"
+    end
+    aws = Putpaws::CloudWatch::LogCommand.config(app, type: log_type)
+
     log_groups = aws.list_log_groups.map{|a| 
       [a.log_group_name, a]
     }.to_h
     raise "Log group not found on your permission" if log_groups.empty?
 
     log_group = if log_groups.length == 1
-      log_groups.first
+      log_groups.values.first
     else
-      prompt = TTY::Prompt.new
       selected = prompt.select("Choose a log_group you're going to operate", log_groups.keys)
        log_groups[selected]
     end

data/lib/putpaws/ecs/task_command.rb

@@ -40,6 +40,8 @@ module Putpaws::Ecs
         task: ecs_task.task_arn,
       })
 
+      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,
@@ -56,7 +58,7 @@ module Putpaws::Ecs
         "StartSession",
         'test',
         target_json.dump,
-        "https://ssm.ap-northeast-1.amazonaws.com"
+        "https://ssm.#{ssm_region}.amazonaws.com"
       ]
       cmd.join(' ')
     end

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

@@ -1,4 +1,4 @@
-require "tty-prompt"
+require "putpaws/prompt"
 require "putpaws/ecs/task_command"
 
 namespace :ecs do
@@ -10,14 +10,14 @@ namespace :ecs do
       task_def = t.task_definition_arn.split('/').last
       ["#{task_id} (#{task_def}) #{t.last_status}", t]
     }.to_h
-    prompt = TTY::Prompt.new
+    prompt = Putpaws::Prompt.safe
     selected = prompt.select("Choose a task you're going to operate", ecs_tasks.keys)
     ecs_task = ecs_tasks[selected]
 
     set :ecs_task, ecs_task
   end
 
-  desc "Attach on ECS task. You need to enable ECS Exec on a specified task."
+  desc "Attach on ECS task. You need to enable ECS Exec on a specified task and also install session-manager-plugin."
   task attach: :set_task do
     ecs_task = fetch(:ecs_task)
     aws = Putpaws::Ecs::TaskCommand.config(fetch(:app))

data/lib/putpaws/infra_network_config.rb

@@ -0,0 +1,31 @@
+require 'json'
+require 'pathname'
+
+class Putpaws::InfraNetworkConfig < Struct.new(
+  :name, :subnets, :security_groups, :assign_public_ip,
+  keyword_init: true)
+  def self.load(path_prefix: '.putpaws')
+    @infra_network_data ||= begin
+      path = Pathname.new(path_prefix).join("infra.json").to_s
+      data = File.exists?(path) ?
+        JSON.parse(File.read(path), symbolize_names: true).to_h :
+        {}
+      data[:network] || {}
+    end
+  end
+
+  def self.all
+    load.map{|k,v|
+      data = v.slice(*self.members)
+      new(data.merge(name: k.to_s))
+    }
+  end
+
+  def self.find(name)
+    infra_network_data = load
+    data = infra_network_data[name.to_sym]
+    return nil unless data
+    data = data.slice(*self.members)
+    new(data.merge({name: name.to_s}))
+  end
+end

data/lib/putpaws/infra_target_config.rb

@@ -0,0 +1,35 @@
+require 'json'
+require 'pathname'
+
+class Putpaws::InfraTargetConfig < Struct.new(
+  :name, 
+  :scheduler_role,
+  :cluster,
+  :task_definition,
+  :container_name,
+  keyword_init: true)
+  def self.load(path_prefix: '.putpaws')
+    @infra_target_data ||= begin
+      path = Pathname.new(path_prefix).join("infra.json").to_s
+      data = File.exists?(path) ?
+        JSON.parse(File.read(path), symbolize_names: true).to_h :
+        {}
+      data[:target] || {}
+    end
+  end
+
+  def self.all
+    load.map{|k,v|
+      data = v.slice(*self.members)
+      new(data.merge(name: k.to_s))
+    }
+  end
+
+  def self.find(name)
+    infra_target_data = load
+    data = infra_target_data[name.to_sym]
+    return nil unless data
+    data = data.slice(*self.members)
+    new(data.merge({name: name.to_s}))
+  end
+end

data/lib/putpaws/prompt.rb

@@ -0,0 +1,9 @@
+require "io/console"
+require "tty-prompt"
+
+class Putpaws::Prompt
+  def self.safe
+    default_args = {output: IO.console || $stderr}
+    TTY::Prompt.new(**default_args)
+  end
+end

data/lib/putpaws/schedule_config.rb

@@ -0,0 +1,54 @@
+require 'json'
+require 'pathname'
+require 'putpaws/infra_network_config'
+require 'putpaws/infra_target_config'
+
+class Putpaws::ScheduleConfig < Struct.new(
+  :name, :region, :network, :target, :command, :args,
+  keyword_init: true)
+  def self.load(path_prefix: '.putpaws')
+    @schedule_data ||= begin
+      path = Pathname.new(path_prefix).join("schedule.json").to_s
+      data = File.exists?(path) ?
+        JSON.parse(File.read(path), symbolize_names: true).to_h :
+        {}
+    end
+  end
+
+  def self.build_args(name, config_args)
+    region = config_args.delete(:region)
+    network = config_args.delete(:network)
+    target = config_args.delete(:target)
+    command = config_args.delete(:command)
+    {
+      name: name.to_s, 
+      region: region, 
+      network: network, 
+      target: target, 
+      command: command,
+    }.merge(args: config_args)
+  end
+
+  def self.all
+    load.map{|k,v|
+      new(build_args(k, v))
+    }
+  end
+
+  def self.find(name)
+    schedule_data = load
+    data = schedule_data[name.to_sym]
+    return nil unless data
+    new(build_args(name, data))
+  end
+
+  def network
+    return nil unless self[:network]
+    @network ||= Putpaws::InfraNetworkConfig.find(self[:network])
+  end
+
+  def target
+    return nil unless self[:target]
+    @target ||= Putpaws::InfraTargetConfig.find(self[:target])
+  end
+end

data/lib/putpaws/scheduler/schedule_command.rb

@@ -0,0 +1,62 @@
+require 'aws-sdk-scheduler'
+
+module Putpaws::Scheduler
+  class ScheduleCommand
+    def self.config(config)
+      new(config.log_command_params)
+    end
+
+    attr_reader :client
+    attr_reader :config, :network, :target
+    
+    def initialize(schedule_config)
+      @config = schedule_config
+      @network = config.network
+      @target = config.target
+      @client = Aws::Scheduler::Client.new({region: config.region})
+    end
+
+    def generated_params
+      {
+        name: config.name,
+        flexible_time_window: {mode: "OFF"},
+        target: {
+          arn: target.cluster,
+          role_arn: target.scheduler_role,
+          retry_policy: {maximum_retry_attempts: 0},
+          input: {
+            containerOverrides: [
+              {
+                name: target.container_name,
+                command: config.command,
+              }
+            ]
+          }.to_json,
+          ecs_parameters: {
+            launch_type: "FARGATE",
+            network_configuration: {
+              awsvpc_configuration: {
+                subnets: network.subnets,
+                security_groups: network.security_groups,
+                assign_public_ip: network.assign_public_ip,
+              }
+            },
+            task_definition_arn: target.task_definition,
+            task_count: 1,          }
+        }
+      }
+    end
+
+    def deploy!
+      # TODO: Use deep merge here
+      args = generated_params.merge(config.args)
+
+      begin
+        res = client.get_schedule(name: config.name)
+        client.update_schedule(args)
+      rescue Aws::Scheduler::Errors::ResourceNotFoundException => e
+        client.create_schedule(args)
+      end
+    end
+  end
+end

data/lib/putpaws/scheduler/scheduler_task.rb

@@ -0,0 +1 @@
+load File.expand_path("../tasks/scheduler_task.rake", __FILE__)

data/lib/putpaws/scheduler/tasks/scheduler_task.rake

@@ -0,0 +1,29 @@
+require "putpaws/prompt"
+require "putpaws/schedule_config"
+require "putpaws/scheduler/schedule_command"
+
+namespace :scheduler do
+  desc "Select Schedule to Manage."
+  task :set_schedule_config do
+    app = fetch(:app)
+    schedules = (app.schedules && !app.schedules.empty?) ? app.schedules : []
+    if schedules.empty?
+      schedule_options = Putpaws::ScheduleConfig.all.map(&:name)
+      raise "Please set `schedules` at .putpaws/schedule.json\nFollowing schedules available:\n#{schedule_options.to_json}\n"
+    end
+
+    prompt = Putpaws::Prompt.safe
+    selected = prompt.select("Choose a task you're going to operate", schedules.map(&:name))
+    schedule_config = schedules.find{|x| x.name == selected}
+
+    set :schedule_config, schedule_config
+  end
+
+  desc "Deploy schedule."
+  task deploy: :set_schedule_config do
+    schedule_config = fetch(:schedule_config)
+    # pp schedule_config
+    aws = Putpaws::Scheduler::ScheduleCommand.new(schedule_config)
+    aws.deploy!
+  end
+end

data/lib/putpaws/version.rb

@@ -1,3 +1,3 @@
 module Putpaws
-  VERSION = "0.0.1"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: putpaws
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.5
 platform: ruby
 authors:
 - metheglin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-26 00:00:00.000000000 Z
+date: 2023-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -28,44 +28,58 @@ dependencies:
   name: tty-prompt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: aws-sdk-ecs
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: aws-sdk-cloudwatchlogs
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        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-scheduler
+  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: '1.0'
+        version: '0'
 description: aws fargate based infra management
 email: pigmybank@gmail.com
 executables:
@@ -89,6 +103,13 @@ files:
 - lib/putpaws/ecs/tasks/ecs_task.rake
 - lib/putpaws/env.rb
 - lib/putpaws/hello.rb
+- lib/putpaws/infra_network_config.rb
+- lib/putpaws/infra_target_config.rb
+- lib/putpaws/prompt.rb
+- lib/putpaws/schedule_config.rb
+- lib/putpaws/scheduler/schedule_command.rb
+- lib/putpaws/scheduler/scheduler_task.rb
+- lib/putpaws/scheduler/tasks/scheduler_task.rake
 - lib/putpaws/setup.rb
 - lib/putpaws/tasks/hello.rake
 - lib/putpaws/version.rb