From 3b5141f1dd3f57896467d431dd8f5f0a74e5d85a Mon Sep 17 00:00:00 2001 From: CDR-DF <69551160+CDR-DF@users.noreply.github.com> Date: Wed, 25 May 2022 16:35:01 +1000 Subject: [PATCH 1/3] Update dotnet.yml Aligned dotnet.yml with mock-data-holder --- .github/workflows/dotnet.yml | 31 ------------------------------- 1 file changed, 31 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 216f3c9..c5bad45 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -103,34 +103,3 @@ jobs: - name: Remove integration tests run: | docker-compose -f './mock-data-holder-energy/Source/docker-compose.IntegrationTests.yml' down - # Publish Unit Test Results - - name: Publish Unit Test Report - uses: dorny/test-reporter@v1 - with: - artifact: unit-test-results - name: Unit Tests - path: './mock-data-holder-energy/Source/_temp/mock-data-holder-energy-unit-tests/testresults/*.trx' - reporter: dotnet-trx - - # Publish Integration Test Results - - name: Publish Integration Test Report - uses: dorny/test-reporter@v1 - with: - artifact: integration-test-results - name: Integration Tests - path: './mock-data-holder-energy/Source/_temp/mock-data-holder-energy-integration-tests/testresults/*.trx' - reporter: dotnet-trx - - - name: List contents - if: always() - run: | - ls - # Publish log files from containers. - - name: Archive container logs - uses: actions/upload-artifact@v2 - if: always() - with: - name: container-logs-artifacts - path: | - ./mock-register/Source/_temp/mock-register/tmp - ./mock-data-holder-energy/Source/_temp/mock-data-holder-energy/tmp \ No newline at end of file From 06e09737d0e18ab26afc1f91a8fe37354ccf9fb0 Mon Sep 17 00:00:00 2001 From: CDR-AndrewG <89497569+CDR-AndrewG@users.noreply.github.com> Date: Fri, 3 Jun 2022 10:32:00 +1000 Subject: [PATCH 2/3] Updates to GitHub actions, seed data and minor bug fixes --- .github/workflows/dotnet.yml | 62 +++++++++++++------ CHANGELOG.md | 7 +++ CertificateManagement/README.md | 2 +- .../Data/seed-data.json | 30 ++++----- .../appsettings.Container.json | 2 +- .../appsettings.Development.json | 2 +- .../appsettings.Release.json | 2 +- 7 files changed, 70 insertions(+), 37 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index c5bad45..041690b 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -35,7 +35,7 @@ jobs: build-and-test: runs-on: ubuntu-latest - ## NOTE: This workflow needs to also checkout the Mock Register for testing. + ## NOTE: This workflow needs to also checkout the Mock Register for testing. ## This workflow will checkout the ConsumerDataRight/mock-register project steps: @@ -44,21 +44,17 @@ jobs: with: path: ./mock-data-holder-energy - - name: Checkout Register (Main Branch) - uses: actions/checkout@v2 + - name: Pull Mock Register Image (main) if: ${{ github.ref == 'refs/heads/main' }} - with: - repository: ConsumerDataRight/mock-register - ref: main - path: ./mock-register - - - name: Checkout Register (Develop Branch) - uses: actions/checkout@v2 + run: | + docker pull consumerdataright/mock-register:main + docker image tag consumerdataright/mock-register:main mock-register:latest + + - name: Pull Mock Register Image (develop) if: ${{ github.ref != 'refs/heads/main' }} - with: - repository: ConsumerDataRight/mock-register - ref: develop - path: ./mock-register + run: | + docker pull consumerdataright/mock-register:develop + docker image tag consumerdataright/mock-register:develop mock-register:latest - name: List contents if: always() @@ -67,10 +63,7 @@ jobs: cd mock-data-holder-energy ls cd .. - # Build mock-register image - - name: Build the mock-register image - run: | - docker build ./mock-register/Source --file ./mock-register/Source/Dockerfile --tag mock-register:latest + # Build mock-data-holder-energy image - name: Build the mock-data-holder-energy image run: | @@ -87,6 +80,7 @@ jobs: - name: List Docker images run: | docker images + # Run unit tests - name: Run unit tests run: | @@ -103,3 +97,35 @@ jobs: - name: Remove integration tests run: | docker-compose -f './mock-data-holder-energy/Source/docker-compose.IntegrationTests.yml' down + + # Archive unit test results + - name: Archive unit test results + uses: actions/upload-artifact@v2 + if: always() + with: + name: unit-test-results + path: ${{ github.workspace }}/mock-data-holder-energy/Source/_temp/mock-data-holder-energy-unit-tests/testresults + + # Archive integration test results + - name: Archive integration test results + uses: actions/upload-artifact@v2 + if: always() + with: + name: integration-test-results + path: ${{ github.workspace }}/mock-data-holder-energy/Source/_temp/mock-data-holder-energy-integration-tests/testresults + + # Archive mock data holder energy logs + - name: Archive mock data holder energy logs + uses: actions/upload-artifact@v2 + if: always() + with: + name: integration-test-artifacts + path: ${{ github.workspace }}/mock-data-holder-energy/Source/_temp/mock-data-holder-energy/tmp + + # Archive mock register logs + - name: Archive mock register logs + uses: actions/upload-artifact@v2 + if: always() + with: + name: integration-test-artifacts + path: ${{ github.workspace }}/mock-data-holder-energy/Source/_temp/mock-register/tmp diff --git a/CHANGELOG.md b/CHANGELOG.md index 43e331e..46a47bf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +### Changed +- Person information in seed data. +- Build and Test action to download containers from docker hub. + +### Fixed +- Intermittent issue when creating the LogEventsManageAPI database table. + ## [0.1.0] - 2022-05-25 ### Added diff --git a/CertificateManagement/README.md b/CertificateManagement/README.md index be368d4..7717e5b 100644 --- a/CertificateManagement/README.md +++ b/CertificateManagement/README.md @@ -2,7 +2,7 @@ Certificates play an important part in the CDR ecosystem to establish trust between participants and protect communications. **DigiCert** is the Certificate Authority (CA) for the CDR and the ACCC is responsible for provisioning DigiCert certificates to participants during the on-boarding process. -For more information, consult the [Certificate Management](https://cdr-register.github.io/register/#certificate-management) section of the Register Design. +For more information, consult the [Certificate Management](https://consumerdatastandardsaustralia.github.io/standards/#certificate-management) section of the Consumer Data Standards. The Mock Data Holder will mimic the behaviour of a data holder in the CDR ecosystem and therefore will use certificates in its interactions. However, the use of DigiCert for this purpose is not feasible or scalable so an alternative approach is adopted. diff --git a/Source/CDR.DataHolder.Manage.API/Data/seed-data.json b/Source/CDR.DataHolder.Manage.API/Data/seed-data.json index f8067dd..a66d54c 100644 --- a/Source/CDR.DataHolder.Manage.API/Data/seed-data.json +++ b/Source/CDR.DataHolder.Manage.API/Data/seed-data.json @@ -10,9 +10,9 @@ "LastName": "Moss", "MiddleNames": "", "Prefix": "Ms", - "Suffix": "", - "OccupationCode": "", - "OccupationCodeVersion": "", + "Suffix": null, + "OccupationCode": null, + "OccupationCodeVersion": null, "LastUpdateTime": "2021-04-01T10:30:00Z" }, "Accounts": [ @@ -188,9 +188,9 @@ "LastName": "Hare", "MiddleNames": "", "Prefix": "Ms", - "Suffix": "", - "OccupationCode": "", - "OccupationCodeVersion": "", + "Suffix": null, + "OccupationCode": null, + "OccupationCodeVersion": null, "LastUpdateTime": "2021-12-01T10:30:00Z" }, "Accounts": [ @@ -237,9 +237,9 @@ "LastName": "Johnson", "MiddleNames": "", "Prefix": "Mr", - "Suffix": "", - "OccupationCode": "", - "OccupationCodeVersion": "", + "Suffix": null, + "OccupationCode": null, + "OccupationCodeVersion": null, "LastUpdateTime": "2021-07-01T10:30:00Z" }, "Accounts": [ @@ -302,9 +302,9 @@ "LastName": "Wilson", "MiddleNames": "", "Prefix": "Mr", - "Suffix": "", - "OccupationCode": "", - "OccupationCodeVersion": "", + "Suffix": null, + "OccupationCode": null, + "OccupationCodeVersion": null, "LastUpdateTime": "2020-03-01T10:30:00Z" }, "Accounts": [ @@ -383,9 +383,9 @@ "LastName": "Robertson", "MiddleNames": "", "Prefix": "Mr", - "Suffix": "", - "OccupationCode": "", - "OccupationCodeVersion": "", + "Suffix": null, + "OccupationCode": null, + "OccupationCodeVersion": null, "LastUpdateTime": "2020-05-01T10:30:00Z" }, "Accounts": [ diff --git a/Source/CDR.DataHolder.Manage.API/appsettings.Container.json b/Source/CDR.DataHolder.Manage.API/appsettings.Container.json index 8a60db9..e9a896e 100644 --- a/Source/CDR.DataHolder.Manage.API/appsettings.Container.json +++ b/Source/CDR.DataHolder.Manage.API/appsettings.Container.json @@ -33,7 +33,7 @@ "connectionString": "DataHolder_Energy_Logging_DB", "sinkOptionsSection": { "tableName": "LogEventsManageAPI", - "autoCreateSqlTable": true + "autoCreateSqlTable": false }, "restrictedToMinimumLevel": "Verbose", "batchPostingLimit": 1000, diff --git a/Source/CDR.DataHolder.Manage.API/appsettings.Development.json b/Source/CDR.DataHolder.Manage.API/appsettings.Development.json index bfca815..18237fb 100644 --- a/Source/CDR.DataHolder.Manage.API/appsettings.Development.json +++ b/Source/CDR.DataHolder.Manage.API/appsettings.Development.json @@ -33,7 +33,7 @@ "connectionString": "DataHolder_Energy_Logging_DB", "sinkOptionsSection": { "tableName": "LogEventsManageAPI", - "autoCreateSqlTable": true + "autoCreateSqlTable": false }, "restrictedToMinimumLevel": "Verbose", "batchPostingLimit": 1000, diff --git a/Source/CDR.DataHolder.Manage.API/appsettings.Release.json b/Source/CDR.DataHolder.Manage.API/appsettings.Release.json index e641f32..367da72 100644 --- a/Source/CDR.DataHolder.Manage.API/appsettings.Release.json +++ b/Source/CDR.DataHolder.Manage.API/appsettings.Release.json @@ -33,7 +33,7 @@ "connectionString": "DataHolder_Energy_Logging_DB", "sinkOptionsSection": { "tableName": "LogEventsManageAPI", - "autoCreateSqlTable": true + "autoCreateSqlTable": false }, "restrictedToMinimumLevel": "Verbose", "batchPostingLimit": 1000, From f9c0f5c7a05ce98bf353427fcb7b53bc7ab93ae6 Mon Sep 17 00:00:00 2001 From: CDR-AndrewG <89497569+CDR-AndrewG@users.noreply.github.com> Date: Thu, 9 Jun 2022 13:33:29 +1000 Subject: [PATCH 3/3] Update change log with release 0.1.1 number and date --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 46a47bf..30cf582 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [0.1.1] - 2022-06-09 ### Changed - Person information in seed data. - Build and Test action to download containers from docker hub.