lmc 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b3a6cc095210c99890c8ebb6b1c24f18fdee5ace
-  data.tar.gz: c32528dfb1a87d9238db2c96f23297dbdd75660f
+  metadata.gz: d48faaacdbd824c7de50805b596093047f0d998b
+  data.tar.gz: 75157b26d52efbb46c47f6eaf79b617360e06e71
 SHA512:
-  metadata.gz: 32ff5ff2362f3534b20e8dab058cc0faccf9f754fa7858b89e5693f26be5c7d2adab48af988660df597242323bcb58f39f46440ba75efd938d8517f7dbaf468c
-  data.tar.gz: b9c2259efdb008fca13912c5066a966d66b65f25a92843413d2447bc0ee20011365869f1514f0f1c265b73f0ea64fd2176892b475bdf481e6e9115c13b9f958a
+  metadata.gz: ec495e4f3442c58ee21f6ba28a1f748c8ec8fc89f011c1bfecdb5b603b0410312c1a18b65927b75e2bed552642d4466bf9a9e6a9bd100b206f4cf8e93eb4b7b8
+  data.tar.gz: 6954e95f5657f7d5e2c51004f269f334c7d7eaf3d820621da71fcebbc3fc6bed07ccd38b6a5364ac9cfb23480559c839ecc83742836d2e02b3a1ae5d225b9a2c

data/.idea/lmc.iml

@@ -1,7 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="RUBY_MODULE" version="4">
   <component name="ModuleRunConfigurationManager">
-    <shared />
+    <shared>
+      <configuration default="false" name="tests" type="TestUnitRunConfigurationType" factoryName="Test::Unit/Shoulda/Minitest">
+        <predefined_log_file id="RUBY_TESTUNIT" enabled="true" />
+        <module name="lmc" />
+        <RTEST_RUN_CONFIG_SETTINGS_ID NAME="RUBY_ARGS" VALUE="-e $stdout.sync=true;$stderr.sync=true;load($0=ARGV.shift)" />
+        <RTEST_RUN_CONFIG_SETTINGS_ID NAME="WORK DIR" VALUE="" />
+        <RTEST_RUN_CONFIG_SETTINGS_ID NAME="SHOULD_USE_SDK" VALUE="false" />
+        <RTEST_RUN_CONFIG_SETTINGS_ID NAME="ALTERN_SDK_NAME" VALUE="" />
+        <RTEST_RUN_CONFIG_SETTINGS_ID NAME="myPassParentEnvs" VALUE="true" />
+        <EXTENSION ID="BundlerRunConfigurationExtension" bundleExecEnabled="true" />
+        <EXTENSION ID="JRubyRunConfigurationExtension" NailgunExecEnabled="false" />
+        <EXTENSION ID="RubyCoverageRunConfigurationExtension" track_test_folders="true" runner="rcov">
+          <COVERAGE_PATTERN ENABLED="true">
+            <PATTERN REGEXPS="/.rvm/" INCLUDED="false" />
+          </COVERAGE_PATTERN>
+        </EXTENSION>
+        <RTEST_RUN_CONFIG_SETTINGS_ID NAME="TESTS_FOLDER_PATH" VALUE="$MODULE_DIR$/test" />
+        <RTEST_RUN_CONFIG_SETTINGS_ID NAME="TEST_SCRIPT_PATH" VALUE="" />
+        <RTEST_RUN_CONFIG_SETTINGS_ID NAME="TEST_FILE_MASK" VALUE="**/{*_test,test_*,*_spec}.rb" />
+        <RTEST_RUN_CONFIG_SETTINGS_ID NAME="TEST_METHOD_NAME" VALUE="" />
+        <RTEST_RUN_CONFIG_SETTINGS_ID NAME="TEST_TEST_TYPE" VALUE="ALL_IN_FOLDER" />
+        <RTEST_RUN_CONFIG_SETTINGS_ID NAME="DRB" VALUE="false" />
+        <RTEST_RUN_CONFIG_SETTINGS_ID NAME="ZEUS" VALUE="false" />
+        <RTEST_RUN_CONFIG_SETTINGS_ID NAME="SPRING" VALUE="false" />
+        <RTEST_RUN_CONFIG_SETTINGS_ID NAME="RUNNER_OPTIONS" VALUE="" />
+        <method />
+      </configuration>
+    </shared>
   </component>
   <component name="NewModuleRootManager">
     <content url="file://$MODULE_DIR$" />
@@ -9,22 +36,27 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" scope="PROVIDED" name="ansi (v1.5.0, rbenv: 2.4.1) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="builder (v3.2.3, rbenv: 2.4.1) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="bundler (v1.16.1, rbenv: 2.4.1) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="docile (v1.1.5, rbenv: 2.4.1) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="domain_name (v0.5.20170404, rbenv: 2.4.1) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="bundler (v1.16.2, rbenv: 2.4.1) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="coderay (v1.1.2, rbenv: 2.4.1) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="docile (v1.3.1, rbenv: 2.4.1) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="domain_name (v0.5.20180417, rbenv: 2.4.1) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="http-cookie (v1.0.3, rbenv: 2.4.1) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="json (v2.1.0, rbenv: 2.4.1) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="method_source (v0.8.2, rbenv: 2.4.1) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="mime-types (v3.1, rbenv: 2.4.1) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="mime-types-data (v3.2016.0521, rbenv: 2.4.1) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="minitest (v5.11.3, rbenv: 2.4.1) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="minitest-reporters (v1.1.19, rbenv: 2.4.1) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="minitest-reporters (v1.2.0, rbenv: 2.4.1) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="netrc (v0.11.0, rbenv: 2.4.1) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="pry (v0.10.4, rbenv: 2.4.1) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="pry-nav (v0.2.4, rbenv: 2.4.1) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rake (v10.5.0, rbenv: 2.4.1) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="recursive-open-struct (v1.1.0, rbenv: 2.4.1) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rest-client (v2.0.2, rbenv: 2.4.1) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="ruby-progressbar (v1.9.0, rbenv: 2.4.1) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="simplecov (v0.15.1, rbenv: 2.4.1) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="simplecov (v0.16.1, rbenv: 2.4.1) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="simplecov-html (v0.10.2, rbenv: 2.4.1) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="slop (v3.6.0, rbenv: 2.4.1) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="unf (v0.1.4, rbenv: 2.4.1) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="unf_ext (v0.0.7.5, rbenv: 2.4.1) [gem]" level="application" />
   </component>

data/.idea/runConfigurations/tests.xml

@@ -0,0 +1,28 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="tests" type="TestUnitRunConfigurationType" factoryName="Test::Unit/Shoulda/Minitest">
+    <predefined_log_file id="RUBY_TESTUNIT" enabled="true" />
+    <module name="lmc" />
+    <RTEST_RUN_CONFIG_SETTINGS_ID NAME="RUBY_ARGS" VALUE="-e $stdout.sync=true;$stderr.sync=true;load($0=ARGV.shift)" />
+    <RTEST_RUN_CONFIG_SETTINGS_ID NAME="WORK DIR" VALUE="" />
+    <RTEST_RUN_CONFIG_SETTINGS_ID NAME="SHOULD_USE_SDK" VALUE="false" />
+    <RTEST_RUN_CONFIG_SETTINGS_ID NAME="ALTERN_SDK_NAME" VALUE="" />
+    <RTEST_RUN_CONFIG_SETTINGS_ID NAME="myPassParentEnvs" VALUE="true" />
+    <EXTENSION ID="BundlerRunConfigurationExtension" bundleExecEnabled="true" />
+    <EXTENSION ID="JRubyRunConfigurationExtension" NailgunExecEnabled="false" />
+    <EXTENSION ID="RubyCoverageRunConfigurationExtension" track_test_folders="true" runner="rcov">
+      <COVERAGE_PATTERN ENABLED="true">
+        <PATTERN REGEXPS="/.rvm/" INCLUDED="false" />
+      </COVERAGE_PATTERN>
+    </EXTENSION>
+    <RTEST_RUN_CONFIG_SETTINGS_ID NAME="TESTS_FOLDER_PATH" VALUE="$MODULE_DIR$/test" />
+    <RTEST_RUN_CONFIG_SETTINGS_ID NAME="TEST_SCRIPT_PATH" VALUE="" />
+    <RTEST_RUN_CONFIG_SETTINGS_ID NAME="TEST_FILE_MASK" VALUE="**/{*_test,test_*,*_spec}.rb" />
+    <RTEST_RUN_CONFIG_SETTINGS_ID NAME="TEST_METHOD_NAME" VALUE="" />
+    <RTEST_RUN_CONFIG_SETTINGS_ID NAME="TEST_TEST_TYPE" VALUE="ALL_IN_FOLDER" />
+    <RTEST_RUN_CONFIG_SETTINGS_ID NAME="DRB" VALUE="false" />
+    <RTEST_RUN_CONFIG_SETTINGS_ID NAME="ZEUS" VALUE="false" />
+    <RTEST_RUN_CONFIG_SETTINGS_ID NAME="SPRING" VALUE="false" />
+    <RTEST_RUN_CONFIG_SETTINGS_ID NAME="RUNNER_OPTIONS" VALUE="" />
+    <method />
+  </configuration>
+</component>

data/README.md

@@ -29,6 +29,8 @@ TODO: Write usage instructions here
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+### Running a single test file
+    rake test TEST=test/file_with_tests.rb
 
 ### Tests against real LMC instances
 

data/coverage/.last_run.json

@@ -1,5 +1,5 @@
 {
   "result": {
-    "covered_percent": 83.38
+    "covered_percent": 75.05
   }
 }

data/lib/lmc.rb

@@ -10,6 +10,12 @@ Dir.glob(File.expand_path("../lmc/exceptions/*.rb", __FILE__)).each do |file|
 end
 
 module LMC
+  SERVICELIST = ['cloud-service-auth',
+                 'cloud-service-devices',
+                 'cloud-service-monitoring',
+                 'cloud-service-config',
+                 'cloud-service-licenses']
+
   def self.useful
     return true
   end

data/lib/lmc/Account.rb

@@ -4,7 +4,7 @@ module LMC
   class Account < Entity
     ROOT_ACCOUNT_UUID = '9ec458c2-d05f-3004-96f0-ebe73fa20de8'
     attr_accessor :name
-    attr_reader :id, :state, :type
+    attr_reader :id, :state, :type, :identifier
 
     def self.get(id)
       cloud = Cloud.instance
@@ -31,6 +31,14 @@ module LMC
       end
     end
 
+    def self.get_children_from_root account
+      cloud = Cloud.instance
+      cloud.auth_for_accounts [ROOT_ACCOUNT_UUID]
+      response = cloud.get ['cloud-service-auth', 'accounts', account.id, 'children'],
+                           {"parent.id" => account.id}
+      response.map {|child| Account.new child}
+    end
+
 
     def initialize(data)
       @cloud = LMC::Cloud.instance
@@ -49,7 +57,7 @@ module LMC
       return self
     end
 
-    def delete
+    def delete!
       if @id != nil
         @cloud.auth_for_accounts [@id]
         deleted = @cloud.delete ["cloud-service-auth", "accounts", @id]
@@ -94,20 +102,20 @@ module LMC
     #end
 
     def remove_membership(member_id)
-      response = @cloud.delete ["cloud-service-auth", "accounts", id, "members", member_id]
+      @cloud.delete ["cloud-service-auth", "accounts", id, "members", member_id]
     end
 
     def remove_membership_self
-      response = @cloud.delete ["cloud-service-auth", "accounts", id, "members", "self"]
+      @cloud.delete ["cloud-service-auth", "accounts", id, "members", "self"]
     end
 
     def authorities
       response = @cloud.get ['cloud-service-auth', 'accounts', id, 'authorities']
-      if response.code == 200
-        return response.body
-      else
-        raise 'Unable to get authorities'
+      raise 'Unable to get authorities' unless response.code == 200
+      authorities = response.body.map do |r|
+        Authority.new r, self
       end
+      return authorities
     end
 
     def children
@@ -116,6 +124,7 @@ module LMC
       response.map {|child| Account.new child}
     end
 
+
     def logs
       # https://lmctest/cloud-service-logging/accounts/6392b234-b11c-498a-a077-a5f5b23c54a0/logs?lang=DE
       cloud = Cloud.instance
@@ -169,6 +178,7 @@ module LMC
       @name = data["name"]
       @state = data["state"]
       @type = data["type"]
+      @identifier = data["identifier"]
     end
 
   end

data/lib/lmc/Cloud.rb

@@ -24,12 +24,13 @@ module LMC
 
     attr_reader :auth_ok, :cloud_host
 
-    def initialize(cloud_host, user, pass, auth=true)
+    def initialize(cloud_host, user, pass, auth = true)
       @auth_ok = false
       @cloud_host = cloud_host
       @user = user
       @password = pass
       @verify_tls = Cloud.verify_tls
+      #@last_authorized_account_ids = []
       authorize if auth
     end
 
@@ -186,21 +187,25 @@ module LMC
     end
 
     def accept_tos(tos)
-        authorize([], tos)
+      authorize([], tos)
     end
 
 
     private
+
     def authorize(account_ids = [], tos = [])
-      begin
-        reply = post(["cloud-service-auth", "auth"], {name: @user, password: @password, accountIds: account_ids, termsOfUse: tos})
-        puts "authorize reply " + reply.inspect if Cloud.debug
-        @auth_token = reply
-        @auth_ok = true
-      rescue ::RestClient::ExceptionWithResponse => e
-        response = JSON.parse(e.response.body)
-        if response['code'] == 100
+      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
+        rescue ::RestClient::ExceptionWithResponse => e
+          response = JSON.parse(e.response.body)
+          if response['code'] == 100
             raise LMC::OutdatedTermsOfUseException.new(response)
+          end
         end
       end
     end

data/lib/lmc/Device.rb

@@ -39,6 +39,7 @@ module LMC
         data["account"] = account
         LMC::Device.new(data)
       end
+      return devices
     end
 
     def self.get_for_account_id(account_id)
@@ -69,4 +70,4 @@ module LMC
 
   end
 
-end
+end

data/lib/lmc/Response.rb

@@ -34,11 +34,11 @@ module LMC
     end
 
     def map(&block)
-      @body_object.map &block
+      @body_object.map(&block)
     end
 
     def each(&block)
-      @body_object.each &block
+      @body_object.each(&block)
     end
 
     def to_s

data/lib/lmc/Site.rb

@@ -31,7 +31,8 @@ module LMC
     def configstates
       response = @cloud.get ["cloud-service-config", "configsubnetgroup", "accounts", @account.id, "subnetgroups", @subnet_group_id, "updatestates"]
       states = LMC::Configstates.new response.body
+      return states
     end
   end
 
-end
+end

data/lib/lmc/account_manager.rb

@@ -1,8 +1,8 @@
 module LMC
   class AccountManager
-    @options
-    @global_options
-    @errors
+    #@options
+    #@global_options
+    #@errors
     attr_reader :errors
 
     def initialize(options, global_options)
@@ -80,4 +80,4 @@ END
       return true
     end
   end
-end
+end

data/lib/lmc/authority.rb

@@ -0,0 +1,51 @@
+module LMC
+  class Authority
+    attr_accessor :account, :id, :name, :visibility, :type
+
+    def initialize(data, account)
+      @cloud = Cloud.instance
+      apply_data(data)
+      @account = account
+    end
+
+    def rights
+      # GET /accounts/{accountId}/authorities/{authorityId}/rights
+      @cloud.auth_for_account @account
+      response = @cloud.get ['cloud-service-auth', 'accounts', @account.id, 'authorities', @id, 'rights']
+      return response.body.to_s
+    end
+
+    #returns itself, allows chaining
+    def save
+      response = if @id.nil?
+                   Cloud.instance.post ["cloud-service-auth", 'accounts', @account.id, "authorities"], self
+                 else
+                   raise "editing authorities not supported"
+                   #@cloud.put ["cloud-service-auth", "principals", @id], self
+                 end
+      apply_data(response.body)
+      return self
+    end
+
+    def to_json(*a)
+      {
+          "name" => @name,
+          "type" => @type,
+          "visibility" => @visibility
+      }.to_json(*a)
+    end
+
+    def to_s
+      "#{@name} (#{@type}/#{@visibility})"
+    end
+
+    private
+
+    def apply_data(data)
+      @id = data['id']
+      @name = data['name']
+      @visibility = data['visibility']
+      @type = data['type']
+    end
+  end
+end

data/lib/lmc/version.rb

@@ -1,3 +1,3 @@
 module LMC
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

data/lmc.gemspec

@@ -10,7 +10,6 @@ Gem::Specification.new do |spec|
   spec.email         = ["philipp@copythat.de"]
 
   spec.summary       = %q{Library for interacting with LMC cloud instances}
-#  spec.homepage      = "https://copythat.de"
   spec.license       = 'BSD-3-Clause'
 
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lmc
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - erpel
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-06 00:00:00.000000000 Z
+date: 2018-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -148,6 +148,7 @@ files:
 - ".idea/lmc.iml"
 - ".idea/misc.xml"
 - ".idea/modules.xml"
+- ".idea/runConfigurations/tests.xml"
 - ".idea/vcs.xml"
 - ".ruby-version"
 - ".travis.yml"
@@ -167,6 +168,7 @@ files:
 - lib/lmc/Site.rb
 - lib/lmc/User.rb
 - lib/lmc/account_manager.rb
+- lib/lmc/authority.rb
 - lib/lmc/device_config_state.rb
 - lib/lmc/entity.rb
 - lib/lmc/exceptions/lmc_outdated_terms_of_use_exception.rb