radiosonde 0.1.1 → 0.2.0.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5453299693d666c8203cc4ac18dda1a6b6f5ac29
-  data.tar.gz: 0f7270861c8a03f9781499adb97cfe2b6ea87722
+  metadata.gz: 2fd996f58c5a00b537d2e18788677303e682443f
+  data.tar.gz: 6c697fdec4968eb129539b4fb76ae51b38d3a9ae
 SHA512:
-  metadata.gz: 004c1745134cfd3fe5e235d6e133b9b562b77e1eae74140e9fadff9b7703a863c88d9fec1a7eb1a02451819a27ccf43284b6831385bb9402a411dea462d653cf
-  data.tar.gz: 1c69c27564da763732c5465b6e324b9a8bbdd20a3f2d2d1cb6b408ac074a6f56051d2045fa21f80763cf28a47c158b82641ea494850fe8fa4518ca7c0616afa7
+  metadata.gz: c7471238fc343fd02749a154281fe0029a778eebe65d97d178355aae08101ac970a6b6b95c730312d3673a08063d04c82dccf0268b531e32f5a63408a9fa59ee
+  data.tar.gz: 619cbd2478165ebaa7ac8f4f064bce83d7572d42407e33f747388b6de46a8078e5dc322166faf032e51163304098b403ff93bcfe2141993a9087dc1c598a41aa

data/bin/radiosonde

@@ -71,17 +71,17 @@ ARGV.options do |opt|
         :secret_access_key => secret_key
       )
     elsif profile_name
-      provider = AWS::Core::CredentialProviders::SharedCredentialFileProvider.new(
+      credentials = Aws::SharedCredentials.new(
         :profile_name => profile_name
       )
-      aws_opts[:credential_provider] = provider
+      aws_opts[:credentials] = credentials
     elsif (access_key and !secret_key) or (!access_key and secret_key) or mode.nil?
       puts opt.help
       exit 1
     end
 
     aws_opts[:region] = region if region
-    AWS.config(aws_opts)
+    Aws.config.update(aws_opts)
   rescue => e
     $stderr.puts("[ERROR] #{e.message}")
     exit 1
@@ -91,7 +91,7 @@ end
 String.colorize = options[:color]
 
 if options[:debug]
-  AWS.config({
+  Aws.config.update({
     :http_wire_trace => true,
     :logger => Radiosonde::Logger.instance,
   })

data/lib/radiosonde.rb

@@ -7,7 +7,7 @@ require 'ostruct'
 require 'singleton'
 require 'pp'
 
-require 'aws-sdk-v1'
+require 'aws-sdk-core'
 require 'term/ansicolor'
 require 'diffy'
 require 'hashie'

data/lib/radiosonde/client.rb

@@ -4,15 +4,13 @@ class Radiosonde::Client
 
   def initialize(options = {})
     @options = options
-    @cloud_watch = AWS::CloudWatch.new
+    @cloud_watch = Aws::CloudWatch::Client.new
   end
 
   def export(opts = {})
     exported = nil
 
-    AWS.memoize do
-      exported = Radiosonde::Exporter.export(@cloud_watch, @options.merge(opts))
-    end
+    exported = Radiosonde::Exporter.export(@cloud_watch, @options.merge(opts))
 
     Radiosonde::DSL.convert(exported, @options.merge(opts))
   end
@@ -20,34 +18,30 @@ class Radiosonde::Client
   def metrics(opts = {})
     namespaces = {}
 
-    AWS.memoize do
-      ms = @cloud_watch.metrics
-
-      [:namespace, :metric_name].each do |name|
-        if (value = opts[name])
-          ms = ms.filter(name.to_s, value)
-        end
-      end
-
-      ms.sort_by {|m| [m.namespace, m.metric_name] }.each do |m|
-        if opts[:with_statistics]
-          namespaces[m.namespace] ||= {}
-          statistics_ops = {}
-          [:start_time, :end_time, :statistics].each do |name|
-            statistics_ops[name] = opts[name] if opts[name]
-          end
-          statistics = m.statistics(statistics_ops)
-          namespaces[m.namespace][m.metric_name] = {
-            :label => statistics.label,
-            :datapoints => statistics.datapoints
-          }
-        elsif opts[:with_dimensions]
-          namespaces[m.namespace] ||= {}
-          namespaces[m.namespace][m.metric_name] = m.dimensions
-        else
-          namespaces[m.namespace] ||= []
-          namespaces[m.namespace] << m.metric_name
+    ms = @cloud_watch.list_metrics(namespace: opts[:namespace], metric_name: opts[:metric_name]).flat_map(&:metrics)
+    ms.sort_by {|m| [m.namespace, m.metric_name] }.each do |m|
+      if opts[:with_statistics]
+        namespaces[m.namespace] ||= {}
+        statistics_ops = {
+          namespace: opts[:namespace],
+          metric_name: opts[:metric_name],
+          period: 60,
+          dimensions: m.dimensions,
+        }
+        [:start_time, :end_time, :statistics].each do |name|
+          statistics_ops[name] = opts[name] if opts[name]
         end
+        statistics = @cloud_watch.get_metric_statistics(statistics_ops)
+        namespaces[m.namespace][m.metric_name] = {
+          label: statistics.label,
+          datapoints: statistics.datapoints.map(&:to_h),
+        }
+      elsif opts[:with_dimensions]
+        namespaces[m.namespace] ||= {}
+        namespaces[m.namespace][m.metric_name] = m.dimensions.map(&:to_h)
+      else
+        namespaces[m.namespace] ||= []
+        namespaces[m.namespace] << m.metric_name
       end
     end
 
@@ -55,7 +49,7 @@ class Radiosonde::Client
   end
 
   def apply(file)
-    AWS.memoize { walk(file) }
+    walk(file)
   end
 
   private

data/lib/radiosonde/dsl/context/alarm.rb

@@ -53,7 +53,7 @@ class Radiosonde::DSL::Context::Alarm
 
     if value.kind_of?(Hash)
       value = value.map do |name, value|
-        {:name => name, :value => value}
+        Aws::CloudWatch::Types::Dimension.new(name: name, value: value)
       end
     end
 

data/lib/radiosonde/exporter.rb

@@ -15,9 +15,11 @@ class Radiosonde::Exporter
   def export
     result = {}
 
-    @cloud_watch.alarms.each do |alarm|
-      if matched?(alarm.alarm_name, @options[:include], @options[:exclude])
-        export_alarm(alarm, result)
+    @cloud_watch.describe_alarms.each do |page|
+      page.metric_alarms.each do |alarm|
+        if matched?(alarm.alarm_name, @options[:include], @options[:exclude])
+          export_alarm(alarm, result)
+        end
       end
     end
 

data/lib/radiosonde/ext/cloud_watch_ext.rb

@@ -1,4 +1,4 @@
-class AWS::CloudWatch
+class Aws::CloudWatch::Client
   def modify!
     @modified = true
   end

data/lib/radiosonde/version.rb

@@ -1,3 +1,3 @@
 module Radiosonde
-  VERSION = '0.1.1'
+  VERSION = '0.2.0.beta'
 end

data/lib/radiosonde/wrapper/alarm.rb

@@ -63,7 +63,7 @@ class Radiosonde::Wrapper::Alarm
 
     unless @options[:dry_run]
       opts = self.class.normalize_attrs(dsl)
-      @alarm.update(opts)
+      @cloud_watch.put_metric_alarm(opts.merge(alarm_name: alarm_name))
       @cloud_watch.modify!
     end
   end
@@ -72,7 +72,7 @@ class Radiosonde::Wrapper::Alarm
     log(:info, 'Delete Alarm', :red, self.alarm_name)
 
     unless @options[:dry_run]
-      @alarm.delete
+      @cloud_watch.delete_alarms(alarm_names: [alarm_name])
       @cloud_watch.modify!
     end
   end

data/lib/radiosonde/wrapper/alarm_collection.rb

@@ -1,15 +1,16 @@
 class Radiosonde::Wrapper::AlarmCollection
   include Radiosonde::Logger::Helper
 
-  def initialize(cloud_watch, alarms, options = {})
+  def initialize(cloud_watch, options = {})
     @cloud_watch = cloud_watch
-    @alarms = alarms
     @options = options
   end
 
   def each
-    @alarms.each do |alarm|
-      yield(Radiosonde::Wrapper::Alarm.new(@cloud_watch, alarm, @options))
+    @cloud_watch.describe_alarms.each do |page|
+      page.metric_alarms.each do |alarm|
+        yield(Radiosonde::Wrapper::Alarm.new(@cloud_watch, alarm, @options))
+      end
     end
   end
 
@@ -17,10 +18,9 @@ class Radiosonde::Wrapper::AlarmCollection
     log(:info, 'Create Alarm', :cyan, name)
     opts = Radiosonde::Wrapper::Alarm.normalize_attrs(dsl)
 
-    if @options[:dry_run]
-      alarm = OpenStruct.new(opts.merge(:alarm_name => name))
-    else
-      alarm = @alarms.create(name, opts)
+    alarm = Aws::CloudWatch::Types::MetricAlarm.new(opts.merge(alarm_name: name))
+    unless @options[:dry_run]
+      @cloud_watch.put_metric_alarm(alarm.to_h)
       @cloud_watch.modify!
     end
 

data/lib/radiosonde/wrapper/cloud_watch.rb

@@ -5,7 +5,7 @@ class Radiosonde::Wrapper::CloudWatch
   end
 
   def alarms
-    Radiosonde::Wrapper::AlarmCollection.new(@cloud_watch, @cloud_watch.alarms, @options)
+    Radiosonde::Wrapper::AlarmCollection.new(@cloud_watch, @options)
   end
 
   def modified?

data/radiosonde.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'aws-sdk-v1'
+  spec.add_dependency 'aws-sdk-core', '>= 2.1.0'
   spec.add_dependency 'json'
   spec.add_dependency 'term-ansicolor'
   spec.add_dependency 'diffy'

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: radiosonde
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0.beta
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-29 00:00:00.000000000 Z
+date: 2016-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: aws-sdk-v1
+  name: aws-sdk-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -177,9 +177,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5.1