cwa 0.2.3 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c78a561097938293f123e52178ed3c7268e62353ba3653c932a54ac874632693
-  data.tar.gz: 45ef4753e2e7d92e9a021a15c2f0e712f8e9fe9d512a69cfd248403cce2f83b5
+  metadata.gz: ed03242af15ac021b94d8c3ba2d0eeb32d97769f6eba09ab8e71dc112efdb824
+  data.tar.gz: 9604ba10ae8fbee2d90b184e219dcc8b8878cf4ce8496f2fc1df632a2ca4430d
 SHA512:
-  metadata.gz: 789f2ccffae2409eedbc6cc1da3feb3b92d5f56c175ae208f16a85423957ed51dc572832fdab08e3245c14dc9b14579d50e9378188e2fcc95c9ce1b2f45d2e94
-  data.tar.gz: 50de2f1713343c6c967286e2c927d8dcf2d7e497e041d0a16266e49178caa2f2aac08a863cf1ff90297b982e53c30778ff3ca513b685d16efb52860e1e68ff3a
+  metadata.gz: '08d9a3e96588461c2c757d8fc038cfa246e9073fd63c8a595a2010a82bd25cbbad60c6aa1b733131bbcc91951bad081a3f3c4f07afe09b28dba1feebd513d1a1'
+  data.tar.gz: 72ea2ff7740f58c409fb961230b0d0493079f8a6ae13cb80dbf6f06e4a9fbc5349d71376f4ff28bf299a316ce3340aeb2f8fad3b5723b142c7117bd6fe117a22

data/.solargraph.yml

@@ -0,0 +1,16 @@
+---
+include:
+- "**/*.rb"
+exclude:
+- spec/**/*
+- test/**/*
+- vendor/**/*
+- ".bundle/**/*"
+require: []
+domains: []
+reporters:
+- rubocop
+- require_not_found
+require_paths: []
+plugins: []
+max_files: 5000

data/README.md

@@ -19,12 +19,18 @@ Or install it yourself as:
 
 ## Usage
 ```
+$ >> cwa help
 Commands:
   cwa alarms  --name ALARMNAME --regexp ALARMNAME --namespae NAMESPACE --dimensions KEY:VALUE  # show cloudwatch alms
+  cwa configure                                                                                # create config files
   cwa disable --name ALARMNAME --regexp ALARMNAME --namespae NAMESPACE --dimensions KEY:VALUE  # disable cloudwatch alms
   cwa enable  --name ALARMNAME --regexp ALARMNAME --namespae NAMESPACE --dimensions KEY:VALUE  # enable cloudwatch alms
   cwa help [COMMAND]                                                                           # Describe available commands or one specific command
 
 Options:
   [--verbose], [--no-verbose]
+  [--profile=PROFILE]
+  [--region=REGION]
+  [--assume-role=ASSUME_ROLE]
+  [--output=OUTPUT]
 ```

data/cwa.gemspec

@@ -40,4 +40,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "solargraph"
 end

data/lib/cwa.rb

@@ -1,30 +1,19 @@
+# frozen_string_literal: true
+
 require 'aws-sdk-core'
-require "cwa/client"
-require "cwa/version"
+require 'cwa/client'
+require 'cwa/version'
 
+#--
+# Copyright (c) 2021 Ito Toshifumi
+# cloudwatch alarm cli
+#++
 module CWA
   class Error < StandardError; end
 
   class << self
-    def configure(**opts)
-      @aws_opts = opts
-    end
-
     def get(opts = {})
-      @aws_opts         ||= {}
-      @aws_opts[:profile] = opts[:profile] if opts[:profile]
-      @aws_opts[:region]  = opts[:region ] if opts[:region]
-
-      Client.new(@aws_opts)
-    end
-
-    def assume_role(opts)
-      role_credentials = Aws::AssumeRoleCredentials.new(
-        client: Aws::STS::Client.new(opts),
-        role_arn: opts[:arn],
-        role_session_name: opts[:session_name]
-      )
-      @aws_opts[:credentials] = role_credentials
+      Client.new(opts)
     end
   end
 end

data/lib/cwa/alarms.rb

@@ -1,39 +1,62 @@
+# frozen_string_literal: true
+
 module CWA
   class Alarms
     class Error < StandardError; end
 
+    DEFAULT_OPTS = {
+      alarm_name_prefix: '*',
+      max_records:       100
+    }.freeze
+
     def initialize(client, **opts)
-      @opts   = opts
-      @client = client
+      @client        = client
     end
 
     def filter(query)
-      alms = _alarms.metric_alarms
+      @alms = alarms
 
       # querys
-      name_query       = ->(alm) { alm.alarm_name == query[:name]       }
-      regexp_query  = ->(alm) { alm.alarm_name =~ /#{query[:regexp]}/   }
-      namespace_query  = ->(alm) { alm.namespace  == query[:namespace]  }
-
-      alms = alms.select(&name_query)              if query[:name      ]
-      alms = alms.select(&regexp_query)            if query[:regexp    ]
-      alms = alms.select(&namespace_query)         if query[:namespace ]
-      alms = _dimension?(alms, query[:dimensions]) if query[:dimensions]
-      alms
+      name_query       = ->(alm) { alm.alarm_name == query[:name]        }
+      regexp_query     = ->(alm) { alm.alarm_name =~ /#{query[:regexp]}/ }
+      namespace_query  = ->(alm) { alm.namespace  == query[:namespace]   }
+
+      @alms = @alms.select(&name_query)             if query[:name      ]
+      @alms = @alms.select(&regexp_query)           if query[:regexp    ]
+      @alms = @alms.select(&namespace_query)        if query[:namespace ]
+      @alms = dimension?(@alms, query[:dimensions]) if query[:dimensions]
+
+      @alms
     end
 
-    def refresh
+    def refresh(query = nil)
       @alms = nil
-      _alarms
+      query ? filter(query) : alarms
     end
 
     private
-    def _alarms(**opts)
-      opts[:alarm_name_prefix] = "*" unless opts
-      @alms ||= @client.describe_alarms(opts)
+    def alarms(**opts)
+      opts = DEFAULT_OPTS unless opts
+
+      unless @alms
+        @alms      = Array.new
+        alms       = @client.describe_alarms(opts)
+        next_token = alms.next_token
+        @alms     << alms
+
+        while next_token
+          opts[:next_token] = next_token
+          alms              = @client.describe_alarms(opts)
+          next_token        = alms.next_token
+
+          @alms << alms
+        end
+      end
+
+      @alms.map {|e| e.metric_alarms }.flatten
     end
 
-    def _dimension?(alms, dimensions)
+    def dimension?(alms, dimensions)
       alms.select do |alm|
         alm.dimensions.any? do |dims|
           dimensions.keys.any?(dims.name) && dimensions.values.any?(dims.value)

data/lib/cwa/cli.rb

@@ -1,75 +1,97 @@
+# frozen_string_literal: true
+
 require 'cwa'
 require 'thor'
 require 'terminal-table'
 require 'colorize'
 require 'yaml'
+require 'json'
 require 'fileutils'
 
-ASSUME_DIR  = File.join(Dir.home,   '.config', 'cwa')
-ASSUME_FILE = File.join(ASSUME_DIR, 'assume.yml')
+ASSUME_DIR  = File.join(Dir.home,   '.config', 'cwa').freeze
+ASSUME_FILE = File.join(ASSUME_DIR, 'assume.yml').freeze
+
+OUTPUT_KEYS = %i[
+namespace
+alarm_name
+actions_enabled
+].freeze
 
-OUTPUT_KEYS = %i(
-  namespace
-  alarm_name
-  actions_enabled
-  dimensions
-  alarm_arn
-  alarm_description
-)
+OUTPUT_KEYS_DETAIL = %i[
+namespace
+alarm_name
+actions_enabled
+dimensions
+alarm_arn
+alarm_description
+].freeze
 
 
-AWS_OPTIONS = %i(
-  profile
-  region
-)
+AWS_OPTIONS = %i[
+profile
+region
+].freeze
 
-OPTIONS = "--name ALARMNAME --regexp ALARMNAME --namespae NAMESPACE --dimensions KEY:VALUE"
+OPTIONS = '--name ALARMNAME --regexp ALARMNAME --namespae NAMESPACE --dimensions KEY:VALUE'.freeze
 
 module CWA
+  # cli class
   class Cli < Thor
     class_option :verbose,      type: :boolean
     class_option :profile,      type: :string
     class_option :region,       type: :string
     class_option :assume_role,  type: :string
+    class_option :output,       type: :string
 
-    desc "alarms  #{OPTIONS}", "show cloudwatch alms"
-    option :name,       type: :string, aliases: "n"
-    option :namespace,  type: :string, aliases: "s"
-    option :regexp,     type: :string, aliases: "r"
-    option :dimensions, type: :hash,   aliases: "d"
+    desc "alarms  #{OPTIONS}", 'show cloudwatch alms'
+    option :name,       type: :string, aliases: 'n'
+    option :namespace,  type: :string, aliases: 's'
+    option :regexp,     type: :string, aliases: 'r'
+    option :dimensions, type: :hash,   aliases: 'd'
     def alarms
       begin
-        _enable_assume if options[:assume_role]
-
-        alms  = _output_alms
-        raise "not alarms" if alms.empty?
+        cwa  = CWA.get(aws_opts)
+        alms = cwa.alarms(options)
+        keys = OUTPUT_KEYS
+        keys = OUTPUT_KEYS_DETAIL if options[:verbose]
 
-        head  = alms.first.keys
-        rows  = alms.map{|alm| alm.values }
-        table = Terminal::Table.new :headings => head, :rows => rows
+        alms = alms.map do |alm|
+          keys.reduce({}) { |h, key| h.merge!(key => alm.method(key).call) }
+        end
 
-        puts table
-      rescue => err
-        puts "error => #{err}".colorize(:red)
+        raise 'not alarms' if alms.empty?
+
+        case options[:output]
+        when 'json'
+          puts JSON.dump(alms)
+        when 'yaml'
+          puts YAML.dump(alms)
+        else
+          head  = alms.first.keys
+          rows  = alms.map{|alm| alm.values }
+          table = Terminal::Table.new :headings => head, :rows => rows
+          puts table
+        end
+      rescue StandardError => e
+        puts "error => #{e}".colorize(:red)
         exit 1
       end
     end
 
-    desc "enable  #{OPTIONS}", "enable cloudwatch alms"
-    option :name,       type: :string, aliases: "n"
-    option :namespace,  type: :string, aliases: "s"
-    option :regexp,     type: :string, aliases: "r"
-    option :dimensions, type: :hash,   aliases: "d"
+    desc "enable  #{OPTIONS}", 'enable cloudwatch alms'
+    option :name,       type: :string, aliases: 'n'
+    option :namespace,  type: :string, aliases: 's'
+    option :regexp,     type: :string, aliases: 'r'
+    option :dimensions, type: :hash,   aliases: 'd'
     def enable
       begin
-        _enable_assume if options[:assume_role]
-
-        cwa  = CWA.get(options)
+        cwa  = CWA.get(aws_opts)
         alms = cwa.alarms(options)
-        alms = _check_alm(alms, :enable)
+        alms = check_alm(alms, :enable)
 
-        raise "not alarms" if alms.empty?
-        _confirm("cloudwatch alarm enable?")
+        raise 'not alarms' if alms.empty?
+
+        confirm('cloudwatch alarm enable?')
 
         alms.each do |alm|
           cwa.enable(alm)
@@ -77,27 +99,26 @@ module CWA
         end
         puts
         alarms
-      rescue => err
-        puts "error => #{err}".colorize(:red)
+      rescue StandardError => e
+        puts "error => #{e}".colorize(:red)
         exit 1
       end
     end
 
-    desc "disable #{OPTIONS}", "disable cloudwatch alms"
-    option :name,       type: :string, aliases: "n"
-    option :namespace,  type: :string, aliases: "s"
-    option :regexp,     type: :string, aliases: "r"
-    option :dimensions, type: :hash,   aliases: "d"
+    desc "disable #{OPTIONS}", 'disable cloudwatch alms'
+    option :name,       type: :string, aliases: 'n'
+    option :namespace,  type: :string, aliases: 's'
+    option :regexp,     type: :string, aliases: 'r'
+    option :dimensions, type: :hash,   aliases: 'd'
     def disable
       begin
-        _enable_assume if options[:assume_role]
-
-        cwa  = CWA.get(options)
+        cwa  = CWA.get(aws_opts)
         alms = cwa.alarms(options)
-        alms = _check_alm(alms, :disable)
+        alms = check_alm(alms, :disable)
+
+        raise 'not alarms' if alms.empty?
 
-        raise "not alarms" if alms.empty?
-        _confirm("cloudwatch alarm disable?")
+        confirm('cloudwatch alarm disable?')
 
         alms.each do |alm|
           cwa.disable(alm)
@@ -111,77 +132,82 @@ module CWA
       end
     end
 
-    desc "configure", "create config files"
+    desc 'configure', 'create config files'
     def configure
-      configs     = %w(assume_role)
-
-      puts configs
-      print "create type? : "
-      type = $stdin.gets.strip
-      case type
-      when 'assume_role'
-        print "name?         : "
-        name    = $stdin.gets.strip
-        print "arn?          : "
-        arn     = $stdin.gets.strip
-        print "session_name? : "
-        session = $stdin.gets.strip
-
-        assume = {name => { arn: arn, session_name: session}}
-        FileUtils.mkdir_p(ASSUME_DIR) unless Dir.exist?(ASSUME_DIR)
-        file = open(ASSUME_FILE, "w")
-        YAML.dump(assume, file)
-        puts "create => #{ASSUME_FILE.colorize(:yellow)}"
+      begin
+        configs     = %w[assume_role]
+
+        puts configs
+        print "create type? : "
+        type = $stdin.gets.strip
+        case type
+        when 'assume_role'
+          print "name?         : "
+          name    = $stdin.gets.strip
+          print "arn?          : "
+          arn     = $stdin.gets.strip
+          print "session_name? : "
+          session = $stdin.gets.strip
+
+          assume = {name => { arn: arn, session_name: session}}
+
+          FileUtils.mkdir_p(ASSUME_DIR)              unless Dir.exist?(ASSUME_DIR)
+          assume.merge!(YAML.load_file(ASSUME_FILE)) if     File.exist?(ASSUME_FILE)
+          file = open(ASSUME_FILE, "w")
+          YAML.dump(assume, file)
+
+          puts "create => #{ASSUME_FILE.colorize(:yellow)}"
+        end
+      rescue StandardError => e
+        puts "error => #{e}".colorize(:red)
+        exit 1
       end
     end
 
     private
-    def _output_alms
-      cwa  = CWA.get(options)
-      alms = cwa.alarms(options)
+    def aws_opts
+      opts = {}
 
-      alms.map do |alm|
-        v = Hash.new
-        OUTPUT_KEYS.each do |key|
-          v[key] = alm.method(key).call
-        end
-        v
-      end
+      opts[:region]       = options[:region]
+      opts[:profile]      = options[:profile]
+      opts[:assume_role]  = assume
+      opts.compact
     end
 
-    def _enable_assume
+    def assume
+      return nil unless options[:assume_role]
       raise 'not config file, pls "cwa configure"' unless File.exist?(ASSUME_FILE)
-      assume = YAML.load_file(ASSUME_FILE)[options[:assume_role]]
-      CWA.assume_role(assume)
+
+      YAML.load_file(ASSUME_FILE)[options[:assume_role]]
     end
 
-    def _check_alm(alms, mode)
+    def check_alm(alms, mode)
       check = false if mode == :enable
       check = true  if mode == :disable
       alms.map do |alm|
-        puts "-" * 50
-        puts "namespace       : #{alm[:namespace      ]}"
-        puts "alarm_name      : #{alm[:alarm_name     ]}"
-        puts "dimensions      : #{alm[:dimensions     ]}"
+        puts '-' * 50
+        puts "namespace       : #{alm[:namespace]}"
+        puts "alarm_name      : #{alm[:alarm_name]}"
+        puts "dimensions      : #{alm[:dimensions]}"
         puts "actions_enabled : #{alm[:actions_enabled]}"
         unless alm[:actions_enabled] == check
           puts "=> #{'skip'.colorize(:yellow)}"
-          puts "-" * 50
+          puts '-' * 50
           next
         end
-        puts "-" * 50
+        puts '-' * 50
         alm
       end.compact
     end
 
-    def _confirm(check_word, **opt)
-      true_word  = ( opt[:true] || /yes|y/ )
-      false_word = ( opt[:false] || /no/ )
+    def confirm(check_word, **_opt)
+      true_word  = /yes|y/
+      false_word = /no/
 
       while true
-        print "#{check_word} (#{true_word.inspect.delete("/")}/#{false_word.inspect.delete("/")}) : "
-        case anser = $stdin.gets.strip
-        when true_word then return true
+        print "#{check_word} (#{true_word.inspect.delete('/')}/#{false_word.inspect.delete('/')}) : "
+        case $stdin.gets.strip
+        when true_word  then return true
         when false_word then return false
         end
       end

data/lib/cwa/client.rb

@@ -1,35 +1,56 @@
+# frozen_string_literal: true
+
 require 'aws-sdk-cloudwatch'
-require "cwa/alarms"
+require 'cwa/alarms'
 
 module CWA
+  # AWS client class
   class Client
     class Error < StandardError; end
 
     def initialize(opts)
+      if opts[:assume_role]
+        role = opts.delete(:assume_role)
+        opts[:credentials] = assume_role(role)
+      end
+
       @client = Aws::CloudWatch::Client.new(opts)
     end
 
     def alarms(query)
       @alarms ||= Alarms.new(@client)
       alms      = @alarms.filter(query)
-      if block_given?
-        alms.each{|alm| yield alm }
-      end
+      alms.each { |alm| yield alm } if block_given?
+
+      @query_cache = query
       alms
     end
 
-    def refresh
-      @alarms.refresh
+    def update(cache: true)
+      if cache
+        @alarms.refresh(@query_cache)
+      else
+        @alarms.refresh
+      end
     end
 
     def enable(alm)
       alm = alm[:alarm_name]
-      @client.enable_alarm_actions({alarm_names: [alm] })
+      @client.enable_alarm_actions({ alarm_names: [alm] })
     end
 
     def disable(alm)
       alm = alm[:alarm_name]
-      @client.disable_alarm_actions({alarm_names: [alm] })
+      @client.disable_alarm_actions({ alarm_names: [alm] })
+    end
+
+    private
+    def assume_role(opts)
+      Aws::AssumeRoleCredentials.new(
+        client: Aws::STS::Client.new,
+        role_arn: opts[:arn],
+        role_session_name: opts[:session_name]
+      )
     end
   end
 end

data/lib/cwa/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module CWA
-  VERSION = "0.2.3"
+  VERSION = "0.3.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cwa
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.2
 platform: ruby
 authors:
 - gen
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-10-05 00:00:00.000000000 Z
+date: 2020-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: solargraph
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: cloudwatch alarm client
 email:
 - ymdtshm@gmail.com
@@ -117,7 +131,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- ".ruby-version"
+- ".solargraph.yml"
 - Gemfile
 - README.md
 - Rakefile

data/.ruby-version

@@ -1 +0,0 @@
-2.6.5