kaname 0.6.3 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 670ec8c0c2f974a1d43bab32bf55cabdc0a3ce9160f4e9e4f6161c2e9d52749c
-  data.tar.gz: ecec1d85344a9c03b6adaebf55ca18f06a48893e5db688d6376dd22f734129ca
+  metadata.gz: fe3c27f2607b4105fe6a10b05f66ef7bdcb35172c8cd24f38bd7170d885304d7
+  data.tar.gz: faac94a44762c477b44f6ab7e8f21883e7b5ed3db55ef0d55cda00b05d4d1028
 SHA512:
-  metadata.gz: e4542d0669ab3ebfb97e65b028f5637ae5299c0db65bdc27ce3be49adc0927172f0a49b0d16c34a52514b2daf5a0c3ca516944100b648f91e36a24b2a66e7e8c
-  data.tar.gz: 4ce6e27c259e7ec7afbf9b3ecac776e9986adf2e9468cd2b946f5a509a63650ac2bf59e5e458a75dab944ea11012147b9772655ed29c10f1ad3d903813492bce
+  metadata.gz: 2d5b66680b2249b122ed9113d7027adbde1966f3ad76fb82ddc76c0ea69adb91ce647b9d960bb2a2d0b84bef18907a5090255219891c357850b1a60a7f4d224e
+  data.tar.gz: a433ed47937b24448a4956cabecac62b9fea1c2045f1b6a23f9963dc36d736e7743306bc51b1462eaa5aa3f8c2b8cf534ebc3000d64dce529278f0701a221fe8

data/.gitignore

@@ -7,5 +7,6 @@
 /pkg/
 /spec/reports/
 /tmp/
+vendor/bundle
 
 keystone.yml

data/.travis.yml

@@ -1,5 +1,4 @@
 language: ruby
 rvm:
-  - 2.1.10
-  - 2.2.5
-  - 2.3.1
+  - 2.6.6
+  - 2.7.2

data/README.md

@@ -48,6 +48,7 @@ password: "admin-no-password"
 also, you can set some options.
 
 ```
+ca_cert: "/path/to/ca.pem"
 client_cert: "/path/to/cert.pem"
 client_key: "/path/to/key.pem"
 region_name: "YourRegion"

data/kaname.gemspec

@@ -19,9 +19,9 @@ 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.13.4"
   spec.add_dependency "diffy"
-  spec.add_dependency "hashdiff"
+  spec.add_dependency "hashdiff", ">= 1.0.0"
   spec.add_dependency "thor"
 
   spec.add_development_dependency "bundler"

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/cli.rb

@@ -29,7 +29,7 @@ module Kaname
       end
 
       if Kaname::Resource.yaml
-        diffs = HashDiff.diff(adapter.users_hash, Kaname::Resource.yaml)
+        diffs = Hashdiff.diff(adapter.users_hash, Kaname::Resource.yaml)
         diffs.each do |diff|
           resource = diff[1].split('.')
           if resource.size == 1 # "user"

data/lib/kaname/config.rb

@@ -4,6 +4,9 @@ require 'yaml'
 module Kaname
   class Config
     @@username = String.new
+    @@ca_cert = nil
+    @@client_key = nil
+    @@client_cert = nil
 
     def self.setup
       load_config unless envs_exist?
@@ -17,7 +20,7 @@ module Kaname
     private
 
     def self.envs_exist?
-      %w[OS_AUTH_URL OS_TENANT_NAME OS_USERNAME OS_PASSWORD OS_CERT OS_KEY OS_REGION_NAME].any?{|k|ENV[k]}
+      %w[OS_AUTH_URL OS_TENANT_NAME OS_USERNAME OS_PASSWORD OS_CERT OS_KEY OS_REGION_NAME OS_IDENTITY_API_VERSION].any?{|k|ENV[k]}
     end
 
     def self.load_config
@@ -30,25 +33,34 @@ module Kaname
         raise "Configuration '#{conf_item}' is missing. Check your ~/.kaname" unless config[conf_item]
       end
 
-      @@auth_url       = config['auth_url']
-      @@tenant         = config['tenant']
-      @@username       = config['username']
-      @@password       = config['password']
-      @@client_cert    = config['client_cert']
-      @@client_key     = config['client_key']
-      @@region_name    = config['region_name']
+      @@auth_url             = config['auth_url']
+      @@tenant               = config['tenant']
+      @@username             = config['username']
+      @@password             = config['password']
+      @@ca_cert              = config['ca_cert']
+      @@client_cert          = config['client_cert']
+      @@client_key           = config['client_key']
+      @@region_name          = config['region_name']
+      @@user_domain_name     = config['user_domain_name']
+      @@project_domain_name  = config['project_domain_name']
+      @@identity_api_version = config['identity_api_version']
       true
     end
 
     def self.setup_yao
       Yao.configure do
-        auth_url    (ENV['OS_AUTH_URL']    || @@auth_url)
-        tenant_name (ENV['OS_TENANT_NAME'] || @@tenant)
-        username    (ENV['OS_USERNAME']    || @@username)
-        password    (ENV['OS_PASSWORD']    || @@password)
-        client_cert (ENV['OS_CERT']        || @@client_cert)
-        client_key  (ENV['OS_KEY']         || @@client_key)
-        region_name (ENV['OS_REGION_NAME'] || @@region_name)
+        auth_url             (ENV['OS_AUTH_URL']             || @@auth_url)
+        tenant_name          (ENV['OS_TENANT_NAME']          || @@tenant)
+        username             (ENV['OS_USERNAME']             || @@username)
+        password             (ENV['OS_PASSWORD']             || @@password)
+        ca_cert              (ENV['OS_CACERT']               || @@ca_cert)
+        client_cert          (ENV['OS_CERT']                 || @@client_cert)
+        client_key           (ENV['OS_KEY']                  || @@client_key)
+        region_name          (ENV['OS_REGION_NAME']          || @@region_name)
+        identity_api_version (ENV['OS_IDENTITY_API_VERSION'] || @@identity_api_version)
+        user_domain_name     (ENV['OS_USER_DOMAIN_NAME']     || @@user_domain_name)
+        project_domain_name  (ENV['OS_PROJECT_DOMAIN_NAME']  || @@project_domain_name)
+        debug  ENV['YAO_DEBUG']
       end
     end
   end

data/lib/kaname/version.rb

@@ -1,3 +1,3 @@
 module Kaname
-  VERSION = "0.6.3"
+  VERSION = "0.8.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kaname
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.8.2
 platform: ruby
 authors:
 - SHIBATA Hiroshi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-21 00:00:00.000000000 Z
+date: 2020-11-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.13.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.13.4
 - !ruby/object:Gem::Dependency
   name: diffy
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: thor
   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.1.2
 signing_key: 
 specification_version: 4
 summary: Identity configuration tool for OpenStack.