lmc 0.9.0 → 0.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 4cf28191aafd359f60cc8d8d3eb7b9c4ffb4ff6a
-  data.tar.gz: 109b27a7784b63820b94a63d04ca53174a59a687
+SHA256:
+  metadata.gz: cfd78ebb37da9e527f2da6cdf0d7297994c49031cef7af9ce0534f86d2d66b01
+  data.tar.gz: bada57081f44bbdd303ebf2ebedee80c0e6c21be9e354614ba976ca96d4bc627
 SHA512:
-  metadata.gz: 2ce921af5e82516e865bb5241719f7efb09b90dfac67d6d82402ffa06bc4b27bd108735784b25cccff56e0c2193e8c8c198ad879d443b9ea723353b93bb0a1bc
-  data.tar.gz: db341afd04ed21951870cd9a982c27d0bf93eee1a9872dce292bc6c9f324e27d62ca66021709cb7d9a04a09d709f2ca1154bb7eec7cb18a22baece62f4775492
+  metadata.gz: 1ada15e1c15fedb1553b6f04334dee02bbcdad709c75b2750487932abd162245ab845b476be3f2d3d71cb43133df1800c2c4fc5b264ee1ba2b9bef339607c083
+  data.tar.gz: 1d08d68450769836432be5f38e16791de5dbf5bbbbedae30bd8eefd36d3a87aab5982bd0ed64080e30fb30ff673ddc84c8d8e0fec84b714f92276003adef2632

data/.idea/inspectionProfiles/Project_Default.xml

@@ -1,7 +1,7 @@
 <component name="InspectionProjectProfileManager">
   <profile version="1.0">
     <option name="myName" value="Project Default" />
-    <inspection_tool class="Rubocop" enabled="true" level="WARNING" enabled_by_default="true">
+    <inspection_tool class="Rubocop" enabled="false" level="WARNING" enabled_by_default="true">
       <scope name="Tests" level="ERROR" enabled="true" />
     </inspection_tool>
     <inspection_tool class="RubyInstanceMethodNamingConvention" enabled="true" level="WARNING" enabled_by_default="true">

data/.idea/vcs.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+    <mapping directory="" vcs="Git" />
   </component>
 </project>

data/.rubocop.yml

@@ -1,4 +1,8 @@
-Layout/IndentHash:
+Layout/TrailingEmptyLines:
+  EnforcedStyle: final_blank_line
+Layout/FirstHashElementIndentation:
   IndentationWidth: 4
-Metrics/LineLength:
+Layout/LineLength:
   Max: 110
+Style/IfUnlessModifier:
+  Enabled: false

data/.ruby-version

@@ -1 +1 @@
-2.4.1
+2.7.1

data/Rakefile

@@ -21,15 +21,16 @@ RuboCop::RakeTask.new(:autocop) do |t|
       'Layout/SpaceAroundOperators',
       'Layout/SpaceInsideBlockBraces',
       'Layout/SpaceInsideHashLiteralBraces',
-      'Layout/TrailingBlankLines',
-      'Style/BracesAroundHashParameters',
+      'Layout/TrailingEmptyLines',
       'Style/CommentAnnotation',
       'Style/FrozenStringLiteralComment',
       'Style/MethodDefParentheses',
       'Style/RedundantSelf',
       'Style/RedundantReturn',
       'Style/StringLiterals',
-      'Style/StringLiteralsInInterpolation']
+      'Style/StringLiteralsInInterpolation',
+      'Style/StabbyLambdaParentheses',
+  ]
   t.options = ['--only', autofix.join(','), '--auto-correct', 'lib', 'test', 'Rakefile', 'lmc.gemspec']
 end
 task :default => :test
@@ -38,3 +39,4 @@ RDoc::Task.new do |rdoc|
   rdoc.main = 'README.rdoc'
   rdoc.rdoc_files.include('README.rdoc', 'lib/**/*.rb')
 end
+

data/coverage/.last_run.json

@@ -1,5 +1,5 @@
 {
   "result": {
-    "covered_percent": 90.56
+    "covered_percent": 91.59
   }
 }

data/lib/lmc.rb

@@ -23,8 +23,9 @@ Dir.glob(File.expand_path('../lmc/*.rb', __FILE__)).each do |file|
   require file
 end
 
-['exceptions', 'auth', 'config', 'monitoring'].each do |folder|
+['exceptions', 'auth', 'config', 'monitoring', 'preferences'].each do |folder|
   Dir.glob(File.expand_path("../lmc/#{folder}/*.rb", __FILE__)).each do |file|
     require file
   end
 end
+

data/lib/lmc/Account.rb

@@ -25,7 +25,7 @@ module LMC
         (name.nil? || a.name == name) && (type.nil? || a.type == type)
       end
       if accounts.length == 1
-        return accounts[0]
+        accounts[0]
       elsif accounts.length == 0
         raise 'Did not find account'
       else
@@ -83,7 +83,14 @@ module LMC
     end
 
     def find_member_by_name(name)
-      members.find { |m| m.name == name }
+      if name.nil?
+        raise 'No member name given'
+      end
+      member = members.find { |m| m.name == name }
+      unless member
+        raise "Member named #{name} not found in account #{self}"
+      end
+      member
     end
 
     # def update_member(principal_id, data)
@@ -116,9 +123,14 @@ module LMC
     end
 
     def children
-      @cloud.auth_for_accounts([id, ROOT_ACCOUNT_UUID])
-      response = @cloud.get ['cloud-service-auth', 'accounts', id, 'children']
-      response.map { |child| Account.new @cloud, child }
+      @cloud.auth_for_accounts([ROOT_ACCOUNT_UUID])
+      # Projects can not have children, return empty map immediately as optimization
+      if type != "PROJECT"
+        response = @cloud.get ['cloud-service-auth', 'accounts', id, 'children']
+        response.map { |child| Account.new @cloud, child }
+      else
+        []
+      end
     end
 
     def logs
@@ -132,7 +144,7 @@ module LMC
       # private clouds can not have sites
       return [] if @type == 'PRIVATE_CLOUD'
       @cloud.auth_for_accounts([id])
-      response = @cloud.get ['cloud-service-devices', 'accounts', id, 'sites'], {:select => :id}
+      response = @cloud.get ['cloud-service-devices', 'accounts', id, 'sites'], :select => :id
       response.body.map { |data|
         Site.new(UUID.new(data), self)
       }
@@ -161,6 +173,10 @@ module LMC
       "#{name}"
     end
 
+    def summary
+      "\"#{@name}\" (#{@type}) ID: #{@id}"
+    end
+
     private
 
     ## should be put into entity or such
@@ -178,3 +194,4 @@ module LMC
     end
   end
 end
+

data/lib/lmc/Cloud.rb

@@ -63,6 +63,11 @@ module LMC
       post ['cloud-service-auth', 'accounts', account_id, 'members'], body
     end
 
+    # @param section Array of String to indicate section to access. Example: ['principal', 'self', 'ui']
+    def preferences(section)
+      LMC::Preferences.new cloud: self, section: section
+    end
+
     def get(path, params = nil)
       prepared_headers = headers
       prepared_headers[:params] = params
@@ -74,31 +79,37 @@ module LMC
       execute_request args
     end
 
-    def put(path, body_object)
+    def put(path, body_object, params = nil)
+      prepared_headers = headers
+      prepared_headers[:params] = params
       args = {
           :method => :put,
           :url => build_url(path),
-          :payload => body_object.to_json
-
+          :payload => body_object.to_json,
+          :headers => prepared_headers
       }
       execute_request args
     end
 
-    def post(path, body_object)
+    def post(path, body_object, params=nil )
+      prepared_headers = headers
+      prepared_headers[:params] = params
       args = {
           :method => :post,
           :url => build_url(path),
-          :payload => body_object.to_json
+          :payload => body_object.to_json,
+          :headers => prepared_headers
       }
       execute_request args
     end
 
-    def delete(path, body_object = nil)
+    def delete(path, params = nil)
+      prepared_headers = headers
+      prepared_headers[:params] = params
       args = {
           :method => :delete,
           :url => build_url(path),
-          :payload => body_object.to_json,
-          :headers => headers
+          :headers => prepared_headers
       }
       execute_request args
     end
@@ -143,7 +154,6 @@ module LMC
       if account_ids != @last_authorized_account_ids
         begin
           reply = post(['cloud-service-auth', 'auth'], name: @user, password: @password, accountIds: account_ids, termsOfUse: tos)
-          puts 'authorize reply ' + reply.inspect if Cloud.debug
           @last_authorized_account_ids = account_ids
           @auth_token = reply
           @auth_ok = true
@@ -181,17 +191,16 @@ module LMC
       internal_args.merge! args
       begin
         resp = RestClient::Request.execute internal_args
-        return LMCResponse.new(resp)
+        LMCResponse.new(resp)
       rescue RestClient::ExceptionWithResponse => e
-        print_exception e if Cloud.debug
+        if Cloud.debug
+          puts 'EXCEPTION: ' + e.to_s
+          puts 'EX.response: ' + e.response.to_s
+          puts JSON.parse(e.response)['message']
+        end
         raise e
       end
     end
-
-    def print_exception(execption)
-      puts 'EXCEPTION: ' + execption.to_s
-      puts 'EX.response: ' + execption.response.to_s
-      puts JSON.parse(execption.response)['message']
-    end
   end
 end
+

data/lib/lmc/Configstates.rb

@@ -12,3 +12,4 @@ module LMC
     end
   end
 end
+

data/lib/lmc/Device.rb

@@ -77,3 +77,4 @@ module LMC
     end
   end
 end
+

data/lib/lmc/Response.rb

@@ -59,3 +59,4 @@ module LMC
     end
   end
 end
+

data/lib/lmc/Site.rb

@@ -27,3 +27,4 @@ module LMC
     end
   end
 end
+

data/lib/lmc/User.rb

@@ -38,3 +38,4 @@ module LMC
     end
   end
 end
+

data/lib/lmc/account_manager.rb

@@ -83,3 +83,4 @@ END
     end
   end
 end
+

data/lib/lmc/auth/auth_action.rb

@@ -20,3 +20,4 @@ module LMC
     end
   end
 end
+

data/lib/lmc/authority.rb

@@ -52,3 +52,4 @@ module LMC
     end
   end
 end
+

data/lib/lmc/config/device_config.rb

@@ -172,16 +172,17 @@ module LMC
     end
 
     def redeem_ticket(tries)
+      wait_seconds = 0.5
       attempts = 1
       until @response
-        raise 'Too many attempts' if attempts > tries
+        raise "Timeout waiting for config (#{attempts * wait_seconds}s)" if attempts > tries
         attempts += 1
         body = @cloud.get(url_ticket).body
         unless body.respond_to? :ticketId
           @ticket_id = nil
           @response = body
         end
-        sleep 0.5
+        sleep wait_seconds * attempts
       end
     end
 
@@ -190,3 +191,4 @@ module LMC
     # end
   end
 end
+

data/lib/lmc/config/device_dsc_ui.rb

@@ -91,3 +91,4 @@ module LMC
     end
   end
 end
+

data/lib/lmc/device_config_state.rb

@@ -5,3 +5,4 @@ module LMC
   class DeviceConfigState < OpenStruct
   end
 end
+

data/lib/lmc/entity.rb

@@ -5,9 +5,9 @@ module LMC
     def self.get_by_uuid_or_name(term)
       raise 'Missing argument' if term.nil?
       begin
-        return get_by_uuid term
+        get_by_uuid term
       rescue RestClient::BadRequest, URI::InvalidURIError
-        return get_by_name term
+        get_by_name term
       end
     end
 
@@ -16,3 +16,4 @@ module LMC
     end
   end
 end
+

data/lib/lmc/exceptions/lmc_outdated_terms_of_use_exception.rb

@@ -20,3 +20,4 @@ module LMC
     end
   end
 end
+

data/lib/lmc/logger.rb

@@ -5,8 +5,15 @@ module LMC
   class Logger < ::Logger
     @cloud = nil
     attr_accessor :cloud
+    @@header_token_re = /"Authorization"=>"Bearer ([\S]*)"/
     def <<(line)
-      super line.gsub @cloud.password, '********'
+      value_found = @@header_token_re.match line
+      if value_found
+        line.gsub! value_found[1], 'TOKEN REDACTED'
+      end
+      line.gsub! @cloud.password, '********'
+      super
     end
   end
 end
+

data/lib/lmc/membership.rb

@@ -14,3 +14,4 @@ module LMC
     end
   end
 end
+

data/lib/lmc/mixins/json_able.rb

@@ -14,3 +14,4 @@ module LMC::JSONAble
     end
   end
 end
+

data/lib/lmc/mixins/service_resource.rb

@@ -9,9 +9,6 @@ module LMC
         end
       end
       klass.class_exec do
-        def methodtest
-          puts("cloud-service-#{service_name}")
-        end
 
         # method that wraps attr_accessor to keep the defined attrs in a class instance var for serializing
         def self.resource_attrs(*attrs)
@@ -26,10 +23,6 @@ module LMC
       end
     end
 
-    def method_on_instance_of_class
-      puts("cloud-service-#{service_name} #{inspect}, #{@cloud}")
-    end
-
     def collection_path
       ["cloud-service-#{service_name}", collection_name]
     end
@@ -39,3 +32,4 @@ module LMC
     end
   end
 end
+

data/lib/lmc/monitoring/monitoring_record.rb

@@ -31,3 +31,4 @@ module LMC
     end
   end
 end
+

data/lib/lmc/preferences/preferences.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+module LMC
+  class Preferences
+    def initialize(cloud:, section:)
+      @cloud = cloud
+      @section = section
+    end
+
+    def get(path)
+      response = @cloud.get build_url, { path: path }
+      response.body
+    end
+
+    def put(path, payload)
+      @cloud.put build_url, payload, { path: path }
+    end
+
+    private
+    def build_url
+      ['cloud-service-preferences'] + @section
+    end
+  end
+end
+

data/lib/lmc/principal.rb

@@ -52,3 +52,4 @@ module LMC
     end
   end
 end
+

data/lib/lmc/uuid.rb

@@ -13,4 +13,5 @@ module LMC
       @string
     end
   end
-end
+end
+

data/lib/lmc/version.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
 module LMC
-  VERSION = '0.9.0'
+  VERSION = '0.12.1'
 end
+

data/lmc.gemspec

@@ -32,12 +32,13 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'minitest', '~> 5.11'
   spec.add_development_dependency 'minitest-reporters', '~> 1'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rake', '~> 12.0'
   spec.add_development_dependency 'recursive-open-struct', '~> 1.1'
   spec.add_development_dependency 'simplecov', '~> 0.15'
   spec.add_development_dependency 'pry-nav', '~> 0.2.4'
   spec.add_development_dependency 'rubocop', '~> 0.58.1'
 
-  spec.add_runtime_dependency 'json', '~> 2.0'
+  spec.add_runtime_dependency 'json', '~> 2.3'
   spec.add_runtime_dependency 'rest-client', '~> 2.0'
 end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lmc
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.12.1
 platform: ruby
 authors:
 - erpel
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-23 00:00:00.000000000 Z
+date: 2020-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: recursive-open-struct
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -195,6 +195,7 @@ files:
 - lib/lmc/mixins/json_able.rb
 - lib/lmc/mixins/service_resource.rb
 - lib/lmc/monitoring/monitoring_record.rb
+- lib/lmc/preferences/preferences.rb
 - lib/lmc/principal.rb
 - lib/lmc/uuid.rb
 - lib/lmc/version.rb
@@ -219,8 +220,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Library for interacting with LMC cloud instances