Skip to content

Commit e8ae3bc

Browse files
CCM-10160 minor fixes to workflows and precommits
1 parent 3b7b924 commit e8ae3bc

File tree

7 files changed

+11
-8
lines changed

7 files changed

+11
-8
lines changed

.github/workflows/pr_closed.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,4 +60,6 @@ jobs:
6060
--targetEnvironment "main" \
6161
--targetAccountGroup "nhs-notify-supplier-api-dev" \
6262
--targetComponent "${{ matrix.component }}" \
63-
--terraformAction "apply"
63+
--terraformAction "apply" \
64+
--overrideProjectName "nhs" \
65+
--overrideRoleName "nhs-main-acct-supplier-api-github-deploy"

.github/workflows/release_created.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,6 @@ jobs:
3636
--targetEnvironment "main" \
3737
--targetAccountGroup "nhs-notify-supplier-api-nonprod" \
3838
--targetComponent "${{ matrix.component }}" \
39-
--terraformAction "apply"
39+
--terraformAction "apply" \
40+
--overrideProjectName "nhs" \
41+
--overrideRoleName "nhs-main-acct-supplier-api-github-deploy"

infrastructure/terraform/components/api/README.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@ No requirements.
3131
|------|--------|---------|
3232
| <a name="module_authorizer_lambda"></a> [authorizer\_lambda](#module\_authorizer\_lambda) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.20/terraform-lambda.zip | n/a |
3333
| <a name="module_domain_truststore"></a> [domain\_truststore](#module\_domain\_truststore) | git::https://github.com/NHSDigital/nhs-notify-shared-modules.git//infrastructure/modules/s3bucket | v2.0.17 |
34-
| <a name="module_get_letters"></a> [get\_letters](#module\_get\_letters) | git::https://github.com/NHSDigital/nhs-notify-shared-modules.git//infrastructure/modules/lambda | v2.0.10 |
35-
| <a name="module_kms"></a> [kms](#module\_kms) | git::https://github.com/NHSDigital/nhs-notify-shared-modules.git//infrastructure/modules/kms | v2.0.10 |
3634
| <a name="module_get_letters"></a> [get\_letters](#module\_get\_letters) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.20/terraform-lambda.zip | n/a |
3735
| <a name="module_kms"></a> [kms](#module\_kms) | https://github.com/NHSDigital/nhs-notify-shared-modules/releases/download/v2.0.20/terraform-kms.zip | n/a |
3836
| <a name="module_logging_bucket"></a> [logging\_bucket](#module\_logging\_bucket) | git::https://github.com/NHSDigital/nhs-notify-shared-modules.git//infrastructure/modules/s3bucket | v2.0.17 |

sandbox/.eslintrc.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
// Use this file as a starting point for your project's .eslintrc.
2-
// Copy this file, and add rule overrides as needed.
31
{
42
"extends": "airbnb-base",
53
"rules": {

scripts/config/pre-commit.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ repos:
1515
args: ['--autofix']
1616
exclude: |
1717
(?x)^(
18+
package(-lock)?\.json$ |
1819
sdk/.* |
1920
someotherdir/.* |
2021
src/server/host/Properties/launchSettings.json
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
*
2+
!.gitignore

scripts/init.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ _install-dependency: # Install asdf dependency - mandatory: name=[listed in the
4646
asdf install ${name} $(or ${version},)
4747

4848
_install-dependencies: # Install all the dependencies listed in .tool-versions
49-
for plugin in $$(grep ^[a-z] .tool-versions | sed 's/[[:space:]].*//'); do
50-
make _install-dependency name="$${plugin}"
49+
for plugin in $$(grep '^[a-z]' .tool-versions | cut -f1 -d' '); do \
50+
echo "Installing $${plugin}..."; \
5151
done
5252

5353
clean:: # Remove all generated and temporary files (common) @Operations

0 commit comments

Comments
 (0)