Skip to content

Commit 34b7d34

Browse files
committed
CCM-10980: debugging
1 parent 937efd4 commit 34b7d34

File tree

10 files changed

+71
-63
lines changed

10 files changed

+71
-63
lines changed

.github/workflows/stage-2-test.yaml

Lines changed: 56 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -62,60 +62,60 @@ jobs:
6262
steps:
6363
- name: "Checkout code"
6464
uses: actions/checkout@v4
65-
- name: "Repo setup"
66-
run: |
67-
npm ci
68-
- name: "Generate dependencies"
69-
run: |
70-
npm run generate-dependencies --workspaces --if-present
71-
- name: "Run unit test suite"
72-
run: |
73-
make test-unit
74-
- name: "Save the result of fast test suite"
75-
uses: actions/upload-artifact@v4
76-
with:
77-
name: unit-tests
78-
path: "**/.reports/unit"
79-
include-hidden-files: true
80-
if: always()
81-
- name: "Save the result of code coverage"
82-
uses: actions/upload-artifact@v4
83-
with:
84-
name: code-coverage-report
85-
path: ".reports/lcov.info"
86-
if: always()
65+
# - name: "Repo setup"
66+
# run: |
67+
# npm ci
68+
# - name: "Generate dependencies"
69+
# run: |
70+
# npm run generate-dependencies --workspaces --if-present
71+
# - name: "Run unit test suite"
72+
# run: |
73+
# make test-unit
74+
# - name: "Save the result of fast test suite"
75+
# uses: actions/upload-artifact@v4
76+
# with:
77+
# name: unit-tests
78+
# path: "**/.reports/unit"
79+
# include-hidden-files: true
80+
# if: always()
81+
# - name: "Save the result of code coverage"
82+
# uses: actions/upload-artifact@v4
83+
# with:
84+
# name: code-coverage-report
85+
# path: ".reports/lcov.info"
86+
# if: always()
8787
test-lint:
8888
name: "Linting"
8989
runs-on: ubuntu-latest
9090
timeout-minutes: 5
9191
steps:
9292
- name: "Checkout code"
9393
uses: actions/checkout@v4
94-
- name: "Repo setup"
95-
run: |
96-
npm ci
97-
- name: "Generate dependencies"
98-
run: |
99-
npm run generate-dependencies --workspaces --if-present
100-
- name: "Run linting"
101-
run: |
102-
make test-lint
94+
# - name: "Repo setup"
95+
# run: |
96+
# npm ci
97+
# - name: "Generate dependencies"
98+
# run: |
99+
# npm run generate-dependencies --workspaces --if-present
100+
# - name: "Run linting"
101+
# run: |
102+
# make test-lint
103103
test-typecheck:
104104
name: "Typecheck"
105105
runs-on: ubuntu-latest
106106
timeout-minutes: 5
107107
steps:
108108
- name: "Checkout code"
109109
uses: actions/checkout@v4
110-
- name: "Repo setup"
111-
run: |
112-
npm ci
113-
- name: "Generate dependencies"
114-
run: |
115-
npm run generate-dependencies --workspaces --if-present
116-
- name: "Run typecheck"
117-
run: |
118-
make test-typecheck
110+
# - name: "Repo setup"
111+
# run: |
112+
# npm ci
113+
# - name: "Generate dependencies"
114+
# run: |
115+
# npm run generate-dependencies --workspaces --if-present
116+
# - name: "Run typecheck"
117+
# run: |
118+
# make test-typecheck
119119
test-coverage:
120120
name: "Test coverage"
121121
needs: [test-unit]
@@ -124,12 +124,12 @@ jobs:
124124
steps:
125125
- name: "Checkout code"
126126
uses: actions/checkout@v4
127-
- name: "Run test coverage check"
128-
run: |
129-
make test-coverage
130-
- name: "Save the coverage check result"
131-
run: |
132-
echo "Nothing to save"
127+
# - name: "Run test coverage check"
128+
# run: |
129+
# make test-coverage
130+
# - name: "Save the coverage check result"
131+
# run: |
132+
# echo "Nothing to save"
133133
perform-static-analysis:
134134
name: "Perform static analysis"
135135
needs: [test-unit]
@@ -143,13 +143,13 @@ jobs:
143143
uses: actions/checkout@v4
144144
with:
145145
fetch-depth: 0 # Full history is needed to improving relevancy of reporting
146-
- name: "Download coverage report for SONAR"
147-
uses: actions/download-artifact@v4
148-
with:
149-
name: code-coverage-report
150-
- name: "Perform static analysis"
151-
uses: ./.github/actions/perform-static-analysis
152-
with:
153-
sonar_organisation_key: "${{ vars.SONAR_ORGANISATION_KEY }}"
154-
sonar_project_key: "${{ vars.SONAR_PROJECT_KEY }}"
155-
sonar_token: "${{ secrets.SONAR_TOKEN }}"
146+
# - name: "Download coverage report for SONAR"
147+
# uses: actions/download-artifact@v4
148+
# with:
149+
# name: code-coverage-report
150+
# - name: "Perform static analysis"
151+
# uses: ./.github/actions/perform-static-analysis
152+
# with:
153+
# sonar_organisation_key: "${{ vars.SONAR_ORGANISATION_KEY }}"
154+
# sonar_project_key: "${{ vars.SONAR_PROJECT_KEY }}"
155+
# sonar_token: "${{ secrets.SONAR_TOKEN }}"

.github/workflows/stage-4-acceptance.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jobs:
6262
needs:
6363
- acceptance-tests
6464
- generate-sandbox-name
65-
if: always()
65+
# if: always()
6666

6767
uses: ./.github/workflows/dispatch_internal_repo_workflow.yaml
6868
secrets: inherit

infrastructure/terraform/components/acct/README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
| <a name="input_group"></a> [group](#input\_group) | The group variables are being inherited from (often synonmous with account short-name) | `string` | n/a | yes |
2323
| <a name="input_initial_cli_secrets_provision_override"></a> [initial\_cli\_secrets\_provision\_override](#input\_initial\_cli\_secrets\_provision\_override) | A map of default value to intialise SSM secret values with. Only useful for initial setup of the account due to lifecycle rules. | `map(string)` | `{}` | no |
2424
| <a name="input_kms_deletion_window"></a> [kms\_deletion\_window](#input\_kms\_deletion\_window) | When a kms key is deleted, how long should it wait in the pending deletion state? | `string` | `"30"` | no |
25-
| <a name="input_letter_suppliers"></a> [letter\_suppliers](#input\_letter\_suppliers) | Letter suppliers enabled in the account (across all environments) | <pre>map(object({<br/> enable_polling = bool<br/> default_supplier = optional(bool)<br/> }))</pre> | `{}` | no |
25+
| <a name="input_letter_suppliers"></a> [letter\_suppliers](#input\_letter\_suppliers) | Letter suppliers enabled in the account (across all environments) | <pre>map(object({<br> enable_polling = bool<br> default_supplier = optional(bool)<br> }))</pre> | `{}` | no |
2626
| <a name="input_log_retention_in_days"></a> [log\_retention\_in\_days](#input\_log\_retention\_in\_days) | The retention period in days for the Cloudwatch Logs events to be retained, default of 0 is indefinite | `number` | `0` | no |
2727
| <a name="input_oam_sink_id"></a> [oam\_sink\_id](#input\_oam\_sink\_id) | The ID of the Cloudwatch OAM sink in the appropriate observability account. | `string` | `""` | no |
2828
| <a name="input_observability_account_id"></a> [observability\_account\_id](#input\_observability\_account\_id) | The Observability Account ID that needs access | `string` | n/a | yes |
@@ -31,7 +31,7 @@
3131
| <a name="input_root_domain_name"></a> [root\_domain\_name](#input\_root\_domain\_name) | The service's root DNS root nameespace, like nonprod.nhsnotify.national.nhs.uk | `string` | `"nonprod.nhsnotify.national.nhs.uk"` | no |
3232
| <a name="input_support_sandbox_environments"></a> [support\_sandbox\_environments](#input\_support\_sandbox\_environments) | Does this account support dev sandbox environments? | `bool` | `false` | no |
3333
| <a name="input_vpc_cidr"></a> [vpc\_cidr](#input\_vpc\_cidr) | n/a | `string` | `"10.0.0.0/16"` | no |
34-
| <a name="input_vpc_subnet_cidr_bits"></a> [vpc\_subnet\_cidr\_bits](#input\_vpc\_subnet\_cidr\_bits) | Number of additional bits to use for subnetting the VPC CIDR block. The bits are evently distributed | <pre>object({<br/> public = number<br/> private = number<br/> })</pre> | <pre>{<br/> "private": 3,<br/> "public": 12<br/>}</pre> | no |
34+
| <a name="input_vpc_subnet_cidr_bits"></a> [vpc\_subnet\_cidr\_bits](#input\_vpc\_subnet\_cidr\_bits) | Number of additional bits to use for subnetting the VPC CIDR block. The bits are evently distributed | <pre>object({<br> public = number<br> private = number<br> })</pre> | <pre>{<br> "private": 3,<br> "public": 12<br>}</pre> | no |
3535
## Modules
3636

3737
| Name | Source | Version |
@@ -57,6 +57,7 @@
5757
| <a name="output_ses_testing_config"></a> [ses\_testing\_config](#output\_ses\_testing\_config) | n/a |
5858
| <a name="output_vpc_nat_ips"></a> [vpc\_nat\_ips](#output\_vpc\_nat\_ips) | n/a |
5959
| <a name="output_vpc_subnets"></a> [vpc\_subnets](#output\_vpc\_subnets) | n/a |
60+
6061
<!-- vale on -->
6162
<!-- markdownlint-enable -->
6263
<!-- END_TF_DOCS -->

infrastructure/terraform/components/app/README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
| <a name="input_external_email_domain"></a> [external\_email\_domain](#input\_external\_email\_domain) | Externally managed domain used to create an SES identity for sending emails from. Validation DNS records will need to be manually configured in the DNS provider. | `string` | `null` | no |
3838
| <a name="input_group"></a> [group](#input\_group) | The group variables are being inherited from (often synonmous with account short-name) | `string` | n/a | yes |
3939
| <a name="input_kms_deletion_window"></a> [kms\_deletion\_window](#input\_kms\_deletion\_window) | When a kms key is deleted, how long should it wait in the pending deletion state? | `string` | `"30"` | no |
40-
| <a name="input_letter_suppliers"></a> [letter\_suppliers](#input\_letter\_suppliers) | Letter suppliers enabled in the environment | <pre>map(object({<br/> email_addresses = list(string)<br/> enable_polling = bool<br/> default_supplier = optional(bool)<br/> }))</pre> | `{}` | no |
40+
| <a name="input_letter_suppliers"></a> [letter\_suppliers](#input\_letter\_suppliers) | Letter suppliers enabled in the environment | <pre>map(object({<br> email_addresses = list(string)<br> enable_polling = bool<br> default_supplier = optional(bool)<br> }))</pre> | `{}` | no |
4141
| <a name="input_log_retention_in_days"></a> [log\_retention\_in\_days](#input\_log\_retention\_in\_days) | The retention period in days for the Cloudwatch Logs events to be retained, default of 0 is indefinite | `number` | `0` | no |
4242
| <a name="input_observability_account_id"></a> [observability\_account\_id](#input\_observability\_account\_id) | The Observability Account ID that needs access | `string` | n/a | yes |
4343
| <a name="input_override_log_destination_arn"></a> [override\_log\_destination\_arn](#input\_override\_log\_destination\_arn) | Override the log destination ARN for this component. | `string` | `""` | no |
@@ -65,6 +65,7 @@
6565
|------|-------------|
6666
| <a name="output_amplify"></a> [amplify](#output\_amplify) | n/a |
6767
| <a name="output_deployment"></a> [deployment](#output\_deployment) | Deployment details used for post-deployment scripts |
68+
6869
<!-- vale on -->
6970
<!-- markdownlint-enable -->
7071
<!-- END_TF_DOCS -->

infrastructure/terraform/components/branch/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
## Outputs
3030

3131
No outputs.
32+
3233
<!-- vale on -->
3334
<!-- markdownlint-enable -->
3435
<!-- END_TF_DOCS -->

infrastructure/terraform/components/sandbox/README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
| <a name="input_environment"></a> [environment](#input\_environment) | The name of the tfscaffold environment | `string` | n/a | yes |
1919
| <a name="input_group"></a> [group](#input\_group) | The group variables are being inherited from (often synonymous with account short-name) | `string` | n/a | yes |
2020
| <a name="input_kms_deletion_window"></a> [kms\_deletion\_window](#input\_kms\_deletion\_window) | When a kms key is deleted, how long should it wait in the pending deletion state? | `string` | `"30"` | no |
21-
| <a name="input_letter_suppliers"></a> [letter\_suppliers](#input\_letter\_suppliers) | Letter suppliers enabled in the environment | <pre>map(object({<br/> email_addresses = list(string)<br/> enable_polling = bool<br/> default_supplier = optional(bool)<br/> }))</pre> | <pre>{<br/> "WTMMOCK": {<br/> "default_supplier": true,<br/> "email_addresses": [],<br/> "enable_polling": true<br/> }<br/>}</pre> | no |
21+
| <a name="input_letter_suppliers"></a> [letter\_suppliers](#input\_letter\_suppliers) | Letter suppliers enabled in the environment | <pre>map(object({<br> email_addresses = list(string)<br> enable_polling = bool<br> default_supplier = optional(bool)<br> }))</pre> | <pre>{<br> "WTMMOCK": {<br> "default_supplier": true,<br> "email_addresses": [],<br> "enable_polling": true<br> }<br>}</pre> | no |
2222
| <a name="input_log_retention_in_days"></a> [log\_retention\_in\_days](#input\_log\_retention\_in\_days) | The retention period in days for the Cloudwatch Logs events to be retained, default of 0 is indefinite | `number` | `0` | no |
2323
| <a name="input_parent_acct_environment"></a> [parent\_acct\_environment](#input\_parent\_acct\_environment) | Name of the environment responsible for the acct resources used, affects things like DNS zone. Useful for named dev environments | `string` | `"main"` | no |
2424
| <a name="input_project"></a> [project](#input\_project) | The name of the tfscaffold project | `string` | n/a | yes |
@@ -49,6 +49,7 @@
4949
| <a name="output_test_email_bucket_name"></a> [test\_email\_bucket\_name](#output\_test\_email\_bucket\_name) | n/a |
5050
| <a name="output_test_proof_requested_email_prefix"></a> [test\_proof\_requested\_email\_prefix](#output\_test\_proof\_requested\_email\_prefix) | n/a |
5151
| <a name="output_test_template_submitted_email_prefix"></a> [test\_template\_submitted\_email\_prefix](#output\_test\_template\_submitted\_email\_prefix) | n/a |
52+
5253
<!-- vale on -->
5354
<!-- markdownlint-enable -->
5455
<!-- END_TF_DOCS -->

infrastructure/terraform/modules/acct-ses-testing/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ No requirements.
3030
| <a name="output_bucket_name"></a> [bucket\_name](#output\_bucket\_name) | n/a |
3131
| <a name="output_iam_role_arn"></a> [iam\_role\_arn](#output\_iam\_role\_arn) | n/a |
3232
| <a name="output_rule_set_name"></a> [rule\_set\_name](#output\_rule\_set\_name) | n/a |
33+
3334
<!-- vale on -->
3435
<!-- markdownlint-enable -->
3536
<!-- END_TF_DOCS -->

infrastructure/terraform/modules/backend-api/README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ No requirements.
1111
|------|-------------|------|---------|:--------:|
1212
| <a name="input_aws_account_id"></a> [aws\_account\_id](#input\_aws\_account\_id) | The AWS Account ID (numeric) | `string` | n/a | yes |
1313
| <a name="input_cloudfront_distribution_arn"></a> [cloudfront\_distribution\_arn](#input\_cloudfront\_distribution\_arn) | ARN of the cloudfront distribution to serve files from | `string` | `null` | no |
14-
| <a name="input_cognito_config"></a> [cognito\_config](#input\_cognito\_config) | Cognito config | <pre>object({<br/> USER_POOL_ID : string,<br/> USER_POOL_CLIENT_ID : string<br/> })</pre> | n/a | yes |
14+
| <a name="input_cognito_config"></a> [cognito\_config](#input\_cognito\_config) | Cognito config | <pre>object({<br> USER_POOL_ID : string,<br> USER_POOL_CLIENT_ID : string<br> })</pre> | n/a | yes |
1515
| <a name="input_component"></a> [component](#input\_component) | The variable encapsulating the name of this component | `string` | n/a | yes |
1616
| <a name="input_csi"></a> [csi](#input\_csi) | CSI from the parent component | `string` | n/a | yes |
1717
| <a name="input_email_domain"></a> [email\_domain](#input\_email\_domain) | Email domain | `string` | n/a | yes |
@@ -22,7 +22,7 @@ No requirements.
2222
| <a name="input_function_s3_bucket"></a> [function\_s3\_bucket](#input\_function\_s3\_bucket) | Name of S3 bucket to upload lambda artefacts to | `string` | n/a | yes |
2323
| <a name="input_group"></a> [group](#input\_group) | The group variables are being inherited from (often synonmous with account short-name) | `string` | n/a | yes |
2424
| <a name="input_kms_key_arn"></a> [kms\_key\_arn](#input\_kms\_key\_arn) | KMS Key ARN | `string` | n/a | yes |
25-
| <a name="input_letter_suppliers"></a> [letter\_suppliers](#input\_letter\_suppliers) | Letter suppliers enabled in the environment | <pre>map(object({<br/> email_addresses = list(string)<br/> enable_polling = bool<br/> default_supplier = optional(bool)<br/> }))</pre> | n/a | yes |
25+
| <a name="input_letter_suppliers"></a> [letter\_suppliers](#input\_letter\_suppliers) | Letter suppliers enabled in the environment | <pre>map(object({<br> email_addresses = list(string)<br> enable_polling = bool<br> default_supplier = optional(bool)<br> }))</pre> | n/a | yes |
2626
| <a name="input_log_destination_arn"></a> [log\_destination\_arn](#input\_log\_destination\_arn) | Destination ARN to use for the log subscription filter | `string` | `""` | no |
2727
| <a name="input_log_retention_in_days"></a> [log\_retention\_in\_days](#input\_log\_retention\_in\_days) | The retention period in days for the Cloudwatch Logs events to be retained, default of 0 is indefinite | `number` | `0` | no |
2828
| <a name="input_log_subscription_role_arn"></a> [log\_subscription\_role\_arn](#input\_log\_subscription\_role\_arn) | The ARN of the IAM role to use for the log subscription filter | `string` | `""` | no |
@@ -76,6 +76,7 @@ No requirements.
7676
| <a name="output_sftp_mock_credential_path"></a> [sftp\_mock\_credential\_path](#output\_sftp\_mock\_credential\_path) | n/a |
7777
| <a name="output_sftp_poll_lambda_name"></a> [sftp\_poll\_lambda\_name](#output\_sftp\_poll\_lambda\_name) | n/a |
7878
| <a name="output_templates_table_name"></a> [templates\_table\_name](#output\_templates\_table\_name) | n/a |
79+
7980
<!-- vale on -->
8081
<!-- markdownlint-enable -->
8182
<!-- END_TF_DOCS -->

infrastructure/terraform/modules/cognito-triggers/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ No requirements.
2929
| Name | Description |
3030
|------|-------------|
3131
| <a name="output_pre_token_generation_lambda_function_arn"></a> [pre\_token\_generation\_lambda\_function\_arn](#output\_pre\_token\_generation\_lambda\_function\_arn) | n/a |
32+
3233
<!-- vale on -->
3334
<!-- markdownlint-enable -->
3435
<!-- END_TF_DOCS -->

infrastructure/terraform/modules/ses/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ No modules.
2525
| Name | Description |
2626
|------|-------------|
2727
| <a name="output_domain"></a> [domain](#output\_domain) | n/a |
28+
2829
<!-- vale on -->
2930
<!-- markdownlint-enable -->
3031
<!-- END_TF_DOCS -->

0 commit comments

Comments
 (0)