Skip to content

Commit 7e0b67b

Browse files
megan-bower4Rohooliojaklinger
authored
Release/2024 04 26 (#184)
* feature/PI-213-connect_to_ldap squash commits * feature/PI-315-update_trigger updated update trigger * feature/PI-315-update_trigger fixed action * feature/PI-315-update_trigger need to add policy to lambda to allow trigger to work * feature/PI-315-update_trigger removed policy as the lambda got triggered by sched * feature/PI-315-update_trigger update make command * feature/PI-315-update_trigger removed duplicate test * feature/PI-315-update_trigger removed unnecessary integration test - covered in individual cases * feature/PI-315-update_trigger removed unnecessary code * feature/PI-315-update_trigger removed unnecessary code * Created release branch * feature/PI-315-update_trigger squash commits * release/2024-04-26 fixed password logging security issue & updated etl-clear-state to work with persistent envs * [release/2024-04-26] Fix-forward: filter out people * [release/2024-04-26] add more person filters * [release/2024-04-26] move filter to ldap search * [release/2024-04-26] update readme * [release/2024-04-26] update our changelog --------- Co-authored-by: Rowan Gill <[email protected]> Co-authored-by: Joel Klinger <[email protected]>
1 parent b27d3a1 commit 7e0b67b

File tree

23 files changed

+378
-75
lines changed

23 files changed

+378
-75
lines changed

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Changelog
22

3+
## 2024-04-26
4+
- [PI-315] Update trigger
5+
- [PI-343] Remove people branch
6+
37
## 2024-04-16
48
- [PI-311] Smoke tests
59
- [PI-213] Connect to LDAP

‎README.md‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -271,3 +271,21 @@ Before running the bulk trigger, you need to clear the initial ETL state, do:
271271
```
272272
make etl--clear-state
273273
```
274+
275+
Before running the changelog trigger you additionally need to specify a changelog number (ideally close to the true latest changelog number, otherwise the logs will be pretty heavy!)
276+
277+
```
278+
make etl--clear-state SET_CHANGELOG_NUMBER=540210
279+
```
280+
281+
You can additionally set the workspace name if you want to clear the state for a given (e.g. persistent) workspace name:
282+
283+
```
284+
make etl--clear-state WORKSPACE=dev
285+
```
286+
287+
and
288+
289+
```
290+
make etl--clear-state WORKSPACE=dev SET_CHANGELOG_NUMBER=540210
291+
```

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2024.04.16
1+
2024.04.26

‎changelog/2024-04-26.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
- [PI-315] Update trigger
2+
- [PI-343] Remove people branch

‎infrastructure/terraform/per_account/dev/parameters/main.tf‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,3 +45,11 @@ resource "aws_secretsmanager_secret" "sds-hscn-endpoint" {
4545
resource "aws_secretsmanager_secret" "ldap-host" {
4646
name = "${terraform.workspace}-ldap-host"
4747
}
48+
49+
resource "aws_secretsmanager_secret" "ldap-changelog-user" {
50+
name = "${terraform.workspace}-ldap-changelog-user"
51+
}
52+
53+
resource "aws_secretsmanager_secret" "ldap-changelog-password" {
54+
name = "${terraform.workspace}-ldap-changelog-password"
55+
}

‎infrastructure/terraform/per_account/int/parameters/main.tf‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,19 @@ resource "aws_secretsmanager_secret" "apigee-cpm-apikey" {
3838
resource "aws_secretsmanager_secret" "apigee-app-key" {
3939
name = "${terraform.workspace}-apigee-app-key"
4040
}
41+
42+
resource "aws_secretsmanager_secret" "sds-hscn-endpoint" {
43+
name = "${terraform.workspace}-sds-hscn-endpoint"
44+
}
45+
46+
resource "aws_secretsmanager_secret" "ldap-host" {
47+
name = "${terraform.workspace}-ldap-host"
48+
}
49+
50+
resource "aws_secretsmanager_secret" "ldap-changelog-user" {
51+
name = "${terraform.workspace}-ldap-changelog-user"
52+
}
53+
54+
resource "aws_secretsmanager_secret" "ldap-changelog-password" {
55+
name = "${terraform.workspace}-ldap-changelog-password"
56+
}

‎infrastructure/terraform/per_account/prod/parameters/main.tf‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,19 @@ resource "aws_secretsmanager_secret" "apigee-cpm-apikey" {
3838
resource "aws_secretsmanager_secret" "apigee-app-key" {
3939
name = "${terraform.workspace}-apigee-app-key"
4040
}
41+
42+
resource "aws_secretsmanager_secret" "sds-hscn-endpoint" {
43+
name = "${terraform.workspace}-sds-hscn-endpoint"
44+
}
45+
46+
resource "aws_secretsmanager_secret" "ldap-host" {
47+
name = "${terraform.workspace}-ldap-host"
48+
}
49+
50+
resource "aws_secretsmanager_secret" "ldap-changelog-user" {
51+
name = "${terraform.workspace}-ldap-changelog-user"
52+
}
53+
54+
resource "aws_secretsmanager_secret" "ldap-changelog-password" {
55+
name = "${terraform.workspace}-ldap-changelog-password"
56+
}

‎infrastructure/terraform/per_account/qa/parameters/main.tf‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,19 @@ resource "aws_secretsmanager_secret" "apigee-cpm-apikey" {
3838
resource "aws_secretsmanager_secret" "apigee-app-key" {
3939
name = "${terraform.workspace}-apigee-app-key"
4040
}
41+
42+
resource "aws_secretsmanager_secret" "sds-hscn-endpoint" {
43+
name = "${terraform.workspace}-sds-hscn-endpoint"
44+
}
45+
46+
resource "aws_secretsmanager_secret" "ldap-host" {
47+
name = "${terraform.workspace}-ldap-host"
48+
}
49+
50+
resource "aws_secretsmanager_secret" "ldap-changelog-user" {
51+
name = "${terraform.workspace}-ldap-changelog-user"
52+
}
53+
54+
resource "aws_secretsmanager_secret" "ldap-changelog-password" {
55+
name = "${terraform.workspace}-ldap-changelog-password"
56+
}

‎infrastructure/terraform/per_account/ref/parameters/main.tf‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,3 +46,11 @@ resource "aws_secretsmanager_secret" "sds-hscn-endpoint" {
4646
resource "aws_secretsmanager_secret" "ldap-host" {
4747
name = "${terraform.workspace}-ldap-host"
4848
}
49+
50+
resource "aws_secretsmanager_secret" "ldap-changelog-user" {
51+
name = "${terraform.workspace}-ldap-changelog-user"
52+
}
53+
54+
resource "aws_secretsmanager_secret" "ldap-changelog-password" {
55+
name = "${terraform.workspace}-ldap-changelog-password"
56+
}

‎infrastructure/terraform/per_workspace/modules/etl/sds/main.tf‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -319,6 +319,12 @@ data "aws_security_groups" "sds-ldap" {
319319
data "aws_secretsmanager_secret_version" "ldap_host" {
320320
secret_id = "${var.environment}-ldap-host"
321321
}
322+
data "aws_secretsmanager_secret_version" "ldap_changelog_user" {
323+
secret_id = "${var.environment}-ldap-changelog-user"
324+
}
325+
data "aws_secretsmanager_secret_version" "ldap_changelog_password" {
326+
secret_id = "${var.environment}-ldap-changelog-password"
327+
}
322328

323329
module "trigger_update" {
324330
source = "./trigger/"
@@ -341,11 +347,13 @@ module "trigger_update" {
341347
# all compiled dependencies can find each other. Note: this is a hack - and
342348
# may result in version mismatches between system libs on the lambda. The stable
343349
# alternative is to run or deploy the service from a container.
344-
LD_LIBRARY_PATH = "/opt/python:/var/lang/lib:/lib64:/usr/lib64:/var/runtime:/var/runtime/lib:/var/task:/var/task/lib:/opt/lib"
345-
TRUSTSTORE_BUCKET = var.truststore_bucket.id
346-
CPM_FQDN = "cpm.thirdparty.nhs.uk"
347-
LDAP_HOST = data.aws_secretsmanager_secret_version.ldap_host.secret_string
348-
ETL_BUCKET = module.bucket.s3_bucket_id
350+
LD_LIBRARY_PATH = "/opt/python:/var/lang/lib:/lib64:/usr/lib64:/var/runtime:/var/runtime/lib:/var/task:/var/task/lib:/opt/lib"
351+
TRUSTSTORE_BUCKET = var.truststore_bucket.id
352+
CPM_FQDN = "cpm.thirdparty.nhs.uk"
353+
LDAP_HOST = data.aws_secretsmanager_secret_version.ldap_host.secret_string
354+
LDAP_CHANGELOG_USER = data.aws_secretsmanager_secret_version.ldap_changelog_user.secret_string
355+
LDAP_CHANGELOG_PASSWORD = data.aws_secretsmanager_secret_version.ldap_changelog_password.secret_string
356+
ETL_BUCKET = module.bucket.s3_bucket_id
349357
}
350358

351359
vpc_subnet_ids = data.aws_subnets.lambda-connectivity-private.ids

0 commit comments

Comments
 (0)