Merge pull request #1121 from NHSDigital/NRL-1841-refresh-account-wide-infra

anjalitrace2-nhs · web-flow · commit f955882a9807 · 2026-01-27T09:40:40.000Z
NRL-1841 terraform should create different volume pointer tables
diff --git a/terraform/account-wide-infrastructure/test/dynamodb__pointers-table.tf b/terraform/account-wide-infrastructure/test/dynamodb__pointers-table.tf
@@ -32,6 +32,21 @@ module "ref-pointers-table" {
 }
 
 module "perftest-pointers-table" {
+  source      = "../modules/pointers-table"
+  name_prefix = "nhsd-nrlf--perftest"
+}
+
+module "perftest-pointers-baseline-table" {
   source      = "../modules/pointers-table"
   name_prefix = "nhsd-nrlf--perftest-baseline"
 }
+
+module "perftest-pointers-15m-table" {
+  source      = "../modules/pointers-table"
+  name_prefix = "nhsd-nrlf--perftest-15m"
+}
+
+module "perftest-pointers-55m-table" {
+  source      = "../modules/pointers-table"
+  name_prefix = "nhsd-nrlf--perftest-55m"
+}
diff --git a/terraform/bastion/README.md b/terraform/bastion/README.md
@@ -8,6 +8,7 @@ Before deploying a bastion, you will need:
 
 - An AWS account that has already been bootstrapped, as described in [bootstrap/README.md](../bootstrap/README.md) and has the account-wide infrastructure deployed as described in [account-wide-infrastructure/README.md](../account-wide-infrastructure/README.md). This is a one-time account setup step.
 - Your CLI configured to allow authentication to your AWS account
+- Install the [Session Manager plugin](https://docs.aws.amazon.com/systems-manager/latest/userguide/session-manager-working-with-install-plugin.html)
 
 ## Deploying a bastion
 
@@ -17,39 +18,41 @@ To deploy a bastion, you will first need to login to the AWS mgmt account on the
 
 Then, initialise the Terraform workspace with:
 
-```
+```sh
+assume nhsd-nrlf-mgmt
 terraform init
 ```
 
 If you want a read-only bastion (can only READ from the pointers table), plan the deployment like this:
 
-```
+```sh
 make plan-ro
 ```
 
 If you want a read-write bastion (can READ and WRITE from the pointers table), plan the deployment like this:
 
-```
+```sh
 make plan-rw
 ```
 
 Once you're happy with your planned changes, you can apply them with:
 
-```
+```sh
 terraform apply ./bastion.tfplan
 ```
 
 ## Using the bastion
 
 Once the bastion is deployed, you can connect to it via SSH with:
 
-```
-make ssh-connection
+```sh
+assume nhsd-nrlf-test
+make ssh-connection ENV={env}
 ```
 
 Once connected successfully, you will be at the SSM `$` prompt. To switch to the `nrlf_ops` user, run this command:
 
-```
+```sh
 sudo su - nrlf_ops
 ```
 
@@ -68,7 +71,7 @@ see [user-data.sh](./scripts/user-data.sh) for exactly what's installed on there
 
 If you're running the `make ssh-connection` and are seeing this error:
 
-```
+```sh
 $ make ssh-connection
 ....
 An error occurred (TargetNotConnected) when calling the StartSession operation: i-06ff25164f004bee4 is not connected.
@@ -78,21 +81,23 @@ $
 
 If you've just created a new bastion, it may be that it hasn't started yet. Log in to the AWS console to see the state of the EC2 instance. Press the "Connect" button in the console and choose the SSM tab to see if things are working ok.
 
+If there is a warning in the Session Manager tab "SSM Agent is not online" when you attempt to connect then it's likely the SSM agent has crashed. Reboot the EC2 instance and the SSM agent should start up with previous cli history preserved. To reboot via the CLI, find your EC2 instance > Instance state > Reboot instance. Beware: rebooting the EC2 instance will terminate any ongoing processes.
+
 If the EC2 instance is running and the console looks ok, check you have defined the correct ENV param for the installed bastion.
 
 #### The `nrlf_ops` using is missing
 
 If you're getting this error:
 
-```
+```sh
 $ sudo su - nrlf_ops
 su: user some_other does not exist or the user entry does not contain all the required fields
 $
 ```
 
 If you've just created a new bastion, you may need to wait a little until the cloud-init script has finished. You can check the status of this process with:
 
-```
+```sh
 sudo tail -f /var/log/cloud-init-output.log
 ```
 
@@ -102,7 +107,7 @@ If you're trying to access an AWS resource from the bastion and are getting an a
 
 You can check the role in the AWS console to work out if things are missing and can edit it there too for immediate access to the resources you need.
 
-If you want to permenantly grant new access to the bastion, you can add a policy and attach it to the EC2 instance in [iam.tf](iam.tf)
+If you want to permanently grant new access to the bastion, you can add a policy and attach it to the EC2 instance in [iam.tf](iam.tf)
 
 #### A tool I need is missing
 
