inferno_core 0.6.10 → 0.6.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ff5c612e8052b2c2a817e5ad58d27d935b8838adc2d738a8924e61ba7ecc1a0
-  data.tar.gz: 4324693af54d9c83d4eb60f2a2b85dc8012c72d372d9858bda39693d2b1de8b4
+  metadata.gz: b899985c0f229c1f91aa9218d09f9f502ed315c537398edc911e989cbe61c6a8
+  data.tar.gz: '08cca457d4bb79bdb70487a14fa07f8274dac19faae5623bedef8797541e993b'
 SHA512:
-  metadata.gz: 2cbff301066bd9b295edc08790bbf8b6d658d2cd5c647a636a09c5918ff0024fc06eb566742d271bf6ea1a145745072f16ab157a674b6be3e8076a298d8110fd
-  data.tar.gz: 5a9281d55a608b9356d535c5e7fc0b9bc8afb6d23a5cc6f76192e074582d385358b81ff07dd8959286440634b08411d8866b306313c4826d81ca85eb02a4d225
+  metadata.gz: 36b765180f9d7168c91238e1c7a63e8cc281f3a795f068e3d6ddb317d419d90dc2401585b8fde37e3d27c0c82fda9ef66dba3c6bd96201f1dafa9d3be301b53f
+  data.tar.gz: d83ffd4c0fec0cf1d3621a7f563c9d369d671bfce5f11c9bdcac9f287c5918a3c37f3ff340cd3429b4dbb1e96e9daa936ce50fe4bd889420cb66c0a41020a777

data/lib/inferno/apps/cli/execute.rb

@@ -6,6 +6,7 @@ Dir[File.join(__dir__, 'execute', '*_outputter.rb')].each { |outputter| require
 
 module Inferno
   module CLI
+    # @private
     class Execute
       include ::Inferno::Utils::VerifyRunnable
       include ::Inferno::Utils::PersistInputs
@@ -45,7 +46,6 @@ module Inferno
         self.options = options
 
         outputter.print_start_message(self.options)
-
         load_preset_file_and_set_preset_id
 
         results = []
@@ -104,18 +104,6 @@ module Inferno
         @outputter ||= OUTPUTTERS[options[:outputter]].new
       end
 
-      def load_preset_file_and_set_preset_id
-        return unless options[:preset_file]
-        raise StandardError, 'Cannot use `--preset-id` and `--preset-file` options together' if options[:preset_id]
-
-        raise StandardError, "File #{options[:preset_file]} not found" unless File.exist? options[:preset_file]
-
-        options[:preset_id] = JSON.parse(File.read(options[:preset_file]))['id']
-        raise StandardError, "Preset #{options[:preset_file]} is missing id" if options[:preset_id].nil?
-
-        presets_repo.insert_from_file(options[:preset_file])
-      end
-
       def all_selected_groups_and_tests
         @all_selected_groups_and_tests ||= runnables_by_short_id + groups + tests
       end
@@ -123,7 +111,7 @@ module Inferno
       def run_one(runnable, test_run)
         verify_runnable(
           runnable,
-          thor_hash_to_inputs_array(inputs_and_preset),
+          all_inputs,
           test_session.suite_options
         )
 
@@ -132,15 +120,14 @@ module Inferno
         dispatch_job(test_run)
       end
 
-      def inputs_and_preset
+      def all_inputs
         if preset
-          preset_inputs = preset.inputs.to_h do |preset_input|
-            [preset_input[:name], preset_input[:value]]
-          end
+          test_sessions_repo.apply_preset(test_session, preset.id)
+          preset_inputs = session_data_repo.get_all_from_session(test_session.id)
 
-          options.fetch(:inputs, {}).reverse_merge(preset_inputs)
+          thor_hash_to_inputs_array(options.fetch(:inputs, {})) + preset_inputs.map(&:to_hash)
         else
-          options.fetch(:inputs, {})
+          thor_hash_to_inputs_array(options.fetch(:inputs, {}))
         end
       end
 
@@ -159,6 +146,15 @@ module Inferno
         @preset
       end
 
+      def load_preset_file_and_set_preset_id
+        return unless options[:preset_file]
+        raise StandardError, 'Cannot use `--preset-id` and `--preset-file` options together' if options[:preset_id]
+
+        raise StandardError, "File #{options[:preset_file]} not found" unless File.exist? options[:preset_file]
+
+        options[:preset_id] = presets_repo.insert_from_file(options[:preset_file]).id
+      end
+
       def suite
         @suite ||= Inferno::Repositories::TestSuites.new.find(options[:suite])
 
@@ -214,7 +210,7 @@ module Inferno
         {
           test_session_id: test_session.id,
           runnable_id_key(runnable) => runnable.id,
-          inputs: thor_hash_to_inputs_array(inputs_and_preset)
+          inputs: all_inputs
         }
       end
 

data/lib/inferno/apps/web/router.rb

@@ -1,4 +1,5 @@
 require 'erb'
+require_relative '../../feature'
 
 Dir.glob(File.join(__dir__, 'controllers', '**', '*.rb')).each { |path| require_relative path }
 
@@ -47,13 +48,17 @@ module Inferno
           put '/:id/check_configuration',
               to: Inferno::Web::Controllers::TestSuites::CheckConfiguration,
               as: :check_configuration
-          get ':id/requirements',
-              to: Inferno::Web::Controllers::TestSuites::Requirements::Index,
-              as: :requirements
+          if Feature.requirements_enabled?
+            get ':id/requirements',
+                to: Inferno::Web::Controllers::TestSuites::Requirements::Index,
+                as: :requirements
+          end
         end
 
-        scope 'requirements' do
-          get '/:id', to: Inferno::Web::Controllers::Requirements::Show, as: :show
+        if Feature.requirements_enabled?
+          scope 'requirements' do
+            get '/:id', to: Inferno::Web::Controllers::Requirements::Show, as: :show
+          end
         end
 
         get '/requests/:id', to: Inferno::Web::Controllers::Requests::Show, as: :requests_show

data/lib/inferno/apps/web/serializers/serializer.rb

@@ -1,5 +1,6 @@
 require 'oj'
 require 'blueprinter'
+require_relative '../../../feature'
 
 module Inferno
   module Web
@@ -13,6 +14,12 @@ module Inferno
             result.send(name).present?
           end
         end
+
+        # When removing the feature flag, replace all instances of this method
+        # with `.field_present?`
+        def self.field_present_and_requirements_enabled?(field_name, result, options)
+          field_present?(field_name, result, options) && Feature.requirements_enabled?
+        end
       end
     end
   end

data/lib/inferno/apps/web/serializers/test.rb

@@ -20,7 +20,7 @@ module Inferno
         field :input_instructions
         field :user_runnable?, name: :user_runnable
         field :optional?, name: :optional
-        field :verifies_requirements, if: :field_present?
+        field :verifies_requirements, if: :field_present_and_requirements_enabled?
       end
     end
   end

data/lib/inferno/apps/web/serializers/test_group.rb

@@ -32,7 +32,7 @@ module Inferno
           Input.render_as_hash(group.available_inputs(suite_options).values)
         end
         field :output_definitions, name: :outputs, extractor: HashValueExtractor
-        field :verifies_requirements, if: :field_present?
+        field :verifies_requirements, if: :field_present_and_requirements_enabled?
       end
     end
   end

data/lib/inferno/apps/web/serializers/test_suite.rb

@@ -38,7 +38,7 @@ module Inferno
             suite_options = options[:suite_options]
             Input.render_as_hash(suite.available_inputs(suite_options).values)
           end
-          field :requirement_sets, if: :field_present? do |suite, options|
+          field :requirement_sets, if: :field_present_and_requirements_enabled? do |suite, options|
             selected_options = options[:suite_options] || []
             requirement_sets = suite.requirement_sets.select do |requirement_set|
               requirement_set.suite_options.all? { |suite_option| selected_options.include? suite_option }
@@ -46,7 +46,7 @@ module Inferno
 
             RequirementSet.render_as_hash(requirement_sets)
           end
-          field :verifies_requirements, if: :field_present?
+          field :verifies_requirements, if: :field_present_and_requirements_enabled?
         end
       end
     end

data/lib/inferno/feature.rb

@@ -0,0 +1,9 @@
+module Inferno
+  module Feature
+    class << self
+      def requirements_enabled?
+        ENV.fetch('ENABLE_REQUIREMENTS', 'false')&.casecmp?('true')
+      end
+    end
+  end
+end