kaname 0.6.2 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 15b28f025e86bd66760143c6f4746ea38e43be3c
-  data.tar.gz: bf491e308de8a2b16f34469d7d80dab03289ac80
+SHA256:
+  metadata.gz: 90d10babee7819939e06b5e30de7e45874695795286f484383288724f885004b
+  data.tar.gz: 387231fe536276850ce78b9ea8567a8f26cad09cdb7dfbd5b28c47594400a18f
 SHA512:
-  metadata.gz: 84717d072d821c76d99f9a3f9f2b3f24256354f643a37feda0228e5d6965dc7e26ce610fa4a1e4b864deb53cb58ede620f8dd26c50a5f7e4fc99b3f9194bffc0
-  data.tar.gz: 4422dac3de3308fad2ea4747cd1c951ee7db77239406307da565f3bb6a9dd7a88be5a5fa8772cc1239bf5450b358840ad9e048233b9fbdb3b51e6a3c74010e8c
+  metadata.gz: b379ed4b0ac3d5f224ee3a445589d09879775d778655bc4c1805da626509bc0fcc13f434830692d95593c293cd36c46b6811c2ed5aa73e0fb50a63795a628568
+  data.tar.gz: 71131ed96229fd43d4b7db03df9469b746ab5b110e22777ae4e8cd06d8d193a8a902201db480410bcc3bf274777d920503d4233e54c6b86c5db21ec1dbb3acd0

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

@@ -43,12 +43,12 @@ auth_url: "http://your-openstack-auth-endpoint/v2.0"
 username: "admin"
 tenant: "admin"
 password: "admin-no-password"
-management_url: "http://your-openstack-management-endpoint/v2.0"
 ```
 
 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_and_write.rb

@@ -17,25 +17,17 @@ module Kaname
       end
 
       def update_user_password(old_password, new_password)
-        unless Kaname::Config.management_url
-          raise 'management_url is missing. Check the configuration file.'
-        end
-
         if old_password && new_password
-          token = Yao::Auth.try_new.token
           me    = Yao::User.get_by_name(Kaname::Config.username)
-          endpoint = Kaname::Config.management_url
-
-          url = URI.parse("#{endpoint}/OS-KSCRUD/users/#{me.id}")
+          client= Yao.default_client.pool['identity']
 
-          req = Net::HTTP::Patch.new(url.path)
-          req["Content-type"] = "application/json"
-          req["X-Auth-Token"] = token
-          req.body = JSON.generate({'user' => {'password' => new_password, 'original_password' => old_password}})
-
-          res = Net::HTTP.start(url.host, url.port) {|http| http.request(req) }
+          params = JSON.generate({'user' => {'password' => new_password, 'original_password' => old_password}})
+          res = client.patch("./OS-KSCRUD/users/#{me.id}") do |req|
+            req.body = params
+            req.headers['Content-Type'] = 'application/json'
+          end
 
-          if res.code == "200"
+          if res.status == 200
             puts "Your password is updated. Please update your ~/.kaname configuration too."
           else
             raise "password updating is failed"

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

@@ -3,12 +3,13 @@ require 'yaml'
 
 module Kaname
   class Config
-    %w[username management_url].each do |m|
-      self.class_variable_set(:"@@#{m}", String.new)
-    end
+    @@username = String.new
+    @@ca_cert = nil
+    @@client_key = nil
+    @@client_cert = nil
 
     def self.setup
-      load_config
+      load_config unless envs_exist?
       setup_yao
     end
 
@@ -16,12 +17,12 @@ module Kaname
       @@username
     end
 
-    def self.management_url
-      @@management_url
-    end
-
     private
 
+    def self.envs_exist?
+      %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
       config_file = File.join(Dir.home, '.kaname')
       raise '~/.kaname is missing' unless File.exists?(config_file)
@@ -32,26 +33,33 @@ 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']
-      @@management_url = config['management_url']
-      @@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    @@auth_url
-        tenant_name @@tenant
-        username    @@username
-        password    @@password
-        client_cert @@client_cert
-        client_key  @@client_key
-        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)
       end
     end
   end

data/lib/kaname/resource.rb

@@ -4,7 +4,7 @@ module Kaname
   class Resource
     class << self
       def yaml(filename = 'keystone.yml')
-        if File.exists?(filename)
+        if File.exist?(filename)
           @_yaml ||= expand_all_tenants(YAML.load_file(filename))
         end
       end

data/lib/kaname/version.rb

@@ -1,3 +1,3 @@
 module Kaname
-  VERSION = "0.6.2"
+  VERSION = "0.8.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kaname
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.8.1
 platform: ruby
 authors:
 - SHIBATA Hiroshi
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2018-01-10 00:00:00.000000000 Z
+date: 2020-10-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
@@ -182,7 +182,7 @@ homepage: https://github.com/yaocloud/kaname
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -197,9 +197,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
-signing_key: 
+rubygems_version: 3.0.6
+signing_key:
 specification_version: 4
 summary: Identity configuration tool for OpenStack.
 test_files: []