Skip to content

Commit 35ed0c6

Browse files
committed
Merge branch 'main' of https://github.com/NHSDigital/eps-assist-me into AEA-5507-code-tidy-up
2 parents fe8515e + ffb0421 commit 35ed0c6

File tree

8 files changed

+2357
-3
lines changed

8 files changed

+2357
-3
lines changed

.devcontainer/Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ ENV PATH="$PATH:/home/vscode/.asdf/bin/:/workspaces/eps-assist-me/node_modules/.
2424
# Install ASDF plugins
2525
RUN asdf plugin add python; \
2626
asdf plugin add poetry https://github.com/asdf-community/asdf-poetry.git; \
27+
asdf plugin add shellcheck https://github.com/luizm/asdf-shellcheck.git; \
28+
asdf plugin add nodejs https://github.com/asdf-vm/asdf-nodejs.git; \
2729
asdf plugin add direnv; \
2830
asdf plugin add actionlint; \
2931
asdf plugin add ruby https://github.com/asdf-vm/asdf-ruby.git
@@ -32,7 +34,7 @@ RUN asdf plugin add python; \
3234
WORKDIR /workspaces/eps-assist-me
3335

3436
# Copy .tool-versions
35-
ADD .tool-versions /workspaces/prescriptionsforpatients/.tool-versions
37+
ADD .tool-versions /workspaces/eps-assist-me/.tool-versions
3638
ADD .tool-versions /home/vscode/.tool-versions
3739

3840
# Install tools

.tool-versions

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
nodejs 22.12.0
12
python 3.12.7
23
poetry 1.8.3
34
shellcheck 0.10.0

Makefile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,17 @@ guard-%:
66

77
.PHONY: install build test publish release clean
88

9-
install: install-python install-hooks
9+
install: install-python install-hooks install-node
1010

1111
install-python:
1212
poetry install
1313

1414
install-hooks: install-python
1515
poetry run pre-commit install --install-hooks --overwrite
1616

17+
install-node:
18+
npm ci
19+
1720
pre-commit: git-secrets-docker-setup
1821
poetry run pre-commit run --all-files
1922

README.md

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,36 @@ This will ensure that your VSCode bash terminal prompts you for your GPG key pas
4242

4343
You can cache the gpg key passphrase by following instructions at https://superuser.com/questions/624343/keep-gnupg-credentials-cached-for-entire-user-session
4444

45+
### Setup
46+
47+
Ensure you have the following lines in the file .envrc
48+
49+
```bash
50+
export AWS_DEFAULT_PROFILE=prescription-dev
51+
```
52+
53+
Once you have saved .envrc, start a new terminal in vscode and run this command to authenticate against AWS
54+
55+
```bash
56+
make aws-configure
57+
```
58+
59+
Put the following values in:
60+
61+
```text
62+
SSO session name (Recommended): sso-session
63+
SSO start URL [None]: <USE VALUE OF SSO START URL FROM AWS LOGIN COMMAND LINE ACCESS INSTRUCTIONS ACCESSED FROM https://myapps.microsoft.com>
64+
SSO region [None]: eu-west-2
65+
SSO registration scopes [sso:account:access]:
66+
```
67+
68+
This will then open a browser window and you should authenticate with your hscic credentials
69+
You should then select the development account and set default region to be eu-west-2.
70+
71+
You will now be able to use AWS and SAM CLI commands to access the dev account. You can also use the AWS extension to view resources.
72+
73+
When the token expires, you may need to reauthorise using `make aws-login`
74+
4575
### CI Setup
4676

4777
The GitHub Actions require a secret to exist on the repo called "SONAR_TOKEN".

0 commit comments

Comments
 (0)