us_core_test_kit 0.11.3 → 0.11.4

data/lib/us_core_test_kit/client/generated/v3.1.1/auth_udap_group.rb

@@ -1,31 +0,0 @@
-require 'udap_security_test_kit'
-require_relative 'tags'
-
-module USCoreTestKit
-  module Client
-    module USCoreClientV311
-      class ClientAuthUDAPGroup < Inferno::TestGroup
-        id :us_core_client_v311_auth_udap
-        title 'Review UDAP Authentication Interactions'
-        description %(
-          During these tests, Inferno will verify that the client interacted with Inferno's
-          simulated UDAP authorization server in a conformant manner when requesting access tokens
-          and that the client under test was able to use provided access tokens to make US Core
-          requests.
-        )
-        run_as_group
-
-        test from: :udap_client_authorization_request_verification,
-            id: :us_core_client_v311_authorization_udap_verification,
-            config: { options: { endpoint_suite_id: :us_core_client_v311 } }
-        test from: :udap_client_token_request_ac_verification,
-            id: :us_core_client_v311_token_udap_verification,
-            config: { options: { endpoint_suite_id: :us_core_client_v311 } }
-        test from: :udap_client_token_use_verification,
-              config: {
-                options: { access_request_tags: [READ_REQUEST_TAG, SEARCH_REQUEST_TAG] }
-              }
-      end
-    end
-  end
-end

data/lib/us_core_test_kit/client/generated/v3.1.1/authorization_endpoint.rb

@@ -1,55 +0,0 @@
-# frozen_string_literal: true
-
-require 'udap_security_test_kit'
-require 'smart_app_launch_test_kit'
-require_relative 'urls'
-require_relative 'tags'
-require_relative '../../us_core_client_options'
-
-module USCoreTestKit
-  module Client
-    module USCoreClientV311
-      module MockUdapSmartServer
-        class AuthorizationEndpoint < Inferno::DSL::SuiteEndpoint
-          include SMARTAppLaunch::MockSMARTServer::SMARTAuthorizationResponseCreation
-          include UDAPSecurityTestKit::MockUDAPServer::UDAPAuthorizationResponseCreation
-          include USCoreClientOptions
-
-          def test_run_identifier
-            request.params[:client_id]
-          end
-
-          def suite_options
-            @suite_options ||=
-              Inferno::Repositories::TestSessions.new.find(result.test_session_id)
-                &.suite_options&.map { |so| [so.id, so.value] }&.to_h
-          end
-
-          def make_response
-            if selected_security_ig(suite_options) == UDAPSecurityTestKit::UDAP_TAG
-              make_udap_authorization_response
-            else
-              make_smart_authorization_response
-            end
-          end
-
-          def update_result
-            nil # never update for now
-          end
-
-          def tags
-            tags = [UDAPSecurityTestKit::AUTHORIZATION_TAG, UDAPSecurityTestKit::AUTHORIZATION_CODE_TAG]
-            tags <<
-              if selected_security_ig(suite_options) == UDAPSecurityTestKit::UDAP_TAG
-                UDAPSecurityTestKit::UDAP_TAG
-              else
-                SMARTAppLaunch::SMART_TAG
-              end
-
-            tags
-          end
-        end
-      end
-    end
-  end
-end

data/lib/us_core_test_kit/client/generated/v3.1.1/registration/configuration_display_udap_test.rb

@@ -1,40 +0,0 @@
-require_relative '../urls'
-
-module USCoreTestKit
-  module Client
-    module USCoreClientV311
-      class RegistrationConfigurationUDAPDisplay < Inferno::Test
-        include URLs
-
-        id :us_core_client_v311_reg_config_udap_display
-        title 'Confirm client configuration'
-        description %(
-          This test provides all the information needed for testers to configure
-          the client under test to communicate with Inferno's simulated US Core server
-          including UDAP endpoints to obtain access tokens.
-        )
-
-        input :client_id
-
-        run do
-          wait(
-            identifier: client_id,
-            message: %(
-              **Inferno Simulated Server Details**:
-
-              FHIR Base URL: `#{fhir_url}`
-
-              Authentication Details:
-              - UDAP Client Id: `#{client_id}`
-              - Authorization endpoint: `#{authorization_url}`
-              - Token endpoint: `#{token_url}`
-
-              [Click here](#{resume_pass_url}?token=#{client_id}) once you have configured
-              the client to connect to Inferno at the above endpoints.
-            )
-          )
-        end
-      end
-    end
-  end
-end

data/lib/us_core_test_kit/client/generated/v3.1.1/token_endpoint.rb

@@ -1,82 +0,0 @@
-# frozen_string_literal: true
-
-require 'udap_security_test_kit'
-require 'smart_app_launch_test_kit'
-require_relative 'urls'
-require_relative 'tags'
-
-module USCoreTestKit
-  module Client
-    module USCoreClientV311
-      module MockUdapSmartServer
-        class TokenEndpoint < Inferno::DSL::SuiteEndpoint
-          include SMARTAppLaunch::MockSMARTServer::SMARTTokenResponseCreation
-          include UDAPSecurityTestKit::MockUDAPServer::UDAPTokenResponseCreation
-          include URLs
-
-          def test_run_identifier
-            case request.params[:grant_type]
-            when UDAPSecurityTestKit::CLIENT_CREDENTIALS_TAG
-              UDAPSecurityTestKit::MockUDAPServer.client_id_from_client_assertion(request.params[:client_assertion])
-            when UDAPSecurityTestKit::AUTHORIZATION_CODE_TAG
-              UDAPSecurityTestKit::MockUDAPServer.issued_token_to_client_id(request.params[:code])
-            when UDAPSecurityTestKit::REFRESH_TOKEN_TAG
-              UDAPSecurityTestKit::MockUDAPServer.issued_token_to_client_id(
-                UDAPSecurityTestKit::MockUDAPServer.refresh_token_to_authorization_code(request.params[:refresh_token])
-              )
-            end
-          end
-
-          def make_response
-            if request.params[:udap].present?
-              case request.params[:grant_type]
-              when UDAPSecurityTestKit::AUTHORIZATION_CODE_TAG
-                make_udap_authorization_code_token_response
-              when UDAPSecurityTestKit::REFRESH_TOKEN_TAG
-                make_udap_refresh_token_response
-              else
-                UDAPSecurityTestKit::MockUDAPServer.update_response_for_invalid_assertion(
-                  response,
-                  "unsupported grant_type: #{request.params[:grant_type]}"
-                )
-              end
-            else
-              suite_options_list = Inferno::Repositories::TestSessions.new.find(result.test_session_id)&.suite_options
-              suite_options_hash = suite_options_list&.map { |option| [option.id, option.value] }&.to_h
-              smart_authentication_approach =
-                SMARTAppLaunch::SMARTClientOptions.smart_authentication_approach(suite_options_hash)
-              
-              case request.params[:grant_type]
-              when SMARTAppLaunch::AUTHORIZATION_CODE_TAG
-                make_smart_authorization_code_token_response(smart_authentication_approach)
-              when SMARTAppLaunch::REFRESH_TOKEN_TAG
-                make_smart_refresh_token_response(smart_authentication_approach)
-              else
-                SMARTAppLaunch::MockSMARTServer.update_response_for_invalid_assertion(
-                  response,
-                  "unsupported grant_type: #{request.params[:grant_type]}"
-                )
-              end
-            end
-          end
-
-          def update_result
-            nil # never update for now
-          end
-
-          def tags
-            tags = [UDAPSecurityTestKit::TOKEN_TAG]
-            tags << (request.params[:udap].present? ? UDAPSecurityTestKit::UDAP_TAG : SMARTAppLaunch::SMART_TAG)
-            if [UDAPSecurityTestKit::CLIENT_CREDENTIALS_TAG, 
-                UDAPSecurityTestKit::AUTHORIZATION_CODE_TAG, 
-                UDAPSecurityTestKit::REFRESH_TOKEN_TAG].include?(request.params[:grant_type])
-              tags << request.params[:grant_type]
-            end
-
-            tags
-          end
-        end
-      end
-    end
-  end
-end

data/lib/us_core_test_kit/client/generated/v4.0.0/auth_udap_group.rb

@@ -1,31 +0,0 @@
-require 'udap_security_test_kit'
-require_relative 'tags'
-
-module USCoreTestKit
-  module Client
-    module USCoreClientV400
-      class ClientAuthUDAPGroup < Inferno::TestGroup
-        id :us_core_client_v400_auth_udap
-        title 'Review UDAP Authentication Interactions'
-        description %(
-          During these tests, Inferno will verify that the client interacted with Inferno's
-          simulated UDAP authorization server in a conformant manner when requesting access tokens
-          and that the client under test was able to use provided access tokens to make US Core
-          requests.
-        )
-        run_as_group
-
-        test from: :udap_client_authorization_request_verification,
-            id: :us_core_client_v400_authorization_udap_verification,
-            config: { options: { endpoint_suite_id: :us_core_client_v400 } }
-        test from: :udap_client_token_request_ac_verification,
-            id: :us_core_client_v400_token_udap_verification,
-            config: { options: { endpoint_suite_id: :us_core_client_v400 } }
-        test from: :udap_client_token_use_verification,
-              config: {
-                options: { access_request_tags: [READ_REQUEST_TAG, SEARCH_REQUEST_TAG] }
-              }
-      end
-    end
-  end
-end

data/lib/us_core_test_kit/client/generated/v4.0.0/authorization_endpoint.rb

@@ -1,55 +0,0 @@
-# frozen_string_literal: true
-
-require 'udap_security_test_kit'
-require 'smart_app_launch_test_kit'
-require_relative 'urls'
-require_relative 'tags'
-require_relative '../../us_core_client_options'
-
-module USCoreTestKit
-  module Client
-    module USCoreClientV400
-      module MockUdapSmartServer
-        class AuthorizationEndpoint < Inferno::DSL::SuiteEndpoint
-          include SMARTAppLaunch::MockSMARTServer::SMARTAuthorizationResponseCreation
-          include UDAPSecurityTestKit::MockUDAPServer::UDAPAuthorizationResponseCreation
-          include USCoreClientOptions
-
-          def test_run_identifier
-            request.params[:client_id]
-          end
-
-          def suite_options
-            @suite_options ||=
-              Inferno::Repositories::TestSessions.new.find(result.test_session_id)
-                &.suite_options&.map { |so| [so.id, so.value] }&.to_h
-          end
-
-          def make_response
-            if selected_security_ig(suite_options) == UDAPSecurityTestKit::UDAP_TAG
-              make_udap_authorization_response
-            else
-              make_smart_authorization_response
-            end
-          end
-
-          def update_result
-            nil # never update for now
-          end
-
-          def tags
-            tags = [UDAPSecurityTestKit::AUTHORIZATION_TAG, UDAPSecurityTestKit::AUTHORIZATION_CODE_TAG]
-            tags <<
-              if selected_security_ig(suite_options) == UDAPSecurityTestKit::UDAP_TAG
-                UDAPSecurityTestKit::UDAP_TAG
-              else
-                SMARTAppLaunch::SMART_TAG
-              end
-
-            tags
-          end
-        end
-      end
-    end
-  end
-end

data/lib/us_core_test_kit/client/generated/v4.0.0/registration/configuration_display_udap_test.rb

@@ -1,40 +0,0 @@
-require_relative '../urls'
-
-module USCoreTestKit
-  module Client
-    module USCoreClientV400
-      class RegistrationConfigurationUDAPDisplay < Inferno::Test
-        include URLs
-
-        id :us_core_client_v400_reg_config_udap_display
-        title 'Confirm client configuration'
-        description %(
-          This test provides all the information needed for testers to configure
-          the client under test to communicate with Inferno's simulated US Core server
-          including UDAP endpoints to obtain access tokens.
-        )
-
-        input :client_id
-
-        run do
-          wait(
-            identifier: client_id,
-            message: %(
-              **Inferno Simulated Server Details**:
-
-              FHIR Base URL: `#{fhir_url}`
-
-              Authentication Details:
-              - UDAP Client Id: `#{client_id}`
-              - Authorization endpoint: `#{authorization_url}`
-              - Token endpoint: `#{token_url}`
-
-              [Click here](#{resume_pass_url}?token=#{client_id}) once you have configured
-              the client to connect to Inferno at the above endpoints.
-            )
-          )
-        end
-      end
-    end
-  end
-end

data/lib/us_core_test_kit/client/generated/v4.0.0/token_endpoint.rb

@@ -1,82 +0,0 @@
-# frozen_string_literal: true
-
-require 'udap_security_test_kit'
-require 'smart_app_launch_test_kit'
-require_relative 'urls'
-require_relative 'tags'
-
-module USCoreTestKit
-  module Client
-    module USCoreClientV400
-      module MockUdapSmartServer
-        class TokenEndpoint < Inferno::DSL::SuiteEndpoint
-          include SMARTAppLaunch::MockSMARTServer::SMARTTokenResponseCreation
-          include UDAPSecurityTestKit::MockUDAPServer::UDAPTokenResponseCreation
-          include URLs
-
-          def test_run_identifier
-            case request.params[:grant_type]
-            when UDAPSecurityTestKit::CLIENT_CREDENTIALS_TAG
-              UDAPSecurityTestKit::MockUDAPServer.client_id_from_client_assertion(request.params[:client_assertion])
-            when UDAPSecurityTestKit::AUTHORIZATION_CODE_TAG
-              UDAPSecurityTestKit::MockUDAPServer.issued_token_to_client_id(request.params[:code])
-            when UDAPSecurityTestKit::REFRESH_TOKEN_TAG
-              UDAPSecurityTestKit::MockUDAPServer.issued_token_to_client_id(
-                UDAPSecurityTestKit::MockUDAPServer.refresh_token_to_authorization_code(request.params[:refresh_token])
-              )
-            end
-          end
-
-          def make_response
-            if request.params[:udap].present?
-              case request.params[:grant_type]
-              when UDAPSecurityTestKit::AUTHORIZATION_CODE_TAG
-                make_udap_authorization_code_token_response
-              when UDAPSecurityTestKit::REFRESH_TOKEN_TAG
-                make_udap_refresh_token_response
-              else
-                UDAPSecurityTestKit::MockUDAPServer.update_response_for_invalid_assertion(
-                  response,
-                  "unsupported grant_type: #{request.params[:grant_type]}"
-                )
-              end
-            else
-              suite_options_list = Inferno::Repositories::TestSessions.new.find(result.test_session_id)&.suite_options
-              suite_options_hash = suite_options_list&.map { |option| [option.id, option.value] }&.to_h
-              smart_authentication_approach =
-                SMARTAppLaunch::SMARTClientOptions.smart_authentication_approach(suite_options_hash)
-              
-              case request.params[:grant_type]
-              when SMARTAppLaunch::AUTHORIZATION_CODE_TAG
-                make_smart_authorization_code_token_response(smart_authentication_approach)
-              when SMARTAppLaunch::REFRESH_TOKEN_TAG
-                make_smart_refresh_token_response(smart_authentication_approach)
-              else
-                SMARTAppLaunch::MockSMARTServer.update_response_for_invalid_assertion(
-                  response,
-                  "unsupported grant_type: #{request.params[:grant_type]}"
-                )
-              end
-            end
-          end
-
-          def update_result
-            nil # never update for now
-          end
-
-          def tags
-            tags = [UDAPSecurityTestKit::TOKEN_TAG]
-            tags << (request.params[:udap].present? ? UDAPSecurityTestKit::UDAP_TAG : SMARTAppLaunch::SMART_TAG)
-            if [UDAPSecurityTestKit::CLIENT_CREDENTIALS_TAG, 
-                UDAPSecurityTestKit::AUTHORIZATION_CODE_TAG, 
-                UDAPSecurityTestKit::REFRESH_TOKEN_TAG].include?(request.params[:grant_type])
-              tags << request.params[:grant_type]
-            end
-
-            tags
-          end
-        end
-      end
-    end
-  end
-end

data/lib/us_core_test_kit/client/generated/v5.0.1/auth_udap_group.rb

@@ -1,31 +0,0 @@
-require 'udap_security_test_kit'
-require_relative 'tags'
-
-module USCoreTestKit
-  module Client
-    module USCoreClientV501
-      class ClientAuthUDAPGroup < Inferno::TestGroup
-        id :us_core_client_v501_auth_udap
-        title 'Review UDAP Authentication Interactions'
-        description %(
-          During these tests, Inferno will verify that the client interacted with Inferno's
-          simulated UDAP authorization server in a conformant manner when requesting access tokens
-          and that the client under test was able to use provided access tokens to make US Core
-          requests.
-        )
-        run_as_group
-
-        test from: :udap_client_authorization_request_verification,
-            id: :us_core_client_v501_authorization_udap_verification,
-            config: { options: { endpoint_suite_id: :us_core_client_v501 } }
-        test from: :udap_client_token_request_ac_verification,
-            id: :us_core_client_v501_token_udap_verification,
-            config: { options: { endpoint_suite_id: :us_core_client_v501 } }
-        test from: :udap_client_token_use_verification,
-              config: {
-                options: { access_request_tags: [READ_REQUEST_TAG, SEARCH_REQUEST_TAG] }
-              }
-      end
-    end
-  end
-end

data/lib/us_core_test_kit/client/generated/v5.0.1/authorization_endpoint.rb

@@ -1,55 +0,0 @@
-# frozen_string_literal: true
-
-require 'udap_security_test_kit'
-require 'smart_app_launch_test_kit'
-require_relative 'urls'
-require_relative 'tags'
-require_relative '../../us_core_client_options'
-
-module USCoreTestKit
-  module Client
-    module USCoreClientV501
-      module MockUdapSmartServer
-        class AuthorizationEndpoint < Inferno::DSL::SuiteEndpoint
-          include SMARTAppLaunch::MockSMARTServer::SMARTAuthorizationResponseCreation
-          include UDAPSecurityTestKit::MockUDAPServer::UDAPAuthorizationResponseCreation
-          include USCoreClientOptions
-
-          def test_run_identifier
-            request.params[:client_id]
-          end
-
-          def suite_options
-            @suite_options ||=
-              Inferno::Repositories::TestSessions.new.find(result.test_session_id)
-                &.suite_options&.map { |so| [so.id, so.value] }&.to_h
-          end
-
-          def make_response
-            if selected_security_ig(suite_options) == UDAPSecurityTestKit::UDAP_TAG
-              make_udap_authorization_response
-            else
-              make_smart_authorization_response
-            end
-          end
-
-          def update_result
-            nil # never update for now
-          end
-
-          def tags
-            tags = [UDAPSecurityTestKit::AUTHORIZATION_TAG, UDAPSecurityTestKit::AUTHORIZATION_CODE_TAG]
-            tags <<
-              if selected_security_ig(suite_options) == UDAPSecurityTestKit::UDAP_TAG
-                UDAPSecurityTestKit::UDAP_TAG
-              else
-                SMARTAppLaunch::SMART_TAG
-              end
-
-            tags
-          end
-        end
-      end
-    end
-  end
-end

data/lib/us_core_test_kit/client/generated/v5.0.1/registration/configuration_display_udap_test.rb

@@ -1,40 +0,0 @@
-require_relative '../urls'
-
-module USCoreTestKit
-  module Client
-    module USCoreClientV501
-      class RegistrationConfigurationUDAPDisplay < Inferno::Test
-        include URLs
-
-        id :us_core_client_v501_reg_config_udap_display
-        title 'Confirm client configuration'
-        description %(
-          This test provides all the information needed for testers to configure
-          the client under test to communicate with Inferno's simulated US Core server
-          including UDAP endpoints to obtain access tokens.
-        )
-
-        input :client_id
-
-        run do
-          wait(
-            identifier: client_id,
-            message: %(
-              **Inferno Simulated Server Details**:
-
-              FHIR Base URL: `#{fhir_url}`
-
-              Authentication Details:
-              - UDAP Client Id: `#{client_id}`
-              - Authorization endpoint: `#{authorization_url}`
-              - Token endpoint: `#{token_url}`
-
-              [Click here](#{resume_pass_url}?token=#{client_id}) once you have configured
-              the client to connect to Inferno at the above endpoints.
-            )
-          )
-        end
-      end
-    end
-  end
-end

data/lib/us_core_test_kit/client/generated/v5.0.1/token_endpoint.rb

@@ -1,82 +0,0 @@
-# frozen_string_literal: true
-
-require 'udap_security_test_kit'
-require 'smart_app_launch_test_kit'
-require_relative 'urls'
-require_relative 'tags'
-
-module USCoreTestKit
-  module Client
-    module USCoreClientV501
-      module MockUdapSmartServer
-        class TokenEndpoint < Inferno::DSL::SuiteEndpoint
-          include SMARTAppLaunch::MockSMARTServer::SMARTTokenResponseCreation
-          include UDAPSecurityTestKit::MockUDAPServer::UDAPTokenResponseCreation
-          include URLs
-
-          def test_run_identifier
-            case request.params[:grant_type]
-            when UDAPSecurityTestKit::CLIENT_CREDENTIALS_TAG
-              UDAPSecurityTestKit::MockUDAPServer.client_id_from_client_assertion(request.params[:client_assertion])
-            when UDAPSecurityTestKit::AUTHORIZATION_CODE_TAG
-              UDAPSecurityTestKit::MockUDAPServer.issued_token_to_client_id(request.params[:code])
-            when UDAPSecurityTestKit::REFRESH_TOKEN_TAG
-              UDAPSecurityTestKit::MockUDAPServer.issued_token_to_client_id(
-                UDAPSecurityTestKit::MockUDAPServer.refresh_token_to_authorization_code(request.params[:refresh_token])
-              )
-            end
-          end
-
-          def make_response
-            if request.params[:udap].present?
-              case request.params[:grant_type]
-              when UDAPSecurityTestKit::AUTHORIZATION_CODE_TAG
-                make_udap_authorization_code_token_response
-              when UDAPSecurityTestKit::REFRESH_TOKEN_TAG
-                make_udap_refresh_token_response
-              else
-                UDAPSecurityTestKit::MockUDAPServer.update_response_for_invalid_assertion(
-                  response,
-                  "unsupported grant_type: #{request.params[:grant_type]}"
-                )
-              end
-            else
-              suite_options_list = Inferno::Repositories::TestSessions.new.find(result.test_session_id)&.suite_options
-              suite_options_hash = suite_options_list&.map { |option| [option.id, option.value] }&.to_h
-              smart_authentication_approach =
-                SMARTAppLaunch::SMARTClientOptions.smart_authentication_approach(suite_options_hash)
-              
-              case request.params[:grant_type]
-              when SMARTAppLaunch::AUTHORIZATION_CODE_TAG
-                make_smart_authorization_code_token_response(smart_authentication_approach)
-              when SMARTAppLaunch::REFRESH_TOKEN_TAG
-                make_smart_refresh_token_response(smart_authentication_approach)
-              else
-                SMARTAppLaunch::MockSMARTServer.update_response_for_invalid_assertion(
-                  response,
-                  "unsupported grant_type: #{request.params[:grant_type]}"
-                )
-              end
-            end
-          end
-
-          def update_result
-            nil # never update for now
-          end
-
-          def tags
-            tags = [UDAPSecurityTestKit::TOKEN_TAG]
-            tags << (request.params[:udap].present? ? UDAPSecurityTestKit::UDAP_TAG : SMARTAppLaunch::SMART_TAG)
-            if [UDAPSecurityTestKit::CLIENT_CREDENTIALS_TAG, 
-                UDAPSecurityTestKit::AUTHORIZATION_CODE_TAG, 
-                UDAPSecurityTestKit::REFRESH_TOKEN_TAG].include?(request.params[:grant_type])
-              tags << request.params[:grant_type]
-            end
-
-            tags
-          end
-        end
-      end
-    end
-  end
-end

data/lib/us_core_test_kit/client/generated/v6.1.0/auth_udap_group.rb

@@ -1,31 +0,0 @@
-require 'udap_security_test_kit'
-require_relative 'tags'
-
-module USCoreTestKit
-  module Client
-    module USCoreClientV610
-      class ClientAuthUDAPGroup < Inferno::TestGroup
-        id :us_core_client_v610_auth_udap
-        title 'Review UDAP Authentication Interactions'
-        description %(
-          During these tests, Inferno will verify that the client interacted with Inferno's
-          simulated UDAP authorization server in a conformant manner when requesting access tokens
-          and that the client under test was able to use provided access tokens to make US Core
-          requests.
-        )
-        run_as_group
-
-        test from: :udap_client_authorization_request_verification,
-            id: :us_core_client_v610_authorization_udap_verification,
-            config: { options: { endpoint_suite_id: :us_core_client_v610 } }
-        test from: :udap_client_token_request_ac_verification,
-            id: :us_core_client_v610_token_udap_verification,
-            config: { options: { endpoint_suite_id: :us_core_client_v610 } }
-        test from: :udap_client_token_use_verification,
-              config: {
-                options: { access_request_tags: [READ_REQUEST_TAG, SEARCH_REQUEST_TAG] }
-              }
-      end
-    end
-  end
-end