Skip to content

Conversation

@JackPlowman
Copy link
Contributor

@JackPlowman JackPlowman commented Aug 15, 2023

Release Branch Pull Request

Description of Changes

This PR is to release Shared Resources Two

mik3ola and others added 30 commits May 31, 2022 20:07
Upgrade test to python version 3.10.4
Added new file to handle change events from dos
…332)

Bumps [django](https://github.com/django/django) from 3.2.7 to 3.2.13.
- [Release notes](https://github.com/django/django/releases)
- [Commits](django/django@3.2.7...3.2.13)

---
updated-dependencies:
- dependency-name: django
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Replaced elifs with case statements
* Resolved circular dependencies in change event

* Further amendments to resolve dependency issues

* Applying changes from commit checks
* Add Vulture code

* Exclude files that use by other lambdas

* Improve TODO message

* Exclude files that use by other lambdas

* Add an unit test for reporter.py
Update make devops library
Set everything to use main branch name
* Bump hashicorp/random in /infrastructure/stacks/dos-api-gateway-mock

Bumps [hashicorp/random](https://github.com/hashicorp/terraform-provider-random) from 3.2.0 to 3.3.0.
- [Release notes](https://github.com/hashicorp/terraform-provider-random/releases)
- [Changelog](https://github.com/hashicorp/terraform-provider-random/blob/main/CHANGELOG.md)
- [Commits](hashicorp/terraform-provider-random@v3.2.0...v3.3.0)

---
updated-dependencies:
- dependency-name: hashicorp/random
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump hashicorp/aws in /infrastructure/stacks/before-lambda-deployment

Bumps [hashicorp/aws](https://github.com/hashicorp/terraform-provider-aws) from 4.16.0 to 4.17.1.
- [Release notes](https://github.com/hashicorp/terraform-provider-aws/releases)
- [Changelog](https://github.com/hashicorp/terraform-provider-aws/blob/main/CHANGELOG.md)
- [Commits](hashicorp/terraform-provider-aws@v4.16.0...v4.17.1)

---
updated-dependencies:
- dependency-name: hashicorp/aws
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump hashicorp/aws in /infrastructure/stacks/appconfig

Bumps [hashicorp/aws](https://github.com/hashicorp/terraform-provider-aws) from 4.16.0 to 4.17.1.
- [Release notes](https://github.com/hashicorp/terraform-provider-aws/releases)
- [Changelog](https://github.com/hashicorp/terraform-provider-aws/blob/main/CHANGELOG.md)
- [Commits](hashicorp/terraform-provider-aws@v4.16.0...v4.17.1)

---
updated-dependencies:
- dependency-name: hashicorp/aws
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump hashicorp/aws in /infrastructure/stacks/dos-api-gateway-mock

Bumps [hashicorp/aws](https://github.com/hashicorp/terraform-provider-aws) from 4.16.0 to 4.17.1.
- [Release notes](https://github.com/hashicorp/terraform-provider-aws/releases)
- [Changelog](https://github.com/hashicorp/terraform-provider-aws/blob/main/CHANGELOG.md)
- [Commits](hashicorp/terraform-provider-aws@v4.16.0...v4.17.1)

---
updated-dependencies:
- dependency-name: hashicorp/aws
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump hashicorp/aws in /infrastructure/stacks/development-pipeline

Bumps [hashicorp/aws](https://github.com/hashicorp/terraform-provider-aws) from 4.16.0 to 4.17.1.
- [Release notes](https://github.com/hashicorp/terraform-provider-aws/releases)
- [Changelog](https://github.com/hashicorp/terraform-provider-aws/blob/main/CHANGELOG.md)
- [Commits](hashicorp/terraform-provider-aws@v4.16.0...v4.17.1)

---
updated-dependencies:
- dependency-name: hashicorp/aws
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump hashicorp/aws in /infrastructure/stacks/api-key

Bumps [hashicorp/aws](https://github.com/hashicorp/terraform-provider-aws) from 4.16.0 to 4.17.1.
- [Release notes](https://github.com/hashicorp/terraform-provider-aws/releases)
- [Changelog](https://github.com/hashicorp/terraform-provider-aws/blob/main/CHANGELOG.md)
- [Commits](hashicorp/terraform-provider-aws@v4.16.0...v4.17.1)

---
updated-dependencies:
- dependency-name: hashicorp/aws
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump hashicorp/random in /infrastructure/stacks/api-key

Bumps [hashicorp/random](https://github.com/hashicorp/terraform-provider-random) from 3.2.0 to 3.3.0.
- [Release notes](https://github.com/hashicorp/terraform-provider-random/releases)
- [Changelog](https://github.com/hashicorp/terraform-provider-random/blob/main/CHANGELOG.md)
- [Commits](hashicorp/terraform-provider-random@v3.2.0...v3.3.0)

---
updated-dependencies:
- dependency-name: hashicorp/random
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump hashicorp/aws in /infrastructure/stacks/development-pipeline

Bumps [hashicorp/aws](https://github.com/hashicorp/terraform-provider-aws) from 4.16.0 to 4.17.1.
- [Release notes](https://github.com/hashicorp/terraform-provider-aws/releases)
- [Changelog](https://github.com/hashicorp/terraform-provider-aws/blob/main/CHANGELOG.md)
- [Commits](hashicorp/terraform-provider-aws@v4.16.0...v4.17.1)

---
updated-dependencies:
- dependency-name: hashicorp/aws
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump hashicorp/aws in /infrastructure/stacks/release-pipeline

Bumps [hashicorp/aws](https://github.com/hashicorp/terraform-provider-aws) from 4.16.0 to 4.17.1.
- [Release notes](https://github.com/hashicorp/terraform-provider-aws/releases)
- [Changelog](https://github.com/hashicorp/terraform-provider-aws/blob/main/CHANGELOG.md)
- [Commits](hashicorp/terraform-provider-aws@v4.16.0...v4.17.1)

---
updated-dependencies:
- dependency-name: hashicorp/aws
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Add basic template to be used when action runs

* Update task and test PR templates

* Simplify Workflow to use single file

* Experiment with environment variables

* Add test branches to regex

* Reword template files

Co-authored-by: Jack Plowman <jack.plowman1@nhs.net>
Rename master to main in diagram and confluence

Co-authored-by: Rohit <rohit.kondapalli1@nhs.net>
* Change template folder name

* Add new workflow

* Update Github Actions

* Fix incorrect directory
* Separate Secret Scanning and Security vulnerability scanning

* Add update description workflow

* Get branch name

* Update description regex

* Add multiple jobs to GH workflow

* Separate checklist checker again

* Add warning to PR template
* Refactor unused variables

* Fix comparison reporter

* Fix unit tests
* Simplify docker build steps

* Save specific CMD to docker image

* Remove unused code

* Add demo deployment fixes

* Remove debug command
* Bump hashicorp/aws in /infrastructure/stacks/appconfig

Bumps [hashicorp/aws](https://github.com/hashicorp/terraform-provider-aws) from 4.17.1 to 4.18.0.
- [Release notes](https://github.com/hashicorp/terraform-provider-aws/releases)
- [Changelog](https://github.com/hashicorp/terraform-provider-aws/blob/main/CHANGELOG.md)
- [Commits](hashicorp/terraform-provider-aws@v4.17.1...v4.18.0)

---
updated-dependencies:
- dependency-name: hashicorp/aws
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump hashicorp/aws in /infrastructure/stacks/api-key

Bumps [hashicorp/aws](https://github.com/hashicorp/terraform-provider-aws) from 4.17.1 to 4.18.0.
- [Release notes](https://github.com/hashicorp/terraform-provider-aws/releases)
- [Changelog](https://github.com/hashicorp/terraform-provider-aws/blob/main/CHANGELOG.md)
- [Commits](hashicorp/terraform-provider-aws@v4.17.1...v4.18.0)

---
updated-dependencies:
- dependency-name: hashicorp/aws
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump hashicorp/aws in /infrastructure/stacks/before-lambda-deployment

Bumps [hashicorp/aws](https://github.com/hashicorp/terraform-provider-aws) from 4.17.1 to 4.18.0.
- [Release notes](https://github.com/hashicorp/terraform-provider-aws/releases)
- [Changelog](https://github.com/hashicorp/terraform-provider-aws/blob/main/CHANGELOG.md)
- [Commits](hashicorp/terraform-provider-aws@v4.17.1...v4.18.0)

---
updated-dependencies:
- dependency-name: hashicorp/aws
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump hashicorp/aws in /infrastructure/stacks/dos-api-gateway-mock

Bumps [hashicorp/aws](https://github.com/hashicorp/terraform-provider-aws) from 4.17.1 to 4.18.0.
- [Release notes](https://github.com/hashicorp/terraform-provider-aws/releases)
- [Changelog](https://github.com/hashicorp/terraform-provider-aws/blob/main/CHANGELOG.md)
- [Commits](hashicorp/terraform-provider-aws@v4.17.1...v4.18.0)

---
updated-dependencies:
- dependency-name: hashicorp/aws
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump hashicorp/aws in /infrastructure/stacks/perf-test-tools

Bumps [hashicorp/aws](https://github.com/hashicorp/terraform-provider-aws) from 4.16.0 to 4.18.0.
- [Release notes](https://github.com/hashicorp/terraform-provider-aws/releases)
- [Changelog](https://github.com/hashicorp/terraform-provider-aws/blob/main/CHANGELOG.md)
- [Commits](hashicorp/terraform-provider-aws@v4.16.0...v4.18.0)

---
updated-dependencies:
- dependency-name: hashicorp/aws
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump hashicorp/aws in /infrastructure/stacks/development-pipeline

Bumps [hashicorp/aws](https://github.com/hashicorp/terraform-provider-aws) from 4.17.1 to 4.18.0.
- [Release notes](https://github.com/hashicorp/terraform-provider-aws/releases)
- [Changelog](https://github.com/hashicorp/terraform-provider-aws/blob/main/CHANGELOG.md)
- [Commits](hashicorp/terraform-provider-aws@v4.17.1...v4.18.0)

---
updated-dependencies:
- dependency-name: hashicorp/aws
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Remove duplicated make targets and fix development pipeline

* Remove extra line

* Fix entrypoint to docker images
* Fix dos api gateway mock

* Revert health check checker

* Increase unit test coverage

* Revert event sender

* Fix not running unit tests
* Refactored several steps for dos ce

* Removed commented out stuff

* Event type added to fix in parent steps

* Changed event type to org type

* Resolved issues with tests

* Removed change made to utils for troubleshooting

* Updated some intermittently failing cases

* Resolved the code quality error

* Added issue occurring with split opening times

* Update dentist demographics data and fix ods bug

* Update failing scenario step

* Removed get payload function as not in develop

Co-authored-by: mik3ola <michael.olaw1@nhs.net>
* Add scanning results make targets

* Improve ECR image scanning make target

* Put Image scanning on the correct buildspec
Improve Unit Testing

Bump chuhlomin/render-template from 1.4 to 1.5

Bumps [chuhlomin/render-template](https://github.com/chuhlomin/render-template) from 1.4 to 1.5.
- [Release notes](https://github.com/chuhlomin/render-template/releases)
- [Commits](chuhlomin/render-template@v1.4...v1.5)

---
updated-dependencies:
- dependency-name: chuhlomin/render-template
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Add mutation tests

Slim down repetitive make targets

Update Github Actions add improve unit

Add temporary full mutation test run

Fix mutation test results and Github Action names

Reduce scope of mutations

Start process to only run against folder that have changed

Simplify filters for mutation testing

Silence output from make target

Add rest of lambda folders

Update Github Workflow to use matrix

Use correct matrix name

Improve unit tests

Continue to improve unit tests

Increase unit test coverage

Update pip as part of docker build

Exclude logger and tracer lines

Improve test coverage
Bumps [actions/dependency-review-action](https://github.com/actions/dependency-review-action) from 1 to 2.
- [Release notes](https://github.com/actions/dependency-review-action/releases)
- [Commits](actions/dependency-review-action@v1...v2)

---
updated-dependencies:
- dependency-name: actions/dependency-review-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Fix performance tests using incorrect environment
Refactor Test Suite

Remove change_request function and file

Remove useless variable initialisation

Fix PR description updater

Type hint and introduce variables

Use constant aliases for service type matching
JackPlowman and others added 5 commits June 26, 2023 15:02
# Task Branch Pull Request

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

## Description of Changes

This PR implements WAF on API Gateway.
# Task Branch Pull Request

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

## Description of Changes

This PR changes to application to allow the new SSO roles to deploy the
application.
# Task Branch Pull Request

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

## Description of Changes

This PR fixes a misconfigured CloudWatch Log group name to allow the DI
role to access it.
# Task Branch Pull Request

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

## Description of Changes

This PR improves application performance. By removing the Orchestrator,
setting lambda rate limits (max concurrency) and transitioning the
lambdas to be ARM based.

---------

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

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

## Description of Changes

This PR updates the build arm image buildspec (pipeline) to set the
correct version. As well it renames some buildspec files to improve
understandability.
@JackPlowman JackPlowman changed the base branch from develop to main August 15, 2023 08:48
@JackPlowman JackPlowman force-pushed the release/shared_resources_two branch from b1d7240 to ee2ebc4 Compare August 15, 2023 08:54
@JackPlowman JackPlowman marked this pull request as ready for review August 15, 2023 12:57
@JackPlowman JackPlowman enabled auto-merge (squash) August 15, 2023 12:58
@JackPlowman JackPlowman force-pushed the release/shared_resources_two branch 3 times, most recently from 5a6ca67 to fa73a3b Compare August 15, 2023 13:31
JackPlowman and others added 13 commits August 15, 2023 16:11
# Task Branch Pull Request

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

## Description of Changes

This PR updates the documentation after DS-924 to remove the
orchestrator from documentation and diagrams.
# Task Branch Pull Request

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

## Description of Changes

This PR updates the security documentation and fixes incorrect resource
name in components diagram.
# Task Branch Pull Request

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

## Description of Changes

This PR bumps up the load test load to be closer to NHS UK's max load.
This sets the load test to 5 requests per second similar to NHS UK's
traffic.
….1) (#783)

# Task Branch Pull Request

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

## Description of Changes

Hotfix release to fix issue with the Serverless Framework deployment now
requiring dos-db-handler lambda variables to be defined even when it
isn't being deployed. See here for more details
https://nhsd-jira.digital.nhs.uk/browse/DS-1183

## 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
…ect (#784)

# Task Branch Pull Request

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

## Description of Changes

This PR fixes the pre-release CodeBuild job that builds, deploy and
tests a release in an environment known as release (dev profile).
# Task Branch Pull Request

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

## Description of Changes

This PR adds infrastructure for service matcher feature flags. This
allows selectively allowing service types to be matched and processed.
# Task Branch Pull Request

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

## Description of Changes

This PR is to update the environments documentation so the repository is
up to date and is representative of DI's environments.
# Task Branch Pull Request

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

## Description of Changes

This PR sets an API Gateway Rate Limit.
# Task Branch Pull Request

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

## Description of Changes

This PR refactors and renames the build task environment job to task env
deploy and test. This increases reliability, observability, ensuring
each run is meaningful.
#788)

# Task Branch Pull Request

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

## Description of Changes

This PR converts the Service Matcher feature flag for pharmacy first
phase one from AWS AppConfig to AWS Parameter Store.
# Task Branch Pull Request

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

## Description of Changes

This PR removes dentist tests and references. Including constants and
other code.
# Task Branch Pull Request

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

## Description of Changes

This PR removes specific dentist code from the application lambdas and
unit tests.
@JackPlowman JackPlowman force-pushed the release/shared_resources_two branch from fa73a3b to a0f8d07 Compare August 15, 2023 15:13
@sonarqubecloud
Copy link

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

100.0% 100.0% Coverage
0.0% 0.0% Duplication

@JackPlowman JackPlowman merged commit d01913e into main Aug 16, 2023
@JackPlowman JackPlowman deleted the release/shared_resources_two branch August 16, 2023 10:30
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.

6 participants