foreman_remote_execution 1.4.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: abc43eab1a70a711a3ecb5ea217d164d1e41b796
-  data.tar.gz: 0763324144fef57d8a5c146f0d28de18f3f88f65
+SHA256:
+  metadata.gz: 692272aa7e7c8d5bc38a8bcf9373d387dcdff4afa82709909bf77d389b29edee
+  data.tar.gz: 0c3e0531fb299378345f13bc4d7b4bc870cf7d659ba84e0363c283ca974b32b7
 SHA512:
-  metadata.gz: 6c3d790c35b20ba1fa1e4ab3fe123f64c590661b14106aa4d002467175d58920c7149b8ed53c28fe33a9c1c44604a9aec0e7c379e763b69ccba5f0e030b328ea
-  data.tar.gz: 4259ae34af58ffcf160d48614eb542198488b07f3095f34498c9b70c8c2087c831398f3f227e250b6596fbf8dccf96c1510f797ebd1ecce0144025467d6a2ed2
+  metadata.gz: 724ac1dd282ba907819d8adde27ad8ba8eab5aa1aceb5ecaaeaeba7fedf9c05087b4fa42522ec669db28e398f18d397d45c05c005f9c2a40bfe6a090d2ed790e
+  data.tar.gz: f3a9a2b127a21c8bebb0e3955d314ea57b829b4588347bbc93c3ffb51e90579eed00990143799243a9958c5339428f884f6258ed687e12bf5f12f6f70097698a

data/.rubocop.yml

@@ -11,9 +11,6 @@ Rails:
 Rails/Date:
   Enabled: false
 
-Rails/HttpPositionalArguments:
-  Enabled: false
-
 # Don't enforce documentation
 Style/Documentation:
   Enabled: false
@@ -27,7 +24,7 @@ Style/TrailingCommaInLiteral:
 #Style/TrailingCommaInArguments:
 #Enabled: false
 
-Style/AccessorMethodName:
+Naming/AccessorMethodName:
   Enabled: false
 
 Style/RedundantSelf:
@@ -38,7 +35,7 @@ Metrics/ClassLength:
   Exclude:
        - 'test/**/*'
 
-Style/FileName:
+Naming/FileName:
   Exclude:
       - 'db/seeds.d/*'
 
@@ -69,7 +66,7 @@ Metrics/BlockLength:
 Metrics/ParameterLists:
   Enabled: false
 
-Style/VariableNumber:
+Naming/VariableNumber:
   Enabled: false
 
 # a == 0 is not the same as a.zero?, when a is not a number
@@ -85,9 +82,14 @@ Rails/SkipsModelValidations:
 Style/SymbolArray:
   Enabled: false
 
-# for compatibility with Foreman 1.15
-Rails/ApplicationRecord:
+Style/FormatString:
   Enabled: false
 
-Style/FormatString:
+Naming/HeredocDelimiterNaming:
+  Enabled: false
+
+Style/RescueStandardError:
+  Enabled: false
+
+Lint/BooleanSymbol:
   Enabled: false

data/.rubocop_todo.yml

@@ -1,198 +1,228 @@
 # This configuration was generated by
-# `rubocop --auto-gen-config`
-# on 2016-04-25 14:06:56 -0400 using RuboCop version 0.35.1.
+# `rubocop --auto-gen-config --exclude-limit 0`
+# on 2017-12-25 00:41:15 +0100 using RuboCop version 0.52.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 7
+# Offense count: 2
 # Cop supports --auto-correct.
-# Configuration parameters: IgnoreEmptyBlocks.
-Lint/UnusedBlockArgument:
+# Configuration parameters: Include, TreatCommentsAsGroupSeparators.
+# Include: **/*.gemspec
+Gemspec/OrderedDependencies:
   Enabled: false
 
-# Offense count: 11
+# Offense count: 16
 # Cop supports --auto-correct.
-# Configuration parameters: AllowUnusedKeywordArguments, IgnoreEmptyMethods.
-Lint/UnusedMethodArgument:
+# Configuration parameters: EnforcedStyle, IndentOneStep, IndentationWidth.
+# SupportedStyles: case, end
+Layout/CaseIndentation:
+  Enabled: false
+
+# Offense count: 6
+# Cop supports --auto-correct.
+Layout/EmptyLines:
   Enabled: false
 
 # Offense count: 1
-Lint/UselessAssignment:
+# Cop supports --auto-correct.
+Layout/EmptyLinesAroundArguments:
   Enabled: false
 
-# Offense count: 35
-Metrics/AbcSize:
-  Max: 42
+# Offense count: 8
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: empty_lines, no_empty_lines
+Layout/EmptyLinesAroundBlockBody:
+  Enabled: false
+
+# Offense count: 22
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: empty_lines, empty_lines_except_namespace, empty_lines_special, no_empty_lines
+Layout/EmptyLinesAroundClassBody:
+  Enabled: false
 
 # Offense count: 3
-Metrics/CyclomaticComplexity:
-  Max: 8
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: empty_lines, empty_lines_except_namespace, empty_lines_special, no_empty_lines
+Layout/EmptyLinesAroundModuleBody:
+  Enabled: false
 
-# Offense count: 775
-# Configuration parameters: AllowURI, URISchemes.
+# Offense count: 907
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# URISchemes: http, https
 Metrics/LineLength:
   Max: 204
 
-# Offense count: 3
-Metrics/PerceivedComplexity:
-  Max: 8
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: Width, IgnoredPatterns.
+Layout/IndentationWidth:
+  Enabled: false
 
-# Offense count: 2
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Rails/TimeZone:
-  Exclude:
-    - 'app/models/job_invocation_composer.rb'
-    - 'test/functional/api/v2/job_invocations_controller_test.rb'
+# Offense count: 8
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, IndentationWidth.
+# SupportedStyles: aligned, indented
+Layout/MultilineOperationIndentation:
+  Enabled: false
 
-# Offense count: 15
+# Offense count: 2
 # Cop supports --auto-correct.
-# Configuration parameters: IndentWhenRelativeTo, SupportedStyles, IndentOneStep.
-Style/CaseIndentation:
+Layout/SpaceAfterComma:
   Enabled: false
 
 # Offense count: 4
 # Cop supports --auto-correct.
-# Configuration parameters: Keywords.
-Style/CommentAnnotation:
+# Configuration parameters: AllowForAlignment.
+Layout/SpaceAroundOperators:
   Enabled: false
 
-# Offense count: 1
-Style/DoubleNegation:
-  Exclude:
-    - 'app/models/input_template_renderer.rb'
+# Offense count: 44
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBrackets.
+# SupportedStyles: space, no_space, compact
+# SupportedStylesForEmptyBrackets: space, no_space
+Layout/SpaceInsideArrayLiteralBrackets:
+  Enabled: false
 
-# Offense count: 5
+# Offense count: 97
 # Cop supports --auto-correct.
-Style/EmptyLines:
+# Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBraces.
+# SupportedStyles: space, no_space, compact
+# SupportedStylesForEmptyBraces: space, no_space
+Layout/SpaceInsideHashLiteralBraces:
   Enabled: false
 
-# Offense count: 12
+# Offense count: 6
+# Configuration parameters: MaximumRangeSize.
+Lint/MissingCopEnableDirective:
+  Enabled: false
+
+# Offense count: 11
 # Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/EmptyLinesAroundBlockBody:
+# Configuration parameters: IgnoreEmptyBlocks, AllowUnusedKeywordArguments.
+Lint/UnusedBlockArgument:
   Enabled: false
 
-# Offense count: 19
+# Offense count: 15
 # Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/EmptyLinesAroundClassBody:
+# Configuration parameters: AllowUnusedKeywordArguments, IgnoreEmptyMethods.
+Lint/UnusedMethodArgument:
+  Enabled: false
+
+# Offense count: 1
+Lint/UselessAssignment:
   Enabled: false
 
+# Offense count: 42
+Metrics/AbcSize:
+  Max: 40
+
 # Offense count: 3
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/EmptyLinesAroundModuleBody:
+Metrics/CyclomaticComplexity:
+  Max: 8
+
+# Offense count: 7
+# Configuration parameters: Include.
+# Include: db/migrate/*.rb
+Rails/CreateTableWithTimestamps:
   Enabled: false
 
-# Offense count: 2
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/FormatString:
-  Exclude:
-    - 'app/controllers/job_templates_controller.rb'
-    - 'app/lib/actions/remote_execution/run_hosts_job.rb'
-
-# Offense count: 9
-# Configuration parameters: MinBodyLength.
-Style/GuardClause:
-  Exclude:
-    - 'app/controllers/api/v2/template_inputs_controller.rb'
-    - 'app/models/concerns/foreman_remote_execution/errors_flattener.rb'
-    - 'app/models/concerns/foreman_remote_execution/nic_extensions.rb'
-    - 'app/models/job_template.rb'
-    - 'app/models/targeting.rb'
-    - 'app/models/template_invocation.rb'
-
-# Offense count: 1299
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, UseHashRocketsWithSymbolValues.
-Style/HashSyntax:
+# Offense count: 27
+# Configuration parameters: Include.
+# Include: app/models/**/*.rb
+Rails/InverseOf:
   Enabled: false
 
 # Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: Width.
-Style/IndentationWidth:
-  Exclude:
-    - 'app/models/template_invocation.rb'
+# Configuration parameters: Include.
+# Include: app/controllers/**/*.rb
+Rails/LexicallyScopedActionFilter:
+  Enabled: false
 
-# Offense count: 12
+# Offense count: 3
 # Cop supports --auto-correct.
-Style/LineEndConcatenation:
+Rails/Presence:
   Enabled: false
 
-# Offense count: 6
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/MultilineOperationIndentation:
+# Offense count: 3
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: strict, flexible
+Rails/TimeZone:
   Enabled: false
 
-# Offense count: 10
+# Offense count: 3
 # Cop supports --auto-correct.
-# Configuration parameters: PreferredDelimiters.
-Style/PercentLiteralDelimiters:
+# Configuration parameters: Keywords.
+# Keywords: TODO, FIXME, OPTIMIZE, HACK, REVIEW
+Style/CommentAnnotation:
   Enabled: false
 
 # Offense count: 1
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/RaiseArgs:
+Style/DoubleNegation:
   Enabled: false
 
-# Offense count: 8
+# Offense count: 1
 # Cop supports --auto-correct.
-# Configuration parameters: AllowMultipleReturnValues.
-Style/RedundantReturn:
+Style/Encoding:
+  Enabled: false
+
+# Offense count: 18
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: annotated, template, unannotated
+Style/FormatStringToken:
   Enabled: false
 
-# Offense count: 33
+# Offense count: 1481
 # Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/SignalException:
+# Configuration parameters: EnforcedStyle, UseHashRocketsWithSymbolValues, PreferHashRocketsForNonAlnumEndingSymbols.
+# SupportedStyles: ruby19, hash_rockets, no_mixed_keys, ruby19_no_mixed_keys
+Style/HashSyntax:
   Enabled: false
 
-# Offense count: 1
-# Configuration parameters: Methods.
-Style/SingleLineBlockParams:
-  Exclude:
-    - 'app/models/job_template.rb'
+# Offense count: 14
+# Cop supports --auto-correct.
+Style/IfUnlessModifier:
+  Enabled: false
 
-# Offense count: 2
+# Offense count: 12
 # Cop supports --auto-correct.
-Style/SpaceAfterComma:
-  Exclude:
-    - 'test/functional/api/v2/job_invocations_controller_test.rb'
+Style/LineEndConcatenation:
+  Enabled: false
 
-# Offense count: 5
+# Offense count: 17
 # Cop supports --auto-correct.
-# Configuration parameters: MultiSpaceAllowedForOperators.
-Style/SpaceAroundOperators:
-  Exclude:
-    - 'db/migrate/20150708133242_add_invocation.rb'
-    - 'test/unit/input_template_renderer_test.rb'
-    - 'test/unit/job_invocation_composer_test.rb'
+# Configuration parameters: PreferredDelimiters.
+Style/PercentLiteralDelimiters:
+  Enabled: false
 
-# Offense count: 43
+# Offense count: 1
 # Cop supports --auto-correct.
-Style/SpaceInsideBrackets:
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: compact, exploded
+Style/RaiseArgs:
   Enabled: false
 
-# Offense count: 89
+# Offense count: 14
 # Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBraces, SupportedStyles.
-Style/SpaceInsideHashLiteralBraces:
+# Configuration parameters: AllowMultipleReturnValues.
+Style/RedundantReturn:
   Enabled: false
 
-# Offense count: 7
+# Offense count: 4
 # Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
+# Configuration parameters: EnforcedStyle, ConsistentQuotesInMultiline.
+# SupportedStyles: single_quotes, double_quotes
 Style/StringLiterals:
-  Exclude:
-    - 'locale/action_names.rb'
+  Enabled: false
 
 # Offense count: 1
 # Cop supports --auto-correct.
 # Configuration parameters: IgnoredMethods.
+# IgnoredMethods: respond_to, define_method
 Style/SymbolProc:
-  Exclude:
-    - 'app/models/concerns/foreman_remote_execution/host_extensions.rb'
+  Enabled: false

data/app/controllers/api/v2/job_invocations_controller.rb

@@ -2,7 +2,6 @@ module Api
   module V2
     class JobInvocationsController < ::Api::V2::BaseController
       include ::Api::Version2
-      include ::Api::TaxonomyScope
       include ::Foreman::Renderer
 
       before_action :find_optional_nested_object
@@ -71,6 +70,10 @@ module Api
       param :host_id, :identifier, :required => true
       param :since, String, :required => false
       def output
+        if @nested_obj.task.delayed?
+          render :json => { :refresh => true, :output => [], :delayed => true, :start_at => @nested_obj.task.start_at }
+          return
+        end
         task = @nested_obj.sub_task_for_host(@host)
         refresh = task.pending?
         since = params[:since].to_f if params[:since].present?
@@ -111,6 +114,8 @@ module Api
       def job_invocation_params
         job_invocation_params = params.fetch(:job_invocation, {}).dup
         job_invocation_params.merge!(job_invocation_params.delete(:ssh)) if job_invocation_params.key?(:ssh)
+        job_invocation_params[:inputs] ||= {}
+        job_invocation_params[:inputs].permit!
         job_invocation_params
       end
     end

data/app/controllers/api/v2/job_templates_controller.rb

@@ -2,7 +2,6 @@ module Api
   module V2
     class JobTemplatesController < ::Api::V2::BaseController
       include ::Api::Version2
-      include ::Api::TaxonomyScope
       include ::Foreman::Renderer
       include ::Foreman::Controller::ProvisioningTemplates
       include ::Foreman::Controller::Parameters::JobTemplate

data/app/controllers/job_invocations_controller.rb

@@ -89,7 +89,12 @@ class JobInvocationsController < ApplicationController
     if params[:feature].present?
       JobInvocationComposer.for_feature(params[:feature], params[:host_ids], {})
     else
-      JobInvocationComposer.from_ui_params(params.merge(:triggering => triggering_params))
+      # triggering_params is a Hash
+      #   when a hash is merged into ActionController::Parameters,
+      #   it is assumed not to be #permitted?
+      with_triggering = params.merge(:triggering => triggering_params)
+      with_triggering[:triggering].permit!
+      JobInvocationComposer.from_ui_params(with_triggering)
     end
   end
 end