lmc 0.10.1 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5b372c965270e732a0cae9bac5a6f86d30bd1340
-  data.tar.gz: 34d28f4b1e789a0f31c0cb9a28769d37ca6d8201
+SHA256:
+  metadata.gz: e239ac693f1144e6391c0aad69e68657ad5498ae51e3b0c92dcc9e163abb15de
+  data.tar.gz: d98d01d4b424db42dc6fb581d763f4b60e20d4e283a87f1b771bd786c8c1a34e
 SHA512:
-  metadata.gz: 35ddcdb65d3be6fad01fa189bba0a8a9d377a4dd14c6268306c81bbfd050b06c819b4cad78f649291cb1fa7619ec9a351d60155949fc53ba26fc9a74357862d8
-  data.tar.gz: 70ea891cf778e2e8d70a8f6ff00453452b4c8c0eb24b8bd59dd6546fd710cf8a6dc01dd07615dbdf9a8f853b1fa025ad6053562558aa8d2cc6265f267f8c23d7
+  metadata.gz: abb83a783cfe4247cb3952cdd10df18fd36c4d9ad91d4196783e90aaf5bb39f5be51ee6b65ee1b11c4421077d3479e16f7c10359b83e39e361e90e586c3aee7c
+  data.tar.gz: 778005cf105deaf7fbd4bfd9ba60bb595ffb747e14e924a89dc1e56c5e8790518c9f386770ad36c3876280ed72f08e61bc6f081f0e15fbd8123fd570d4fc9b7b

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,8 +1,8 @@
-Layout/TrailingBlankLines:
+Layout/TrailingEmptyLines:
   EnforcedStyle: final_blank_line
-Layout/IndentFirstHashElement:
+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

data/coverage/.last_run.json

@@ -1,5 +1,5 @@
 {
   "result": {
-    "covered_percent": 90.81
+    "covered_percent": 92.33
   }
 }

data/lib/lmc.rb

@@ -5,10 +5,23 @@ require 'restclient'
 
 module LMC
   SERVICELIST = ['cloud-service-auth',
+                 'cloud-service-backstage',
+                 'cloud-service-config',
                  'cloud-service-devices',
+                 'cloud-service-devicetunnel',
+                 'cloud-service-dyndns',
+                 'cloud-service-fields',
+                 'cloud-service-geolocation',
+                 'cloud-service-hotspot',
+                 'cloud-service-jobs',
                  'cloud-service-monitoring',
-                 'cloud-service-config',
-                 'cloud-service-licenses']
+                 'cloud-service-messaging',
+                 'cloud-service-notification',
+                 'cloud-service-licenses',
+                 'cloud-service-logging',
+                 'cloud-service-preferences',
+                 'cloud-service-uf-translator'
+  ]
 
   def self.useful
     true
@@ -23,7 +36,7 @@ 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

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
@@ -56,8 +56,8 @@ module LMC
         delete_action = AuthAction.new @cloud
         delete_action.type = AuthAction::ACCOUNT_DELETE
         delete_action.name = Cloud.user
-        delete_action.data = {'password' => Cloud.password,
-                              'accountId' => @id}
+        delete_action.data = { 'password' => Cloud.password,
+                              'accountId' => @id }
         delete_action.post
         @id = nil
         true
@@ -73,30 +73,33 @@ module LMC
     def members
       ids = Cloud.instance.get ['cloud-service-auth', 'accounts', @id, 'members'], 'select' => 'id'
       puts ids.inspect if Cloud.debug
-      principals = ids.map do |principal_id|
-        response = Cloud.instance.get ['cloud-service-auth', 'accounts', @id, 'members', principal_id]
-        principal = response.body
-        puts principal.inspect if Cloud.debug
-        principal
+      # these are not actual membership objects
+      memberships = ids.map do |member_id|
+        response = Cloud.instance.get ['cloud-service-auth', 'accounts', @id, 'members', member_id]
+        memberships = response.body
+        puts memberships.inspect if Cloud.debug
+        memberships
       end
-      principals
+      memberships
     end
 
     def find_member_by_name(name)
       if name.nil?
         raise 'No member name given'
       end
-      member = members.find {|m| m.name == name}
+      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)
     #  response = @cloud.post ["cloud-service-auth", "accounts", id, 'members', principal_id], data
     #  return response
     # end
+    #++
 
     def remove_membership(member_id)
       @cloud.delete ['cloud-service-auth', 'accounts', id, 'members', member_id]
@@ -123,16 +126,21 @@ 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
 
+    # This can only show the most recent page of logs so far
     def logs
-      # https://lmctest/cloud-service-logging/accounts/6392b234-b11c-498a-a077-a5f5b23c54a0/logs?lang=DE
       cloud = Cloud.instance
       cloud.auth_for_accounts [id]
-      cloud.get(['cloud-service-logging', 'accounts', id, 'logs?lang=DE']).body
+      cloud.get(['cloud-service-logging', 'accounts', id, 'logs', 'paginated?lang=DE']).body.logs
     end
 
     def sites
@@ -140,7 +148,7 @@ module LMC
       return [] if @type == 'PRIVATE_CLOUD'
       @cloud.auth_for_accounts([id])
       response = @cloud.get ['cloud-service-devices', 'accounts', id, 'sites'], :select => :id
-      response.body.map {|data|
+      response.body.map { |data|
         Site.new(UUID.new(data), self)
       }
     end
@@ -168,6 +176,10 @@ module LMC
       "#{name}"
     end
 
+    def summary
+      "\"#{@name}\" (#{@type}) ID: #{@id}"
+    end
+
     private
 
     ## should be put into entity or such

data/lib/lmc/Cloud.rb

@@ -7,22 +7,24 @@ require 'restclient'
 module LMC
   class Cloud
     class << self
-      attr_accessor :cloud_host, :user, :password, :verbose, :debug, :verify_tls, :use_tls
+      attr_accessor :cloud_host, :user, :password, :code, :verbose, :debug, :verify_tls, :use_tls
       Cloud.use_tls = true
       Cloud.verify_tls = true
+      Cloud.code = nil
     end
 
     def self.instance(opts = { authorize: true })
-      @@inst ||= new(@cloud_host, @user, @password, opts[:authorize])
+      @@inst ||= new(@cloud_host, @user, @password, @code, opts[:authorize])
     end
 
     attr_reader :auth_ok, :cloud_host, :user, :password
 
-    def initialize(cloud_host, user, pass, auth = true)
+    def initialize(cloud_host, user, password, code = nil, auth = true)
       @auth_ok = false
       @cloud_host = cloud_host
       @user = user
-      @password = pass
+      @password = password
+      @code = code
       @verify_tls = Cloud.verify_tls
       @last_authorized_account_ids = nil
       @logger ||= ::LMC::Logger.new(STDOUT) if Cloud.debug
@@ -31,7 +33,7 @@ module LMC
       authorize if auth
     end
 
-    # hide password from dumps
+    # hide secret fields from being displayed in dumps
     def inspect
       "#<Cloud:#{object_id}, #{build_url}>"
     end
@@ -63,6 +65,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 +81,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
@@ -142,7 +155,12 @@ 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)
+          reply = post(['cloud-service-auth', 'auth'],
+                       name: @user,
+                       password: @password,
+                       code: @code,
+                       accountIds: account_ids,
+                       termsOfUse: tos)
           @last_authorized_account_ids = account_ids
           @auth_token = reply
           @auth_ok = true
@@ -151,6 +169,7 @@ module LMC
           if response['code'] == 100
             raise LMC::OutdatedTermsOfUseException.new(response)
           end
+          raise e
         end
       end
     end
@@ -180,7 +199,7 @@ module LMC
       internal_args.merge! args
       begin
         resp = RestClient::Request.execute internal_args
-        return LMCResponse.new(resp)
+        LMCResponse.new(resp)
       rescue RestClient::ExceptionWithResponse => e
         if Cloud.debug
           puts 'EXCEPTION: ' + e.to_s

data/lib/lmc/Response.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'ostruct'
+require 'recursive-open-struct'
 module LMC
   class LMCResponse
     attr_reader :body, :code, :headers
@@ -13,12 +14,12 @@ module LMC
       if @body_object.class == Array
         @body = @body_object.map { |elem|
           if elem.is_a? Hash then
-            OpenStruct.new(elem)
+            RecursiveOpenStruct.new(elem, recurse_over_arrays: true)
           else
             elem
           end}
       elsif @body_object.class == Hash
-        @body = OpenStruct.new(@body_object)
+        @body = RecursiveOpenStruct.new(@body_object, recurse_over_arrays: true)
       elsif @body_object.class == TrueClass || @body_object.class == FalseClass
         @body = @body_object
       else

data/lib/lmc/User.rb

@@ -34,6 +34,7 @@ module LMC
       action = AuthAction.new Cloud.instance
       action.type = 'PASSWORD_RESET'
       action.name = @email
+      action.data = nil
       action.post
     end
   end

data/lib/lmc/authority.rb

@@ -5,8 +5,7 @@ module LMC
     attr_accessor :account, :id, :name, :visibility, :type
 
     def initialize(data, account)
-      # TODO: Use cloud object from account
-      @cloud = Cloud.instance
+      @cloud = account.cloud
       apply_data(data)
       @account = account
     end

data/lib/lmc/config/device_config.rb

@@ -54,7 +54,7 @@ module LMC
     def descriptive_confighash
       item_map = dscui.item_by_id_map
       confighash.map { |k, v|
-        [item_map[k].description, v]
+        [item_map[k.to_s].description, v]
       }.to_h
     end
 
@@ -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
 

data/lib/lmc/config/device_dsc_ui.rb

@@ -28,7 +28,7 @@ module LMC
       attr_reader :version_string, :sections
 
       def initialize(v_hash)
-        keys = v_hash.keys
+        keys = v_hash.to_h.keys
         raise('More than one version key contained in dscui.') if keys.length > 1
         @version_string = keys.first
         @sections = v_hash[@version_string].map { |section_wrapper| Section.new section_wrapper }
@@ -76,7 +76,7 @@ module LMC
       end
 
       def initialize(item_wrapper)
-        keys = item_wrapper.keys
+        keys = item_wrapper.to_h.keys
         raise('More than one key contained in item wrapper') if keys.length > 1
         @type = keys.first
         item = item_wrapper[@type]

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
 

data/lib/lmc/logger.rb

@@ -5,7 +5,7 @@ module LMC
   class Logger < ::Logger
     @cloud = nil
     attr_accessor :cloud
-    @@header_token_re = /"Authorization"=>"Bearer ([\S.]*)"/
+    @@header_token_re = /"Authorization"=>"Bearer ([\S]*)"/
     def <<(line)
       value_found = @@header_token_re.match line
       if value_found

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

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module LMC
-  VERSION = '0.10.1'
+  VERSION = '0.14.0'
 end
 

data/lmc.gemspec

@@ -10,6 +10,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ['erpel']
   spec.email         = ['philipp@copythat.de']
 
+  spec.required_ruby_version = '~> 2.0'
   spec.summary       = %q{Library for interacting with LMC cloud instances}
   spec.license       = 'BSD-3-Clause'
 
@@ -32,13 +33,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 'recursive-open-struct', '~> 1.1'
+  spec.add_development_dependency 'rake', '~> 12.0'
   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'
+  spec.add_runtime_dependency 'recursive-open-struct', '~> 1.1'
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lmc
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.14.0
 platform: ruby
 authors:
 - erpel
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-11-25 00:00:00.000000000 Z
+date: 2021-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,28 +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'
-- !ruby/object:Gem::Dependency
-  name: recursive-open-struct
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +114,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
@@ -150,7 +136,21 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-description: 
+- !ruby/object:Gem::Dependency
+  name: recursive-open-struct
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+description:
 email:
 - philipp@copythat.de
 executables: []
@@ -195,33 +195,33 @@ 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
 - lmc.gemspec
 - misc/debug_log_experiment.rb
-homepage: 
+homepage:
 licenses:
 - BSD-3-Clause
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Library for interacting with LMC cloud instances
 test_files: []