inferno_core 1.4.2 → 1.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1318358aa5a9dfd3f856740eb3b02ca30c5a960893595e44631fea414906936
-  data.tar.gz: ddf3a22b024d5745efeead73eacc55a23d7c0b9841e57177df877ed46457dc3a
+  metadata.gz: c8c3149fd821b0530f7481d6a01bdef6da32263f1cca74f7b852567edb67af43
+  data.tar.gz: df8cd12ccb8054d182655c7537c730cd0a1f6fa538552e98171b93c43300d17b
 SHA512:
-  metadata.gz: 5ddfa620841f6acb416190f683235fefeb089e623f238578ac7cd0022bc01ece6aee0644bae93b6d9f4ee72aff33fa4cefeda871a9a160502cd26dde0b193260
-  data.tar.gz: 718dcda3cd89f1f9d673eaa7596ec5dc8b4dd405b9434c6a55eb2caf381d2cd1516614098ac565d1104c410991ec6496b5e11ecfaf66df77b4d49df1ae5c569f
+  metadata.gz: f6d6c9b29f44b0f3169bee590aac204520aa3fc24d651443b5136958cecfffc889d71172881b4c97323b6b17b65d78afd8fd8027a0b8d933037023345fed975d
+  data.tar.gz: 196c88889027e64aa05e3e7a9997749c9dfc5fab9fecdfa1a40437005d2cfd9a5390945f3efc3382ae4c2a3ea3f208ebc5720b5837ca1ad46fd5f08dfdab8678

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

@@ -138,7 +138,7 @@ module Inferno
 
       ExecutionStatus = Struct.new(
         :done, :failed, :timed_out, :cancel_pending, :current_session, :current_timeout, :last_log_time,
-        :cross_session_status, :last_step_signatures
+        :poll_start_time, :cross_session_status, :last_step_signatures
       )
 
       attr_accessor :yaml_file, :options, :execution_status
@@ -155,6 +155,7 @@ module Inferno
           cancel_pending: false,
           current_session: sessions.first,
           current_timeout: options[:default_poll_timeout],
+          poll_start_time: nil,
           cross_session_status: {},
           last_step_signatures: {}
         )
@@ -416,6 +417,7 @@ module Inferno
         warn ''
         warn "Polling session: #{session.key} (#{session.session_id}) timeout=#{timeout}s"
         deadline = Time.now + timeout
+        execution_status.poll_start_time = Time.now
         execution_status.last_log_time = Time.now - LOG_INTERVAL_SECONDS
 
         loop do
@@ -518,12 +520,14 @@ module Inferno
         last_completed = last_completed_from_status(status)
         poll_status_last_test =
           last_completed.present? ? " - last test: #{format_last_completed(last_completed, session_key)}" : ''
-        warn "  [#{session_key}] #{status['status']} (#{test_progress(status)})#{poll_status_last_test}"
+        elapsed = (Time.now - execution_status.poll_start_time).round
+        warn "  [#{session_key}] #{status['status']} (#{test_progress(status, elapsed)})" \
+             "#{poll_status_last_test}"
         execution_status.last_log_time = Time.now
       end
 
-      def test_progress(status)
-        "#{status['completed_test_count']}/#{status['test_count']} tests"
+      def test_progress(status, elapsed)
+        "completed #{status['completed_test_count']}/#{status['test_count']} tests in #{elapsed}s"
       end
 
       def fetch_session_status(session_id)

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

@@ -9,6 +9,7 @@ require_relative 'suites'
 require_relative 'new'
 require_relative 'execute'
 require_relative 'execute_script'
+require_relative '../../utils/execution_script_runner'
 require_relative '../../version'
 
 module Inferno
@@ -78,8 +79,31 @@ module Inferno
       desc 'requirements SUBCOMMAND ...ARGS', 'Perform requirements operations'
       subcommand 'requirements', Requirements
 
-      desc 'execute_script YAML_FILE',
-           'Run a session orchestration script defined by a YAML config file.'
+      desc 'execute_script [PATTERN]',
+           'Run one or more session orchestration scripts defined by YAML config file(s).'
+      long_desc <<-LONGDESC
+        Run a session orchestration script defined by a YAML config file.
+
+        PATTERN may be a single YAML file, or it may contain wildcards (e.g. glob
+        patterns like `*` or `**`) to match and run multiple scripts in sequence.
+        When PATTERN matches more than one file, each matching script is run in a
+        separate process; a summary of passed and failed scripts is printed at the
+        end, and the command exits non-zero if any script failed.
+
+        If PATTERN is omitted, it defaults to `execution_scripts/**/*.yaml`, running
+        every script under the execution_scripts directory.
+
+        Examples:
+
+        # Run every script under execution_scripts
+        `bundle exec inferno execute_script`
+
+        # Run a single script
+        `bundle exec inferno execute_script execution_scripts/demo/demo_individual_tests.yaml`
+
+        # Run every script in a directory
+        `bundle exec inferno execute_script "execution_scripts/demo/*.yaml"`
+      LONGDESC
       option :inferno_base_url,
              aliases: ['-I'],
              type: :string,
@@ -113,9 +137,26 @@ module Inferno
              type: :boolean,
              default: false,
              desc: 'Allow execution script steps that run arbitrary shell commands. ' \
-                   'Scripts with command: steps will fail unless this flag is set.'
-      def execute_script(yaml_file)
-        ExecuteScript.new(yaml_file, options).run
+                   'Scripts with command: steps will fail unless this flag is set. ' \
+                   'When PATTERN matches multiple scripts, this also applies to all of them ' \
+                   '(in addition to any individual script whose filename contains "_with_commands").'
+      def execute_script(pattern = 'execution_scripts/**/*.yaml')
+        matches = Dir.glob(pattern).select { |file| file.end_with?('.yaml', '.yml') }.sort
+
+        if matches.length > 1 || (matches.empty? && pattern.match?(/[*?\[\]{}]/))
+          Utils::ExecutionScriptRunner.run_all(
+            pattern:,
+            inferno_base_url: options[:inferno_base_url],
+            allow_commands: options[:allow_commands],
+            compare_messages: options[:compare_messages],
+            compare_result_message: options[:compare_result_message],
+            poll_interval: options[:poll_interval],
+            default_poll_timeout: options[:default_poll_timeout],
+            only_different_messages: options[:only_different_messages]
+          )
+        else
+          ExecuteScript.new(matches.first || pattern, options).run
+        end
       end
 
       desc 'session SUBCOMMAND ...ARGS', 'Perform session operations'

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

@@ -119,7 +119,7 @@ module Inferno
             suite_runnables.select { |runnable| runnable.verifies_requirements.include? requirement_id }
 
           runnables_for_requirement.map do |runnable|
-            [requirement_id, runnable.short_id, runnable.id]
+            [requirement_id, runnable < Inferno::Entities::TestSuite ? 'suite' : runnable.short_id, runnable.id]
           end
         end
       end

data/lib/inferno/apps/cli/templates/Rakefile.tt

@@ -5,19 +5,6 @@ begin
 rescue LoadError # rubocop:disable Lint/SuppressedException
 end
 
-namespace :execute_scripts do
-  desc 'Run all execution script YAML files against a local Inferno instance (already running). ' \
-       'Optional FILTER env var restricts by File.fnmatch pattern, e.g. FILTER="execution_scripts/demo/*". ' \
-       'Optional INFERNO_BASE_URL env var sets the target Inferno URL, e.g. INFERNO_BASE_URL="http://localhost:4567/"'
-  task :run_all do
-    require 'inferno/utils/execution_script_runner'
-    Inferno::Utils::ExecutionScriptRunner.run_all(
-      pattern: ENV.fetch('FILTER', 'execution_scripts/**/*.yaml'),
-      inferno_base_url: ENV.fetch('INFERNO_BASE_URL', nil)
-    )
-  end
-end
-
 namespace :db do
   desc 'Apply changes to the database'
   task :migrate do

data/lib/inferno/apps/cli/templates/config/nginx.background.conf.tt

@@ -53,36 +53,6 @@ http {
     # the server will close connections after this time
     keepalive_timeout 600;
 
-    location /validator {
-      proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-      proxy_set_header Host $http_host;
-      proxy_set_header X-Forwarded-Proto $scheme;
-      proxy_set_header X-Forwarded-Port $server_port;
-      proxy_redirect off;
-      proxy_set_header Connection '';
-      proxy_http_version 1.1;
-      chunked_transfer_encoding off;
-      proxy_buffering off;
-      proxy_cache off;
-
-      proxy_pass http://fhir_validator_app;
-    }
-
-    location /validatorapi/ {
-      proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-      proxy_set_header Host $http_host;
-      proxy_set_header X-Forwarded-Proto $scheme;
-      proxy_set_header X-Forwarded-Port $server_port;
-      proxy_redirect off;
-      proxy_set_header Connection '';
-      proxy_http_version 1.1;
-      chunked_transfer_encoding off;
-      proxy_buffering off;
-      proxy_cache off;
-
-      proxy_pass http://validator_service:4567/;
-    }
-
     location /hl7validatorapi/ {
       proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
       proxy_set_header Host $http_host;

data/lib/inferno/apps/cli/templates/config/nginx.conf.tt

@@ -68,36 +68,6 @@ http {
       proxy_pass http://inferno:4567;
     }
 
-    location /validator {
-      proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-      proxy_set_header Host $http_host;
-      proxy_set_header X-Forwarded-Proto $scheme;
-      proxy_set_header X-Forwarded-Port $server_port;
-      proxy_redirect off;
-      proxy_set_header Connection '';
-      proxy_http_version 1.1;
-      chunked_transfer_encoding off;
-      proxy_buffering off;
-      proxy_cache off;
-
-      proxy_pass http://fhir_validator_app;
-    }
-
-    location /validatorapi/ {
-      proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-      proxy_set_header Host $http_host;
-      proxy_set_header X-Forwarded-Proto $scheme;
-      proxy_set_header X-Forwarded-Port $server_port;
-      proxy_redirect off;
-      proxy_set_header Connection '';
-      proxy_http_version 1.1;
-      chunked_transfer_encoding off;
-      proxy_buffering off;
-      proxy_cache off;
-
-      proxy_pass http://validator_service:4567/;
-    }
-
     location /hl7validatorapi/ {
       proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
       proxy_set_header Host $http_host;

data/lib/inferno/apps/cli/templates/docker-compose.background.yml.tt

@@ -1,4 +1,3 @@
-version: '3'
 services:
   hl7_validator_service:
     image: infernocommunity/inferno-resource-validator
@@ -11,18 +10,6 @@ services:
       # To let the service share your local FHIR package cache,
       # uncomment the below line
       # - ~/.fhir:/home/ktor/.fhir
-  validator_service:
-    image: infernocommunity/fhir-validator-service
-    # Update this path to match your directory structure
-    volumes:
-      - ./data/igs:/home/igs
-  fhir_validator_app:
-    image: infernocommunity/fhir-validator-app
-    depends_on:
-      - validator_service
-    environment:
-      EXTERNAL_VALIDATOR_URL: http://localhost/validatorapi
-      VALIDATOR_BASE_PATH: /validator
   fhirpath:
     image: infernocommunity/fhirpath-service
     ports:
@@ -35,7 +22,7 @@ services:
       - "80:80"
     command: [nginx, '-g', 'daemon off;']
     depends_on:
-      - fhir_validator_app
+      - hl7_validator_service
       - fhirpath
   redis:
     image: redis

data/lib/inferno/apps/cli/templates/docker-compose.yml.tt

@@ -1,4 +1,3 @@
-version: '3'
 services:
   inferno:
     build:
@@ -6,7 +5,7 @@ services:
     volumes:
       - ./data:/opt/inferno/data
     depends_on:
-      - validator_service
+      - hl7_validator_service
   worker:
     build:
       context: ./
@@ -19,14 +18,6 @@ services:
     extends:
       file: docker-compose.background.yml
       service: hl7_validator_service
-  validator_service:
-    extends:
-      file: docker-compose.background.yml
-      service: validator_service
-  fhir_validator_app:
-    extends:
-      file: docker-compose.background.yml
-      service: fhir_validator_app
   fhirpath:
     extends:
       file: docker-compose.background.yml

data/lib/inferno/apps/cli/templates/execution_scripts/{README.md.tt → README.md}

@@ -10,7 +10,7 @@ as `tx.fhir.org`.
 
 Execution scripts defined here will
 be [executed](https://inferno-framework.github.io/docs/advanced-test-features/scripting-execution.html#execution)
-automatically on pull requests as a part of the github
+automatically on pull requests as a part of the GitHub
 workflows and can also be executed locally using the
-[`execute_script` CLI](https://inferno-framework.github.io/docs/getting-started/inferno-cli.html#complex-scripted-execution)
-on individual scripts or the `execute_scripts:run_all` rake task.
+[`execute_script` CLI](https://inferno-framework.github.io/docs/getting-started/inferno-cli.html#complex-scripted-execution).
+If no `.yaml` files are found under this directory, the GitHub workflow will be skipped.

data/lib/inferno/apps/cli/templates/lib/%library_name%/requirements/%library_name%_requirements.csv

@@ -0,0 +1,3 @@
+Req Set,ID,URL,Requirement,Conformance,Actors,Sub-Requirement(s),Conditionality,Not Tested Reason,Not Tested Details
+sample_v1,12,www.example.com/page.html#section,Requirement text SHALL go here,SHALL,Server,sample_v1@13,false,Not Tested,We've decided not to test this requirement
+sample_v1,13,www.example.com/page.html#section,"This is a subsrequirement, and it SHOULD be implemented.",SHOULD,Server,,false,,

data/lib/inferno/apps/cli/templates/lib/%library_name%/requirements/README.md

@@ -0,0 +1,12 @@
+# Using Core Requirements Tools
+
+This directory contains [requirement artifacts](https://inferno-framework.github.io/docs/advanced-test-features/requirements.html)
+that contain example requirements that could be linked to tests
+within this test kit and displayed within the UI as justification
+for the tests.
+
+Each `.xlsx` file defined in this directory will contribute towards the
+test kit's requirements and a GitHub workflow executed automatically on pull
+requests checks that these files are in sync with the generated requirement
+list and coverage analysis `.csv` files. If no `.xlsx` files are found in
+this directory, the GitHub workflow will be skipped. 

data/lib/inferno/apps/cli/templates/lib/%library_name%/requirements/generated/%test_suite_id%_requirements_coverage.csv.tt

@@ -0,0 +1 @@
+Req Set,ID,URL,Requirement,Conformance,Actors,Conditionality,Not Tested Reason,Not Tested Details,<%= title_name %> Short ID(s),<%= title_name %> Full ID(s)

data/lib/inferno/dsl/fhir_resource_navigation.rb

@@ -42,8 +42,13 @@ module Inferno
       # @param given_element [FHIR::Model, Array<FHIR::Model>]
       # @param path [String]
       # @param include_dar [Boolean]
+      # @param recursive_segments [Array<String>] names of path segments that are
+      #   self-referential (eg. `item` in Questionnaire.item.item, via a FHIR
+      #   `contentReference`). When a segment matches, the search also continues
+      #   into deeper repeats of that segment (item.item.item...) if the value
+      #   isn't found at the literal path depth.
       # @return a single matching value (which can include `false`) or `nil` if not found
-      def find_a_value_at(given_element, path, include_dar: false, &block)
+      def find_a_value_at(given_element, path, include_dar: false, recursive_segments: [], &block)
         return nil if given_element.nil?
 
         elements = Array.wrap(given_element)
@@ -56,8 +61,13 @@ module Inferno
         remaining_path = path_segments.join('.')
         elements.each do |element|
           child = get_next_value(element, segment)
-          element_found = find_a_value_at(child, remaining_path, include_dar:, &block)
+          element_found = find_a_value_at(child, remaining_path, include_dar:, recursive_segments:, &block)
           return element_found if value_not_empty?(element_found)
+
+          next unless recursive_segments.include?(segment)
+
+          nested_found = find_a_value_at(child, path, include_dar:, recursive_segments:, &block)
+          return nested_found if value_not_empty?(nested_found)
         end
 
         nil

data/lib/inferno/dsl/fhir_resource_validation.rb

@@ -26,6 +26,7 @@ module Inferno
     #       allowExampleUrls true
     #       txServer nil
     #     end
+    #     expansion_parameters 'path/to/expansion_parameters.json'
     #   end
     module FHIRResourceValidation
       def self.included(klass)
@@ -54,6 +55,19 @@ module Inferno
           @validator_session_repo ||= Inferno::Repositories::ValidatorSessions.new
         end
 
+        # Environment variable that, when set to a truthy-looking value,
+        # enables verbose validation logging (the validationContext sent
+        # with each request, and the resulting issues including which were
+        # filtered out) through Inferno's normal application logger, tagged
+        # with the validator definition and, when available, the test
+        # session and test that triggered the request.
+        VALIDATOR_DEBUG_LOGGING_ENV_VAR = 'FHIR_RESOURCE_VALIDATOR_DEBUG_LOGGING'.freeze
+
+        # @private
+        def debug_logging_enabled?
+          ENV.fetch(VALIDATOR_DEBUG_LOGGING_ENV_VAR, nil).present?
+        end
+
         # Set the url of the validator service
         #
         # @param validator_url [String]
@@ -118,6 +132,129 @@ module Inferno
 
         alias cli_context validation_context
 
+        # Environment variable containing the default expansion parameters.
+        # Used by {#expansion_parameters} when no value has been set
+        # explicitly. May contain either the raw JSON content of a FHIR
+        # Parameters resource (if it starts with `{`) or a path to a file
+        # containing one.
+        EXPANSION_PARAMETERS_ENV_VAR = 'FHIR_RESOURCE_VALIDATOR_EXPANSION_PARAMETERS'.freeze
+
+        # Set the expansion parameters to be sent with each validation
+        # request. This configures how the validator's terminology engine
+        # expands value sets during validation (e.g. designation
+        # preferences, forcing the use of the latest terminology versions,
+        # etc.). The content is sent inline with every validation request
+        # made by this validator, since the validator does not have access
+        # to Inferno's filesystem.
+        #
+        # Accepts either a Hash containing the contents of a FHIR Parameters
+        # resource, or a String path to a file (JSON or XML) containing one.
+        # The file is read once, the first time it's needed.
+        #
+        # If never set explicitly, this falls back to the
+        # `FHIR_RESOURCE_VALIDATOR_EXPANSION_PARAMETERS` environment
+        # variable, if present. This allows a shared set of expansion
+        # parameters to be configured once for every test kit that uses a
+        # given validator instance, while still letting individual test
+        # kits opt out or override it by calling this method themselves.
+        # The environment variable's content is treated as raw JSON if it
+        # starts with `{`, and otherwise as a file path.
+        #
+        # @example
+        #   # Passing a Hash
+        #   fhir_resource_validator do
+        #     url 'http://example.com/validator'
+        #     expansion_parameters({
+        #       resourceType: 'Parameters',
+        #       parameter: [{ name: 'excludeNested', valueBoolean: true }]
+        #     })
+        #   end
+        #
+        # @example
+        #   # Passing a file path
+        #   fhir_resource_validator do
+        #     url 'http://example.com/validator'
+        #     expansion_parameters 'path/to/expansion_parameters.json'
+        #   end
+        #
+        # @param value [Hash, String, nil] contents of a Parameters resource
+        #   as a Hash, or a path to a file (JSON or XML) containing one
+        def expansion_parameters(value = nil)
+          if value
+            @expansion_parameters = build_expansion_parameters(value)
+          elsif !@expansion_parameters_resolved
+            env_value = ENV.fetch(EXPANSION_PARAMETERS_ENV_VAR, nil)
+            @expansion_parameters = build_expansion_parameters_from_env(env_value) if env_value
+          end
+          @expansion_parameters_resolved = true
+
+          @expansion_parameters
+        end
+
+        # @private
+        # Determines whether the environment variable's content is raw JSON
+        # or a file path based on its first non-whitespace character.
+        def build_expansion_parameters_from_env(env_value)
+          if env_value.lstrip.start_with?('{')
+            build_expansion_parameters_from_json_content(env_value)
+          else
+            build_expansion_parameters(env_value)
+          end
+        end
+
+        # @private
+        def build_expansion_parameters(value)
+          case value
+          when Hash
+            build_expansion_parameters_from_json_content(value.to_json)
+          else
+            {
+              fileName: File.basename(value),
+              fileContent: File.read(value),
+              fileType: nil
+            }
+          end
+        end
+
+        # @private
+        def build_expansion_parameters_from_json_content(json_content)
+          {
+            fileName: 'expansion_parameters.json',
+            fileContent: json_content,
+            fileType: nil
+          }
+        end
+
+        # Environment variable that, when set, enables terminology server
+        # request logging by the validator itself. Its value is sent as
+        # `txLog` in the validationContext of every validation request,
+        # telling the validator where to log the terminology server
+        # requests it makes. Note that the log will appear within
+        # the container running the validator.
+        TX_LOG_ENV_VAR = 'FHIR_RESOURCE_VALIDATOR_TX_LOG'.freeze
+
+        # @private
+        def tx_log
+          ENV.fetch(TX_LOG_ENV_VAR, nil).presence
+        end
+
+        # @private
+        # Builds the validationContext sent with a request for the given
+        # profile. Pulled out on its own (rather than inlined in
+        # `wrap_target_for_hl7_wrapper`) so the same, resource-content-free
+        # context can also be used for logging in `log_validation_result`.
+        #
+        # @param profile_url [String]
+        # @return [Hash]
+        def build_validation_context(profile_url)
+          context = {
+            **validation_context.definition,
+            profiles: [profile_url]
+          }
+          context[:txLog] = tx_log if tx_log
+          context
+        end
+
         # @private
         # Used internally by perform_additional_validation
         def additional_validations
@@ -240,6 +377,7 @@ module Inferno
 
           # 4. Mark resources as filtered
           mark_issues_for_filtering(issues)
+          log_validation_result(profile_url, issues, runnable) if debug_logging_enabled?
 
           # 5. Add error messages to runnable
           filtered_issues = issues.reject(&:filtered)
@@ -353,12 +491,57 @@ module Inferno
         # @private
         def call_validator(target, profile_url)
           request_body = wrap_target_for_hl7_wrapper(target, profile_url)
+
           Faraday.new(
             url,
             request: { timeout: 600 }
           ).post('validate', request_body, content_type: 'application/json')
         end
 
+        # @private
+        # Logs the validationContext and expansionParameters sent with a
+        # request together with the resulting issues (including which were
+        # filtered out) in a single entry, tagged with enough context to
+        # trace it back to the validator definition and triggering test run.
+        #
+        # Deliberately omits the resource content itself (sent separately as
+        # `filesToValidate`): only the small, non-PHI-bearing
+        # validationContext and expansionParameters are logged, not the full
+        # request body.
+        #
+        # @param profile_url [String] the profile URL validated against
+        # @param issues [Array<ValidatorIssue>] the resulting issues, already marked for filtering
+        # @param runnable [Object] the runnable (typically a Test) that triggered the request
+        def log_validation_result(profile_url, issues, runnable)
+          payload = {
+            validator_name: name,
+            test_suite_id: test_suite_id,
+            test_session_id: runnable.respond_to?(:test_session_id) ? runnable.test_session_id : nil,
+            test_id: runnable.id,
+            validation_context: build_validation_context(profile_url),
+            expansion_parameters:,
+            issues: issues.map { |issue| issue_summary(issue) }
+          }.compact
+
+          Application[:logger].info("FHIR validation result: #{payload.to_json}")
+        end
+
+        # @private
+        # Recursively builds a loggable summary of a validation issue,
+        # including nested slice_info, without any resource content.
+        #
+        # @param issue [ValidatorIssue]
+        # @return [Hash]
+        def issue_summary(issue)
+          {
+            severity: issue.severity,
+            location: issue.location,
+            message: issue.message,
+            filtered: issue.filtered,
+            slice_info: issue.slice_info.any? ? issue.slice_info.map { |nested| issue_summary(nested) } : nil
+          }.compact
+        end
+
         # @private
         # Post an object to the validation service for validating.
         # Returns the raw validator response body.
@@ -609,10 +792,7 @@ module Inferno
             end
 
           wrapped_resource = {
-            context_key => {
-              **validation_context.definition,
-              profiles: [profile_url]
-            },
+            context_key => build_validation_context(profile_url),
             filesToValidate: [
               {
                 fileName: "#{profile_url.split('/').last}.json",
@@ -622,6 +802,8 @@ module Inferno
             ],
             sessionId: @session_id
           }
+          wrapped_resource[:expansionParameters] = expansion_parameters if expansion_parameters
+
           wrapped_resource.to_json
         end
       end

data/lib/inferno/dsl/must_support_assessment.rb

@@ -15,10 +15,14 @@ module Inferno
       # @param resources [Array<FHIR::Resource>]
       # @param profile_url [String]
       # @param validator_name [Symbol] Name of the FHIR Validator that references the IG the profile is in
-      # @param metadata [Hash] MustSupport Metadata (optional),
-      #        if provided the check will use this instead of re-generating metadata from the profile
+      # @param metadata [Inferno::DSL::ProfileMetadata, #must_supports] MustSupport Metadata (optional),
+      #        if provided the check will use this instead of re-generating metadata from the profile.
+      #        Must respond to `#must_supports`, returning a Hash with `:elements`, `:extensions`, and
+      #        `:slices` keys (and optionally `:choices` and `:recursive_elements`) -- the shape produced by
+      #        {MustSupportMetadataExtractor#must_supports}. {Inferno::DSL::ProfileMetadata} is a base class
+      #        test kits can subclass to build these objects, eg from generated YAML, instead of hand-rolling one.
       # @param requirement_extension [String] Extension URL that implies "required" as an alternative to the MS flag
-      # @yield [Metadata] Customize the metadata before running the test
+      # @yield [MustSupportMetadataExtractor] Customize the metadata before running the test
       # @return [Array<String>] List of missing elements
       def missing_must_support_elements(resources, profile_url, validator_name: :default, metadata: nil,
                                         requirement_extension: nil, &)
@@ -199,6 +203,12 @@ module Inferno
           metadata.must_supports[:extensions]
         end
 
+        # Names of path segments that are self-referential (eg 'item' in Questionnaire.item.item)
+        # and so should be searched at any depth of nesting, not just the literal depth of a path.
+        def recursive_element_segments
+          Array.wrap(metadata.must_supports[:recursive_elements])
+        end
+
         def missing_extensions(resources = [])
           @missing_extensions ||=
             must_support_extensions.select do |extension_definition|
@@ -212,7 +222,7 @@ module Inferno
                     normalized_extension_url(extension.url) == expected_url
                   end
                 else
-                  extension = find_a_value_at(resource, path) do |el|
+                  extension = find_a_value_at(resource, path, recursive_segments: recursive_element_segments) do |el|
                     normalized_extension_url(el.url) == expected_url
                   end
 
@@ -243,9 +253,10 @@ module Inferno
           ms_extension_urls = must_support_extensions.select { |ex| ex[:path] == "#{raw_path}.extension" }
             .map { |ex| ex[:url] }
 
-          value_found = find_a_value_at(resource, path) do |potential_value|
-            matching_without_extensions?(potential_value, ms_extension_urls, element_definition[:fixed_value])
-          end
+          value_found =
+            find_a_value_at(resource, path, recursive_segments: recursive_element_segments) do |potential_value|
+              matching_without_extensions?(potential_value, ms_extension_urls, element_definition[:fixed_value])
+            end
 
           # Note that false.present? => false, which is why we need to add this extra check
           value_found.present? || value_found == false
@@ -369,7 +380,7 @@ module Inferno
           # TODO: there is a lot of similarity
           # between this and FHIRResourceNavigation.matching_slice?
           # Can these be combined?
-          find_a_value_at(resource, path) do |element|
+          find_a_value_at(resource, path, recursive_segments: recursive_element_segments) do |element|
             case discriminator[:type]
             when 'patternCodeableConcept'
               find_pattern_codeable_concept_slice(element, discriminator)