foreman_teamdynamix 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 712ad657ba486c73b3ed27d103192ed7601d1952
-  data.tar.gz: f391618928e41d508ca72d71f5e082f86760636d
+SHA256:
+  metadata.gz: 794c51b66dd0d644686457e879f7afdac549631887c3992ff7fb3e0f605c75b6
+  data.tar.gz: 643df4d3a0afa76409a95bea74a9d1827ba52ccb34de79d1beef8100c9ecc21d
 SHA512:
-  metadata.gz: 31a92e3d4f4d162119d9f559e2eb0b6baadb0cc4dce2b3b2c054e9ffb34a3bc92bef39aa18598f945ac15dcb171f8f58d520ec10080ed8e32c4923a0897ad739
-  data.tar.gz: a0cf77dfeba937ae494cd3cdd45523e39f8af6488a620ef3107f4bcebdb4eae4a14f1d286d141b19ed5d7be0e2bf48411bb331392133ebf67750adf042e2ac31
+  metadata.gz: 43388c4a90d67990cafa869640227c28dcc11d16ec9a404aca967c4e06ef44ee1637c9d95fb381cc398eca99f40a1e713799c11b0432510061da40286b6f14a6
+  data.tar.gz: a197a8ec8140d1d076b5173529d1bde01c8c3145708f701bf7ba3088fcb0f2d142b4c95eee03269ccbe4925a4ae0e10716f849b08bd1b442879f376e8f4c1ae1

data/Rakefile

@@ -38,7 +38,7 @@ task default: :test
 begin
   require 'rubocop/rake_task'
   RuboCop::RakeTask.new
-rescue StandardError => _
+rescue StandardError => _e
   puts 'Rubocop not loaded.'
 end
 

data/app/controllers/concerns/foreman_teamdynamix/hosts_controller_extensions.rb

@@ -6,8 +6,8 @@ module ForemanTeamdynamix
     def teamdynamix
       find_resource
       render partial: 'foreman_teamdynamix/hosts/teamdynamix', :locals => { :host => @host }
-    rescue ActionView::Template::Error => exception
-      process_ajax_error exception, 'fetch teamdynamix tab information'
+    rescue ActionView::Template::Error => e
+      process_ajax_error e, 'fetch teamdynamix tab information'
     end
 
     private

data/app/helpers/concerns/foreman_teamdynamix/hosts_helper_extensions.rb

@@ -32,7 +32,7 @@ module ForemanTeamdynamix
     def asset_uri(td_pane_fields)
       if td_pane_fields[:url]
         uri = "#{td_pane_fields[:url]}/#{@asset['AppID']}/Assets/AssetDet?AssetID=#{@asset['ID']}"
-        [[_('URI'), link_to(@asset['SerialNumber'], uri, target: '_blank')]]
+        [[_('URI'), link_to(@asset['SerialNumber'], uri, target: '_blank', rel: 'noopener')]]
       else
         []
       end
@@ -43,11 +43,14 @@ module ForemanTeamdynamix
       parent_attrib = nested_attrib_tokens.first
       child_attrib = nested_attrib_tokens[1..nested_attrib_tokens.length].join('.')
       return '' if parent_attrib.blank? || child_attrib.blank?
+
       child_attrib.delete!("'")
       parent_attrib_val = @asset[parent_attrib]
       return '' if parent_attrib_val.blank?
+
       nested_attrib_val = parent_attrib_val.find { |attrib| attrib['Name'] == child_attrib }
       return '' if nested_attrib_val.blank?
+
       nested_attrib_val['Value']
     end
   end

data/app/services/teamdynamix_api.rb

@@ -5,12 +5,15 @@ class TeamdynamixApi
   if SETTINGS[:teamdynamix].blank?
     raise('Missing configurations for the plugin see https://github.com/MiamiOH/foreman_teamdynamix')
   end
+
   API_CONFIG = SETTINGS[:teamdynamix][:api]
 
   raise('Missing Team Dynamix Api ID in plugin settings') if API_CONFIG[:appId].blank?
+
   APP_ID = API_CONFIG[:appId]
 
   raise('Missing Team Dynamix API URL in plugin settings') if API_CONFIG[:url].blank?
+
   API_URL = API_CONFIG[:url]
 
   def initialize
@@ -21,6 +24,7 @@ class TeamdynamixApi
   # returns TeamDynamix.Api.Assets.Asset
   def get_asset(asset_id)
     return nil unless asset_id
+
     uri = URI.parse("#{API_URL}/#{APP_ID}/assets/#{asset_id}")
     rest(:get, uri)
   rescue RuntimeError
@@ -153,7 +157,7 @@ class TeamdynamixApi
   end
 
   def valid_auth_token?(token)
-    token.match(/^[a-zA-Z0-9\.\-\_]*$/)
+    token.match(/^[a-zA-Z0-9.\-_]*$/)
   end
 
   def ensure_configured_create_params

data/config/routes.rb

@@ -1,5 +1,5 @@
 Rails.application.routes.draw do
-  constraints(:id => %r{[^\/]+}) do
+  constraints(:id => %r{[^/]+}) do
     resources :hosts do
       member do
         get 'teamdynamix'

data/lib/foreman_teamdynamix/engine.rb

@@ -16,7 +16,7 @@ module ForemanTeamdynamix
 
     initializer 'foreman_teamdynamix.register_plugin', :before => :finisher_hook do |_app|
       Foreman::Plugin.register :foreman_teamdynamix do
-        requires_foreman '>= 1.7'
+        requires_foreman '>= 2.3'
 
         # Add permissions
         security_block :foreman_teamdynamix do
@@ -29,13 +29,11 @@ module ForemanTeamdynamix
 
     # Include concerns in this config.to_prepare block
     config.to_prepare do
-      begin
-        HostsHelper.send(:include, ForemanTeamdynamix::HostsHelperExtensions)
-        ::HostsController.send(:include, ForemanTeamdynamix::HostsControllerExtensions)
-        ::Host::Managed.send(:include, ForemanTeamdynamix::HostExtensions)
-      rescue StandardError => e
-        Rails.logger.warn "ForemanTeamdynamix: skipping engine hook (#{e})"
-      end
+      HostsHelper.include ForemanTeamdynamix::HostsHelperExtensions
+      ::HostsController.include ForemanTeamdynamix::HostsControllerExtensions
+      ::Host::Managed.include ForemanTeamdynamix::HostExtensions
+    rescue StandardError => e
+      Rails.logger.warn "ForemanTeamdynamix: skipping engine hook (#{e})"
     end
 
     initializer 'foreman_teamdynamix.register_gettext', after: :load_config_initializers do |_app|

data/lib/foreman_teamdynamix/version.rb

@@ -1,3 +1,3 @@
 module ForemanTeamdynamix
-  VERSION = '1.0.0'.freeze
+  VERSION = '2.0.0'.freeze
 end

data/lib/tasks/foreman_teamdynamix_tasks.rake

@@ -11,7 +11,7 @@ namespace :test do
 end
 
 namespace :foreman_teamdynamix do
-  task :rubocop do
+  task rubocop: :environment do
     begin
       require 'rubocop/rake_task'
       RuboCop::RakeTask.new(:rubocop_foreman_teamdynamix) do |task|

data/lib/tasks/teamdynamix.rake

@@ -1,4 +1,4 @@
-desc <<-DESC.strip_heredoc.squish
+desc <<~DESC.squish
   Scans existing hosts and creates or updates the asset in TeamDynamix.
     * If found, update the fields in the TeamDynamix asset.
     * If not found, create a TeamDynamix asset with desired fields.

data/test/functional/concerns/hosts_controller_extensions_test.rb

@@ -7,7 +7,7 @@ class HostsControllerTest < ActionController::TestCase
   before do
     Host::Managed.any_instance.stubs(:td_api).returns(td_api)
   end
-  # rubocop:disable Style/StringLiterals, HttpPositionalArguments
+  # rubocop:disable Style/StringLiterals, Rails/HttpPositionalArguments
   describe 'Given host exist as an asset in TeamDynamix' do
     describe 'when TeamDynamix asset attributes are configured' do
       describe 'GET hosts/show' do
@@ -15,9 +15,10 @@ class HostsControllerTest < ActionController::TestCase
           get :show, { :id => host.name }, set_session_user
           assert_includes response.headers['Content-Type'], 'text/html'
           assert_includes response.body, "<ul id=\"myTab\""
-          assert_equal response.status, 200
+          assert_equal(200, response.status)
           assert_includes response.body, "<li><a href=\"#teamdynamix\" data-toggle=\"tab\">#{td_tab_title}</a></li>"
-          assert_includes response.body, "<div id=\"teamdynamix\" class=\"tab-pane\" data-ajax-url=\"/hosts/#{host.name}/teamdynamix\" data-on-complete=\"onContentLoad\">"
+          assert_includes response.body,
+                          "<div id=\"teamdynamix\" class=\"tab-pane\" data-ajax-url=\"/hosts/#{host.name}/teamdynamix\" data-on-complete=\"onContentLoad\">"
         end
         test 'TeamDynamix tab contains configured asset attributes' do
           skip
@@ -27,5 +28,5 @@ class HostsControllerTest < ActionController::TestCase
       end
     end
   end
-  # rubocop:enable Style/StringLiterals, HttpPositionalArguments
+  # rubocop:enable Style/StringLiterals, Rails/HttpPositionalArguments
 end

data/test/helpers/concerns/foreman_teamdynamix/hosts_helper_extensions_test.rb

@@ -13,7 +13,9 @@ class HostsHelperExtensionsTest < ActiveSupport::TestCase
   describe '#teamdynamix_fields' do
     let(:sample_asset) { td_api.get_asset }
     let(:default_fields) { [sample_asset_uri] }
-    let(:direct_attribs_config) { { 'Asset ID' => 'ID', 'Owner' => 'OwningCustomerName', 'Parent Asset' => 'ParentID' } }
+    let(:direct_attribs_config) do
+      { 'Asset ID' => 'ID', 'Owner' => 'OwningCustomerName', 'Parent Asset' => 'ParentID' }
+    end
     let(:direct_attribs_fields) { get_direct_asset_attribs_val(direct_attribs_config) }
     let(:expected_fields) { default_fields + direct_attribs_fields }
     before do
@@ -56,7 +58,7 @@ class HostsHelperExtensionsTest < ActiveSupport::TestCase
 
     test 'settings title is not present: return default title' do
       SETTINGS[:teamdynamix][:title] = nil
-      assert_equal teamdynamix_title, 'Team Dynamix'
+      assert_equal('Team Dynamix', teamdynamix_title)
       SETTINGS[:teamdynamix][:title] = title_orig
     end
   end

data/test/services/teamdynamix_api_test.rb

@@ -8,17 +8,19 @@ class TeamdynamixApiTest < ActiveSupport::TestCase
   let(:api_url) { api_config[:url] }
   let(:host) { FactoryBot.build(:host, :managed) }
   let(:auth_payload) { { username: api_config[:username], password: api_config[:password] }.to_json }
-  let(:dummy_token) { 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1bmlxdWVfbmFtZSI6InR5YWdpbkBtaWFtaW9oLmVkdSIsImlzcyI6IlREIiwiYXVkIjoiaHR0cHM6Ly93d3cudGVhbWR5bmFtaXguY29tLyIsImV4cCI6MTUxNzA2OTU1OSwibmJmIjoxNTE2OTgzMTU5fQ.PkvKbYQCV-hY7_ni4-Zg3qJARBagSzz99fclBYyxxas' }
+  let(:dummy_token) do
+    'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1bmlxdWVfbmFtZSI6InR5YWdpbkBtaWFtaW9oLmVkdSIsImlzcyI6IlREIiwiYXVkIjoiaHR0cHM6Ly93d3cudGVhbWR5bmFtaXguY29tLyIsImV4cCI6MTUxNzA2OTU1OSwibmJmIjoxNTE2OTgzMTU5fQ.PkvKbYQCV-hY7_ni4-Zg3qJARBagSzz99fclBYyxxas'
+  end
   let(:sample_asset) { FakeTeamdynamixApi.new.get_asset }
   let(:sample_asset_id) { sample_asset['ID'].to_s }
   let(:host_name) { 'delete.foreman_teamdynamix.com' }
-  let(:get_asset_path) { api_url + '/' + app_id + '/assets/' + sample_asset_id }
+  let(:get_asset_path) { "#{api_url}/#{app_id}/assets/#{sample_asset_id}" }
   let(:create_status_id) { 641 }
   let(:custom_attributes) do
     [{ 'name' => 'mu.ci.Lifecycle Status', 'id' => 11_634, 'value' => '26193' },
      { 'name' => 'mu.ci.Description', 'id' => 11_632, 'value' => 'Foreman host created by ForemanTeamdynamix plugin' }]
   end
-  let(:create_path) { api_url + '/' + app_id + '/assets' }
+  let(:create_path) { "#{api_url}/#{app_id}/assets" }
   let(:create_payload) do
     { AppID: app_id,
       SerialNumber: host_name,
@@ -27,7 +29,7 @@ class TeamdynamixApiTest < ActiveSupport::TestCase
       Attributes: custom_attributes }
   end
   before do
-    stub_request(:post, api_url + '/auth')
+    stub_request(:post, "#{api_url}/auth")
       .with(body: auth_payload,
             headers: { 'Content-Type' => 'application/json' })
       .to_return(status: 200, body: dummy_token)
@@ -45,7 +47,7 @@ class TeamdynamixApiTest < ActiveSupport::TestCase
     context 'Valid Request' do
       before do
         stub_request(:post, update_path)
-          .with(headers: { 'Authorization' => 'Bearer ' + dummy_token,
+          .with(headers: { 'Authorization' => "Bearer #{dummy_token}",
                            'Content-Type' => 'application/json' },
                 body: update_payload)
           .to_return(status: 200, body: sample_asset.to_json)
@@ -67,10 +69,10 @@ class TeamdynamixApiTest < ActiveSupport::TestCase
     end
     describe 'valid request' do
       let(:retired_asset) { sample_asset.merge('StatusID' => retire_status_id) }
-      let(:retire_path) { api_url + '/' + app_id + '/assets/' + sample_asset_id }
+      let(:retire_path) { "#{api_url}/#{app_id}/assets/#{sample_asset_id}" }
       before do
         stub_request(:post, retire_path)
-          .with(headers: { 'Authorization' => 'Bearer ' + dummy_token,
+          .with(headers: { 'Authorization' => "Bearer #{dummy_token}",
                            'Content-Type' => 'application/json' })
           .to_return(status: 200, body: retired_asset.to_json)
       end
@@ -91,7 +93,7 @@ class TeamdynamixApiTest < ActiveSupport::TestCase
     context 'Valid Request' do
       before do
         stub_request(:post, create_path)
-          .with(headers: { 'Authorization' => 'Bearer ' + dummy_token,
+          .with(headers: { 'Authorization' => "Bearer #{dummy_token}",
                            'Content-Type' => 'application/json' },
                 body: create_payload)
           .to_return(status: 200, body: sample_asset.to_json)
@@ -112,7 +114,7 @@ class TeamdynamixApiTest < ActiveSupport::TestCase
       # rubocop:enable Style/StringLiterals
       before do
         stub_request(:post, create_path)
-          .with(headers: { 'Authorization' => 'Bearer ' + dummy_token,
+          .with(headers: { 'Authorization' => "Bearer #{dummy_token}",
                            'Content-Type' => 'application/json' },
                 body: create_payload)
           .to_return(status: 400, body: error_body)
@@ -138,7 +140,7 @@ class TeamdynamixApiTest < ActiveSupport::TestCase
       let(:error) { { status: "403", msg: "", body: error_body }.to_json }
       # rubocop:enable Style/StringLiterals
       before do
-        stub_request(:post, api_url + '/auth')
+        stub_request(:post, "#{api_url}/auth")
           .with(body: auth_payload)
           .to_return(status: 403, body: error_body)
       end
@@ -154,7 +156,7 @@ class TeamdynamixApiTest < ActiveSupport::TestCase
     context 'Valid Request' do
       before do
         stub_request(:get, get_asset_path)
-          .with(headers: { 'Authorization' => 'Bearer ' + dummy_token })
+          .with(headers: { 'Authorization' => "Bearer #{dummy_token}" })
           .to_return(status: 200, body: sample_asset.to_json)
       end
       it 'returns asset json' do

data/test/test_plugin_helper.rb

@@ -28,7 +28,7 @@ end
 def sample_asset_uri
   api_url = SETTINGS[:teamdynamix][:api][:url]
   asset_uri = api_url.split('api').first + sample_asset['Uri']
-  [_('URI'), link_to(sample_asset['Uri'], asset_uri, target: '_blank')]
+  [_('URI'), link_to(sample_asset['Uri'], asset_uri, target: '_blank', rel: 'noopener')]
 end
 
 require 'webmock/minitest'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_teamdynamix
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Nipendar Tyagi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-19 00:00:00.000000000 Z
+date: 2021-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -101,7 +115,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -109,16 +123,16 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Creates TeamDynamix Asset when a host is created in Foreman
 test_files:
-- test/models/host_extensions_test.rb
 - test/fake_teamdynamix_api.rb
-- test/test_plugin_helper.rb
-- test/sample_asset.json
 - test/functional/concerns/hosts_controller_extensions_test.rb
+- test/helpers/concerns/foreman_teamdynamix/hosts_helper_extensions_test.rb
+- test/models/host_extensions_test.rb
+- test/sample_asset.json
 - test/services/teamdynamix_api_test.rb
+- test/test_plugin_helper.rb
 - test/unit/foreman_teamdynamix_test.rb
-- test/helpers/concerns/foreman_teamdynamix/hosts_helper_extensions_test.rb