lmcadm 0.15.0 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44c6d0a6cd45c6c772311396c13646899f7db20675004254fc70cb1821620d3c
-  data.tar.gz: 93484873efe2767cb5c7911d00e72be3937cc7fbed2e29dfd3cbaeeb4d634d1d
+  metadata.gz: 2fa137bc6b37c1d4b8ad21a83b634fb19fd6403dcff6b23005da7a467aab9d70
+  data.tar.gz: 8a5f93e98b4f8248c9395e6a5980ae8c3ebc738dd45518295e781d165a0e715c
 SHA512:
-  metadata.gz: d9790f5e3e28fcd2fc3b4a8633b47019b3190e166bc15e9e926ee552620a6ad9a1edb4364f2355c9c4a0cc523db6997f042bccbcdf8f07d781611d1fdf4759ee
-  data.tar.gz: 92ed71b779d0bb817035a51965f4c308ce76cff89c4ddc86f8b06faf940766242e513260164eec6fb62b9c198fbb1e722072a8dc9c65e1be2f475070221d01f8
+  metadata.gz: 67a59f6513b13f9619c28b7319ebc5902d53bcae865570681be86b6842cf3155021850f3b6d32973c9eeb23bf66316c0d1954ac54e389883d1eb8e9b7a8316b4
+  data.tar.gz: 226c8ee80ed5519c3009fa8415abfbb0d9e5a566e52d44abb4ec6c112c48951647c4135e2fe68f521e9352b811b9521b98920c6fac6a93c33d2a1cf103e7c970

data/exe/lmcadm

@@ -85,6 +85,9 @@ module LMCAdm
     ::LMC::Cloud.verify_tls = global["verify-tls"]
     ::LMC::Cloud.use_tls = global["use-tls"]
     LMCAdm::ProgressVisualizer.take_time = global["take-time"]
+    # let table_print print wide columns
+    tp.set :max_width, 50
+
     true
   end
 

data/lib/lmcadm/account_commands.rb

@@ -26,7 +26,7 @@ module LMCAdm
             a["type"] == options[:account_type]
           end
         end
-        accounts.sort {|a, b| a["name"] <=> b["name"]}.each do |account|
+        accounts.sort { |a, b| a["name"] <=> b["name"] }.each do |account|
           puts account.inspect if global_options[:v]
           if options[:l]
             puts account.summary
@@ -82,9 +82,9 @@ module LMCAdm
       account_create.action do |global_options, options, args|
         parent = LMC::Account.get_by_uuid_or_name options[:p]
         t = ProgressVisualizer.new "Creating object"
-        a = LMC::Account.new(LMC::Cloud.instance, {"name" => args.first,
-                                                   "type" => options[GLI::Command::PARENT][:account_type],
-                                                   "parent" => parent.id})
+        a = LMC::Account.new(LMC::Cloud.instance, { "name" => args.first,
+                                                    "type" => options[GLI::Command::PARENT][:account_type],
+                                                    "parent" => parent.id })
         t.done
         t = ProgressVisualizer.new "Saving #{a.name}"
         result = a.save
@@ -106,13 +106,13 @@ module LMCAdm
         t = ProgressVisualizer.new "Getting accounts"
         if options[:e]
           accounts = LMC::Cloud.instance.get_accounts_objects
-          matched_accounts = accounts.select {|account| /#{args.first}/.match(account.name)}
+          matched_accounts = accounts.select { |account| /#{args.first}/.match(account.name) }
         else
           matched_accounts = [LMC::Account.get_by_uuid_or_name(args.first)]
         end
         t.done
         puts 'Accounts to delete:'
-        puts matched_accounts.map {|a| "#{a.id} - #{a.name}"}.join("\n")
+        puts matched_accounts.map { |a| "#{a.id} - #{a.name}" }.join("\n")
         print('Type yes to confirm: ')
         exit unless STDIN.gets.chomp == 'yes'
         t = ProgressVisualizer.new "Deleting accounts"
@@ -159,12 +159,12 @@ module LMCAdm
       memberlist.action do |global_options, options, args|
         account = LMC::Account.get_by_uuid_or_name args.first
         members = account.members
-        tp members, [{:id => {:width => 36}}, :name, :type, :state, :invitationState, :principalState,
-                     :authorities => {:display_method => lambda {|m|
-                       m.authorities.map {|a|
+        tp members, [{ :id => { :width => 36 } }, :name, :type, :state, :invitationState, :principalState,
+                     :authorities => { :display_method => lambda { |m|
+                       m.authorities.map { |a|
                          a['name']
                        }.join(',')
-                     }, :width => 128}]
+                     }, :width => 128 }]
       end
     end
 
@@ -174,8 +174,8 @@ module LMCAdm
       auth.action do |_g, _o, args|
         account = LMC::Account.get_by_uuid_or_name args.first
         authorities = account.authorities
-        max = Helpers::longest_in_collection(authorities.map {|a| a.name})
-        tp authorities, [{:id => {:width => 36}}, {:name => {:width => max}}, :visibility, :type]
+        max = Helpers::longest_in_collection(authorities.map { |a| a.name })
+        tp authorities, [{ :id => { :width => 36 } }, { :name => { :width => max } }, :visibility, :type]
       end
     end
 
@@ -187,7 +187,7 @@ module LMCAdm
         create.flag :A, :required => true
         create.action do |_global_options, options, _args|
           account = LMC::Account.get_by_uuid_or_name options[:A]
-          auth = LMC::Authority.new({'name' => _args.first, 'visibility' => 'PRIVATE'}, account)
+          auth = LMC::Authority.new({ 'name' => _args.first, 'visibility' => 'PRIVATE' }, account)
           puts auth.save
         end
       end
@@ -202,7 +202,7 @@ module LMCAdm
       account_invite.action do |global_options, options, args|
         account = LMC::Account.get_by_uuid_or_name options[:account]
         cloud = LMC::Cloud.instance
-        chosen_authorities = account.authorities.select {|auth| auth.name == options[:role]}
+        chosen_authorities = account.authorities.select { |auth| auth.name == options[:role] }
         args.each do |email|
           cloud.invite_user_to_account email, account.id, options[:type], chosen_authorities
         end
@@ -256,28 +256,40 @@ module LMCAdm
       update.flag :A, :account, :required => true
       update.desc 'authority id'
       update.flag 'add-authority'
-      update.action do |_global_options, options, args|
+      update.desc 'authority name|id'
+      update.flag 'remove-authority'
+      update.action do |global_options, options, args|
         account = LMC::Account.get_by_uuid_or_name(options[:account])
+        account.cloud.auth_for_account account
         membership = account.find_member_by_name args.first
-        puts membership
+        puts "membership class: #{membership.class}"
+        puts "membership.authorities first class: #{membership.authorities.first.class}"
+
+        #real_membership = LMC::Membership.new membership
+        #puts real_membership.inspect
+
+
+        puts membership if global_options[:verbose]
+        authority_ids = membership.authorities.map do |a|
+          a.id
+        end
+        puts "Existing authority ids: #{authority_ids}"
         if options['add-authority']
-          # new_authority = account.authorities.find do |a|
-          #   a.name == options['add-authority']
-          # end
-          puts membership.class
-          puts membership.authorities.class
-          authority_ids = membership.authorities.map do |a|
-            a['id']
-          end
-          puts authority_ids
-          authority_ids = authority_ids.concat [options['add-authority']]
-          puts authority_ids
-          # POST /accounts/{accountId}/members/{principalId}
-          cloud = LMC::Cloud.instance
-          cloud.auth_for_account account
-          res = cloud.post ['cloud-service-auth', 'accounts', account.id, 'members', membership.id], {'authorities' => authority_ids}
-          puts res
+          add_str = options['add-authority']
+          new_authority = Helpers::find_by_id_or_name membership.authorities, add_str
+          authority_ids = authority_ids.concat [new_authority.id]
+          puts "Adding #{authority_ids}"
+        end
+        if options['remove-authority']
+          remove_str = options['remove-authority']
+          deleting_authority = Helpers.find_by_id_or_name account.authorities, remove_str
+          puts "Removing #{deleting_authority}"
+          authority_ids = authority_ids - [deleting_authority.id]
         end
+        puts "New authority ids: #{authority_ids}"
+        # POST /accounts/{accountId}/members/{principalId}
+        res = account.cloud.post ['cloud-service-auth', 'accounts', account.id, 'members', membership.id], { 'authorities' => authority_ids }
+        puts res
       end
     end
 
@@ -288,16 +300,12 @@ module LMCAdm
       children.flag :special
       children.action do |global_options, options, args|
         account = LMC::Account.get_by_uuid_or_name args.first
-        cloud = LMC::Cloud.instance
 
         def recurse_childen account, indent_level
           children = account.children
           children.each do |child|
             puts '  ' * indent_level + child.to_s
-            begin
-              recurse_childen child, indent_level + 1
-            rescue RestClient::Forbidden => e
-            end
+            recurse_childen child, indent_level + 1
           end
         end
 

data/lib/lmcadm/commands/rights.rb

@@ -15,7 +15,7 @@ module LMCAdm
     end
     rights.arg_name "rights"
     rights.command :assign do |assign|
-      assign.flag :A
+      assign.flag :A, :account
       assign.flag :authority
       assign.flag :service
       assign.action do |_g, o, a |
@@ -23,9 +23,34 @@ module LMCAdm
         account = LMC::Account.get_by_uuid_or_name o[:A]
         c = LMC::Cloud.instance
         c.auth_for_account account
-        c.post [o[:service], "accounts", account.id, 'authorities', o[:authority], 'rights' ], a
+        service_name = Helpers.complete_service_name o[:service]
+        c.post [service_name, "accounts", account.id, 'authorities', o[:authority], 'rights' ], a
 
       end
     end
+    rights.arg_name 'servicename account'
+    rights.desc 'example: lmcadm rights authorities messaging myproject'
+    rights.command :authorities do |authorities|
+      authorities.action do |_g, _o, a |
+        account = LMC::Account.get_by_uuid_or_name a[1]
+        account.cloud.auth_for_account account
+        authorities = account.cloud.get [Helpers.complete_service_name(a[0]), 'accounts', account.id, 'authorities']
+        tp authorities.body, [:name , :visibility, :type, :id]
+      end
+    end
+
+    rights.arg_name '<servicename> <account> <authority_id>'
+    rights.desc 'example: lmcadm rights show service-messaging myproject 5c244078-c937-4ff9-bb33-351f5253fe53'
+    rights.command :show do |show|
+      show.action do |_g, _o, a|
+        account = LMC::Account.get_by_uuid_or_name a[1]
+        account.cloud.auth_for_account account
+        service_name = Helpers.complete_service_name a[0]
+        authority = account.cloud.get([service_name, 'accounts', account.id, 'authorities', a[2]]).body
+        puts authority.to_h.to_s
+        rights = account.cloud.get([service_name, 'accounts', account.id, 'authorities', a[2], 'rights']).body
+        puts rights
+      end
+    end
   end
 end

data/lib/lmcadm/helpers/find_helpers.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+module LMCAdm
+  module Helpers
+    def self.find_by_id_or_name(list, search)
+      found = []
+      found += list.select do |item|
+        item.id == search
+      end
+      found += list.select do |item|
+        item.name == search
+      end
+      puts "More than one item found for: #{search}" if found.length > 1
+      raise "Not found: #{search}" if found.length < 1
+      return found.first
+    end
+  end
+end
+

data/lib/lmcadm/helpers/string_helpers.rb

@@ -7,5 +7,15 @@ module LMCAdm
       end
       return max
     end
+
+    def self.complete_service_name(name)
+      if name.start_with? 'cloud-service-'
+        return name
+      end
+      if name.start_with? 'service-'
+        return 'cloud-' + name
+      end
+      return'cloud-service-' + name
+    end
   end
 end

data/lib/lmcadm/version.rb

@@ -1,3 +1,3 @@
 module LMCAdm
-  VERSION = '0.15.0'
+  VERSION = '0.16.0'
 end

data/lmcadm.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "minitest", "~> 5.0"
   spec.add_development_dependency "pry-nav", "0.2.4"
 
-  spec.add_runtime_dependency 'lmc', '~> 0.13.0'
+  spec.add_runtime_dependency 'lmc', '~> 0.14.0'
   spec.add_runtime_dependency 'gli', '~> 2.17'
   spec.add_runtime_dependency 'table_print', '~> 1.5'
   spec.add_runtime_dependency 'colorize', '~> 0.8'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lmcadm
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.16.0
 platform: ruby
 authors:
 - erpel
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-01-15 00:00:00.000000000 Z
+date: 2021-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: 0.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: 0.14.0
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
@@ -177,6 +177,7 @@ files:
 - lib/lmcadm/device_commands.rb
 - lib/lmcadm/helpers/args_helpers.rb
 - lib/lmcadm/helpers/device_helpers.rb
+- lib/lmcadm/helpers/find_helpers.rb
 - lib/lmcadm/helpers/password_helper.rb
 - lib/lmcadm/helpers/string_helpers.rb
 - lib/lmcadm/version.rb