Merge branch 'ab#76170' of https://github.com/Keyfactor/remote-file-orchestrator into ab#76170

Author: leefine02

README.md

@@ -120,10 +120,11 @@ Before installing the Remote File Universal Orchestrator extension, we recommend
 (f) - RFKDB store type only
 
 2. When orchestrating management of local or external certificate stores, the Remote File Orchestrator Extension makes
-   use of SFTP and/or SCP to transfer files to and from the orchestrated server. `SFTP/SCP` cannot make use of `sudo`, so
-   all folders containing certificate stores will need to allow SFTP/SCP file transfer for the user assigned to the
+   use of SCP or SFTP to transfer files to and from the orchestrated server. SCP is attempted first, and if that 
+   fails, SFTP is attempted. `SCP/SFTP` cannot make use of `sudo`, so
+   all folders containing certificate stores will need to allow SCP/SFTP file transfer for the user assigned to the
    certificate store/discovery job. If this is not possible, set the values in the `config.json` appropriately to use an
-   alternative upload/download folder that does allow `SFTP/SCP` file transfer. If the certificate store/discovery job is
+   alternative upload/download folder that does allow `SCP/SFTP` file transfer. If the certificate store/discovery job is
    configured for local (agent) access, the account running the Keyfactor Universal Orchestrator service must have
    access to read/write to the certificate store location, OR the `config.json` file must be set up to use the alternative
    upload/download file.
@@ -160,8 +161,8 @@ Please reference [Certificate Stores and Discovery Jobs](#certificate-stores-and
 creating certificate stores for the `RemoteFile` Orchestrator Extension.  
 
 </details>
-
-Please consult with your system administrator for more information on configuring `SSH/SFTP/SCP` or `WinRM` in your environment.
+C
+Please consult with your system administrator for more information on configuring `SSH/SCP/SFTP` or `WinRM` in your environment.
 
 
 ## Certificate Store Types
@@ -274,7 +275,6 @@ the Keyfactor Command Portal
    | SudoImpersonatingUser | Sudo Impersonating User | The SudoImpersonatingUser field should contain a valid user ID to impersonate using sudo on the destination Linux server. Example: 'impersonatedUserID'.  Overrides DefaultSudoImpersonatedUser [config.json](#post-installation) setting. | String |  | 🔲 Unchecked |
    | RemoveRootCertificate | Remove Root Certificate from Chain | Remove root certificate from chain when adding/renewing a certificate in a store. | Bool | False | 🔲 Unchecked |
    | IncludePortInSPN | Include Port in SPN for WinRM | Internally set the -IncludePortInSPN option when creating the remote PowerShell connection. Needed for some Kerberos configurations. | Bool | False | 🔲 Unchecked |
-   | FileTransferProtocol | File Transfer Protocol to Use | Which protocol should be used when uploading/downloading files - SCP, SFTP, or Both (try one, and then if necessary, the other).  Overrides FileTransferProtocol [config.json](#post-installation) setting. | MultipleChoice | ,SCP,SFTP,Both | 🔲 Unchecked |
    | SSHPort | SSH Port | Integer value representing the port that should be used when connecting to Linux servers over SSH.  Overrides SSHPort [config.json](#post-installation) setting. | String |  | 🔲 Unchecked |
    | UseShellCommands | Use Shell Commands | Recommended to be set to the default value of 'Y'.  For a detailed explanation of this setting, please refer to [Use Shell Commands Setting](#use-shell-commands-setting) | Bool | True | 🔲 Unchecked |
 
@@ -929,7 +929,6 @@ The Remote File Orchestrator Extension uses a JSON configuration file. It is loc
   "CreateStoreIfMissing": "N",
   "UseNegotiate": "N",
   "SeparateUploadFilePath": "",
-  "FileTransferProtocol": "SCP",
   "DefaultLinuxPermissionsOnStoreCreation": "600",
   "DefaultOwnerOnStoreCreation": "",
   "SSHPort": "",
@@ -944,7 +943,6 @@ The Remote File Orchestrator Extension uses a JSON configuration file. It is loc
 | `CreateStoreIfMissing`                   | `N`           | `Y/N`                                 | Determines if a certificate store should be created during a Management-Add job if it doesn't exist. If `N`, the job will return an error. If `Y`, the store will be created and the certificate added.                                                  |
 | `UseNegotiate`                           | `N`           | `Y/N`                                 | Determines if WinRM should use Negotiate (Y) when connecting to the remote server. Only applicable for Windows hosted certificate stores.                                                                                                                |
 | `SeparateUploadFilePath`                 |               | Any valid, existing Linux path        | Path on the orchestrated server for uploading/downloading temporary work files. If empty, the certificate store location will be used. Only applicable for Linux hosted certificate stores.                                                              |
-| `FileTransferProtocol`                   | `SCP`         | `SCP, SFTP, Both`                     | Protocol used for uploading/downloading files. If `Both`, `SCP` will be tried first, then `SFTP`. Only applicable for Linux hosted certificate stores.                                                                                                   |
 | `DefaultLinuxPermissionsOnStoreCreation` | `600`         | Any 3-digit value from 000-777        | Linux file permissions set on new certificate stores. If blank, permissions from the parent folder will be used. Only applicable for Linux hosted certificate stores.                                                                                    |
 | `DefaultOwnerOnStoreCreation`            |               | Any valid user id                     | Sets the owner for newly created certificate stores. Can include group with format `ownerId:groupId`. If blank, the owner of the parent folder will be used. Only applicable for Linux hosted certificate stores.                                        |
 | `SSHPort`                                |               | Any valid integer representing a port | The port that SSH is listening on. Default is 22. Only applicable for Linux hosted certificate stores.                                                                                                                                                   |
@@ -987,7 +985,6 @@ The Remote File Universal Orchestrator extension implements 6 Certificate Store
    | SudoImpersonatingUser | The SudoImpersonatingUser field should contain a valid user ID to impersonate using sudo on the destination Linux server. Example: 'impersonatedUserID'.  Overrides DefaultSudoImpersonatedUser [config.json](#post-installation) setting. |
    | RemoveRootCertificate | Remove root certificate from chain when adding/renewing a certificate in a store. |
    | IncludePortInSPN | Internally set the -IncludePortInSPN option when creating the remote PowerShell connection. Needed for some Kerberos configurations. |
-   | FileTransferProtocol | Which protocol should be used when uploading/downloading files - SCP, SFTP, or Both (try one, and then if necessary, the other).  Overrides FileTransferProtocol [config.json](#post-installation) setting. |
    | SSHPort | Integer value representing the port that should be used when connecting to Linux servers over SSH.  Overrides SSHPort [config.json](#post-installation) setting. |
    | UseShellCommands | Recommended to be set to the default value of 'Y'.  For a detailed explanation of this setting, please refer to [Use Shell Commands Setting](#use-shell-commands-setting) |
 
@@ -1023,7 +1020,6 @@ The Remote File Universal Orchestrator extension implements 6 Certificate Store
    | Properties.SudoImpersonatingUser | The SudoImpersonatingUser field should contain a valid user ID to impersonate using sudo on the destination Linux server. Example: 'impersonatedUserID'.  Overrides DefaultSudoImpersonatedUser [config.json](#post-installation) setting. |
    | Properties.RemoveRootCertificate | Remove root certificate from chain when adding/renewing a certificate in a store. |
    | Properties.IncludePortInSPN | Internally set the -IncludePortInSPN option when creating the remote PowerShell connection. Needed for some Kerberos configurations. |
-   | Properties.FileTransferProtocol | Which protocol should be used when uploading/downloading files - SCP, SFTP, or Both (try one, and then if necessary, the other).  Overrides FileTransferProtocol [config.json](#post-installation) setting. |
    | Properties.SSHPort | Integer value representing the port that should be used when connecting to Linux servers over SSH.  Overrides SSHPort [config.json](#post-installation) setting. |
    | Properties.UseShellCommands | Recommended to be set to the default value of 'Y'.  For a detailed explanation of this setting, please refer to [Use Shell Commands Setting](#use-shell-commands-setting) |
 
@@ -1654,7 +1650,7 @@ permissions and ownership when creating certificate stores will be based on the
 other Linux environmental settings.
 3. Discovery jobs are excluded and will still use the `find` shell command
 4. A rare issue exists where the user id assigned to a certificate store has an expired password causing the orchestrator to hang 
-when attempting an SFTP/SCP connection.  A modification was added to RemoteFile to check for this condition.  Running RemoteFile 
+when attempting an SCP/SFTP connection.  A modification was added to RemoteFile to check for this condition.  Running RemoteFile 
 with Use Shell Commands = N will cause this validation check to NOT occur.
 5. Both RFORA and RFKDB use proprietary CLI commands in order to manage their respective certificate stores.  These commands
 will still be executed when Use Shell Commands is set to Y.