Skip to content

Conversation

@JackPlowman
Copy link
Contributor

@JackPlowman JackPlowman commented Jul 13, 2022

Release Branch 2.0.0

rohith1122 and others added 30 commits May 4, 2022 13:39
* DI-406 Edge cases for dentist ods (#264)

* Added some new functionality to verify no logs

* Streamlined the tests slightly

* Removed the kit flags that were unnecessary

* Added scenario outlines for two features

* Removed reference to splunk from feature

* Added new generic given step

* Removed unnecessary test steps

* Added some more improvements to tests

* Further updates to test steps

* Further removal of steps

* Removed more steps to be generified

* Further updates to test suites

* Resolving rebasing issues with steps

* Fixed a couple more issues

* Added the pharmacy to F004S009

* Removed kit flag that was left present
* Update all the diagrams

* Update the adr

* Update the adr

* Refine the diagrams and ADR

* More funky changes

* More changes yah

* More changes yah

* Add Event Replay feature in

* Add splunk dashboards to solution architecture

* Add a security view

* Fix a few typos
* Change perf to use mock api

* Change perf to use mock api
* Sql querry added to db checker handler

* Update db checker handler query

* Update db checker handler query

* Update db checker handler queries

* Update db checker handler query syntax

* Modify dos data for test with a given step

* Update code layout

* Add unique corr id for data lignment run

* Update unit test
* Add Release Pipelines

* Refactored F002 and F004 features and steps

* Test cases are now all functioning

Start Release Pipeline

Single deploy codebuild

Update codepipeline to build release pipelines

Start release pipeline

Start check if environment is deployed

Add wait for log groups to create

Start terraform to delete release environments and pipelines

Delete based on branch name

Add terraform debugging

Move Performance Pipeline to mgmt account

Continue moving performance pipelines to mgmt

Move to codebuild for performance tests

Upgrade Release pipeline for new S3 module

Fix demo deployment codebuild stage

Use development pipeline outputs

Update to deploy pipeline before running pipeline

Remove github auth in delete release environment

Don't change release pipeline if not required

Fix build branch

Refactor Terraform

Update buildspec to clean terraform modules

Upgrade provider version

* Remove unexpected changes

* Add missing environment variable

* Re add master to Github Workflow
* Swap perf and p2 environments

* Add perf to delete api mock

* Use correct database credentials
* Swap perf and p2 environments

* Add switch between perf and p2 profiles

* Update Readme documentation

* Fix rebase issue
* Initial commit

* Fixed import error

* removed testing print

* Fixed open times reports

* stuff

* makefile addition

* Commit

* Added to gitignore

* Fixed column heading mistake

* Edited makefile paramters

* Edited makefile paramters

* Edited makefile paramters
Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 3.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@v2...v3)

---
updated-dependencies:
- dependency-name: actions/checkout
  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>
#319)

Attempt to update Sonarcloud to include SF and TF
Fix coverage in sonarcloud
* Fix coverage for sonarcloud

* Revert sonarcloud options change
Update unit tests to work
* Add a make target to trigger a Jenkins Job

Add new codebuild stage security group

Add codebuild stage for setting up integration test

Use variable for mgmt vpc

Add debug settings for make target

Remove debug message and update version

* Update release pipeline

* Remove s3 module version
* Update db checker sql query for single service pha

* Update unit test

* Build make target to autodetect active flag

* Update terraform for pipeline modification

* Add query for services count

* Update relaease pipeline

* Update unit test make target on pipeline buildspec

* Update db checker handler unit test
Reduce duplications and code smells

Experiment with test folder in sonarcloud

Fix broken patch

Fix coverage reports
dependabot bot and others added 20 commits June 16, 2022 07:08
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
* Use slack webhook rather than sns topic

* Remove unused data source

* Remove unused variables

* Fix workflow using branch name rather than designator
* Update Cloudwatch dashboard and queries

Fix github action

* Update incorrect echo in github action
* Remove publicname change ability and update unit tests

* Python code formatting

* Add public name int test scenario

* Update env variable for special xter test

* Fix test step and feature change when rebasing to develop

Co-authored-by: Matthew Begley <matthewbegley@nhs.net>
Co-authored-by: mik3ola <michael.olaw1@nhs.net>
* Create ChangeEventBuilder and ChangeEvent

* Move away from dataclass for ChangeEvent class

* Migrate build same as DoS function into ChangeEventBuilder class

* Fix phone bug

* Migrate ChangeEventBuilder into separate file

* Remove debug line

* Refactor Opening Times check
* DI-481 Changed overlap definition and added unit tests (#409)

* Changed overlap definition and added unit tests

* DI-490 Integration tests for same closing and opening time (#411)

* Branch change for hotfix

* Removed dentist test as not supported

* Removed the kit tag

Co-authored-by: Corbisc <95412908+Corbisc@users.noreply.github.com>

* DI-480 Website Validation Hotfix (#410)

* Add website validation

* Handle if http/https is not in URL

* Fix unit tests and update changes to exclude empty string

* Add additional unit tests and fixes

* Remove debugging print statement

* Test scenarios for url variations

Co-authored-by: mik3ola <michael.olaw1@nhs.net>

Co-authored-by: Sam Clayton <SLClayton@users.noreply.github.com>
Co-authored-by: Corbisc <95412908+Corbisc@users.noreply.github.com>
Co-authored-by: mik3ola <michael.olaw1@nhs.net>
* Add developer access to KMS key so that dbcloner can use key

* Fix broken role permission
* Refactor Test Suite

Rename steps file and rebuild context dictionary into class

Move away from dataclass for ChangeEvent class

Migrate build same as DoS function into ChangeEventBuilder class

Fix phone bug

Migrate ChangeEventBuilder into separate file

Remove debug line

Refactor Opening Times check

Remove positive check function to allow negative checks

Fix missing fixture in integration tests

Change line to create change request

Use context class instead of dictionary

Python formatting fixes

Follow python standards

Remove duplicated functionality

Remove run id

Use change event class until sent to API instead of dictionary

Add a test step summary

Handle when there is no context fixture

Fix broken test when change_event moved from dictionary to class

Fix more test failures

More test failure fixes

More test failure fixes

Remove extra log line

Improve run id

Fix missing variable changes

Fix test failures

Add line to trigger CR

Generate unique key

Add temporary flakey test solution

Use pytest fixture instead of building it in step

Reduce duplicated functionality

Change sequence test to make sense

Add unique key

Use unique correlation id for each run

Remove odscode from list of usable odscode

Increase get service id timeout

Increase reliability of website and phone numbers

Reduce duplication in feature files

Reformat feature files

Change back to use reruns

Add feature to auto fail if status code is wrong

Fix missing case statement

Increase timeout for retries

Fix odscode error and incorrect sequence number error

Exclude specific sequence numbers from failing tests

Trial using default CE

Add address change check

Use valid postcode in default event

* Start to fix after rebase

* Increase timeouts to make some tests more reliable

* Merge website steps

* Add additional retry to improve reliability

* Reduce duplications of dynamodb checking

* Increase delay between retries
* Bump terraform-aws-modules/s3-bucket/aws

Bumps [terraform-aws-modules/s3-bucket/aws](https://github.com/terraform-aws-modules/terraform-aws-s3-bucket) from 3.2.3 to 3.3.0.
- [Release notes](https://github.com/terraform-aws-modules/terraform-aws-s3-bucket/releases)
- [Changelog](https://github.com/terraform-aws-modules/terraform-aws-s3-bucket/blob/master/CHANGELOG.md)
- [Commits](terraform-aws-modules/terraform-aws-s3-bucket@v3.2.3...v3.3.0)

---
updated-dependencies:
- dependency-name: terraform-aws-modules/s3-bucket/aws
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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

* Bump terraform-aws-modules/s3-bucket/aws in /infrastructure/modules/s3

Bumps [terraform-aws-modules/s3-bucket/aws](https://github.com/terraform-aws-modules/terraform-aws-s3-bucket) from 3.2.3 to 3.3.0.
- [Release notes](https://github.com/terraform-aws-modules/terraform-aws-s3-bucket/releases)
- [Changelog](https://github.com/terraform-aws-modules/terraform-aws-s3-bucket/blob/master/CHANGELOG.md)
- [Commits](terraform-aws-modules/terraform-aws-s3-bucket@v3.2.3...v3.3.0)

---
updated-dependencies:
- dependency-name: terraform-aws-modules/s3-bucket/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/dos-api-gateway-mock

Bumps [hashicorp/random](https://github.com/hashicorp/terraform-provider-random) from 3.3.0 to 3.3.2.
- [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.3.0...v3.3.2)

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

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.3.0 to 3.3.2.
- [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.3.0...v3.3.2)

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

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.18.0 to 4.21.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.18.0...v4.21.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.18.0 to 4.21.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.18.0...v4.21.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.18.0 to 4.21.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.18.0...v4.21.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.18.0 to 4.21.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.18.0...v4.21.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.18.0 to 4.21.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.18.0...v4.21.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/release-pipeline

Bumps [hashicorp/aws](https://github.com/hashicorp/terraform-provider-aws) from 4.17.1 to 4.21.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.21.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.18.0 to 4.21.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.18.0...v4.21.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 terraform-aws-modules/s3-bucket/aws

Bumps [terraform-aws-modules/s3-bucket/aws](https://github.com/terraform-aws-modules/terraform-aws-s3-bucket) from 3.2.3 to 3.3.0.
- [Release notes](https://github.com/terraform-aws-modules/terraform-aws-s3-bucket/releases)
- [Changelog](https://github.com/terraform-aws-modules/terraform-aws-s3-bucket/blob/master/CHANGELOG.md)
- [Commits](terraform-aws-modules/terraform-aws-s3-bucket@v3.2.3...v3.3.0)

---
updated-dependencies:
- dependency-name: terraform-aws-modules/s3-bucket/aws
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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

* Upgrade after lambda deployment terraform stack

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Initial commit

* Added a bunch of debug logs

* Added new get locations method method

* Fixed untit tests

* Added for redeploy

* fixed vars bug

* Removed most of timing loggings

* Checking for errors

* Changed lambda size for event processor

* Testing changes

* Testing changes

* test bug fix

* Changing for new commit comment
* Add change to remove specified dates in the past

* Refinements and test improvements

* Improve unit tests

* Refactoring of update_changes_with_opening_times function

* Refinements after review
Updated test to be valid for functionality
* Added to generic log output extras

* Edited log error info message

* Updated again to include more of last
* Reduce change event size for logging

* Update one more test senario
@JackPlowman JackPlowman marked this pull request as ready for review July 14, 2022 10:11
@JackPlowman JackPlowman requested a review from a team as a code owner July 14, 2022 10:11
@mabe13 mabe13 deleted the release/2.0.0 branch July 14, 2022 13:19
@JackPlowman JackPlowman reopened this Jul 14, 2022
@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 11 Code Smells

90.8% 90.8% Coverage
0.0% 0.0% Duplication

@JackPlowman JackPlowman changed the title Release/2.0.0 Release 2.0.0 into Live Jul 14, 2022
Copy link
Collaborator

@mabe13 mabe13 left a comment

Choose a reason for hiding this comment

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

Good to Merge 👍

@JackPlowman JackPlowman merged commit 1d5cb1f into main Jul 20, 2022
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.

7 participants