kaname 0.7.1 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 93ce158126b82364f8793a40de13258e28b776ad7ee2a8bd35ac6b5f32f4b526
-  data.tar.gz: d2641332e6d266521f3faad66b6482ad057d04688c7fce8cbb9e463f7bd9de20
+  metadata.gz: 12a0e64803312f26a75142e7149aaa0842da976002a4e5283d228954efb92ce0
+  data.tar.gz: bf43563c58a86f6e0d9eeed5dc03c2ef31230f2dba8eed3e9f6c42d2f58e6fd8
 SHA512:
-  metadata.gz: e891cc790d96086bb83065651ec61d3763ed13c1156991f5f6c0631c73b8ccdf4c6e1b4f2da2faec8f853aae6c3aa686fec3ee228f52c45f9709f90ac0ccecfd
-  data.tar.gz: f72fd7ce52e9d195014f2eb654659aa50279404a45371d570e21c0e673b23ac2f10b1409f987a9effe3edf51c6c98d5bdafe1c85062278286f50eadc86d972ae
+  metadata.gz: f5babea09ab0917e1207e7ec50f28c59700997f8a0d102c87d71e97feb56b89676826819037a4a3e62a2fb7d01eeadab900adc9e34a3441d95effc553be20453
+  data.tar.gz: fa1b59301c571ed3f57479fa406e33db14e48102ed9631ffc01e97db43b6b2a2023627471d7543e45f88d22dbfde12797866e93d4a8db4602fcf0adf8b6b302c

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

@@ -26,7 +26,7 @@ hsbt:
     production: "member"
 ```
 
-You can also define `all_tenants` for config all tenants' authority.  
+You can also define `all_tenants` for config all tenants' authority.
 If both tenants and all_tenants are setting, tenants is preferred.
 
 ```yaml
@@ -35,22 +35,14 @@ suzupy:
   all_tenants: member
 ```
 
-You need to put a configuration file to home directory.
+You will need to set some ENV.
 
 ```sh
-% cat ~/.kaname
-auth_url: "http://your-openstack-auth-endpoint/v2.0"
-username: "admin"
-tenant: "admin"
-password: "admin-no-password"
-```
-
-also, you can set some options.
-
-```
-client_cert: "/path/to/cert.pem"
-client_key: "/path/to/key.pem"
-region_name: "YourRegion"
+$ export OS_AUTH_URL="http://your-openstack-auth-endpoint/v3"
+$ export OS_USERNAME="admin"
+$ export OS_PASSWORD="admin"
+$ export OS_PROJECT_NAME=admin
+$ export OS_TENANT_NAME=admin
 ```
 
 run following command.

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.13.4"
   spec.add_dependency "diffy"
   spec.add_dependency "hashdiff", ">= 1.0.0"
   spec.add_dependency "thor"

data/lib/kaname/adapter/read_and_write.rb

@@ -28,7 +28,7 @@ module Kaname
           end
 
           if res.status == 200
-            puts "Your password is updated. Please update your ~/.kaname configuration too."
+            puts "Your password is updated. Please update your $OS_PASSWORD configuration too."
           else
             raise "password updating is failed"
           end

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

@@ -20,6 +20,7 @@ module Kaname
     end
 
     option :dryrun, type: :boolean
+    option :filename, aliases: :f, type: :string, default: 'keystone.yml'
     desc 'apply', 'Commands about configuration apply'
     def apply
       adapter = if options[:dryrun]
@@ -28,7 +29,7 @@ module Kaname
         Kaname::Adapter::ReadAndWrite.new
       end
 
-      if Kaname::Resource.yaml
+      if Kaname::Resource.yaml(options[:filename])
         diffs = Hashdiff.diff(adapter.users_hash, Kaname::Resource.yaml)
         diffs.each do |diff|
           resource = diff[1].split('.')

data/lib/kaname/config.rb

@@ -4,11 +4,11 @@ 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?
       setup_yao
     end
 
@@ -18,45 +18,20 @@ 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 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)
-
-      config = YAML.load_file(config_file)
-
-      %w[auth_url tenant username password].each do |conf_item|
-        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']
-      @@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)
-        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)
+        auth_url             ENV['OS_AUTH_URL']
+        tenant_name          ENV['OS_TENANT_NAME']
+        username             ENV['OS_USERNAME']
+        password             ENV['OS_PASSWORD']
+        ca_cert              ENV['OS_CACERT']
+        client_cert          ENV['OS_CERT']
+        client_key           ENV['OS_KEY']
+        region_name          ENV['OS_REGION_NAME']
+        identity_api_version ENV['OS_IDENTITY_API_VERSION']
+        user_domain_name     ENV['OS_USER_DOMAIN_NAME']
+        project_domain_name  ENV['OS_PROJECT_DOMAIN_NAME']
+        debug                ENV['YAO_DEBUG']
       end
     end
   end

data/lib/kaname/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kaname
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.9.0
 platform: ruby
 authors:
 - SHIBATA Hiroshi
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-07-26 00:00:00.000000000 Z
+date: 2021-12-22 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
@@ -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,8 +197,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
-signing_key: 
+rubygems_version: 3.2.32
+signing_key:
 specification_version: 4
 summary: Identity configuration tool for OpenStack.
 test_files: []