foreman_teamdynamix 0.4.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 77e70ad3672357e8772f829cdf43cb8005b82ec3
-  data.tar.gz: 4f2b4a5249fbe6c31a6af63a6ffd9aeec60bbed0
+SHA256:
+  metadata.gz: 794c51b66dd0d644686457e879f7afdac549631887c3992ff7fb3e0f605c75b6
+  data.tar.gz: 643df4d3a0afa76409a95bea74a9d1827ba52ccb34de79d1beef8100c9ecc21d
 SHA512:
-  metadata.gz: 341100129b0941eaac64e24226fc100364209ab9821b7af26cdff2159e10064f188c7bb2add1d7829b3dc20835fe379c11f128f08ff447695a6d662a15b8c3e6
-  data.tar.gz: f6502be9bc5df3826407317d315500fbc5d929082fb50ea0160508f1864baa329d5936fe777a982523aaae075cf2b132a162090be26b4739fb9030b1cf5d5a95
+  metadata.gz: 43388c4a90d67990cafa869640227c28dcc11d16ec9a404aca967c4e06ef44ee1637c9d95fb381cc398eca99f40a1e713799c11b0432510061da40286b6f14a6
+  data.tar.gz: a197a8ec8140d1d076b5173529d1bde01c8c3145708f701bf7ba3088fcb0f2d142b4c95eee03269ccbe4925a4ae0e10716f849b08bd1b442879f376e8f4c1ae1

data/README.md

@@ -28,23 +28,23 @@ Example Configuration
     :username: 'xxxxxx'
     :password: 'xxxxxx'
     :create:
-      :StatusID: 641
-      :AcquisitionDate: host.created_at
-      :OwningCustomerName: "'foreman_teamdynamix_plugin_test'"
-      :Attributes:
-      - name: mu.ci.Lifecycle Status
-        id: 11634
-        value: 26190
-      - name: mu.ci.Description
-        id: 11632
-        value: >-
+      StatusID: 641
+      AcquisitionDate: host.created_at
+      OwningCustomerName: "'foreman_teamdynamix_plugin_test'"
+      Attributes:
+      - Name: mu.ci.Lifecycle Status
+        ID: 11634
+        Value: 26190
+      - Name: mu.ci.Description
+        ID: 11632
+        Value: >-
           "created by ForemanTeamdynamix plugin, owner is #{host.owner_id}"
-      - name: Ticket Routing Details
-        id: 11636
-        value: >-
+      - Name: Ticket Routing Details
+        ID: 11636
+        Value: >-
           "Asset for host running on OS #{host.operatingsystem_id}"
     :delete:
-      :StatusId: 642
+      StatusId: 642
   :fields:
     :url: https://miamioh.teamdynamix.com/SBTDNext/Apps
     Asset ID: ID
@@ -58,9 +58,10 @@ Example Configuration
 * All attributes are passed to the TeamDynamix API as is, while creating or deleting a TeamDynamix Asset.
 * An asset gets created or deleted with the Foreman Host create or delete life cycle event.
 
-[:api][:create][:Attributes]
+[:api][:create][Attributes]
 * To configure any [Custom Attributes](https://api.teamdynamix.com/TDWebApi/Home/type/TeamDynamix.Api.CustomAttributes.CustomAttribute) for the asset.
-* It must contain expected value for 'id' and 'value' fields.
+* It must contain expected value for 'Name', 'ID' and 'Value' fields.
+* Notice the case of 'Name', 'ID' and 'Value', this must match for correct merging.
 * rest of the fields are optional, check the Custom Attribute's definition for what other fields are updatable.
 * Code evaluation is supported for custom attribute's value.
 

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

@@ -11,9 +11,9 @@ module ForemanTeamdynamix
 
     def teamdynamix_fields
       td_pane_fields = SETTINGS[:teamdynamix][:fields] || DEFAULT_TD_PANE_FIELDS
-      return [[_('Asset'), 'None Associated']] unless @host.teamdynamix_asset_uid
+      return [[_('Asset'), 'None Associated or error from Team Dynamix']] unless @host.teamdynamix_asset
 
-      get_teamdynamix_asset(@host.teamdynamix_asset_uid)
+      @asset = @host.teamdynamix_asset
 
       # display a link to the asset if url set
       fields = asset_uri(td_pane_fields)
@@ -32,29 +32,26 @@ 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
     end
 
-    def get_teamdynamix_asset(asset_id)
-      @asset = @host.td_api.get_asset(asset_id)
-    rescue StandardError => e
-      raise "Error getting asset Data from Team Dynamix: #{e.message}"
-    end
-
     def get_nested_attrib_val(nested_attrib)
       nested_attrib_tokens = nested_attrib.split('.')
       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.select { |attrib| attrib['Name'] == child_attrib }
+
+      nested_attrib_val = parent_attrib_val.find { |attrib| attrib['Name'] == child_attrib }
       return '' if nested_attrib_val.blank?
-      nested_attrib_val[0]['Value']
+
+      nested_attrib_val['Value']
     end
   end
 end

data/app/models/concerns/foreman_teamdynamix/host_extensions.rb

@@ -2,38 +2,59 @@ module ForemanTeamdynamix
   module HostExtensions
     extend ActiveSupport::Concern
 
+    included do
+      before_create :create_or_update_teamdynamix_asset
+      before_destroy :retire_teamdynamix_asset
+      validates :teamdynamix_asset_uid, uniqueness: { :allow_blank => true }
+    end
+
     def td_api
       @td_api ||= TeamdynamixApi.instance
     end
 
-    included do
-      before_create :create_teamdynamix_asset
-      before_destroy :retire_teamdynamix_asset
-      validates :teamdynamix_asset_uid, uniqueness: { :allow_blank => true }
+    def teamdynamix_asset_status
+      @teamdynamix_asset_status
     end
 
-    private
+    def teamdynamix_asset(search = false)
+      @teamdynamix_asset ||= td_api.get_asset(teamdynamix_asset_uid)
 
-    def create_teamdynamix_asset
-      # when the asset is already in teamdynamix
-      assets = td_api.search_asset(SerialLike: name)
+      if search && !@teamdynamix_asset
+        assets = td_api.search_asset(SerialLike: name)
+        if assets.length == 1
+          @teamdynamix_asset = td_api.get_asset(assets.first['ID'])
+          self.teamdynamix_asset_uid = teamdynamix_asset['ID']
+          @teamdynamix_asset_status = :updated_search
+        elsif assets.length > 1
+          errors.add(:base, _("Search for asset in TeamDynamix failed: Found #{assets.length} matching assets"))
+        end
+      end
 
-      if assets.empty?
-        asset = td_api.create_asset(self)
-        self.teamdynamix_asset_uid = asset['ID']
-      elsif assets.length > 1
-        raise 'Found more than 1 existing asset'
-      else
-        self.teamdynamix_asset_uid = assets.first['ID']
+      @teamdynamix_asset
+    end
+
+    def create_or_update_teamdynamix_asset(save = false)
+      if teamdynamix_asset(true)
         td_api.update_asset(self)
+        @teamdynamix_asset_status ||= :updated_id
+        self.save if save
+      elsif errors.empty?
+        @teamdynamix_asset = td_api.create_asset(self)
+        self.teamdynamix_asset_uid = teamdynamix_asset['ID']
+        @teamdynamix_asset_status = :created
+        self.save if save
+      else
+        false
       end
     rescue StandardError => e
-      errors.add(:base, _("Could not create the asset for the host in TeamDynamix: #{e.message}"))
+      errors.add(:base, _("Could not create or update the asset for the host in TeamDynamix: #{e.message}"))
       false
     end
 
+    private
+
     def retire_teamdynamix_asset
-      td_api.retire_asset(teamdynamix_asset_uid) if teamdynamix_asset_uid
+      td_api.retire_asset(self) if teamdynamix_asset
     rescue StandardError => e
       errors.add(:base, _("Could not retire the asset for the host in TeamDynamix: #{e.message}"))
       false

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
@@ -20,14 +23,12 @@ 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)
-  end
-
-  def asset_exist?(asset_id)
-    get_asset(asset_id).present?
   rescue RuntimeError
-    false
+    nil
   end
 
   def create_asset(host)
@@ -40,9 +41,9 @@ class TeamdynamixApi
     rest(:post, uri, update_asset_payload(host))
   end
 
-  def retire_asset(asset_id)
-    uri = URI.parse("#{API_URL}/#{APP_ID}/assets/#{asset_id}")
-    rest(:post, uri, retire_asset_payload(asset_id))
+  def retire_asset(host)
+    uri = URI.parse("#{API_URL}/#{APP_ID}/assets/#{host.teamdynamix_asset_uid}")
+    rest(:post, uri, retire_asset_payload(host))
   end
 
   # Gets a list of assets matching the specified criteria. (IEnumerable(Of TeamDynamix.Api.Assets.Asset))
@@ -106,26 +107,38 @@ class TeamdynamixApi
     end
   end
 
-  def retire_asset_payload(asset_id)
-    asset = get_asset(asset_id)
-    asset.merge(API_CONFIG[:delete].stringify_keys)
-  end
-
   def create_asset_payload(host)
     ensure_configured_create_params
-    default_attrs = { AppID: APP_ID,
-                      SerialNumber: host.name,
-                      Name: host.fqdn }
-    create_attrs = evaluate_attributes(API_CONFIG[:create], host)
-    default_attrs.merge(create_attrs)
-  end
-
-  def evaluate_attributes(create_attrs, host)
-    create_attrs.symbolize_keys.each_with_object({}) do |(k, v), h|
-      if k.eql?(:Attributes)
-        h[:Attributes] = v.each_with_object([]) do |attribute, a|
-          a << attribute.transform_keys(&:downcase)
-          a.last['value'] = eval_attribute(a.last['value'], host)
+    default_attrs = { 'AppID' => APP_ID,
+                      'SerialNumber' => host.name,
+                      'Name' => host.fqdn }
+    evaluate_attributes(API_CONFIG[:create], host, default_attrs)
+  end
+
+  def update_asset_payload(host)
+    default_attrs = { 'AppID' => APP_ID,
+                      'SerialNumber' => host.name,
+                      'Name' => host.fqdn }
+    evaluate_attributes(API_CONFIG[:create], host, host.teamdynamix_asset.merge(default_attrs))
+  end
+
+  def retire_asset_payload(host)
+    evaluate_attributes(API_CONFIG[:delete], host, host.teamdynamix_asset)
+  end
+
+  def evaluate_attributes(attrs, host, asset = {})
+    attrs.stringify_keys.each_with_object(asset) do |(k, v), h|
+      if k.eql?('Attributes')
+        h['Attributes'] ||= []
+        v.each do |attrib|
+          attrib_c = attrib.stringify_keys
+          match = h['Attributes'].find { |attrib_a| attrib_a['Name'] == attrib_c['Name'] }
+          if match
+            match['Value'] = eval_attribute(attrib_c['Value'], host)
+          else
+            attrib_c['Value'] = eval_attribute(attrib_c['Value'], host)
+            h['Attributes'] << attrib_c
+          end
         end
       else
         h[k] = eval_attribute(v, host)
@@ -140,21 +153,16 @@ class TeamdynamixApi
   end
 
   def must_configure_create_params
-    [:StatusID]
+    ['StatusID']
   end
 
   def valid_auth_token?(token)
-    token.match(/^[a-zA-Z0-9\.\-\_]*$/)
-  end
-
-  def update_asset_payload(host)
-    payload = { ID: host.teamdynamix_asset_uid }
-    payload.merge(create_asset_payload(host))
+    token.match(/^[a-zA-Z0-9.\-_]*$/)
   end
 
   def ensure_configured_create_params
     must_configure_create_params.each do |must_configure_param|
-      unless API_CONFIG[:create].include?(must_configure_param)
+      unless API_CONFIG[:create].include?(must_configure_param) || API_CONFIG[:create].include?(must_configure_param.to_sym)
         raise("#{must_configure_param} is required. Set it as a configuration item.")
       end
     end

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,29 +16,24 @@ 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
-          ps = permission :view_hosts,
-                          { :hosts => [:teamdynamix] },
-                          :resource_type => 'Host'
-          pn = ps.pop
-          po = ps.detect { |p| p.name == :view_hosts }
-          po.actions << pn.actions.first
+          permission :view_teamdynamix,
+                     { :hosts => [:teamdynamix] },
+                     :resource_type => 'Host'
         end
       end
     end
 
     # 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 = '0.4.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.
@@ -6,46 +6,41 @@ desc <<-DESC.strip_heredoc.squish
   It could be run for all the hosts as:
     * rake teamydynamix:sync:hosts
 
+  Available options:
+    * where => where string for limiting host query
+    * limit => limit for limiting host query
+
 DESC
 namespace :teamdynamix do
   namespace :sync do
     task :hosts => :environment do
-      td_api = TeamdynamixApi.instance
       errors = []
-      creates = 0
-      updates_from_serial_matching = 0
-      update_from_asset_id = 0
+      created = 0
+      updated_search = 0
+      updated_id = 0
 
       console_user = User.find_by(login: 'foreman_console_admin')
       User.current = console_user
 
-      Host.all.each do |h|
-        # if asset exists, update it
-        if td_api.asset_exist?(h.teamdynamix_asset_uid)
-          td_api.update_asset(h)
-          update_from_asset_id += 1
-        else
-          assets = td_api.search_asset(SerialLike: h.name)
-          if assets.empty?
-            asset = td_api.create_asset(h)
-            h.teamdynamix_asset_uid = asset['ID']
-            errors.push("Could not save host: #{h.name} (#{h.id})") unless h.save
-            creates += 1
-          elsif assets.length > 1
-            errors.push("Could not sync: Found more than 1 asset for #{h.name} (#{h.id})")
-          else
-            h.teamdynamix_asset_uid = assets.first['ID']
-            td_api.update_asset(h)
-            errors.push("Could not save host: #{h.name} (#{h.id})") unless h.save
-            updates_from_serial_matching += 1
+      hosts = Host
+      hosts = hosts.where(ENV['where']) if ENV['where']
+      hosts = hosts.limit(ENV['limit']) if ENV['limit']
+
+      hosts.all.each do |h|
+        if h.create_or_update_teamdynamix_asset(true)
+          case h.teamdynamix_asset_status
+          when :created then created += 1
+          when :updated_search then updated_search += 1
+          when :updated_id then updated_id += 1
           end
+        else
+          errors.push("Could not save host: #{h.name} (#{h.id}):\n  #{h.errors.full_messages.join("\n  ")}")
         end
+        sleep(1.5) # TD only allows 60 api calls per minute
       end
-      puts "Assets created: #{creates}" unless creates.eql?(0)
-      unless updates_from_serial_matching.eql?(0)
-        puts "Assets updated from serial search: #{updates_from_serial_matching}"
-      end
-      puts "Assets updated from ID: #{update_from_asset_id}" unless update_from_asset_id.eql?(0)
+      puts "Assets created: #{created}" unless created.eql?(0)
+      puts "Assets updated from serial search: #{updated_search}" unless updated_search.eql?(0)
+      puts "Assets updated from ID: #{updated_id}" unless updated_id.eql?(0)
       puts "Errors:\n#{errors.join("\n")}" unless errors.empty?
     end
   end

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: 0.4.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Nipendar Tyagi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-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