Skip to content

Conversation

@mabe13
Copy link
Collaborator

@mabe13 mabe13 commented May 23, 2025

Release Branch Pull Request

Description of Changes

Shared Resources 9.0

  • DI Pen test WAF and DynamoDB changes
  • Integration test case optimization

Shared Resources 9.1

  • Fix production smoke test with new service
  • Include Makefile changes to support Podman for development

JackPlowman and others added 30 commits February 8, 2023 11:37
# Task Branch Pull Request

**<https://nhsd-jira.digital.nhs.uk/browse/DSUEC-49>**

## Description of Changes

Adds a new report which shows when a pharmacy is profiled unexpectedly
# Task Branch Pull Request

**<https://nhsd-jira.digital.nhs.uk/browse/DSUEC-72>**

## Description of Changes

This PR fixes the codebuild stage which deletes nonprod environments
after a PR is merged ensuring less effort in cleaning up environments.
As well I have transitioned all DI-xxx branch name references to dsuec
# Task Branch Pull Request

**<https://nhsd-jira.digital.nhs.uk/browse/DSUEC-94>**

## Description of Changes

This PR migrates all demo environments to now connect to UAT2 database.
# Task Branch Pull Request

**<https://nhsd-jira.digital.nhs.uk/browse/DSUEC-82>**

## Description of Changes

Added 4 Integration tests to verify that palliative care report log
entries are working properly.

## Type of change

- Test

## Development Checklist

- [x] I have performed a self-review of my own code
- [x] Tests have added that prove my fix is effective or that my feature
works (Integration tests)
- [x] I have updated Dependabot to include my changes (if applicable)

## Code Reviewer Checklist

- [x] I can confirm the changes have been tested or approved by a tester
# Task Branch Pull Request

**<https://nhsd-jira.digital.nhs.uk/browse/DSUEC-95>**

## Description of Changes

This PR updates the CloudWatch Dashboard to be more useful. Such as
adding a graph, adding metrics as labels.
# Task Branch Pull Request

**<https://nhsd-jira.digital.nhs.uk/browse/DSUEC-96>**

## Description of Changes

This PR updates the GitHub actions to make them more useable and now
uses best practices.
…634)

# Task Branch Pull Request

**<https://nhsd-jira.digital.nhs.uk/browse/DSUEC-100>**

## Description of Changes

This PR allows the UecServices key of the change event to be different
to what is expected. Within reason!. To ensure DI continues to function
while the initial state is set to null in Profile Manager.
# Task Branch Pull Request

## Description of Changes

This PR stops the release branch from failing the branch checks
# Task Branch Pull Request

**<https://nhsd-jira.digital.nhs.uk/browse/DSUEC-105>**

## Description of Changes

This PR fixes the source version for removing blue/green environment to
ensure the right parameters are passed to the codebuild stage.
# Task Branch Pull Request

**<https://nhsd-jira.digital.nhs.uk/browse/DSUEC-121>**

## Description of Changes

This PR updates the terraform to use security group names to get the
security group id rather than getting the security group id from the RDS
connected security groups.
# Task Branch Pull Request

**<https://nhsd-jira.digital.nhs.uk/browse/DSUEC-120>**

## Description of Changes

This PR updates pyscopg2 to psycopg3 which is now called pyscopg (lol)
Also I've made minor changes to made it work.
# Task Branch Pull Request

**<https://nhsd-jira.digital.nhs.uk/browse/DSUEC-117>**

## Description of Changes

This PR upgrades DI's AWS Lambdas to use Python 3.10 with all the
benefits of it such as better error tracing and slightly improved
performance.
# Task Branch Pull Request

**<https://nhsd-jira.digital.nhs.uk/browse/DSUEC-75>**

## Description of Changes

Update the setup and configuration of the application to use Route 53
address when connection to the DoS databases

## Type of change

- Breaking change (fix or feature that would cause existing
functionality to not work as expected)

## Development Checklist

- [x] I have performed a self-review of my own code
- [x] Tests have added that prove my fix is effective or that my feature
works (Integration tests)
- [x] I have updated Dependabot to include my changes (if applicable)

## Code Reviewer Checklist

- [x] I can confirm the changes have been tested or approved by a tester
# Task Branch Pull Request

**<https://nhsd-jira.digital.nhs.uk/browse/DSUEC-127>**

## Description of Changes

Please include a summary of the change

## Type of change

- Bug fix (non-breaking change which fixes an issue)

## Development Checklist

- [x] I have performed a self-review of my own code
- [x] Tests have added that prove my fix is effective or that my feature
works (Integration tests)
- [x] I have updated Dependabot to include my changes (if applicable)

## Code Reviewer Checklist

- [x] I can confirm the changes have been tested or approved by a tester
# Task Branch Pull Request

**<https://nhsd-jira.digital.nhs.uk/browse/DSUEC-109>**

## Description of Changes

This PR skips the palliative care checks when Palliative Care has never
been set on Profile Manager
# Task Branch Pull Request

**<https://nhsd-jira.digital.nhs.uk/browse/DSUEC-125>**

## Description of Changes

Pin back Bandit Version to 1.7.4
# Task Branch Pull Request

**<https://nhsd-jira.digital.nhs.uk/browse/DSUEC-506>**

## Description of Changes

A change to the parser caused an issue with certain steps. This change
just replaces the wording so the step definition is unique.

## Type of change

Test

## Development Checklist

- [x] I have performed a self-review of my own code
- [x] Tests have added that prove my fix is effective or that my feature
works (Integration tests)
- [x] I have updated Dependabot to include my changes (if applicable)

## Code Reviewer Checklist

- [x] I can confirm the changes have been tested or approved by a tester
…r Aurora (#657)

# Task Branch Pull Request

**<https://nhsd-jira.digital.nhs.uk/browse/DSUEC-550>**

## Description of Changes

This PR updates the Security Group Names and Route53 entries to the
correct values

## Type of change

- Bug fix (non-breaking change which fixes an issue)

## Development Checklist

- [x] I have performed a self-review of my own code
- [x] Tests have added that prove my fix is effective or that my feature
works (Integration tests)
- [x] I have updated Dependabot to include my changes (if applicable)

## Code Reviewer Checklist

- [x] I can confirm the changes have been tested or approved by a tester
# Task Branch Pull Request

**<https://nhsd-jira.digital.nhs.uk/browse/DSUEC-577>**

## Description of Changes

This PR enhances to CodeQL Vulnerability Scanning to run more security
checks as well as quality checks.
# Task Branch Pull Request

**<https://nhsd-jira.digital.nhs.uk/browse/DSUEC-125>**

## Description of Changes

This PR fixes the latest warning messages from bandit

## Type of change

- Bug fix (non-breaking change which fixes an issue)
)

# Task Branch Pull Request

**<https://nhsd-jira.digital.nhs.uk/browse/DSUEC-129>**

## Description of Changes

This PR updates to code to Log only Type 13 to Unexpected Pharmacy
Profiling Report when multiple type 13s are present.
# Task Branch Pull Request

**<https://nhsd-jira.digital.nhs.uk/browse/DSUEC-578>**

## Description of Changes

Adds 2 new integration tests for report error messages regarding service
type

## Type of change

- Test

## Development Checklist

- [x] I have performed a self-review of my own code
- [x] Tests have added that prove my fix is effective or that my feature
works (Integration tests)
- [x] I have updated Dependabot to include my changes (if applicable)

## Code Reviewer Checklist

- [x] I can confirm the changes have been tested or approved by a tester
# Task Branch Pull Request

**<https://nhsd-jira.digital.nhs.uk/browse/DSUEC-118>**

## Description of Changes

This PR migrates all pipeline stages from the old pipeline roles to the
new pipelines roles

## Type of change

- Refactoring (non-breaking change which improves the structure of the
code)
# Task Branch Pull Request

**<https://nhsd-jira.digital.nhs.uk/browse/DSUEC-46>**

## Description of Changes

This PR allows palliative care SGSD to be updated in DoS.
# Task Branch Pull Request

**<https://nhsd-jira.digital.nhs.uk/browse/DSUEC-99>**

## Description of Changes

Additions to automation tests to enable the checking of database entries
when palliative care is enabled.

## Type of change

Delete not appropriate

- Test

## Development Checklist

- [x] I have performed a self-review of my own code
- [x] Tests have added that prove my fix is effective or that my feature
works (Integration tests)
- [x] I have updated Dependabot to include my changes (if applicable)

## Code Reviewer Checklist

- [x] I can confirm the changes have been tested or approved by a tester
# Task Branch Pull Request

**<https://nhsd-jira.digital.nhs.uk/browse/DSUEC-511>**

## Description of Changes

This PR adds security headers for the DI Endpoint API Gateway
# Task Branch Pull Request

**<https://nhsd-jira.digital.nhs.uk/browse/DSUEC-524>**

## Description of Changes

This PR adds new documentation diagrams for potential upcoming
architectures.
# Task Branch Pull Request

## Description of Changes

This PR updates the DoS Version when it refreshes the DoS Environment
# Task Branch Pull Request

**<https://nhsd-jira.digital.nhs.uk/browse/DS-513>**

## Description of Changes

Add Server Access Logging for the send email bucket
# Task Branch Pull Request

**<https://nhsd-jira.digital.nhs.uk/browse/DSUEC-106>**

## Description of Changes

This PR validates that an SDSGID exists within the database. If it
doesn't it logs to the generic error report and alerts to the slack
channel.
mabe13 and others added 23 commits February 23, 2024 15:13
# Task Branch Pull Request

**<https://nhsd-jira.digital.nhs.uk/browse/DS-2244>**

## Description of Changes

This change adds a penetration test profile call pen.mk. This profile is
based of the dev.mk profile but enables the WAF.
# Task Branch Pull Request

**<https://nhsd-jira.digital.nhs.uk/browse/DS-2400>**

## Description of Changes

This fixes an issue with a python package after an update to a
dependency removed a underlying function. Fixed by removing pytest-bdd
package version pinning.

Also included in this PR is a temp fix for the build image codebuild
jobs. A 20 second sleep has been put in place to give time for the aws
ecr security image scan to be ready, before it's checked.

## Type of change

- Bug fix (non-breaking change which fixes an issue)

## Development Checklist

- [x] I have performed a self-review of my own code
- [x] Tests have added that prove my fix is effective or that my feature
works (Integration tests)
- [x] I have updated Dependabot to include my changes (if applicable)

## Code Reviewer Checklist

- [x] I can confirm the changes have been tested or approved by a tester
# Task Branch Pull Request

**<https://nhsd-jira.digital.nhs.uk/browse/DS-2408>**

## Description of Changes

This PR adds a temp fix to the missed build image codebuild jobs used by
DI's pipelines. A 20 second sleep has been put in place to give time for
the aws ecr security image scan to be ready, before it's checked.


## Type of change

- Bug fix (non-breaking change which fixes an issue)

## Development Checklist

- [x] I have performed a self-review of my own code
- [x] Tests have added that prove my fix is effective or that my feature
works (Integration tests)
- [x] I have updated Dependabot to include my changes (if applicable)

## Code Reviewer Checklist

- [x] I can confirm the changes have been tested or approved by a tester
# Task Branch Pull Request

**<https://nhsd-jira.digital.nhs.uk/browse/DS-2362>**

## Description of Changes

Adds a tag on the DynamoDB table to indicate we won't be using Texas's
backup solution. We covered by PiTR (Point in Time Recovery)

## Type of change

- New feature (non-breaking change which adds functionality)


## Development Checklist

- [x] I have performed a self-review of my own code
- [x] Tests have added that prove my fix is effective or that my feature
works (Integration tests)
- [x] I have updated Dependabot to include my changes (if applicable)

## Code Reviewer Checklist

- [x] I can confirm the changes have been tested or approved by a tester
…#1023)

# Task Branch Pull Request

**<https://nhsd-jira.digital.nhs.uk/browse/DS-2622>**

## Description of Changes

Removes ECR vulnerability scan check from PR release codebuild job used
to build and test release in an environment.

Reason from removal can be found in the ticket. 

## Type of change

Delete not appropriate

- Bug fix (non-breaking change which fixes an issue)

## Development Checklist

- [x] I have performed a self-review of my own code
- [x] Tests have added that prove my fix is effective or that my feature
works (Integration tests)
- [x] I have updated Dependabot to include my changes (if applicable)

## Code Reviewer Checklist

- [x] I can confirm the changes have been tested or approved by a tester
…line (#1024)

# Task Branch Pull Request

**<https://nhsd-jira.digital.nhs.uk/browse/DS-2622>**

## Description of Changes

Removes ECR vulnerability scan check from the development pipeline,
missed from previous DS-2622 branch.

Reason from removal can be found in the ticket. 

## Type of change

Delete not appropriate

- Bug fix (non-breaking change which fixes an issue)

## Development Checklist

- [x] I have performed a self-review of my own code
- [x] Tests have added that prove my fix is effective or that my feature
works (Integration tests)
- [x] I have updated Dependabot to include my changes (if applicable)

## Code Reviewer Checklist

- [x] I can confirm the changes have been tested or approved by a tester
# Task Branch Pull Request

**<https://nhsd-jira.digital.nhs.uk/browse/DS-2622>**

## Description of Changes

Removes last ECR vulnerability scan check from the development pipeline,
missed from previous two DS-2622 branches. The last one only removed it
from webhook based buildspec.

Reason from removal can be found in the ticket. 

## Type of change

Delete not appropriate

- Bug fix (non-breaking change which fixes an issue)

## Development Checklist

- [x] I have performed a self-review of my own code
- [x] Tests have added that prove my fix is effective or that my feature
works (Integration tests)
- [x] I have updated Dependabot to include my changes (if applicable)

## Code Reviewer Checklist

- [x] I can confirm the changes have been tested or approved by a tester
# Task Branch Pull Request

**<https://nhsd-jira.digital.nhs.uk/browse/DS-2941>**

## Description of Changes

Please include a summary of the change

## Type of change

Delete not appropriate

- Bug fix (non-breaking change which fixes an issue)
- New feature (non-breaking change which adds functionality)
- Breaking change (fix or feature that would cause existing
functionality to not work as expected)
- Refactoring (non-breaking change which improves the structure of the
code)

## Development Checklist

- [x] I have performed a self-review of my own code
- [x] Tests have added that prove my fix is effective or that my feature
works (Integration tests)
- [x] I have updated Dependabot to include my changes (if applicable)

## Code Reviewer Checklist

- [x] I can confirm the changes have been tested or approved by a tester
# Task Branch Pull Request

**<https://nhsd-jira.digital.nhs.uk/browse/DS-1462>**

## Description of Changes

This PR upgrades Python to 3.12

---------

Co-authored-by: Jack Plowman <jack.plowman1@nhs.net>
Co-authored-by: Matthew Begley <matthewbegley@nhs.net>
# Task Branch Pull Request

**<https://nhsd-jira.digital.nhs.uk/browse/DS-2829>**

## Description of Changes

Adding missing HTTP security headers

---------

Co-authored-by: Sindhu <nsindhu26@gmail.com>
# Task Branch Pull Request

**<https://nhsd-jira.digital.nhs.uk/browse/DS-2840>**

## Description of Changes

SNS Encryption weakness
# Task Branch Pull Request

**<https://nhsd-jira.digital.nhs.uk/browse/DS-2834>**

## Description of Changes

Changed rule for port 5432 to only point to the dos-integration security
group rather than any IP address.
## Type of change

- Bug fix (PEN test change)

## Development Checklist

- [x] I have performed a self-review of my own code
- [x] Tests have added that prove my fix is effective or that my feature
works (Integration tests)
- [x] I have updated Dependabot to include my changes (if applicable)

## Code Reviewer Checklist

- [x] I can confirm the changes have been tested or approved by a tester

---------

Co-authored-by: Matthew Begley <matthewbegley@nhs.net>
# Task Branch Pull Request

**<https://nhsd-jira.digital.nhs.uk/browse/DS-3136>**

## Description of Changes

Added a new constant `DistanceSelling` to the OrganisationSubType list
## Type of change

Delete not appropriate
- New feature (non-breaking change which adds functionality)

## Development Checklist

- [x] I have performed a self-review of my own code
- [x] Tests have added that prove my fix is effective or that my feature
works (Integration tests)
- [x] I have updated Dependabot to include my changes (if applicable)

## Code Reviewer Checklist

- [x] I can confirm the changes have been tested or approved by a tester

---------

Co-authored-by: ManithaSrinivasa <manitha.srinivasa@accenture.com>
# Task Branch Pull Request

**<https://nhsd-jira.digital.nhs.uk/browse/DS-3268>**

## Description of Changes
This PR updates the lambda image builder for pipelines to use an arm
based CodeBuild job. The 86x version stopped working due to an inability
to install the docker xbuild plugin. The arm builder we use for task
environments has not been affect by this issue. As such it makes sense
to align the non-pipeline builder with the pipeline builder and have
both CodeBuild jobs use an arm based container to build arm based
images.

## Type of change

- Bug fix (non-breaking change which fixes an issue)

## Development Checklist

- [x] I have performed a self-review of my own code
- [x] Tests have added that prove my fix is effective or that my feature
works (Integration tests)
- [x] I have updated Dependabot to include my changes (if applicable)

## Code Reviewer Checklist

- [x] I can confirm the changes have been tested or approved by a tester
# Task Branch Pull Request

**<https://nhsd-jira.digital.nhs.uk/browse/DS-3019>**

## Description of Changes

This PR includes the upgrade of AWS Terraform provider to
version 5.68.0

## Type of change

- Infrastructure upgrade change 

## Development Checklist

- [x] I have performed a self-review of my own code
- [x] Tests have added that prove my fix is effective or that my feature
works (Integration tests)
- [x] I have updated Dependabot to include my changes (if applicable)

## Code Reviewer Checklist

- [x] I can confirm the changes have been tested or approved by a tester

Co-authored-by: ajmu1 <ajmu1@hscic.gov.uk>
…te (#1038)

# Task Branch Pull Request

**<https://nhsd-jira.digital.nhs.uk/browse/DS-3293>**

## Description of Changes

Updating date to a future date for open timings integration test

## Type of change

- Integration test case scenario change for open timings

## Development Checklist

- [x] I have performed a self-review of my own code
- [x] Tests have added that prove my fix is effective or that my feature
works (Integration tests)
- [x] I have updated Dependabot to include my changes (if applicable)

## Code Reviewer Checklist

- [x] I can confirm the changes have been tested or approved by a tester
# Task Branch Pull Request

**<https://nhsd-jira.digital.nhs.uk/browse/DS-2843>**

## Description of Changes

This PR change enables the delete protection on change event DB in prod
environment. This delete protection not enabled on any other env as we
will require to tear the lower envs down after the development/testing
purpose is fulfilled and tested in these lower env and hence it's
enabled for prod env only to avoid accidental deletion of DB
## Type of change

Delete not appropriate

- Security enhancement for dynamodb table in prod env

## Development Checklist

- [x] I have performed a self-review of my own code
- [x] Tests have added that prove my fix is effective or that my feature
works (Integration tests)
- [x] I have updated Dependabot to include my changes (if applicable)

## Code Reviewer Checklist

- [x] I can confirm the changes have been tested or approved by a tester
# Task Branch Pull Request

**<https://nhsd-jira.digital.nhs.uk/browse/DS-2844>**

## Description of Changes

This PR creates a custom WAF rule to identify the SQL injection attacks
in change event request.
Please include a summary of the change

## Type of change

- Security enhancements(Prevention of SQL injections)

## Development Checklist

- [x] I have performed a self-review of my own code
- [x] Tests have added that prove my fix is effective or that my feature
works (Integration tests)
- [x] I have updated Dependabot to include my changes (if applicable)

## Code Reviewer Checklist

- [x] I can confirm the changes have been tested or approved by a tester
# Task Branch Pull Request

**<https://nhsd-jira.digital.nhs.uk/browse/DS-392>**

## Description of Changes

Please include a summary of the change

## Type of change

Delete not appropriate

- Bug fix (non-breaking change which fixes an issue)
- New feature (non-breaking change which adds functionality)
- Breaking change (fix or feature that would cause existing
functionality to not work as expected)
- Refactoring (non-breaking change which improves the structure of the
code)

## Development Checklist

- [x] I have performed a self-review of my own code
- [x] Tests have added that prove my fix is effective or that my feature
works (Integration tests)
- [x] I have updated Dependabot to include my changes (if applicable)

## Code Reviewer Checklist

- [x] I can confirm the changes have been tested or approved by a tester
# Task Branch Pull Request

**<https://nhsd-jira.digital.nhs.uk/browse/DS-3492>**

## Description of Changes

Sorting priority order of WAF rules for AWS managed and custom rules. 

## Type of change

- Security enhancements(Monitoring of SQL injections)

## Development Checklist

- [x] I have performed a self-review of my own code
- [x] Tests have added that prove my fix is effective or that my feature
works (Integration tests)
- [x] I have updated Dependabot to include my changes (if applicable)

## Code Reviewer Checklist

- [x] I can confirm the changes have been tested or approved by a tester
# Task Branch Pull Request

**<https://nhsd-jira.digital.nhs.uk/browse/DS-3556>**

## Description of Changes

Enabling podman to run make targets locally along with docker.

## Type of change

- DI Reworking/Tooling

## Development Checklist

- [x] I have performed a self-review of my own code
- [x] Tests have added that prove my fix is effective or that my feature
works (Integration tests)
- [x] I have updated Dependabot to include my changes (if applicable)

## Code Reviewer Checklist

- [x] I can confirm the changes have been tested or approved by a tester

---------

Signed-off-by: Matthew Begley <60427904+mabe13@users.noreply.github.com>
Co-authored-by: Matthew Begley <60427904+mabe13@users.noreply.github.com>
# Task Branch Pull Request

**<https://nhsd-jira.digital.nhs.uk/browse/DS-3746>**

## Description of Changes

Change Smoke test service as the current one has been removed

## Type of change

Delete not appropriate

- Bug fix (non-breaking change which fixes an issue) (Test bug)

## Development Checklist

- [x] I have performed a self-review of my own code
- [x] Tests have added that prove my fix is effective or that my feature
works (Integration tests)
- [x] I have updated Dependabot to include my changes (if applicable)

## Code Reviewer Checklist

- [x] I can confirm the changes have been tested or approved by a tester
@mabe13 mabe13 changed the title Release/shared resources nine one reroll Release shared resources nine one (reroll) May 23, 2025
@sonarqubecloud
Copy link

@mabe13 mabe13 changed the base branch from develop to main May 23, 2025 12:22
@mabe13 mabe13 requested a review from a team as a code owner May 23, 2025 12:22
Copy link
Collaborator

@ajmu1 ajmu1 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@mabe13 mabe13 merged commit 3fe5a6a into main May 23, 2025
22 checks passed
@mabe13 mabe13 deleted the release/shared_resources_nine_one_reroll branch May 23, 2025 13:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants