kaname 0.7.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 93ce158126b82364f8793a40de13258e28b776ad7ee2a8bd35ac6b5f32f4b526
-  data.tar.gz: d2641332e6d266521f3faad66b6482ad057d04688c7fce8cbb9e463f7bd9de20
+  metadata.gz: c9bb34f056e95f72704b84a514305563ca17931d6ca9bc282caef210e7d43ef1
+  data.tar.gz: f6b357b16049d9cf528217cc9353430a39b45b44415f92e28fa2819e960dfbc6
 SHA512:
-  metadata.gz: e891cc790d96086bb83065651ec61d3763ed13c1156991f5f6c0631c73b8ccdf4c6e1b4f2da2faec8f853aae6c3aa686fec3ee228f52c45f9709f90ac0ccecfd
-  data.tar.gz: f72fd7ce52e9d195014f2eb654659aa50279404a45371d570e21c0e673b23ac2f10b1409f987a9effe3edf51c6c98d5bdafe1c85062278286f50eadc86d972ae
+  metadata.gz: eb512dd45dfb0df7eb0fe7098f1433b111cb007380a0c8f01f40be86368f70eccdd2c1e6cda693f4837ad9274e65427dcffecbef56b8a28669d80976c7eed1ff
+  data.tar.gz: 47d99b2ac4cdd68f9fedf87235643ce411038e6d365291d74a37c08c2a22c87acabd40b48eae09cd6709d824dff6d5c5c5457bd812a717c226305a5127b7dd05

data/kaname.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "yao", ">= 0.3.3"
+  spec.add_dependency "yao", ">= 0.8.0"
   spec.add_dependency "diffy"
   spec.add_dependency "hashdiff", ">= 1.0.0"
   spec.add_dependency "thor"

data/lib/kaname/adapter/read_only.rb

@@ -10,12 +10,16 @@ module Kaname
       end
 
       def find_user(name)
-        user = Yao::User.find_by_name(name)
+        user = Yao::User.find_by_name(name).first
         {"id" => user.id, "name" => user.name}
       end
 
       def list_tenants
-        @_tenants ||= Yao::Tenant.list
+        @_tenants ||= if keystone_v2?
+                        Yao::Tenant.list
+                      else
+                        Yao::Project.list
+                      end
       end
 
       def list_roles
@@ -62,6 +66,10 @@ module Kaname
 
       private
 
+      def keystone_v2?
+        Yao.default_client.pool["identity"].url_prefix.to_s.match(/v2\.0/)
+      end
+
       def tenant_role_hash(user_id)
         list_role_assignments.each_with_object(Hash.new) do |t,th|
           if t.user.id == user_id

data/lib/kaname/version.rb

@@ -1,3 +1,3 @@
 module Kaname
-  VERSION = "0.7.1"
+  VERSION = "0.8.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kaname
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.0
 platform: ruby
 authors:
 - SHIBATA Hiroshi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-26 00:00:00.000000000 Z
+date: 2019-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yao
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: diffy
   requirement: !ruby/object:Gem::Requirement
@@ -197,7 +197,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Identity configuration tool for OpenStack.