aws-sdk-transfer 1.66.0 → 1.68.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58d5e4c2d91330af71ae3926307b4261e081d18cfe625310af5124fda56e79fb
-  data.tar.gz: 19948910922f1034587d5c5b50876c2a00f695d622a681ad99483e96dd438ab4
+  metadata.gz: fea65db9c058c1b92c949a5a7efc40bd5f967865eb4ca92880be5b020cfc8c33
+  data.tar.gz: afc7f782c3e8482741bfa49baf23f5e36c19bd0291d614612d1d8cf6bfd8029a
 SHA512:
-  metadata.gz: c02666f8f44edf2c33a19ae47bfefc0f2d67b1c36908f701d5a996893818818bb38768b041879655619649f3ba5f411033881529272e9d1d53ad5163bbb24f54
-  data.tar.gz: 92393ea32b6a36e087b68757e52bcf2c532ee833714c82aa470f86dd185e7b818cbc1a111e5dfe97a93e575e268d03b310d274e826cf295e98ffd4ad7fd6cc78
+  metadata.gz: 39261dd8b5aff9b5a3e263867fa959dc7ecb25921b45289038a8d1837bbdc13fed11a1ac000932e213e47f5ebc8f4cd11f9206c59ed2f1835f1fca2cc255c905
+  data.tar.gz: 1d6f4b7e2af636625201d6a360b81d28473f3548030e47a0c23b915ab7dc06d52d17b66e9f208edb10740936b8353fe072fcf3c9fec97399780068505c05db8b

data/CHANGELOG.md

@@ -1,6 +1,16 @@
 Unreleased Changes
 ------------------
 
+1.68.0 (2023-05-15)
+------------------
+
+* Feature - This release introduces the ability to require both password and SSH key when users authenticate to your Transfer Family servers that use the SFTP protocol.
+
+1.67.0 (2023-02-07)
+------------------
+
+* Feature - Updated the documentation for the ImportCertificate API call, and added examples.
+
 1.66.0 (2023-01-18)
 ------------------
 

data/VERSION

@@ -1 +1 @@
-1.66.0
+1.68.0

data/lib/aws-sdk-transfer/client.rb

@@ -561,8 +561,7 @@ module Aws::Transfer
     #   The landing directory (folder) for files transferred by using the AS2
     #   protocol.
     #
-    #   A `BaseDirectory` example is
-    #   *DOC-EXAMPLE-BUCKET*/*home*/*mydirectory*.
+    #   A `BaseDirectory` example is `/DOC-EXAMPLE-BUCKET/home/mydirectory`.
     #
     # @option params [required, String] :access_role
     #   With AS2, you can send files by calling `StartFileTransfer` and
@@ -882,7 +881,7 @@ module Aws::Transfer
     #   SFTP-enabled server to a new server, don't update the host key.
     #   Accidentally changing a server's host key can be disruptive.
     #
-    #   For more information, see [Update host keys for your SFTP-enabled
+    #   For more information, see [Manage host keys for your SFTP-enabled
     #   server][1] in the *Transfer Family User Guide*.
     #
     #
@@ -890,8 +889,9 @@ module Aws::Transfer
     #   [1]: https://docs.aws.amazon.com/transfer/latest/userguide/edit-server-config.html#configuring-servers-change-host-key
     #
     # @option params [Types::IdentityProviderDetails] :identity_provider_details
-    #   Required when `IdentityProviderType` is set to `AWS_DIRECTORY_SERVICE`
-    #   or `API_GATEWAY`. Accepts an array containing all of the information
+    #   Required when `IdentityProviderType` is set to
+    #   `AWS_DIRECTORY_SERVICE`, `Amazon Web Services_LAMBDA` or
+    #   `API_GATEWAY`. Accepts an array containing all of the information
     #   required to use a directory in `AWS_DIRECTORY_SERVICE` or invoke a
     #   customer-supplied authentication API, including the API Gateway URL.
     #   Not required when `IdentityProviderType` is set to `SERVICE_MANAGED`.
@@ -915,7 +915,7 @@ module Aws::Transfer
     #
     #   Use the `AWS_LAMBDA` value to directly use an Lambda function as your
     #   identity provider. If you choose this value, you must specify the ARN
-    #   for the Lambda function in the `Function` parameter or the
+    #   for the Lambda function in the `Function` parameter for the
     #   `IdentityProviderDetails` data type.
     #
     # @option params [String] :logging_role
@@ -965,14 +965,15 @@ module Aws::Transfer
     #
     #   * If `Protocol` includes either `FTP` or `FTPS`, then the
     #     `EndpointType` must be `VPC` and the `IdentityProviderType` must be
-    #     `AWS_DIRECTORY_SERVICE` or `API_GATEWAY`.
+    #     either `AWS_DIRECTORY_SERVICE`, `AWS_LAMBDA`, or `API_GATEWAY`.
     #
     #   * If `Protocol` includes `FTP`, then `AddressAllocationIds` cannot be
     #     associated.
     #
     #   * If `Protocol` is set only to `SFTP`, the `EndpointType` can be set
-    #     to `PUBLIC` and the `IdentityProviderType` can be set to
-    #     `SERVICE_MANAGED`.
+    #     to `PUBLIC` and the `IdentityProviderType` can be set any of the
+    #     supported identity types: `SERVICE_MANAGED`,
+    #     `AWS_DIRECTORY_SERVICE`, `AWS_LAMBDA`, or `API_GATEWAY`.
     #
     #   * If `Protocol` includes `AS2`, then the `EndpointType` must be `VPC`,
     #     and domain must be Amazon S3.
@@ -1014,10 +1015,11 @@ module Aws::Transfer
     #   Specifies the workflow ID for the workflow to assign and the execution
     #   role that's used for executing the workflow.
     #
-    #   In additon to a workflow to execute when a file is uploaded
-    #   completely, `WorkflowDeatails` can also contain a workflow ID (and
+    #   In addition to a workflow to execute when a file is uploaded
+    #   completely, `WorkflowDetails` can also contain a workflow ID (and
     #   execution role) for a workflow to execute on partial upload. A partial
-    #   upload occurs when a file is open when the session disconnects.
+    #   upload occurs when the server session disconnects while the file is
+    #   still being uploaded.
     #
     # @return [Types::CreateServerResponse] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
     #
@@ -1042,6 +1044,7 @@ module Aws::Transfer
     #       invocation_role: "Role",
     #       directory_id: "DirectoryId",
     #       function: "Function",
+    #       sftp_authentication_methods: "PASSWORD", # accepts PASSWORD, PUBLIC_KEY, PUBLIC_KEY_OR_PASSWORD, PUBLIC_KEY_AND_PASSWORD
     #     },
     #     identity_provider_type: "SERVICE_MANAGED", # accepts SERVICE_MANAGED, API_GATEWAY, AWS_DIRECTORY_SERVICE, AWS_LAMBDA
     #     logging_role: "Role",
@@ -1191,8 +1194,20 @@ module Aws::Transfer
     #   The public portion of the Secure Shell (SSH) key used to authenticate
     #   the user to the server.
     #
+    #   The three standard SSH public key format elements are `<key type>`,
+    #   `<body base64>`, and an optional `<comment>`, with spaces between each
+    #   element.
+    #
     #   Transfer Family accepts RSA, ECDSA, and ED25519 keys.
     #
+    #   * For RSA keys, the key type is `ssh-rsa`.
+    #
+    #   * For ED25519 keys, the key type is `ssh-ed25519`.
+    #
+    #   * For ECDSA keys, the key type is either `ecdsa-sha2-nistp256`,
+    #     `ecdsa-sha2-nistp384`, or `ecdsa-sha2-nistp521`, depending on the
+    #     size of the key you generated.
+    #
     # @option params [Array<Types::Tag>] :tags
     #   Key-value pairs that can be used to group and search for users. Tags
     #   are metadata attached to users for any purpose.
@@ -1268,28 +1283,32 @@ module Aws::Transfer
     #   The `TYPE` specifies which of the following actions is being taken for
     #   this step.
     #
-    #   * *COPY*\: Copy the file to another location.
+    #   * <b> <code>COPY</code> </b> - Copy the file to another location.
+    #
+    #   * <b> <code>CUSTOM</code> </b> - Perform a custom step with an Lambda
+    #     function target.
     #
-    #   * *CUSTOM*\: Perform a custom step with an Lambda function target.
+    #   * <b> <code>DECRYPT</code> </b> - Decrypt a file that was encrypted
+    #     before it was uploaded.
     #
-    #   * *DELETE*\: Delete the file.
+    #   * <b> <code>DELETE</code> </b> - Delete the file.
     #
-    #   * *TAG*\: Add a tag to the file.
+    #   * <b> <code>TAG</code> </b> - Add a tag to the file.
     #
     #   <note markdown="1"> Currently, copying and tagging are supported only on S3.
     #
     #    </note>
     #
-    #   For file location, you specify either the S3 bucket and key, or the
-    #   EFS file system ID and path.
+    #   For file location, you specify either the Amazon S3 bucket and key, or
+    #   the Amazon EFS file system ID and path.
     #
     # @option params [Array<Types::WorkflowStep>] :on_exception_steps
     #   Specifies the steps (actions) to take if errors are encountered during
     #   execution of the workflow.
     #
-    #   <note markdown="1"> For custom steps, the lambda function needs to send `FAILURE` to the
+    #   <note markdown="1"> For custom steps, the Lambda function needs to send `FAILURE` to the
     #   call back API to kick off the exception steps. Additionally, if the
-    #   lambda does not send `SUCCESS` before it times out, the exception
+    #   Lambda does not send `SUCCESS` before it times out, the exception
     #   steps are executed.
     #
     #    </note>
@@ -1556,7 +1575,7 @@ module Aws::Transfer
       req.send_request(options)
     end
 
-    # Deletes the host key that's specified in the `HoskKeyId` parameter.
+    # Deletes the host key that's specified in the `HostKeyId` parameter.
     #
     # @option params [required, String] :server_id
     #   The identifier of the server that contains the host key that you are
@@ -1919,6 +1938,14 @@ module Aws::Transfer
     # You can use `DescribeExecution` to check the details of the execution
     # of the specified workflow.
     #
+    # <note markdown="1"> This API call only returns details for in-progress workflows.
+    #
+    #  If you provide an ID for an execution that is not in progress, or if
+    # the execution doesn't match the specified workflow ID, you receive a
+    # `ResourceNotFound` exception.
+    #
+    #  </note>
+    #
     # @option params [required, String] :execution_id
     #   A unique identifier for the execution of a workflow.
     #
@@ -2146,6 +2173,7 @@ module Aws::Transfer
     #   resp.server.identity_provider_details.invocation_role #=> String
     #   resp.server.identity_provider_details.directory_id #=> String
     #   resp.server.identity_provider_details.function #=> String
+    #   resp.server.identity_provider_details.sftp_authentication_methods #=> String, one of "PASSWORD", "PUBLIC_KEY", "PUBLIC_KEY_OR_PASSWORD", "PUBLIC_KEY_AND_PASSWORD"
     #   resp.server.identity_provider_type #=> String, one of "SERVICE_MANAGED", "API_GATEWAY", "AWS_DIRECTORY_SERVICE", "AWS_LAMBDA"
     #   resp.server.logging_role #=> String
     #   resp.server.post_authentication_login_banner #=> String
@@ -2337,15 +2365,24 @@ module Aws::Transfer
     #   Specifies whether this certificate is used for signing or encryption.
     #
     # @option params [required, String] :certificate
-    #   The file that contains the certificate to import.
+    #   * For the CLI, provide a file path for a certificate in URI format.
+    #     For example, `--certificate file://encryption-cert.pem`.
+    #     Alternatively, you can provide the raw content.
+    #
+    #   * For the SDK, specify the raw content of a certificate file. For
+    #     example, `` --certificate "`cat encryption-cert.pem`" ``.
     #
     # @option params [String] :certificate_chain
     #   An optional list of certificates that make up the chain for the
     #   certificate that's being imported.
     #
     # @option params [String] :private_key
-    #   The file that contains the private key for the certificate that's
-    #   being imported.
+    #   * For the CLI, provide a file path for a private key in URI format.For
+    #     example, `--private-key file://encryption-key.pem`. Alternatively,
+    #     you can provide the raw content of the private key file.
+    #
+    #   * For the SDK, specify the raw content of a private key file. For
+    #     example, `` --private-key "`cat encryption-key.pem`" ``
     #
     # @option params [Time,DateTime,Date,Integer,String] :active_date
     #   An optional date that specifies when the certificate becomes active.
@@ -2402,7 +2439,7 @@ module Aws::Transfer
     #   importing.
     #
     # @option params [required, String] :host_key_body
-    #   The public key portion of an SSH key pair.
+    #   The private key portion of an SSH key pair.
     #
     #   Transfer Family accepts RSA, ECDSA, and ED25519 keys.
     #
@@ -2445,9 +2482,9 @@ module Aws::Transfer
       req.send_request(options)
     end
 
-    # Adds a Secure Shell (SSH) public key to a user account identified by a
-    # `UserName` value assigned to the specific file transfer
-    # protocol-enabled server, identified by `ServerId`.
+    # Adds a Secure Shell (SSH) public key to a Transfer Family user
+    # identified by a `UserName` value assigned to the specific file
+    # transfer protocol-enabled server, identified by `ServerId`.
     #
     # The response returns the `UserName` value, the `ServerId` value, and
     # the name of the `SshPublicKeyId`.
@@ -2461,7 +2498,8 @@ module Aws::Transfer
     #   Transfer Family accepts RSA, ECDSA, and ED25519 keys.
     #
     # @option params [required, String] :user_name
-    #   The name of the user account that is assigned to one or more servers.
+    #   The name of the Transfer Family user that is assigned to one or more
+    #   servers.
     #
     # @return [Types::ImportSshPublicKeyResponse] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
     #
@@ -2691,7 +2729,12 @@ module Aws::Transfer
       req.send_request(options)
     end
 
-    # Lists all executions for the specified workflow.
+    # Lists all in-progress executions for the specified workflow.
+    #
+    # <note markdown="1"> If the specified workflow ID cannot be found, `ListExecutions` returns
+    # a `ResourceNotFound` exception.
+    #
+    #  </note>
     #
     # @option params [Integer] :max_results
     #   Specifies the maximum number of executions to return.
@@ -2703,7 +2746,7 @@ module Aws::Transfer
     #
     #   This is useful for pagination, for instance. If you have 100
     #   executions for a workflow, you might only want to list first 10. If
-    #   so, call the API by specifying the `max-results`\:
+    #   so, call the API by specifying the `max-results`:
     #
     #   `aws transfer list-executions --max-results 10`
     #
@@ -3061,7 +3104,8 @@ module Aws::Transfer
       req.send_request(options)
     end
 
-    # Lists all of your workflows.
+    # Lists all workflows associated with your Amazon Web Services account
+    # for your current region.
     #
     # @option params [Integer] :max_results
     #   Specifies the maximum number of workflows to return.
@@ -3256,8 +3300,8 @@ module Aws::Transfer
     #
     # @option params [required, Array<Types::Tag>] :tags
     #   Key-value pairs assigned to ARNs that you can use to group and search
-    #   for resources by type. You can attach this metadata to user accounts
-    #   for any purpose.
+    #   for resources by type. You can attach this metadata to resources
+    #   (servers, users, workflows, and so on) for any purpose.
     #
     # @return [Struct] Returns an empty {Seahorse::Client::Response response}.
     #
@@ -3293,10 +3337,16 @@ module Aws::Transfer
     # The `ServerId` and `UserName` parameters are required. The
     # `ServerProtocol`, `SourceIp`, and `UserPassword` are all optional.
     #
-    # <note markdown="1"> You cannot use `TestIdentityProvider` if the `IdentityProviderType` of
-    # your server is `SERVICE_MANAGED`.
+    # Note the following:
     #
-    #  </note>
+    # * You cannot use `TestIdentityProvider` if the `IdentityProviderType`
+    #   of your server is `SERVICE_MANAGED`.
+    #
+    # * `TestIdentityProvider` does not work with keys: it only accepts
+    #   passwords.
+    #
+    # * `TestIdentityProvider` can test the password operation for a custom
+    #   Identity Provider that handles keys and passwords.
     #
     # * If you provide any incorrect values for any parameters, the
     #   `Response` field is empty.
@@ -3313,7 +3363,11 @@ module Aws::Transfer
     #   error:
     #
     #   `An error occurred (ResourceNotFoundException) when calling the
-    #   TestIdentityProvider operation: Unknown server`
+    #   TestIdentityProvider operation: Unknown server`.
+    #
+    #   It is possible your sever is in a different region. You can specify
+    #   a region by adding the following: `--region region-code`, such as
+    #   `--region us-east-2` to specify a server in **US East (Ohio)**.
     #
     # @option params [required, String] :server_id
     #   A system-assigned identifier for a specific server. That server's
@@ -3330,14 +3384,16 @@ module Aws::Transfer
     #
     #   * File Transfer Protocol (FTP)
     #
+    #   * Applicability Statement 2 (AS2)
+    #
     # @option params [String] :source_ip
-    #   The source IP address of the user account to be tested.
+    #   The source IP address of the account to be tested.
     #
     # @option params [required, String] :user_name
-    #   The name of the user account to be tested.
+    #   The name of the account to be tested.
     #
     # @option params [String] :user_password
-    #   The password of the user account to be tested.
+    #   The password of the account to be tested.
     #
     # @return [Types::TestIdentityProviderResponse] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
     #
@@ -3956,7 +4012,7 @@ module Aws::Transfer
     #   SFTP-enabled server to a new server, don't update the host key.
     #   Accidentally changing a server's host key can be disruptive.
     #
-    #   For more information, see [Update host keys for your SFTP-enabled
+    #   For more information, see [Manage host keys for your SFTP-enabled
     #   server][1] in the *Transfer Family User Guide*.
     #
     #
@@ -4014,14 +4070,15 @@ module Aws::Transfer
     #
     #   * If `Protocol` includes either `FTP` or `FTPS`, then the
     #     `EndpointType` must be `VPC` and the `IdentityProviderType` must be
-    #     `AWS_DIRECTORY_SERVICE` or `API_GATEWAY`.
+    #     either `AWS_DIRECTORY_SERVICE`, `AWS_LAMBDA`, or `API_GATEWAY`.
     #
     #   * If `Protocol` includes `FTP`, then `AddressAllocationIds` cannot be
     #     associated.
     #
     #   * If `Protocol` is set only to `SFTP`, the `EndpointType` can be set
-    #     to `PUBLIC` and the `IdentityProviderType` can be set to
-    #     `SERVICE_MANAGED`.
+    #     to `PUBLIC` and the `IdentityProviderType` can be set any of the
+    #     supported identity types: `SERVICE_MANAGED`,
+    #     `AWS_DIRECTORY_SERVICE`, `AWS_LAMBDA`, or `API_GATEWAY`.
     #
     #   * If `Protocol` includes `AS2`, then the `EndpointType` must be `VPC`,
     #     and domain must be Amazon S3.
@@ -4034,16 +4091,17 @@ module Aws::Transfer
     #
     # @option params [required, String] :server_id
     #   A system-assigned unique identifier for a server instance that the
-    #   user account is assigned to.
+    #   Transfer Family user is assigned to.
     #
     # @option params [Types::WorkflowDetails] :workflow_details
     #   Specifies the workflow ID for the workflow to assign and the execution
     #   role that's used for executing the workflow.
     #
-    #   In additon to a workflow to execute when a file is uploaded
-    #   completely, `WorkflowDeatails` can also contain a workflow ID (and
+    #   In addition to a workflow to execute when a file is uploaded
+    #   completely, `WorkflowDetails` can also contain a workflow ID (and
     #   execution role) for a workflow to execute on partial upload. A partial
-    #   upload occurs when a file is open when the session disconnects.
+    #   upload occurs when the server session disconnects while the file is
+    #   still being uploaded.
     #
     #   To remove an associated workflow from a server, you can provide an
     #   empty `OnUpload` object, as in the following example.
@@ -4079,6 +4137,7 @@ module Aws::Transfer
     #       invocation_role: "Role",
     #       directory_id: "DirectoryId",
     #       function: "Function",
+    #       sftp_authentication_methods: "PASSWORD", # accepts PASSWORD, PUBLIC_KEY, PUBLIC_KEY_OR_PASSWORD, PUBLIC_KEY_AND_PASSWORD
     #     },
     #     logging_role: "NullableRole",
     #     post_authentication_login_banner: "PostAuthenticationLoginBanner",
@@ -4208,8 +4267,8 @@ module Aws::Transfer
     #   users' transfer requests.
     #
     # @option params [required, String] :server_id
-    #   A system-assigned unique identifier for a server instance that the
-    #   user account is assigned to.
+    #   A system-assigned unique identifier for a Transfer Family server
+    #   instance that the user is assigned to.
     #
     # @option params [required, String] :user_name
     #   A unique string that identifies a user and is associated with a server
@@ -4273,7 +4332,7 @@ module Aws::Transfer
         params: params,
         config: config)
       context[:gem_name] = 'aws-sdk-transfer'
-      context[:gem_version] = '1.66.0'
+      context[:gem_version] = '1.68.0'
       Seahorse::Client::Request.new(handlers, context)
     end
 

data/lib/aws-sdk-transfer/client_api.rb

@@ -249,6 +249,7 @@ module Aws::Transfer
     ServiceUnavailableException = Shapes::StructureShape.new(name: 'ServiceUnavailableException')
     SessionId = Shapes::StringShape.new(name: 'SessionId')
     SetStatOption = Shapes::StringShape.new(name: 'SetStatOption')
+    SftpAuthenticationMethods = Shapes::StringShape.new(name: 'SftpAuthenticationMethods')
     SigningAlg = Shapes::StringShape.new(name: 'SigningAlg')
     SourceFileLocation = Shapes::StringShape.new(name: 'SourceFileLocation')
     SourceIp = Shapes::StringShape.new(name: 'SourceIp')
@@ -721,6 +722,7 @@ module Aws::Transfer
     IdentityProviderDetails.add_member(:invocation_role, Shapes::ShapeRef.new(shape: Role, location_name: "InvocationRole"))
     IdentityProviderDetails.add_member(:directory_id, Shapes::ShapeRef.new(shape: DirectoryId, location_name: "DirectoryId"))
     IdentityProviderDetails.add_member(:function, Shapes::ShapeRef.new(shape: Function, location_name: "Function"))
+    IdentityProviderDetails.add_member(:sftp_authentication_methods, Shapes::ShapeRef.new(shape: SftpAuthenticationMethods, location_name: "SftpAuthenticationMethods"))
     IdentityProviderDetails.struct_class = Types::IdentityProviderDetails
 
     ImportCertificateRequest.add_member(:usage, Shapes::ShapeRef.new(shape: CertificateUsageType, required: true, location_name: "Usage"))

data/lib/aws-sdk-transfer/endpoint_parameters.rb

@@ -50,9 +50,6 @@ module Aws::Transfer
 
     def initialize(options = {})
       self[:region] = options[:region]
-      if self[:region].nil?
-        raise ArgumentError, "Missing required EndpointParameter: :region"
-      end
       self[:use_dual_stack] = options[:use_dual_stack]
       self[:use_dual_stack] = false if self[:use_dual_stack].nil?
       if self[:use_dual_stack].nil?

data/lib/aws-sdk-transfer/endpoint_provider.rb

@@ -14,36 +14,39 @@ module Aws::Transfer
       use_dual_stack = parameters.use_dual_stack
       use_fips = parameters.use_fips
       endpoint = parameters.endpoint
-      if (partition_result = Aws::Endpoints::Matchers.aws_partition(region))
-        if Aws::Endpoints::Matchers.set?(endpoint)
-          if Aws::Endpoints::Matchers.boolean_equals?(use_fips, true)
-            raise ArgumentError, "Invalid Configuration: FIPS and custom endpoint are not supported"
-          end
-          if Aws::Endpoints::Matchers.boolean_equals?(use_dual_stack, true)
-            raise ArgumentError, "Invalid Configuration: Dualstack and custom endpoint are not supported"
-          end
-          return Aws::Endpoints::Endpoint.new(url: endpoint, headers: {}, properties: {})
-        end
-        if Aws::Endpoints::Matchers.boolean_equals?(use_fips, true) && Aws::Endpoints::Matchers.boolean_equals?(use_dual_stack, true)
-          if Aws::Endpoints::Matchers.boolean_equals?(true, Aws::Endpoints::Matchers.attr(partition_result, "supportsFIPS")) && Aws::Endpoints::Matchers.boolean_equals?(true, Aws::Endpoints::Matchers.attr(partition_result, "supportsDualStack"))
-            return Aws::Endpoints::Endpoint.new(url: "https://transfer-fips.#{region}.#{partition_result['dualStackDnsSuffix']}", headers: {}, properties: {})
-          end
-          raise ArgumentError, "FIPS and DualStack are enabled, but this partition does not support one or both"
-        end
+      if Aws::Endpoints::Matchers.set?(endpoint)
         if Aws::Endpoints::Matchers.boolean_equals?(use_fips, true)
-          if Aws::Endpoints::Matchers.boolean_equals?(true, Aws::Endpoints::Matchers.attr(partition_result, "supportsFIPS"))
-            return Aws::Endpoints::Endpoint.new(url: "https://transfer-fips.#{region}.#{partition_result['dnsSuffix']}", headers: {}, properties: {})
-          end
-          raise ArgumentError, "FIPS is enabled but this partition does not support FIPS"
+          raise ArgumentError, "Invalid Configuration: FIPS and custom endpoint are not supported"
         end
         if Aws::Endpoints::Matchers.boolean_equals?(use_dual_stack, true)
-          if Aws::Endpoints::Matchers.boolean_equals?(true, Aws::Endpoints::Matchers.attr(partition_result, "supportsDualStack"))
-            return Aws::Endpoints::Endpoint.new(url: "https://transfer.#{region}.#{partition_result['dualStackDnsSuffix']}", headers: {}, properties: {})
+          raise ArgumentError, "Invalid Configuration: Dualstack and custom endpoint are not supported"
+        end
+        return Aws::Endpoints::Endpoint.new(url: endpoint, headers: {}, properties: {})
+      end
+      if Aws::Endpoints::Matchers.set?(region)
+        if (partition_result = Aws::Endpoints::Matchers.aws_partition(region))
+          if Aws::Endpoints::Matchers.boolean_equals?(use_fips, true) && Aws::Endpoints::Matchers.boolean_equals?(use_dual_stack, true)
+            if Aws::Endpoints::Matchers.boolean_equals?(true, Aws::Endpoints::Matchers.attr(partition_result, "supportsFIPS")) && Aws::Endpoints::Matchers.boolean_equals?(true, Aws::Endpoints::Matchers.attr(partition_result, "supportsDualStack"))
+              return Aws::Endpoints::Endpoint.new(url: "https://transfer-fips.#{region}.#{partition_result['dualStackDnsSuffix']}", headers: {}, properties: {})
+            end
+            raise ArgumentError, "FIPS and DualStack are enabled, but this partition does not support one or both"
+          end
+          if Aws::Endpoints::Matchers.boolean_equals?(use_fips, true)
+            if Aws::Endpoints::Matchers.boolean_equals?(true, Aws::Endpoints::Matchers.attr(partition_result, "supportsFIPS"))
+              return Aws::Endpoints::Endpoint.new(url: "https://transfer-fips.#{region}.#{partition_result['dnsSuffix']}", headers: {}, properties: {})
+            end
+            raise ArgumentError, "FIPS is enabled but this partition does not support FIPS"
+          end
+          if Aws::Endpoints::Matchers.boolean_equals?(use_dual_stack, true)
+            if Aws::Endpoints::Matchers.boolean_equals?(true, Aws::Endpoints::Matchers.attr(partition_result, "supportsDualStack"))
+              return Aws::Endpoints::Endpoint.new(url: "https://transfer.#{region}.#{partition_result['dualStackDnsSuffix']}", headers: {}, properties: {})
+            end
+            raise ArgumentError, "DualStack is enabled but this partition does not support DualStack"
           end
-          raise ArgumentError, "DualStack is enabled but this partition does not support DualStack"
+          return Aws::Endpoints::Endpoint.new(url: "https://transfer.#{region}.#{partition_result['dnsSuffix']}", headers: {}, properties: {})
         end
-        return Aws::Endpoints::Endpoint.new(url: "https://transfer.#{region}.#{partition_result['dnsSuffix']}", headers: {}, properties: {})
       end
+      raise ArgumentError, "Invalid Configuration: Missing Region"
       raise ArgumentError, 'No endpoint could be resolved'
 
     end