yao 0.12.0 → 0.13.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b2ea8c98f6fdefadcfeca2782ed5dde20a91423afc3cc44b925a64fdee3b552a
-  data.tar.gz: a0993ca6bd8ddb9a222d632e98c77031682b492756be20c164632410da64bed4
+  metadata.gz: 9ee889ea30a4ed867e8f34bcb5fd185f194b317320fd8f5797f1a7b24b232e66
+  data.tar.gz: 745bb13217eb75907e47732b457ac41cd90330f23becb0936e4c13beabdeb6e3
 SHA512:
-  metadata.gz: aa2d0252174bc0e69a7697d6fb8e90aba053105fa416219bb5c7b0800a861fcffee6d1e48d0fdc3d84a38f20cb4790d8030dbafbae65f1548c221ae79dbd7e52
-  data.tar.gz: ccef8bca36eda0c7191017929f466a9b424ca8ac697e2e0f104519394ccdc022bd7159391ad1cfebbf9590635ca4b74c5a5705823b2fc54a27027877e252bcb5
+  metadata.gz: bddf10dfefb8277e6ad2dda817ab08b54ede238586c1f4fd913b8648a257d4c8e79cb7301976cbf02f5991b4ffd8a0199d7a06db604d21a9f63438dea263801f
+  data.tar.gz: 2e572a0ca854f98b118cb081daf3a862b3ad60ffcb7e8e0ba58d35d64cdaf40578a507cdd2b578c05b576be5d61c7d92161e251c03e0d6396fa73384599a2520

data/README.md

@@ -34,7 +34,8 @@ Yao.configure do
   # timeout is optional
   timeout     300
 
-  # If your endpoint requires cert & key
+  # If your endpoint requires cacert,cert and key
+  ca_cert "/path/to/my.ca"
   client_cert "/path/to/my.pem"
   client_key "/path/to/my.key"
 

data/lib/yao/auth.rb

@@ -5,7 +5,7 @@ require 'yao/token'
 require 'yao/tokenv3'
 
 module Yao
-  %i(tenant_name username password timeout client_cert client_key region_name
+  %i(tenant_name username password timeout ca_cert client_cert client_key region_name
      identity_api_version user_domain_id user_domain_name project_domain_id project_domain_name).each do |name|
     Yao.config.param name, nil
   end

data/lib/yao/client.rb

@@ -124,13 +124,17 @@ module Yao
         end
 
         # Client Certificate Authentication
-        if Yao.config.client_cert && Yao.config.client_key
-          cert = OpenSSL::X509::Certificate.new(File.read(Yao.config.client_cert))
-          key  = OpenSSL::PKey.read(File.read(Yao.config.client_key))
-          opt.merge!(ssl: {
-            client_cert: cert,
-            client_key:  key,
-          })
+        if (Yao.config.client_cert && Yao.config.client_key) || Yao.config.ca_cert
+          h = {}
+          if Yao.config.client_cert && Yao.config.client_key
+            cert = OpenSSL::X509::Certificate.new(File.read(Yao.config.client_cert))
+            key  = OpenSSL::PKey.read(File.read(Yao.config.client_key))
+            h[:client_cert] = cert
+            h[:client_key] = key
+          end
+
+          h[:ca_file] = Yao.config.ca_cert if Yao.config.ca_cert
+          opt.merge!(ssl: h)
         end
         opt
       end

data/lib/yao/error.rb

@@ -1,6 +1,7 @@
 module Yao
   class ReadOnlyViolationError < ::StandardError; end
   class TooManyItemFonud       < ::StandardError; end
+  class InvalidResponse        < ::StandardError; end
 
   class ServerError < ::StandardError
     def initialize(message, requested_env)

data/lib/yao/faraday_middlewares.rb

@@ -64,6 +64,19 @@ class Faraday::Request::ReadOnly
 end
 Faraday::Request.register_middleware read_only: -> { Faraday::Request::ReadOnly }
 
+class Faraday::Request::UserAgent
+  def initialize(app, user_agent=nil)
+    @app = app
+    @user_agent = user_agent || "Yao/#{Yao::VERSION} Faraday/#{Faraday::VERSION}"
+  end
+
+  def call(env)
+    env[:request_headers]['User-Agent'] = @user_agent
+    @app.call(env)
+  end
+end
+Faraday::Request.register_middleware user_agent: -> { Faraday::Request::UserAgent }
+
 class Faraday::Response::OSDumper < Faraday::Response::Middleware
   def on_complete(env)
     require 'pp'

data/lib/yao/plugins/default_client_generator.rb

@@ -8,6 +8,7 @@ module Yao::Plugins
     def call(f, token)
       f.request :accept, 'application/json'
       f.request :url_encoded
+      f.request :user_agent
 
       if token
         f.request :os_token, token

data/lib/yao/resources/action.rb

@@ -5,7 +5,7 @@ module Yao::Resources
         req.body = query.to_json
         req.headers['Content-Type'] = 'application/json'
       end
-      res.body ? resource_from_json(res.body) : nil
+      res.body
     end
 
     private

data/lib/yao/resources/base.rb

@@ -7,7 +7,7 @@ module Yao::Resources
       names.map(&:to_s).each do |name|
         define_method(name) do
           if !@data.key?(name) && id
-            @data = self.class.get(id)
+            @data = self.class.get(id).to_hash
           end
           self[name]
         end
@@ -51,6 +51,10 @@ module Yao::Resources
       @data[name] = value
     end
 
+    def to_hash
+      @data
+    end
+
     def id
       self["id"]
     end

data/lib/yao/resources/image.rb

@@ -25,5 +25,16 @@ module Yao::Resources
     self.resources_name = "images"
 
     extend MetadataAvailable
+
+    class << self
+      private
+
+      # override Yao::Resources::RestfullyAccessible.resource_from_json
+      # @param json [Hash]
+      # @return [Yao::Resources::*]
+      def resource_from_json(json)
+        new(json)
+      end
+    end
   end
 end

data/lib/yao/resources/restfully_accessible.rb

@@ -1,5 +1,5 @@
 require "forwardable"
-
+require "deep_merge"
 module Yao::Resources
   module RestfullyAccessible
     def self.extended(base)
@@ -85,12 +85,27 @@ module Yao::Resources
       else
         create_url
       end
-
-      json = GET(url, query).body
+      memo_query = query
+      res = {}
+      loop do
+        r = GET(url, query).body
+        if r.is_a?(Hash)
+          res.deep_merge!(r)
+          links = r.find {|k,_| k =~ /links/ }
+          if links && links.last.is_a?(Array) && next_link = links.last.find{|s| s["rel"] == "next" }
+            uri = URI.parse(next_link["href"])
+            query = Hash[URI::decode_www_form(uri.query)] if uri.query
+            next
+          end
+        else
+          res = r
+        end
+        break
+      end
       if return_single_on_querying && !query.empty?
-        [resource_from_json(json)]
+        [resource_from_json(res)]
       else
-        resources_from_json(json)
+        resources_from_json(res)
       end
     end
 
@@ -211,6 +226,8 @@ module Yao::Resources
         item = find_by_name(name)
         if item.size > 1
           raise Yao::TooManyItemFonud.new("More than one resource exists with the name '#{name}'")
+        elsif item.size.zero?
+          raise Yao::InvalidResponse.new("No resource exists with the name '#{name}'")
         end
         GET(create_url(item.first.id), query)
       end

data/lib/yao/resources/role.rb

@@ -37,7 +37,7 @@ module Yao::Resources
       def list_for_user(user_name, on:)
         user   = Yao::User.get(user_name)
         tenant = if api_version_v2?
-                   Yao::Tenant.find_by_name(on)
+                   Yao::Tenant.get(on)
                  else
                    Yao::Project.get(on)
                  end
@@ -54,7 +54,7 @@ module Yao::Resources
         role   = Yao::Role.get(role_name)
         user   = Yao::User.get(to)
         tenant = if api_version_v2?
-                   Yao::Tenant.find_by_name(on)
+                   Yao::Tenant.get(on)
                  else
                    Yao::Project.get(on)
                  end
@@ -71,7 +71,7 @@ module Yao::Resources
         role   = Yao::Role.get(role_name)
         user   = Yao::User.get(from)
         tenant = if api_version_v2?
-                   Yao::Tenant.find_by_name(on)
+                   Yao::Tenant.get(on)
                  else
                    Yao::Project.get(on)
                  end

data/lib/yao/resources/server.rb

@@ -53,6 +53,11 @@ module Yao::Resources
       action(id, {"removeSecurityGroup": {"name": sg_name}})
     end
 
+    def self.get_vnc_console(id)
+      response = action(id, {"os-getVNCConsole": {"type": "novnc"}})
+      response.dig("console", "url")
+    end
+
     class << self
       alias :stop :shutoff
     end

data/lib/yao/version.rb

@@ -1,3 +1,3 @@
 module Yao
-  VERSION = "0.12.0"
+  VERSION = "0.13.4"
 end

data/test/support/restfully_accesible_stub.rb

@@ -41,6 +41,6 @@ module RestfullyAccessibleStub
   end
 
   def request_headers
-    {'Accept'=>'application/json', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'User-Agent'=>"Faraday v#{Faraday::VERSION}"}
+    {'Accept'=>'application/json', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'User-Agent'=>"Yao/#{Yao::VERSION} Faraday/#{Faraday::VERSION}"}
   end
 end

data/test/yao/resources/test_hypervisor.rb

@@ -80,7 +80,7 @@ class TestHypervisor < TestYaoResource
 
   def test_list
     stub = stub_request(:get, "https://example.com:12345/os-hypervisors/detail")
-      .with(headers: {'Accept'=>'application/json', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'User-Agent'=>"Faraday v#{Faraday::VERSION}"})
+      .with(headers: {'Accept'=>'application/json', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'User-Agent'=>"Yao/#{Yao::VERSION} Faraday/#{Faraday::VERSION}"})
       .to_return(
         status: 200,
         body: <<-JSON,
@@ -105,7 +105,7 @@ class TestHypervisor < TestYaoResource
 
   def test_statistics
     stub = stub_request(:get, "https://example.com:12345/os-hypervisors/statistics")
-      .with(headers: {'Accept'=>'application/json', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'User-Agent'=>"Faraday v#{Faraday::VERSION}"})
+      .with(headers: {'Accept'=>'application/json', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'User-Agent'=>"Yao/#{Yao::VERSION} Faraday/#{Faraday::VERSION}"})
       .to_return(
         status: 200,
         body: <<-JSON,
@@ -137,7 +137,7 @@ class TestHypervisor < TestYaoResource
 
   def test_uptime
     stub = stub_request(:get, "https://example.com:12345/os-hypervisors/1/uptime")
-      .with(headers: {'Accept'=>'application/json', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'User-Agent'=>"Faraday v#{Faraday::VERSION}"})
+      .with(headers: {'Accept'=>'application/json', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'User-Agent'=>"Yao/#{Yao::VERSION} Faraday/#{Faraday::VERSION}"})
       .to_return(
         status: 200,
         body: <<-JSON,

data/test/yao/resources/test_image.rb

@@ -1,44 +1,142 @@
 class TestImage < TestYaoResource
+  # https://docs.openstack.org/api-ref/compute/?expanded=list-flavors-detail,list-flavors-with-details-detail,list-hosts-detail,show-host-details-detail,list-images-detail,list-images-with-details-detail#list-images-with-details
+  @@params = {
+    "OS-DCF:diskConfig" => "AUTO",
+    "OS-EXT-IMG-SIZE:size" => 74185822,
+    "created" => "2011-01-01T01:02:03Z",
+    "id" => "70a599e0-31e7-49b7-b260-868f441e862b",
+    "links" => [
+      {
+        "href" => "http://openstack.example.com/v2/6f70656e737461636b20342065766572/images/70a599e0-31e7-49b7-b260-868f441e862b",
+        "rel" => "self"
+      },
+      {
+        "href" => "http://openstack.example.com/6f70656e737461636b20342065766572/images/70a599e0-31e7-49b7-b260-868f441e862b",
+        "rel" => "bookmark"
+      },
+      {
+        "href" => "http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
+        "rel" => "alternate",
+        "type" => "application/vnd.openstack.image"
+      }
+    ],
+    "metadata" => {
+      "architecture" => "x86_64",
+      "auto_disk_config" => "True",
+      "kernel_id" => "nokernel",
+      "ramdisk_id" => "nokernel"
+    },
+    "minDisk" => 0,
+    "minRam" => 0,
+    "name" => "fakeimage7",
+    "progress" => 100,
+    "status" => "ACTIVE",
+    "updated" => "2011-01-01T01:02:03Z"
+  }
 
   def test_image
 
-    # https://docs.openstack.org/api-ref/compute/?expanded=list-flavors-detail,list-flavors-with-details-detail,list-hosts-detail,show-host-details-detail,list-images-detail,list-images-with-details-detail#list-images-with-details
-    params = {
+    image = Yao::Resources::Image.new(@@params)
+    check_image(image)
+
+  end
+
+  def test_to_hash
+    server = Yao::Resources::Server.new(
       "OS-DCF:diskConfig" => "AUTO",
-      "OS-EXT-IMG-SIZE:size" => 74185822,
-      "created" => "2011-01-01T01:02:03Z",
-      "id" => "70a599e0-31e7-49b7-b260-868f441e862b",
+      "OS-EXT-AZ:availability_zone" => "nova",
+      "OS-EXT-SRV-ATTR:host" => "compute",
+      "OS-EXT-SRV-ATTR:hostname" => "new-server-test",
+      "OS-EXT-SRV-ATTR:hypervisor_hostname" => "fake-mini",
+      "OS-EXT-SRV-ATTR:instance_name" => "instance-00000001",
+      "OS-EXT-SRV-ATTR:kernel_id" => "",
+      "OS-EXT-SRV-ATTR:launch_index" => 0,
+      "OS-EXT-SRV-ATTR:ramdisk_id" => "",
+      "OS-EXT-SRV-ATTR:reservation_id" => "r-l0i0clt2",
+      "OS-EXT-SRV-ATTR:root_device_name" => "/dev/sda",
+      "OS-EXT-SRV-ATTR:user_data" => "IyEvYmluL2Jhc2gKL2Jpbi9zdQplY2hvICJJIGFtIGluIHlvdSEiCg==",
+      "OS-EXT-STS:power_state" => 1,
+      "OS-EXT-STS:task_state" => nil,
+      "OS-EXT-STS:vm_state" => "active",
+      "OS-SRV-USG:launched_at" => "2019-04-23T15:19:15.317839",
+      "OS-SRV-USG:terminated_at" => nil,
+      "accessIPv4" => "1.2.3.4",
+      "accessIPv6" => "80fe::",
+      "addresses" => {
+        "private" => [
+          {
+            "OS-EXT-IPS-MAC:mac_addr" => "aa:bb:cc:dd:ee:ff",
+            "OS-EXT-IPS:type" => "fixed",
+            "addr" => "192.168.0.3",
+            "version" => 4
+          }
+        ]
+      },
+      "config_drive" => "",
+      "created" => "2019-04-23T15:19:14Z",
+      "description" => nil,
+      "flavor" => {
+        "disk" => 1,
+        "ephemeral" => 0,
+        "extra_specs" => {},
+        "original_name" => "m1.tiny",
+        "ram" => 512,
+        "swap" => 0,
+        "vcpus" => 1
+      },
+      "hostId" => "2091634baaccdc4c5a1d57069c833e402921df696b7f970791b12ec6",
+      "host_status" => "UP",
+      "id" => "2ce4c5b3-2866-4972-93ce-77a2ea46a7f9",
+      "image" => {
+        "id" => "70a599e0-31e7-49b7-b260-868f441e862b",
+        "links" => [
+          {
+            "href" => "http://openstack.example.com/6f70656e737461636b20342065766572/images/70a599e0-31e7-49b7-b260-868f441e862b",
+            "rel" => "bookmark"
+          }
+        ]
+      },
+      "key_name" => nil,
       "links" => [
         {
-          "href" => "http://openstack.example.com/v2/6f70656e737461636b20342065766572/images/70a599e0-31e7-49b7-b260-868f441e862b",
+          "href" => "http://openstack.example.com/v2.1/6f70656e737461636b20342065766572/servers/2ce4c5b3-2866-4972-93ce-77a2ea46a7f9",
           "rel" => "self"
         },
         {
-          "href" => "http://openstack.example.com/6f70656e737461636b20342065766572/images/70a599e0-31e7-49b7-b260-868f441e862b",
+          "href" => "http://openstack.example.com/6f70656e737461636b20342065766572/servers/2ce4c5b3-2866-4972-93ce-77a2ea46a7f9",
           "rel" => "bookmark"
-        },
-        {
-          "href" => "http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
-          "rel" => "alternate",
-          "type" => "application/vnd.openstack.image"
         }
       ],
+      "locked" => true,
+      "locked_reason" => "I don't want to work",
       "metadata" => {
-        "architecture" => "x86_64",
-        "auto_disk_config" => "True",
-        "kernel_id" => "nokernel",
-        "ramdisk_id" => "nokernel"
+        "My Server Name" => "Apache1"
       },
-      "minDisk" => 0,
-      "minRam" => 0,
-      "name" => "fakeimage7",
-      "progress" => 100,
+      "name" => "new-server-test",
+      "os-extended-volumes:volumes_attached" => [],
+      "progress" => 0,
+      "security_groups" => [
+        {
+          "name" => "default"
+        }
+      ],
       "status" => "ACTIVE",
-      "updated" => "2011-01-01T01:02:03Z"
-    }
+      "tags" => [],
+      "tenant_id" => "6f70656e737461636b20342065766572",
+      "trusted_image_certificates" => nil,
+      "updated" => "2019-04-23T15:19:15Z",
+      "user_id" => "fake"
+    )
 
-    image = Yao::Image.new(params)
+    assert_equal(server.image.to_hash, server['image__Yao::Resources::Image'].to_hash)
 
+    image = Yao::Resources::Image.new(@@params)
+    assert_equal(image.to_hash, @@params)
+  end
+
+  private
+
+  def check_image(image)
     # friendly_attributes
     assert_equal("fakeimage7", image.name)
     assert_equal("ACTIVE", image.status)
@@ -60,4 +158,5 @@ class TestImage < TestYaoResource
     assert_equal(70.74911308288574, image.size('M'))    #
     assert_equal(0.06909093074500561, image.size('G'))  #
   end
+
 end

data/test/yao/resources/test_restfully_accessible.rb

@@ -66,6 +66,20 @@ class TestRestfullyAccesible < Test::Unit::TestCase
 
       assert_equal("OK", Test.get(name))
     end
+
+    test 'name (with no item JSON)' do
+      Test.return_single_on_querying = false
+      name = "dummy2"
+      uuid = "00112233-4455-6677-8899-aabbccddeeff"
+      body = {@resources_name => []}
+
+      stub_get_request_not_found([@url, @resources_name, name].join('/'))
+      stub_get_request_with_json_response([@url, "#{@resources_name}?name=#{name}"].join('/'), body)
+
+      assert_raise(Yao::InvalidResponse, "raise proper exception") do
+        Test.get(name)
+      end
+    end
   end
 
   sub_test_case 'get!' do

data/test/yao/resources/test_role.rb

@@ -60,7 +60,7 @@ class TestRole < TestYaoResource
       assert_equal("0123456789abcdef0123456789abcdef", roles.first.id)
       assert_requested(stub)
     end
-    
+
     def test_list_for_user
       stub_user
       stub_tenant
@@ -77,11 +77,11 @@ class TestRole < TestYaoResource
           JSON
           headers: {'Content-Type' => 'application/json'}
         )
-      
+
       roles = Yao::Role.list_for_user("test_user", on:"admin")
       assert_equal("0123456789abcdef0123456789abcdef", roles.first.id)
       assert_received(Yao::User) { |subject| subject.get("test_user") }
-      assert_received(Yao::Tenant) { |subject| subject.find_by_name("admin") }
+      assert_received(Yao::Tenant) { |subject| subject.get("admin") }
       assert_requested(stub)
     end
 
@@ -99,7 +99,7 @@ class TestRole < TestYaoResource
       Yao::Role.grant("test_role", to:"test_user", on:"admin")
       assert_received(Yao::Role) { |subject| subject.get("test_role") }
       assert_received(Yao::User) { |subject| subject.get("test_user") }
-      assert_received(Yao::Tenant) { |subject| subject.find_by_name("admin") }
+      assert_received(Yao::Tenant) { |subject| subject.get("admin") }
       assert_requested(stub)
     end
 
@@ -117,7 +117,7 @@ class TestRole < TestYaoResource
       Yao::Role.revoke("test_role", from:"test_user", on:"admin")
       assert_received(Yao::Role) { |subject| subject.get("test_role") }
       assert_received(Yao::User) { |subject| subject.get("test_user") }
-      assert_received(Yao::Tenant) { |subject| subject.find_by_name("admin") }
+      assert_received(Yao::Tenant) { |subject| subject.get("admin") }
       assert_requested(stub)
     end
   end
@@ -172,7 +172,7 @@ class TestRole < TestYaoResource
       assert_equal("0123456789abcdef0123456789abcdef", roles.first.id)
       assert_requested(stub)
     end
-    
+
     def test_list_for_user
       stub_user
       stub_project
@@ -189,7 +189,7 @@ class TestRole < TestYaoResource
           JSON
           headers: {'Content-Type' => 'application/json'}
         )
-      
+
       roles = Yao::Role.list_for_user("test_user", on:"admin")
       assert_equal("0123456789abcdef0123456789abcdef", roles.first.id)
       assert_received(Yao::Resources::User) { |subject| subject.get("test_user") }
@@ -249,9 +249,9 @@ class TestRole < TestYaoResource
       "name" => "test_user",
     }) }
   end
-  
+
   def stub_tenant
-    stub(Yao::Tenant).find_by_name { Yao::Tenant.new({
+    stub(Yao::Tenant).get { Yao::Tenant.new({
       "id" => "0123456789abcdef0123456789abcdef",
       "name" => "admin",
     }) }

data/test/yao/resources/test_server.rb

@@ -162,6 +162,46 @@ class TestServer < TestYaoResource
     assert_requested(stub)
   end
 
+  def test_paging
+    stub = stub_request(:get, "https://example.com:12345/servers/detail")
+      .to_return(
+        status: 200,
+        body: <<-JSON,
+        {
+          "servers_links":[
+             {
+                "href":"https://example.com:12345/servers/detail",
+                "rel":"next"
+             }
+          ],
+          "servers": [{
+            "id": "dummy1"
+          }]
+        }
+        JSON
+        headers: {'Content-Type' => 'application/json'}
+      ).times(1).then
+      .to_return(
+        status: 200,
+        body: <<-JSON,
+        {
+          "servers": [{
+            "id": "dummy2"
+          }]
+        }
+        JSON
+        headers: {'Content-Type' => 'application/json'}
+      ).times(1)
+
+    servers = Yao::Server.list
+    assert_instance_of(Array, servers)
+    assert_instance_of(Yao::Server, servers.first)
+    assert_equal('dummy1', servers.first.id)
+    assert_equal('dummy2', servers.last.id)
+
+    assert_requested(stub, times: 2)
+  end
+
   def test_list_detail
     assert_equal(Yao::Server.method(:list), Yao::Server.method(:list_detail))
   end

data/test/yao/test_client.rb

@@ -8,27 +8,32 @@ class TestClient < Test::Unit::TestCase
     cli = Yao::Client.gen_client("http://cool-api.example.com:12345/v3.0")
     assert { cli.url_prefix.to_s == "http://cool-api.example.com:12345/v3.0" }
 
+    adapter = Faraday::Adapter::NetHttp
+    assert { cli.builder.adapter == adapter }
+
     handlers = [
       Faraday::Request::Accept,
       Faraday::Request::UrlEncoded,
+      Faraday::Request::UserAgent,
       Faraday::Request::ReadOnly,
       Faraday::Response::OSErrorDetector,
-      FaradayMiddleware::ParseJson,
-      Faraday::Adapter::NetHttp
+      FaradayMiddleware::ParseJson
     ]
     assert { cli.builder.handlers == handlers }
   end
 
   def test_gen_with_token
     cli = Yao::Client.gen_client("http://cool-api.example.com:12345/v3.0", token: "deadbeaf")
+    adapter = Faraday::Adapter::NetHttp
+    assert { cli.builder.adapter == adapter }
     handlers = [
       Faraday::Request::Accept,
       Faraday::Request::UrlEncoded,
+      Faraday::Request::UserAgent,
       Faraday::Request::OSToken,
       Faraday::Request::ReadOnly,
       Faraday::Response::OSErrorDetector,
-      FaradayMiddleware::ParseJson,
-      Faraday::Adapter::NetHttp
+      FaradayMiddleware::ParseJson
     ]
     assert { cli.builder.handlers == handlers }
   end
@@ -37,15 +42,17 @@ class TestClient < Test::Unit::TestCase
     stub(Yao.config).debug { true }
 
     cli = Yao::Client.gen_client("http://cool-api.example.com:12345/v3.0")
+    adapter = Faraday::Adapter::NetHttp
+    assert { cli.builder.adapter == adapter }
     handlers = [
       Faraday::Request::Accept,
       Faraday::Request::UrlEncoded,
+      Faraday::Request::UserAgent,
       Faraday::Request::ReadOnly,
       Faraday::Response::OSErrorDetector,
       FaradayMiddleware::ParseJson,
       Faraday::Response::Logger,
-      Faraday::Response::OSDumper,
-      Faraday::Adapter::NetHttp
+      Faraday::Response::OSDumper
     ]
     assert { cli.builder.handlers == handlers }
   end
@@ -57,6 +64,7 @@ class TestClient < Test::Unit::TestCase
   end
 
   def test_cert_key
+    stub(Yao.config).ca_cert { File.expand_path("../../fixtures/dummy.pem", __FILE__) }
     stub(Yao.config).client_cert { File.expand_path("../../fixtures/dummy.pem", __FILE__) }
     stub(Yao.config).client_key  { File.expand_path("../../fixtures/dummy.key", __FILE__) }
     stub(OpenSSL::X509::Certificate).new { "DummyCert" }
@@ -64,6 +72,7 @@ class TestClient < Test::Unit::TestCase
 
     cli = Yao::Client.gen_client("http://cool-api.example.com:12345/v3.0")
     ssl = cli.ssl
+    assert { ssl[:ca_file] == File.expand_path("../../fixtures/dummy.pem", __FILE__) }
     assert { ssl[:client_cert] == "DummyCert" }
     assert { ssl[:client_key] == "DummyKey" }
   end

data/test/yao/test_server_error.rb

@@ -1,8 +1,8 @@
 class TestServerError < Test::Unit::TestCase
   def test_detects_error_with_env
     env = Faraday::Env.new
-    env.body = {"itemNotFound"=>{"message"=>"Image not found.", "code"=>404}}
     env.status = 404
+    env.body = {"itemNotFound"=>{"message"=>"Image not found.", "code"=>404}}
 
     error = Yao::ServerError.detect(env)
     assert { error.is_a? Yao::ItemNotFound }
@@ -13,8 +13,8 @@ class TestServerError < Test::Unit::TestCase
 
   def test_anyway_returns_error
     env = Faraday::Env.new
-    env.body = "<html>Not found.</html>"
     env.status = 599
+    env.body = "<html>Not found.</html>"
 
     error = Yao::ServerError.detect(env)
     assert { error.is_a? Yao::ServerError }

data/yao.gemspec

@@ -18,6 +18,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "json"
-  spec.add_dependency "faraday"
+  spec.add_dependency "deep_merge"
+  spec.add_dependency "faraday", "~> 1.0.1"
   spec.add_dependency "faraday_middleware"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yao
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.4
 platform: ruby
 authors:
 - Uchio, KONDO
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-02-28 00:00:00.000000000 Z
+date: 2020-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: faraday
+  name: deep_merge
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: faraday
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
@@ -184,7 +198,7 @@ homepage: https://github.com/yaocloud/yao
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -199,8 +213,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.0.6
+signing_key:
 specification_version: 4
 summary: Yet Another OpenStack API Wrapper that rocks!!
 test_files: