niftycloud-restful-read-api 0.0.2 → 0.0.3

data/Gemfile

@@ -12,3 +12,4 @@ end
 
 gem 'sinatra'
 gem 'nifty-cloud-sdk'
+gem 'aws-sdk'

data/Gemfile.lock

@@ -2,6 +2,9 @@ GEM
   remote: http://rubygems.org/
   specs:
     addressable (2.3.6)
+    aws-sdk (1.44.0)
+      json (~> 1.4)
+      nokogiri (>= 1.4.4)
     builder (3.2.2)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
@@ -61,6 +64,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  aws-sdk
   bundler
   jeweler
   nifty-cloud-sdk

data/README.md

@@ -96,9 +96,19 @@ config.ru から require して使うこともできます。
 * /mq/queues
   * キュー一覧を取得できます
 
+### DNS
+
+* /dns/zones
+  * ゾーン一覧を取得できます
+
+### Storage
+
+* /storage/buckets
+  * バケット一覧を取得できます
+
 ## TODO
 
-* ニフティクラウド MQ/ESS/DNS/Automation
+* ニフティクラウド ESS/Automation
 
 ## ライセンス
 

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/lib/niftycloud-restful-read-api.rb

@@ -1,7 +1,13 @@
 require 'logger'
+require 'openssl'
+require 'base64'
+require 'time'
+
+require 'httparty'
 require 'sinatra'
 require 'json'
 require 'NIFTY'
+require 'aws-sdk'
 
 NIFTY::LOG.level = Logger::DEBUG
 
@@ -15,12 +21,13 @@ end
 class NiftycloudRestfulReadApi < Sinatra::Base
   class NiftyCloud
     class Computing
+      VERSION = '1.18'
   
       def initialize(options)
         @api = NIFTY::Cloud::Base.new(
           :access_key => options[:access_key_id],
           :secret_key => options[:secret_access_key],
-          :server => "{options[:region]}.cp.cloud.nifty.com",
+          :server => "#{options[:region]}.cp.cloud.nifty.com",
           :path => '/api'
         )
       end
@@ -84,6 +91,8 @@ class NiftycloudRestfulReadApi < Sinatra::Base
     end
 
     class Rdb
+      VERSION = '2013-05-15N2013-12-16'
+
       def initialize(options)
         @api = NIFTY::Cloud::Base.new(
           :access_key => options[:access_key_id],
@@ -95,39 +104,40 @@ class NiftycloudRestfulReadApi < Sinatra::Base
   
       def db_instances
         response = @api.send(:response_generator, 'Action' => 'DescribeDBInstances')
-        [response.DescribeDBInstancesResult.DBInstances.DBInstance.to_a].flatten rescue []
+        [response.DescribeDBInstancesResult.DBInstances.DBInstance].flatten rescue []
       end
 
       def db_security_groups
         response = @api.send(:response_generator, 'Action' => 'DescribeDBSecurityGroups')
-        [response.DescribeDBSecurityGroupsResult.DBSecurityGroups.DBSecurityGroup.to_a].flatten rescue []
+        [response.DescribeDBSecurityGroupsResult.DBSecurityGroups.DBSecurityGroup].flatten rescue []
       end
 
       def db_parameter_groups
         response = @api.send(:response_generator, 'Action' => 'DescribeDBParameterGroups')
-        [response.DescribeDBParameterGroupsResult.DBParameterGroups.DBParameterGroup.to_a].flatten rescue []
+        [response.DescribeDBParameterGroupsResult.DBParameterGroups.DBParameterGroup].flatten rescue []
       end
 
       def db_snapshots
         response = @api.send(:response_generator, 'Action' => 'DescribeDBSnapshots')
-        p response
-        [response.DescribeDBSnapshotsResult.DBSnapshots.DBSnapshot.to_a].flatten rescue []
+        [response.DescribeDBSnapshotsResult.DBSnapshots.DBSnapshot].flatten rescue []
       end
 
       def db_engine_versions
         response = @api.send(:response_generator, 'Action' => 'DescribeDBEngineVersions')
-        [response.DescribeDBEngineVersionsResult.DBEngineVersions.DBEngineVersion.to_a].flatten rescue []
+        [response.DescribeDBEngineVersionsResult.DBEngineVersions.DBEngineVersion].flatten rescue []
       end
 
       # TODO: Engine
       #def orderable_db_instance_options
       #  response = @api.send(:response_generator, 'Action' => 'DescribeOrderableDBInstanceOptions')
       #  p response
-      #  [response.DescribeOrderableDBInstanceOptionsResult.OrderableDBInstanceOptions.OrderableDBInstanceOption.to_a].flatten rescue []
+      #  [response.DescribeOrderableDBInstanceOptionsResult.OrderableDBInstanceOptions.OrderableDBInstanceOption].flatten rescue []
       #end
     end
 
     class Mq
+      VERSION = '2012-11-05N2013-12-16'
+
       def initialize(options)
         @api = NIFTY::Cloud::Base.new(
           :access_key => options[:access_key_id],
@@ -143,27 +153,95 @@ class NiftycloudRestfulReadApi < Sinatra::Base
         [response.ListQueuesResult.QueueUrl].flatten.map {|queue_url| {'QueueUrl' => queue_url} } rescue []
       end
     end
-  end
-  
-  helpers do
-    def compute
-      @compute ||= NiftyCloud::Computing.new(
-        :region => @region,
-        :access_key_id => @access_key_id,
-        :secret_access_key => @secret_access_key
-      )
+    
+    class Dns
+      include HTTParty
+      $debug_output = true
+      base_uri 'https://dns.api.cloud.nifty.com'
+
+      VERSION = '2012-12-12N2013-12-16'
+
+      def initialize(options)
+        @access_key_id = options[:access_key_id]
+        @secret_access_key = options[:secret_access_key]
+      end
+    
+      def zones
+        @date = Time.now.rfc2822.gsub(/(\-|\+)\d{4}$/, 'GMT')
+        response = self.class.get("/#{Dns::VERSION}/hostedzone", :headers => headers)
+        [response['ListHostedZonesResponse']['HostedZones']['HostedZone']].flatten rescue []
+      end
+
+      def headers
+        {
+          'x-nifty-authorization' => "NIFTY3-HTTPS NIFTYAccessKeyId=#{@access_key_id},ALgorithm=HmacSHA256,Signature=#{signature}", 
+          'x-nifty-date' => @date
+        }
+      end
+
+      def signature
+        signature = Base64.encode64(OpenSSL::HMAC.digest(OpenSSL::Digest::Digest.new('sha256'), @secret_access_key, @date)).strip
+      end
     end
 
-    def rdb
-      @rdb ||= NiftyCloud::Rdb.new(
-        :region => @region,
-        :access_key_id => @access_key_id,
-        :secret_access_key => @secret_access_key
-      )
+    class Storage
+      include HTTParty
+      $debug_output = true
+
+      VERSION = '0'
+
+      def initialize(options)
+        @access_key_id = options[:access_key_id]
+        @secret_access_key = options[:secret_access_key]
+        if options[:region] == 'east-1'
+          self.class.base_uri "https://ncss.nifty.com"
+        else
+          self.class.base_uri "https://#{options[:region]}-ncss.nifty.com"
+        end
+      end
+    
+      def buckets
+        @date = Time.now.rfc2822.gsub(/(\-|\+)\d{4}$/, 'GMT')
+        response = self.class.get("/", :headers => headers)
+        [response['ListAllMyBucketsResult']['Buckets']['Bucket']].flatten rescue []
+      end
+
+      def headers
+        {
+          'authorization' => "NIFTY #{@access_key_id}:#{signature}", 
+          'date' => @date,
+          'content-type' => 'text/plain'
+        }
+      end
+
+      def signature
+        signature = Base64.encode64(OpenSSL::HMAC.digest(OpenSSL::Digest::Digest.new('sha1'), @secret_access_key, string_to_sign)).strip
+      end
+
+      def string_to_sign
+        str = []
+        str << 'GET'
+        str << ''
+        str << 'text/plain'
+        str << @date
+        str << '/'
+        str.join("\n")
+      end
     end
+  end
+  
+  helpers do
+    SERVICE_CLASS = {
+      :computing => NiftyCloud::Computing,
+      :rdb       => NiftyCloud::Rdb,
+      :mq        => NiftyCloud::Mq,
+      :dns       => NiftyCloud::Dns,
+      :storage   => NiftyCloud::Storage
+    }
 
-    def mq
-      @rdb ||= NiftyCloud::Mq.new(
+    def service(service)
+      NIFTY::VERSION.gsub!(/^.+$/) { SERVICE_CLASS[service]::VERSION }
+      SERVICE_CLASS[service].new(
         :region => @region,
         :access_key_id => @access_key_id,
         :secret_access_key => @secret_access_key
@@ -178,17 +256,7 @@ class NiftycloudRestfulReadApi < Sinatra::Base
     @secret_access_key = params[:secret_access_key] || ENV['SECRET_ACCESS_KEY']
   end
   
-  post '/computing/:resources' do
-    compute.send(params[:resources]).to_json
-  end
-
-  post '/rdb/:resources' do
-    NIFTY::VERSION = '2013-05-15N2013-12-16'
-    rdb.send(params[:resources]).to_json
-  end
-
-  post '/mq/:resources' do
-    NIFTY::VERSION = '2012-11-05N2013-12-16'
-    mq.send(params[:resources]).to_json
+  get '/:service/:resources' do
+    service(params[:service].to_sym).send(params[:resources]).to_json
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: niftycloud-restful-read-api
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-25 00:00:00.000000000Z
+date: 2014-06-26 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &227443700 !ruby/object:Gem::Requirement
+  requirement: &144182160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *227443700
+  version_requirements: *144182160
 - !ruby/object:Gem::Dependency
   name: nifty-cloud-sdk
-  requirement: &227462700 !ruby/object:Gem::Requirement
+  requirement: &144181320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *227462700
+  version_requirements: *144181320
+- !ruby/object:Gem::Dependency
+  name: aws-sdk
+  requirement: &144180180 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *144180180
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &227462220 !ruby/object:Gem::Requirement
+  requirement: &144178260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *227462220
+  version_requirements: *144178260
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &227461740 !ruby/object:Gem::Requirement
+  requirement: &144177380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *227461740
+  version_requirements: *144177380
 description: NIFTYCloud の情報取得系 API を RESTful に利用できるようにする Sinatra アプリ
 email: tily05@gmail.com
 executables:
@@ -63,7 +74,6 @@ extensions: []
 extra_rdoc_files:
 - LICENSE.txt
 - README.md
-- TODO
 files:
 - .document
 - Gemfile
@@ -76,7 +86,6 @@ files:
 - lib/niftycloud-restful-read-api.rb
 - test/helper.rb
 - test/test_nifty-cloud-restful-read-api.rb
-- TODO
 homepage: http://github.com/tily/niftycloud-restful-read-api
 licenses:
 - MIT
@@ -92,7 +101,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 801768762339487333
+      hash: 3637886189179613779
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/TODO

@@ -1 +0,0 @@
-RDB, to_a が要らない