Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions .azuredevops/pipelines/build-dcr-func.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
schedules:
- cron: '0 5 * * 0'
displayName: 'Run at 5:00 AM every Sunday (UTC)'
always: true
branches:
include:
- develop

trigger:
- develop
- main
Expand All @@ -8,10 +16,10 @@ pool:

steps:
- task: UseDotNet@2
displayName: 'Install .NET 6 SDK'
displayName: 'Install .NET 8 SDK'
inputs:
packageType: 'sdk'
version: '6.0.x'
version: '8.0.x'
performMultiLevelLookup: true

- script: |
Expand Down
12 changes: 10 additions & 2 deletions .azuredevops/pipelines/build-dh-func.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
schedules:
- cron: '0 5 * * 0'
displayName: 'Run at 5:00 AM every Sunday (UTC)'
always: true
branches:
include:
- develop

trigger:
- develop
- main
Expand All @@ -8,10 +16,10 @@ pool:

steps:
- task: UseDotNet@2
displayName: 'Install .NET 6 SDK'
displayName: 'Install .NET 8 SDK'
inputs:
packageType: 'sdk'
version: '6.0.x'
version: '8.0.x'
performMultiLevelLookup: true

- script: |
Expand Down
2 changes: 1 addition & 1 deletion .azuredevops/pipelines/build-no-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ steps:
condition: always()
inputs:
packageType: sdk
version: '6.0.x'
version: '8.0.x'
performMultiLevelLookup: true

- task: CmdLine@2
Expand Down
15 changes: 11 additions & 4 deletions .azuredevops/pipelines/build-v2.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
# Build pipeline v2 (Containerised)
schedules:
- cron: '0 5 * * 0'
displayName: 'Run at 5:00 AM every Sunday (UTC)'
always: true
branches:
include:
- develop


variables:

Expand Down Expand Up @@ -194,18 +201,18 @@ jobs:
artifact: Mock-Data-Recipient - E2E tests

- task: UseDotNet@2
displayName: 'Use .NET 6 sdk'
displayName: 'Use .NET 8 sdk'
condition: always()
inputs:
packageType: sdk
version: '6.0.x'
version: '8.0.x'
performMultiLevelLookup: true

- task: CmdLine@2
displayName: 'Install dotnet-ef'
condition: always()
inputs:
script: 'dotnet tool install --version 7.0.13 --global dotnet-ef'
script: 'dotnet tool install --version 8.0.4 --global dotnet-ef'

- task: CmdLine@2
displayName: 'Check dotnet-ef version'
Expand Down
18 changes: 8 additions & 10 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@ on:
- '.github/ISSUE_TEMPLATE/**'
- '.github/pull_request_template.md'
- '.github/stale.yml'
- 'LICENSE'
- 'Postman/**'
- 'LICENSE'
pull_request:
branches: [main, develop]
types: [opened, synchronize, reopened]
Expand All @@ -24,8 +23,7 @@ on:
- '.github/ISSUE_TEMPLATE/**'
- '.github/pull_request_template.md'
- '.github/stale.yml'
- 'LICENSE'
- 'Postman/**'
- 'LICENSE'

env:
DOCKER_IMAGE: consumerdataright/mock-data-recipient
Expand All @@ -36,11 +34,11 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Setup Docker Metadata
id: meta
uses: docker/metadata-action@v3
uses: docker/metadata-action@v5
with:
# list of Docker images to use as base name for tags
images: |
Expand All @@ -54,21 +52,21 @@ jobs:
type=semver,pattern={{major}}

- name: Setup Docker QEMU
uses: docker/setup-qemu-action@v1
uses: docker/setup-qemu-action@v3

- name: Setup Docker Buildx
uses: docker/setup-buildx-action@v1
uses: docker/setup-buildx-action@v3

- name: Login to DockerHub
if: ${{ github.repository_owner == 'ConsumerDataRight' && github.event_name != 'pull_request' }}
uses: docker/login-action@v1
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: Build and push Docker image
id: docker_build
uses: docker/build-push-action@v2
uses: docker/build-push-action@v6
with:
context: ./Source
file: ./Source/Dockerfile
Expand Down
6 changes: 2 additions & 4 deletions .github/workflows/dotnet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@ on:
- '.github/ISSUE_TEMPLATE/**'
- '.github/pull_request_template.md'
- '.github/stale.yml'
- 'LICENSE'
- 'Postman/**'
- 'LICENSE'
pull_request:
branches: [ main, develop ]
types: [opened, synchronize, reopened]
Expand All @@ -22,8 +21,7 @@ on:
- '.github/ISSUE_TEMPLATE/**'
- '.github/pull_request_template.md'
- '.github/stale.yml'
- 'LICENSE'
- 'Postman/**'
- 'LICENSE'

env:
buildConfiguration: 'Release'
Expand Down
18 changes: 18 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,24 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [2.1.0] - 2024-08-16
### Changed
- Updated nuget package versions

## [2.0.0] - 2024-06-12
### Changed
- Migrated from .NET 6 to .NET 8
- Migrated docker compose from v1 to v2

## [1.3.0] - 2024-03-13
### Changed
- Removed Bank Participant Data scope (i.e. cdr-register:bank:read) references.
- Updated NuGet packages to avoid vulnerabilities.
- DCR and PAR screen defaults to Authorisation Code Flow (ACF).

### Fixed
- Fixed Consumer Data Sharing Common swagger proxy UI failure due to 'IndustryName' validation - [Mock Data Recipient Issue 68](https://github.com/ConsumerDataRight/mock-data-recipient/issues/68)

## [1.2.5] - 2023-11-29
### Fixed
- Refactored code and minor bug fixes
Expand Down
2 changes: 1 addition & 1 deletion Help/azurefunctions/HELP.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ azurite --silent --location c:\azurite --debug c:\azurite\debug.log

```
navigate to .\mock-data-holder\Source\CDR.GetDataRecipients
func start --verbose
func host start --verbose
```

<div style="margin-left:18px;">
Expand Down
4 changes: 2 additions & 2 deletions Help/container/HELP.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ Example of accepting the `ACCEPT_EULA` environment variable of the SQL Server co
```
mssql:
container_name: sql1
image: 'mcr.microsoft.com/mssql/server:2019-latest'
image: 'mcr.microsoft.com/mssql/server:2022-latest'
ports:
- '1433:1433'
environment:
Expand Down Expand Up @@ -109,7 +109,7 @@ docker build -f Dockerfile -t mock-data-recipient .
```
Run the SQL Server image.
```
docker run -d -e "ACCEPT_EULA=Y" -e "SA_PASSWORD=Pa{}w0rd2019" -p 1433:1433 --name sql1 -h sql1 -d mcr.microsoft.com/mssql/server:2019-latest
docker run -d -e "ACCEPT_EULA=Y" -e "SA_PASSWORD=Pa{}w0rd2019" -p 1433:1433 --name sql1 -h sql1 -d mcr.microsoft.com/mssql/server:2022-latest
```
Run the new docker image.
```
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
![Consumer Data Right Logo](./cdr-logo.png?raw=true)

[![Consumer Data Standards v1.27.0](https://img.shields.io/badge/Consumer%20Data%20Standards-v1.27.0-blue.svg)](https://consumerdatastandardsaustralia.github.io/standards-archives/standards-1.27.0/#introduction)
[![Consumer Data Standards v1.31.0](https://img.shields.io/badge/Consumer%20Data%20Standards-v1.31.0-blue.svg)](https://consumerdatastandardsaustralia.github.io/standards-archives/standards-1.31.0/#introduction)
[![made-with-dotnet](https://img.shields.io/badge/Made%20with-.NET-1f425Ff.svg)](https://dotnet.microsoft.com/)
[![made-with-csharp](https://img.shields.io/badge/Made%20with-C%23-1f425Ff.svg)](https://docs.microsoft.com/en-us/dotnet/csharp/)
[![MIT License](https://img.shields.io/github/license/ConsumerDataRight/mock-data-recipient)](./LICENSE)
Expand All @@ -13,7 +13,7 @@ This repository contains a mock implementation of a Data Recipient and is offere

## Mock Data Recipient - Alignment
The Mock Data Recipient in this release:
* aligns to [v1.27.0](https://consumerdatastandardsaustralia.github.io/standards-archives/standards-1.27.0/#introduction) of the [Consumer Data Standards](https://consumerdatastandardsaustralia.github.io/standards-archives/standards-1.27.0/#introduction);
* aligns to [v1.31.0](https://consumerdatastandardsaustralia.github.io/standards-archives/standards-1.31.0/#introduction) of the [Consumer Data Standards](https://consumerdatastandardsaustralia.github.io/standards-archives/standards-1.31.0/#introduction);
* can connect to and complete authentication against both [FAPI 1.0 Migration Phase 2 and Phase 3](https://consumerdatastandardsaustralia.github.io/standards/#authentication-flows) compliant data holders.

## Getting Started
Expand Down Expand Up @@ -89,7 +89,7 @@ The Mock Data Recipient contains the following components:
- Used internally within the Mock Data Recipient to simplify interactions with the Register and Data Holders.
- Azure Functions
- Azure Functions that can automate the continuous Get Data Holders discovery and Dynamic Client Registration process.
- For each Data Holder retrieved from the Register, a message will be added to the DynamicClietnRegistration queue. A function listening to the queue, will pick up the message and attempt to register the Data Recipient with the Data Holder.
- For each Data Holder retrieved from the Register, a message will be added to the DynamicClientRegistration queue. A function listening to the queue, will pick up the message and attempt to register the Data Recipient with the Data Holder.
- To get help on the Azure Functions, see the [help guide](./Help/azurefunctions/HELP.md).
- Repository
- A SQL repository is included that contains local data used within the Mock Data Recipient.
Expand All @@ -100,7 +100,7 @@ The Mock Data Recipient contains the following components:

## Technology Stack
The following technologies have been used to build the Mock Data Recipient:
- The source code has been written in `C#` using the `.Net 6` framework.
- The source code has been written in `C#` using the `.Net 8` framework.
- The Repository utilises a `SQL` instance.

# Testing
Expand All @@ -125,4 +125,4 @@ See our [security policy](./SECURITY.md) for information on security controls, r
[MIT License](./LICENSE)

# Notes
The Mock Data Recipient is provided as a development tool only. It conforms to the Consumer Data Standards.
The Mock Data Recipient is provided as a development tool only. It conforms to the Consumer Data Standards.
5 changes: 2 additions & 3 deletions SECURITY.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,8 @@ Visit our [Responsible disclosure of security vulnerabilities policy](https://ww

| Version | Supported |
| ------- | ------------------ |
| 1.2.x | :white_check_mark: |
| 1.1.x | :x: |
| 1.0.x | :x: |
| 2.1.x | :white_check_mark: |
| 1.x.x | :x: |


## Reporting a Vulnerability
Expand Down
28 changes: 19 additions & 9 deletions Source/CDR.DCR/CDR.DCR.csproj
Original file line number Diff line number Diff line change
@@ -1,23 +1,30 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<AzureFunctionsVersion>v4</AzureFunctionsVersion>
<_FunctionsSkipCleanOutput>true</_FunctionsSkipCleanOutput>
<Version>1.2.5</Version>
<FileVersion>1.2.5</FileVersion>
<AssemblyVersion>1.2.5</AssemblyVersion>
<TargetFramework>$(TargetFrameworkVersion)</TargetFramework>
<Version>$(Version)</Version>
<FileVersion>$(Version)</FileVersion>
<AssemblyVersion>$(Version)</AssemblyVersion>
<OutputType>Exe</OutputType>
<ImplicitUsings>enabled</ImplicitUsings>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Azure.Storage.Queues" Version="12.12.0" />
<PackageReference Include="Microsoft.Azure.WebJobs.Extensions.Storage" Version="4.0.5" />
<PackageReference Include="Microsoft.Data.SqlClient" Version="5.0.1" />
<PackageReference Include="Microsoft.NET.Sdk.Functions" Version="4.1.3" />
<FrameworkReference Include="Microsoft.AspNetCore.App" />
<PackageReference Include="Microsoft.Azure.Functions.Worker" Version="1.22.0" />
<PackageReference Include="Microsoft.Azure.Functions.Worker.Sdk" Version="1.17.4" />
<PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Http.AspNetCore" Version="1.3.2" />
<PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Storage.Queues" Version="5.4.0" />
<PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.1" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\CDR.DataRecipient.Repository.SQL\CDR.DataRecipient.Repository.SQL.csproj" />
<ProjectReference Include="..\CDR.DataRecipient.SDK\CDR.DataRecipient.SDK.csproj" />
</ItemGroup>
<ItemGroup>
<None Update="appsettings.docker.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="certificate.pfx">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
Expand All @@ -29,4 +36,7 @@
<CopyToPublishDirectory>Never</CopyToPublishDirectory>
</None>
</ItemGroup>
</Project>
<ItemGroup>
<Using Include="System.Threading.ExecutionContext" Alias="ExecutionContext" />
</ItemGroup>
</Project>
Loading