Skip to content

Commit f922986

Browse files
authored
Merge pull request #1736 from companieshouse/CC-2691
CC-2691
2 parents f62268d + 1727dcf commit f922986

File tree

6 files changed

+80
-47
lines changed

6 files changed

+80
-47
lines changed

README.md

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -123,42 +123,41 @@ NB: All variables under the headings below are based on the contents of the vari
123123

124124
### Terraform Config variables
125125

126-
Key | Description
127-
----------------|---------------------------
126+
Key | Description
127+
----------------|---------------------------
128128
aws_bucket | The bucket used to store the current terraform state files
129129
remote_state_bucket | Alternative bucket used to store the remote state files from ch-service-terraform
130130
state_prefix | The bucket prefix used with the remote_state_bucket files
131131
deploy_to | Bucket namespace used with remote_state_bucket and state_prefix
132132

133133
### Environment
134134

135-
Key | Description
136-
----------------|---------------------------
137-
environment | The environment name, defined in environment's vars
138-
aws_region | The AWS region for deployment
135+
Key | Description
136+
----------------|---------------------------
137+
environment | The environment name, defined in environment's vars
138+
aws_region | The AWS region for deployment
139139
aws_profile | The AWS profile to use for deployment
140140
kms_alias |
141141

142142
### Docker container variables
143143

144-
Key | Description
144+
Key | Description
145145
----------------|---------------------------
146-
docker_registry | The FQDN of the Docker registry
146+
docker_registry | The FQDN of the Docker registry
147147

148148
### Service performance and scaling configs
149149

150150
Key | Description | Example Value
151151
----------------|--------------------------- |-------------------------
152152
desired_task_count | The desired ECS task count for this service | 1
153-
required_cpus | The required cpu resource for this service. 1024 here is 1 vCPU | 128
153+
required_cpus | The required cpu resource for this service. 1024 here is 1 vCPU | 128
154154
required_memory | The required memory for this service | 256
155155

156156
### Service environment variable configs (in addition to the common config variables)
157157

158158
Key | Description | Example Value
159159
----------------|--------------------------- |-------------------------
160160
overseas_entities_web_version | The version of the overseas entities web container to run. | 1.0
161-
account_local_url | Used in place of ACCOUNT_URL | `https://account.cidev.aws.chdev.org`
162161
cache_pool_size | Size of cache pool | 8
163162
default_session_expiration | Lifetime of sessions | 3600
164163
redirect_uri | Redirect users to homepage when trying to access other pages directly | `/`

nodemon.json

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
{
2-
"exec": "ts-node ./src/bin/www.ts",
3-
"ext": "ts,html",
4-
"watch": [
5-
"./src",
6-
"./views"
7-
]
8-
}
2+
"exec": "node --require ts-node/register --inspect=0.0.0.0:9229 ./src/bin/nodemon-entry.ts",
3+
"ext": "ts,html",
4+
"watch": ["./src","./views"],
5+
"ignore": [],
6+
"events": {
7+
"restart": "echo '🔄 ' Nodemon Restarting...",
8+
"crash": "echo '💥 ' Nodemon Crashed!"
9+
}
10+
}

package-lock.json

Lines changed: 50 additions & 27 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414
"sonarqube": "branch=$(git rev-parse --symbolic-full-name --abbrev-ref HEAD); if [[ $branch == \"HEAD\" ]]; then echo $branch && npm run sonarqube-base-branch; else echo $branch && npm run sonarqube-pull-request; fi;",
1515
"test": "jest",
1616
"coverage": "jest --coverage --forceExit --passWithNoTests",
17-
"prepare": "husky install"
17+
"prepare": "husky install",
18+
"chs-dev": "nodemon --legacy-watch"
1819
},
1920
"engines": {
20-
"npm": "^10",
2121
"node": ">=20.0.0"
2222
},
2323
"repository": {

src/bin/nodemon-entry.ts

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
import app from '../app';
2+
3+
const PORT = 3000;
4+
5+
app.set('port', PORT);
6+
7+
app.listen(PORT, () => {
8+
console.log(`✅ Application Ready. Running on port ${PORT}`);
9+
});

src/validation/relevant.period.required.information.validation.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ import { ErrorMessages } from "./error.messages";
33

44
export const relevantPeriodRequiredInformation = [
55
body("required_information").not().isEmpty().withMessage(ErrorMessages.SELECT_RELEVANT_PERIOD_REQUIRED_INFORMATION),
6-
];
6+
];

0 commit comments

Comments
 (0)