fog-sakuracloud 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c091507bd4319e29aaec68ccec48639442edba9
-  data.tar.gz: ef1f332eeed7a16ceb330d8eb9510b87d5ece2bb
+  metadata.gz: 014fe488d00660395b62a242e215abe51ca05c63
+  data.tar.gz: fb076fcce9be47923d125cf7a8bc112c66f397f9
 SHA512:
-  metadata.gz: 8edf9a260ef6f5990ade711a07478f3761e6cde29e9cde6a0353777f87627e9e74b994a2960c5de981ff40aaf7d22a9b7538cd30da030f15003dc2d3603ddf35
-  data.tar.gz: 10dcd3507057780c9959c70e5b4b250f510e3cbad3ce1f684bb7b4c17ae50fb0a1231ab3d3ec59c16c023e88679f2e8a398aaf0757369ce29e66a081dfc4f420
+  metadata.gz: ead625df63feec5beb0f5007a6d8ce8afa07583b5889482abb4c2a1352883330ba9396a4f2f59ac24d285f820aab3c791f238fd696054a32b27759f090a1e7e9
+  data.tar.gz: 65dd7c88569457e006ed7563360d24a1c9a4faa088dfa2b07f231a186594a11c036b631beb83021916dd71e640781e1046117f574724fc09aa816b164289e202

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog of fog-sakuracloud
 
+## v1.3.0
+
+- Feature: Manage Cloud DNS
+
 ## v1.2.0
 
 - Feature: Manage Interface.

data/lib/fog/sakuracloud.rb

@@ -14,6 +14,10 @@ module Fog
     autoload :SakuraCloud, File.expand_path('../sakuracloud/volume', __FILE__)
   end
 
+  module DNS
+    autoload :SakuraCloud, File.expand_path('../sakuracloud/dns', __FILE__)
+  end
+
   module SakuraCloud
     extend Fog::Provider
 
@@ -29,5 +33,6 @@ module Fog
     service(:volume,  'Volume')
     service(:network, 'Network')
     service(:script,  'Script')
+    service(:dns,     'DNS')
   end
 end

data/lib/fog/sakuracloud/compute.rb

@@ -25,7 +25,6 @@ module Fog
       request      :list_plans
       request      :list_ssh_keys
       request      :list_zones
-      request      :regist_interface_to_server
 
       class Real
         def initialize(options = {})

data/lib/fog/sakuracloud/dns.rb

@@ -0,0 +1,76 @@
+module Fog
+  module DNS
+    class SakuraCloud < Fog::Service
+      requires     :sakuracloud_api_token
+      requires     :sakuracloud_api_token_secret
+
+      recognizes   :sakuracloud_api_url
+
+      model_path 'fog/sakuracloud/models/dns'
+      model      :zone
+      collection :zones
+
+      request_path 'fog/sakuracloud/requests/dns'
+      request      :list_zones
+      request      :create_zone
+      request      :delete_zone
+      request      :modify_zone
+
+      class Real
+        def initialize(options = {})
+          @auth_encord = Base64.strict_encode64([
+            options[:sakuracloud_api_token],
+            options[:sakuracloud_api_token_secret]
+          ].join(':'))
+          Fog.credentials[:sakuracloud_api_token]        = options[:sakuracloud_api_token]
+          Fog.credentials[:sakuracloud_api_token_secret] = options[:sakuracloud_api_token_secret]
+
+          @sakuracloud_api_url = options[:sakuracloud_api_url] || 'https://secure.sakura.ad.jp'
+
+          @connection = Fog::Core::Connection.new(@sakuracloud_api_url)
+        end
+
+        def request(params)
+          response = parse @connection.request(params)
+          response
+        end
+
+        private
+        def parse(response)
+          return response if response.body.empty?
+          response.body = Fog::JSON.decode(response.body)
+          response
+        end
+      end
+
+      class Mock
+        def self.data
+          @data ||= Hash.new do |hash, key|
+            hash[key] = {
+              :notes => []
+            }
+          end
+        end
+
+        def self.reset
+          @data = nil
+        end
+
+        def initialize(options={})
+          @sakuracloud_api_token        = options[:sakuracloud_api_token]
+          @sakuracloud_api_token_secret = options[:sakuracloud_api_token_secret]
+        end
+
+        def data
+          self.class.data[@sakuracloud_api_token]
+          self.class.data[@sakuracloud_api_token_secret]
+        end
+
+        def reset_data
+          self.class.data.delete(@sakuracloud_api_token)
+          self.class.data.delete(@sakuracloud_api_token_secret)
+        end
+      end
+    end
+  end
+end

data/lib/fog/sakuracloud/models/dns/zone.rb

@@ -0,0 +1,49 @@
+require 'fog/core/model'
+
+module Fog
+  module DNS
+    class SakuraCloud
+      class Zone < Fog::Model
+        identity :id, :aliases => 'ID'
+        attribute :name, :aliases => 'Name'
+        attribute :description, :aliases => 'Description'
+        attribute :status, :aliases => 'Status'
+        attribute :settings, :aliases => 'Settings'
+        attribute :tags, :aliases => 'Tags'
+
+        ## Reader methods for nested values.
+        # Returns value or nil
+        def rr_sets
+          settings.fetch('DNS', {}).fetch('ResourceRecordSets', []) if settings
+        end
+
+        def zone
+          status.fetch('Zone') if status
+        end
+
+        def nameservers
+          status.fetch('NS') if status
+        end
+
+        def delete
+          service.delete_zone(identity)
+          true
+        end
+        alias_method :destroy, :delete
+
+        def save
+          requires :zone
+          if identity
+            Fog::Logger.warning("Update DNS Zone #{identity}")
+            data = service.modify_zone(@attributes).body["CommonServiceItem"]
+          else
+            Fog::Logger.warning("Create DNS Zone")
+            data = service.create_zone(@attributes).body["CommonServiceItem"]
+          end
+          merge_attributes(data)
+          true
+        end
+      end
+    end
+  end
+end

data/lib/fog/sakuracloud/models/dns/zones.rb

@@ -0,0 +1,27 @@
+require 'fog/core/collection'
+require 'fog/sakuracloud/models/dns/zone'
+
+module Fog
+  module DNS
+    class SakuraCloud
+      class Zones < Fog::Collection
+        model Fog::DNS::SakuraCloud::Zone
+
+        def all
+          load service.list_zones.body['CommonServiceItems']
+        end
+
+        def get(id)
+          all.find { |f| f.id == id }
+        rescue Fog::Errors::NotFound
+          nil
+        end
+
+        def delete(id)
+          service.delete_zone(id)
+          true
+        end
+      end
+    end
+  end
+end

data/lib/fog/sakuracloud/requests/dns/create_zone.rb

@@ -0,0 +1,46 @@
+# coding: utf-8
+
+module Fog
+  module DNS
+    class SakuraCloud
+      class Real
+        def create_zone(options)
+          name = options[:name] ? options[:name] : options[:zone]
+          body = {
+            "CommonServiceItem"=>{
+              "Name"=>name,
+              "Status"=>{"Zone"=>options[:zone]},
+              "Provider"=>{"Class"=>"dns"},
+              "Description"=> options[:description],
+              "Settings" => {
+                "DNS" => {
+                  "ResourceRecordSets" => options[:rr_sets]
+                }
+              }
+            }
+          }
+
+          request(
+            :headers => {
+              'Authorization' => "Basic #{@auth_encord}"
+            },
+            :expects  => 201,
+            :method => 'POST',
+            :path => "#{Fog::SakuraCloud::SAKURACLOUD_API_ENDPOINT}/commonserviceitem",
+            :body => Fog::JSON.encode(body)
+          )
+        end
+      end # Real
+
+      class Mock
+        def create_zone(options)
+          response = Excon::Response.new
+          response.status = 201
+          response.body = {
+          }
+          response
+        end
+      end
+    end # SakuraCloud
+  end # DNS
+end # Fog

data/lib/fog/sakuracloud/requests/dns/delete_zone.rb

@@ -0,0 +1,30 @@
+# coding: utf-8
+
+module Fog
+  module DNS
+    class SakuraCloud
+      class Real
+        def delete_zone( id )
+          request(
+            :headers => {
+              'Authorization' => "Basic #{@auth_encord}"
+            },
+            :expects  => [200],
+            :method => 'DELETE',
+            :path => "#{Fog::SakuraCloud::SAKURACLOUD_API_ENDPOINT}/commonserviceitem/#{id}"
+          )
+        end
+      end # Real
+
+      class Mock
+        def delete_zone( id )
+          response = Excon::Response.new
+          response.status = 200
+          response.body = {
+          }
+          response
+        end
+      end
+    end # SakuraCloud
+  end # DNS
+end # Fog

data/lib/fog/sakuracloud/requests/dns/list_zones.rb

@@ -0,0 +1,35 @@
+# coding: utf-8
+
+module Fog
+  module DNS
+    class SakuraCloud
+      class Real
+        def list_zones(options = {})
+          filter = {
+            "Filter" => {
+              "Provider.Class" => "dns"
+            }
+          }
+          request(
+            :headers => {
+              'Authorization' => "Basic #{@auth_encord}"
+            },
+            :method => 'GET',
+            :path => "#{Fog::SakuraCloud::SAKURACLOUD_API_ENDPOINT}/commonserviceitem",
+            :query => URI.encode(Fog::JSON.encode(filter))
+          )
+        end
+      end
+
+      class Mock
+        def list_zones(options = {})
+          response = Excon::Response.new
+          response.status = 200
+          response.body = {
+          }
+          response
+        end
+      end
+    end
+  end
+end

data/lib/fog/sakuracloud/requests/dns/modify_zone.rb

@@ -0,0 +1,37 @@
+# coding: utf-8
+
+module Fog
+  module DNS
+    class SakuraCloud
+      class Real
+        def modify_zone(options)
+          body = {
+            "CommonServiceItem"=>{
+              "Settings" => options[:settings]
+            }
+          }
+
+          request(
+            :headers => {
+              'Authorization' => "Basic #{@auth_encord}"
+            },
+            :expects  => 200,
+            :method => 'PUT',
+            :path => "#{Fog::SakuraCloud::SAKURACLOUD_API_ENDPOINT}/commonserviceitem/#{options[:id]}",
+            :body => Fog::JSON.encode(body)
+          )
+        end
+      end # Real
+
+      class Mock
+        def modify_zone(options)
+          response = Excon::Response.new
+          response.status = 200
+          response.body = {
+          }
+          response
+        end
+      end
+    end # SakuraCloud
+  end # DNS
+end # Fog

data/lib/fog/sakuracloud/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Sakuracloud
-    VERSION = "1.2.0"
+    VERSION = "1.3.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-sakuracloud
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - sawanoboly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-20 00:00:00.000000000 Z
+date: 2015-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core
@@ -213,6 +213,7 @@ files:
 - lib/fog/bin/sakuracloud.rb
 - lib/fog/sakuracloud.rb
 - lib/fog/sakuracloud/compute.rb
+- lib/fog/sakuracloud/dns.rb
 - lib/fog/sakuracloud/models/compute/plan.rb
 - lib/fog/sakuracloud/models/compute/plans.rb
 - lib/fog/sakuracloud/models/compute/server.rb
@@ -221,6 +222,8 @@ files:
 - lib/fog/sakuracloud/models/compute/ssh_keys.rb
 - lib/fog/sakuracloud/models/compute/zone.rb
 - lib/fog/sakuracloud/models/compute/zones.rb
+- lib/fog/sakuracloud/models/dns/zone.rb
+- lib/fog/sakuracloud/models/dns/zones.rb
 - lib/fog/sakuracloud/models/network/interface.rb
 - lib/fog/sakuracloud/models/network/interfaces.rb
 - lib/fog/sakuracloud/models/network/router.rb
@@ -244,6 +247,10 @@ files:
 - lib/fog/sakuracloud/requests/compute/list_ssh_keys.rb
 - lib/fog/sakuracloud/requests/compute/list_zones.rb
 - lib/fog/sakuracloud/requests/compute/stop_server.rb
+- lib/fog/sakuracloud/requests/dns/create_zone.rb
+- lib/fog/sakuracloud/requests/dns/delete_zone.rb
+- lib/fog/sakuracloud/requests/dns/list_zones.rb
+- lib/fog/sakuracloud/requests/dns/modify_zone.rb
 - lib/fog/sakuracloud/requests/network/connect_interface_to_switch.rb
 - lib/fog/sakuracloud/requests/network/create_router.rb
 - lib/fog/sakuracloud/requests/network/create_switch.rb