2.0.0

Author: DKroot

README.md

@@ -7,17 +7,18 @@ Configure and ssh or create a tunnel to an Oracle Cloud Infrastructure host via
 
 ### Setup ###
 
-0. Bash shell, SSH CLI client, `sed`, `sleep`, etc.
+1. Bash shell, `perl`, `sleep`, etc.
     * (macOS, Linux) Out-of-the-box 
     * (Windows) Install [WSL](https://learn.microsoft.com/en-us/windows/wsl/) or [Cygwin](https://www.cygwin.com/)
-1. `ssh` CLI client.
+2. `ssh` CLI client.
     * Generate an SSH key pair if you don't have any. One of the following SSH public keys in \`~/.ssh/\` is required: 
     \`id_rsa.pub\`, \`id_dsa.pub\`, \`id_ecdsa.pub\`, \`id_ed25519.pub\`, or \`id_xmss.pub\`. If there are multiple keys
     the first one found in this order will be used. The corresponding private key is usually also present there, but it
     can be moved to a credential vault and SSH agent, e.g. [1Password](https://developer.1password.com/docs/ssh).     
-2. Install and configure [OCI CLI](https://docs.oracle.com/en-us/iaas/Content/API/SDKDocs/cliinstall.htm).
-3. Install [`jq`](https://stedolan.github.io/jq/).
-4. Define the following environment variables. OCI menus below are as of October 2022. 
+3. Install and configure [OCI CLI](https://docs.oracle.com/en-us/iaas/Content/API/SDKDocs/cliinstall.htm).
+4. Install [`jq`](https://stedolan.github.io/jq/).
+5. Install [`PCRE`](https://www.pcre.org/).
+6. Define the following environment variables. OCI menus below are as of October 2022. 
     1. `OCI_INSTANCE`: OCI host Internal FQDN or Private IP. See `Compute` > `Instances` > {host} > `Primary VNIC`.
     2. `OCI_INSTANCE_OCID`. See `Compute` > `Instances` > {host} > `General information` > `OCID`
     3. `OCI_BASTION_OCID`. See `Identity & Security` > `Bastion` > {bastion} > `Bastion information` > `OCID`
@@ -26,8 +27,9 @@ Configure and ssh or create a tunnel to an Oracle Cloud Infrastructure host via
 
 ### Usage Examples ###
 
-* Create a bastion session and ssh using system environment vars: `ssh-oci-bastion.sh joe`
+* Create a bastion session and ssh as `taras` server user using the system environment vars: `ssh-oci-bastion.sh taras`
 * Create a bastion session and ssh: 
-  `OCI_INSTANCE=10.0.xx OCI_INSTANCE_OCID=ocid1.instance.xx OCI_BASTION_OCID=ocid1.bastion.xx ssh-oci-bastion.sh joe`
-* Create a bastion port-forwarding session and launch the tunnel for the port 1234: `ssh-oci-bastion.sh -p 1234` 
+  `OCI_INSTANCE=10.xx OCI_INSTANCE_OCID=ocid1.instance.xx OCI_BASTION_OCID=ocid1.bastion.xx ssh-oci-bastion.sh taras`
+* Create a bastion port-forwarding session and launch the tunnel for the port 1234: `ssh-oci-bastion.sh -p 1234`
+* Create a bastion session and ssh using the `ADMIN` OCI client profile: `ssh-oci-bastion.sh -o ADMIN taras`
 

ssh-oci-bastion.sh

@@ -174,7 +174,7 @@ if [[ $port ]]; then
 fi
 
 if [[ $HOST_USER ]]; then
-  echo -e "\nCreating a bastion session: this can take up to 1m:20s to succeed..."
+  echo -e "\nCreating a bastion session: this can take up to 1m:30s to succeed..."
   # `--session-ttl`: session duration in seconds (defaults to 30 minutes, maximum is 3 hours).
   # `--wait-interval-seconds`: state check interval (defaults to 30 seconds).
   # `--ssh-public-key-file` is required