lmc 0.10.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 00ee8363416f6202be68b106dcf805e7e6166c03
-  data.tar.gz: ef7c4be2c2dd0e9dc38294f9062c02f1a5b3f1df
+SHA256:
+  metadata.gz: ea7050b8975d248f8f6c341c900a0987fea13b061ab262d87ab1862aa2a9d169
+  data.tar.gz: 00d0fe53b221e06a8f1185c6eca7b48387038d95fb271d466f3b48f5e0761790
 SHA512:
-  metadata.gz: 74a1b17a56e44a69de7f726bedb1f8779c4125f96c67483b1c9b0a8a35ef555a5e33208b0d4c3f6d8f87d2343c46adacaeacaf80db1cbd0b6be7d61e40b752d3
-  data.tar.gz: 8f51ec09ad3a76c781c3755421fad500c16a977311a94ac14a3990e0d513a90d7ba3dc6a6ad68351bfe5769382f41a8824bb8bed894ec09e375d08e77bb415c0
+  metadata.gz: 83ef7581a5c3ea7efbfa7245b7238b29a060acca4544c5157074609671dfb4c61e2c1100a1bcf769722a70f870cccb91df56c8ad83baf98db183cb74dd5ee093
+  data.tar.gz: f9e91e63ff73a690108bb62cb046d8d342e7017e5edd9e6cdb2715f112b0b8df9a0320ab8ab5cf70cbeb73e5070f1aeda18852d2afad649b6f80b1a771391d2e

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,6 +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.74
+    "covered_percent": 91.6
   }
 }

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
@@ -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
@@ -161,6 +173,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/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
 

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.0'
+  VERSION = '0.13.0'
 end
 

data/lmc.gemspec

@@ -32,13 +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.10.0
+  version: 0.13.0
 platform: ruby
 authors:
 - erpel
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-11-24 00:00:00.000000000 Z
+date: 2021-01-15 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
@@ -150,7 +150,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-description: 
+description:
 email:
 - philipp@copythat.de
 executables: []
@@ -195,16 +195,17 @@ 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
@@ -219,9 +220,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !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: []