cwa 0.2.6 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 68fe5fa6a7a7028fe3a8aa3c6781ba92b95c77972bcb9b32f0ef87b7d3ffea5f
-  data.tar.gz: d37958cce67757b099ab293a157060d91053c83f34a563fc9743254cbdbe4fe5
+  metadata.gz: 18c398f2c91a08ef355f725b361937608fa500b37ab27b6a610b9668fc3ae92a
+  data.tar.gz: 90aa7ff8fa4231e29effd83e4093803e862afd4e23c535f31232a59448e5a415
 SHA512:
-  metadata.gz: b4380bddd08abd79d38d6a5dde6b99c5af8ad93d4ab0086783c258f50accebb0c4c6abb9f649d468b1e7578ecfd60aa56bdccfc13943ec8e43191a5ef999b525
-  data.tar.gz: 6dc99a2dedb8a4ffabdd1a086cb5204a91c7e56c4afd20f47a5593fa220d742c52dd01b987c4027fdd6d89f4f26df36744d8edf6cd2b5e0b261160723eb21ebf
+  metadata.gz: b0400884cd212804b16584a58f982ce397b787ea469444f6e936da9a180b89b96b605e9049fe94d5e5c1dba3fcfcdc23de043ab8df9516f089415f054ea46543
+  data.tar.gz: 6447715b1e308ebd2801748447f7984c49046c526f4cd42244edc43cefb4d75cf2e6c6f1459d68bfe0645d7b9e81741b4016397e2505e0ce45fed45ce6ab9d02

data/lib/cwa.rb

@@ -12,25 +12,8 @@ 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

@@ -10,28 +10,28 @@ module CWA
     }.freeze
 
     def initialize(client, **opts)
-      @opts   = opts
-      @client = client
+      @client        = client
     end
 
     def filter(query)
-      alms = 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
+      @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

data/lib/cwa/cli.rb

@@ -12,24 +12,24 @@ 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
+namespace
+alarm_name
+actions_enabled
 ].freeze
 
 OUTPUT_KEYS_DETAIL = %i[
-  namespace
-  alarm_name
-  actions_enabled
-  dimensions
-  alarm_arn
-  alarm_description
+namespace
+alarm_name
+actions_enabled
+dimensions
+alarm_arn
+alarm_description
 ].freeze
 
 
 AWS_OPTIONS = %i[
-  profile
-  region
+profile
+region
 ].freeze
 
 OPTIONS = '--name ALARMNAME --regexp ALARMNAME --namespae NAMESPACE --dimensions KEY:VALUE'.freeze
@@ -37,7 +37,6 @@ OPTIONS = '--name ALARMNAME --regexp ALARMNAME --namespae NAMESPACE --dimensions
 module CWA
   # cli class
   class Cli < Thor
-    begin
     class_option :verbose,      type: :boolean
     class_option :profile,      type: :string
     class_option :region,       type: :string
@@ -50,22 +49,32 @@ module CWA
     option :regexp,     type: :string, aliases: 'r'
     option :dimensions, type: :hash,   aliases: 'd'
     def alarms
-      enable_assume if options[:assume_role]
-
-      alms  = output_alms
-      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
+      begin
+        cwa  = CWA.get(aws_opts)
+        alms = cwa.alarms(options)
+        keys = OUTPUT_KEYS
+        keys = OUTPUT_KEYS_DETAIL if options[:verbose]
+
+        alms = alms.map do |alm|
+          keys.reduce({}) { |h, key| h.merge!(key => alm.method(key).call) }
+        end
+
+        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
 
@@ -76,9 +85,7 @@ module CWA
     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)
 
@@ -105,9 +112,7 @@ module CWA
     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)
 
@@ -129,53 +134,51 @@ module CWA
 
     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)}"
-      end
-    end
+      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)
-      keys = OUTPUT_KEYS
-      keys = OUTPUT_KEYS_DETAIL if options[:verbose]
+    def aws_opts
+      opts = {}
 
-      alms.map do |alm|
-        v = Hash.new
-        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)

data/lib/cwa/client.rb

@@ -9,6 +9,11 @@ module CWA
     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
 
@@ -16,11 +21,17 @@ module CWA
       @alarms ||= Alarms.new(@client)
       alms      = @alarms.filter(query)
       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)
@@ -32,5 +43,14 @@ module CWA
       alm = alm[:alarm_name]
       @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,5 +1,5 @@
 # frozen_string_literal: true
 
 module CWA
-  VERSION = "0.2.6"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cwa
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.3.1
 platform: ruby
 authors:
 - gen
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-10-10 00:00:00.000000000 Z
+date: 2020-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core