From 0ca302cef04ddbc09e9eed00205d239eb8ae7b21 Mon Sep 17 00:00:00 2001 From: James Friel Date: Fri, 10 Jan 2025 14:39:36 +0000 Subject: [PATCH 1/9] fix simple file extractor --- CHANGELOG.md | 1 + .../DataExtraction/Pipeline/SimpleFileExtractor.cs | 13 +------------ 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3c4410727d..b3dec610b5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Build on and target .Net 9 rather than 8 - Simplify DB Patching Interface +- Fix issue with Simple File Extractor pipeline component checking ## [8.4.2] - 2024-12-18 diff --git a/Rdmp.Core/DataExport/DataExtraction/Pipeline/SimpleFileExtractor.cs b/Rdmp.Core/DataExport/DataExtraction/Pipeline/SimpleFileExtractor.cs index 7b31947518..1c15509ace 100644 --- a/Rdmp.Core/DataExport/DataExtraction/Pipeline/SimpleFileExtractor.cs +++ b/Rdmp.Core/DataExport/DataExtraction/Pipeline/SimpleFileExtractor.cs @@ -72,17 +72,6 @@ public override void Check(ICheckNotifier notifier) notifier.OnCheckPerformed(new CheckEventArgs( $"PerPatient is false but Pattern {Pattern} contains token $p. This token will never be matched in MoveAll mode", CheckResult.Fail)); - - try - { - notifier.OnCheckPerformed(new CheckEventArgs($"Output path is:{GetDestinationDirectory()}", - CheckResult.Success)); - } - catch (Exception ex) - { - throw new Exception( - "Unable to to determine output directory from 'OutputDirectoryName'. Perhaps pattern is bad", ex); - } } protected override void MoveFiles(ExtractGlobalsCommand command, IDataLoadEventListener listener, @@ -124,7 +113,7 @@ public DirectoryInfo GetDestinationDirectory() if (path.Contains("$p")) path = path.Replace("$p", _command.Project.ExtractionDirectory); if (path.Contains("$n")) path = path.Replace("$n", _command.Project.ProjectNumber.ToString()); - if (path.Contains("$c")) + if (path.Contains("$c") ) path = path.Replace("$c", new ExtractionDirectory(_command.Project.ExtractionDirectory, _command.Configuration) .ExtractionDirectoryInfo.FullName); From 974b7af4cc5b8d77746614f414bc1553a5b29a11 Mon Sep 17 00:00:00 2001 From: James Friel Date: Fri, 10 Jan 2025 15:03:48 +0000 Subject: [PATCH 2/9] fix white space --- .../DataExport/DataExtraction/Pipeline/SimpleFileExtractor.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Rdmp.Core/DataExport/DataExtraction/Pipeline/SimpleFileExtractor.cs b/Rdmp.Core/DataExport/DataExtraction/Pipeline/SimpleFileExtractor.cs index 1c15509ace..47da26b694 100644 --- a/Rdmp.Core/DataExport/DataExtraction/Pipeline/SimpleFileExtractor.cs +++ b/Rdmp.Core/DataExport/DataExtraction/Pipeline/SimpleFileExtractor.cs @@ -113,7 +113,7 @@ public DirectoryInfo GetDestinationDirectory() if (path.Contains("$p")) path = path.Replace("$p", _command.Project.ExtractionDirectory); if (path.Contains("$n")) path = path.Replace("$n", _command.Project.ProjectNumber.ToString()); - if (path.Contains("$c") ) + if (path.Contains("$c")) path = path.Replace("$c", new ExtractionDirectory(_command.Project.ExtractionDirectory, _command.Configuration) .ExtractionDirectoryInfo.FullName); From ed562bb1ba65a5427decd6712c69b6f4a16849a0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 Jan 2025 12:26:28 -0600 Subject: [PATCH 3/9] Bump NunitXml.TestLogger from 4.1.0 to 5.0.0 (#2098) * Bump NunitXml.TestLogger from 4.1.0 to 5.0.0 Bumps [NunitXml.TestLogger](https://github.com/spekt/testlogger) from 4.1.0 to 5.0.0. - [Release notes](https://github.com/spekt/testlogger/releases) - [Changelog](https://github.com/spekt/testlogger/blob/master/CHANGELOG.md) - [Commits](https://github.com/spekt/testlogger/compare/v4.1.0...v5.0.0) --- updated-dependencies: - dependency-name: NunitXml.TestLogger dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] * Remove disused test loggers * Remove old TestLogger ref from docs --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: James A Sutherland <> Co-authored-by: James Friel --- Directory.Packages.props | 3 +- Documentation/CodeTutorials/PluginWriting.md | 38 ++++++++++---------- Rdmp.Core.Tests/Rdmp.Core.Tests.csproj | 1 - Rdmp.UI.Tests/Rdmp.UI.Tests.csproj | 1 - 4 files changed, 19 insertions(+), 24 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 9a8ea5c911..13014bbcd4 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -39,11 +39,10 @@ - - \ No newline at end of file + diff --git a/Documentation/CodeTutorials/PluginWriting.md b/Documentation/CodeTutorials/PluginWriting.md index 1fe842faf2..9240a2c5db 100644 --- a/Documentation/CodeTutorials/PluginWriting.md +++ b/Documentation/CodeTutorials/PluginWriting.md @@ -504,7 +504,6 @@ dotnet add package HIC.RDMP.Plugin.Test dotnet add package Microsoft.NET.Test.Sdk dotnet add package NUnit dotnet add package NUnit3TestAdapter -dotnet add package NunitXml.TestLogger ``` Add the following test: @@ -516,27 +515,26 @@ using Rdmp.Core.DataFlowPipeline; using ReusableLibraryCode.Progress; using System.Data; -namespace MyPipelinePluginTests +namespace MyPipelinePluginTests; + +public class TestAnonymisationPlugins { - public class TestAnonymisationPlugins + [Test] + public void TestBasicDataTableAnonymiser1() { - [Test] - public void TestBasicDataTableAnonymiser1() - { - var dt = new DataTable(); - dt.Columns.Add("Story"); - dt.Rows.Add(new[] {"Thomas went to school regularly"}); - dt.Rows.Add(new[] {"It seems like Wallace went less regularly"}); - dt.Rows.Add(new[] {"Mr Smitty was the teacher"}); - - var a = new BasicDataTableAnonymiser1(); - var resultTable = a.ProcessPipelineData(dt,new ThrowImmediatelyDataLoadEventListener(),new GracefulCancellationToken()); - - Assert.AreEqual(resultTable.Rows.Count,3); - Assert.AreEqual("REDACTED went to school regularly",resultTable.Rows[0][0]); - Assert.AreEqual("It seems like REDACTED went less regularly",resultTable.Rows[1][0]); - Assert.AreEqual("Mr Smitty was the teacher",resultTable.Rows[2][0]); - } + using var dt = new DataTable(); + dt.Columns.Add("Story"); + dt.Rows.Add(new[] {"Thomas went to school regularly"}); + dt.Rows.Add(new[] {"It seems like Wallace went less regularly"}); + dt.Rows.Add(new[] {"Mr Smitty was the teacher"}); + + var a = new BasicDataTableAnonymiser1(); + var resultTable = a.ProcessPipelineData(dt,new ThrowImmediatelyDataLoadEventListener(),new GracefulCancellationToken()); + + Assert.AreEqual(resultTable.Rows.Count,3); + Assert.AreEqual("REDACTED went to school regularly",resultTable.Rows[0][0]); + Assert.AreEqual("It seems like REDACTED went less regularly",resultTable.Rows[1][0]); + Assert.AreEqual("Mr Smitty was the teacher",resultTable.Rows[2][0]); } } diff --git a/Rdmp.Core.Tests/Rdmp.Core.Tests.csproj b/Rdmp.Core.Tests/Rdmp.Core.Tests.csproj index cb80e9c6ae..4821571fde 100644 --- a/Rdmp.Core.Tests/Rdmp.Core.Tests.csproj +++ b/Rdmp.Core.Tests/Rdmp.Core.Tests.csproj @@ -80,7 +80,6 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - diff --git a/Rdmp.UI.Tests/Rdmp.UI.Tests.csproj b/Rdmp.UI.Tests/Rdmp.UI.Tests.csproj index a99c0723dc..9e4b588f3c 100644 --- a/Rdmp.UI.Tests/Rdmp.UI.Tests.csproj +++ b/Rdmp.UI.Tests/Rdmp.UI.Tests.csproj @@ -30,7 +30,6 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - From b5e0d32d34cb9f572ac955b19b440fe712e03a54 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Jan 2025 01:19:30 +0000 Subject: [PATCH 4/9] Bump shogo82148/actions-setup-perl from 1.31.4 to 1.32.0 (#2117) --- .github/workflows/build.yml | 2 +- .github/workflows/codeql.yml | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b26b4f3f09..3e08969fcc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -216,7 +216,7 @@ jobs: - name: Install Perl dependencies - uses: shogo82148/actions-setup-perl@v1.31.4 + uses: shogo82148/actions-setup-perl@v1.32.0 with: install-modules-with: cpanm install-modules: Archive::Zip Archive::Tar diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index eff78bfcba..5ae3c96498 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -27,6 +27,9 @@ jobs: uses: actions/checkout@v4 - name: setup .NET uses: actions/setup-dotnet@v4.2.0 + with: + global-json-file: global.json + dotnet-version: '6.0.x' - name: Initialize CodeQL uses: github/codeql-action/init@v3 From c38f2266ae91f5b8dc1012f1feecc550db403809 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Jan 2025 01:22:52 +0000 Subject: [PATCH 5/9] Bump the aws-sdk group with 4 updates Bumps the aws-sdk group with 4 updates: [AWSSDK.S3](https://github.com/aws/aws-sdk-net), [AWSSDK.SecurityToken](https://github.com/aws/aws-sdk-net), [AWSSDK.SSO](https://github.com/aws/aws-sdk-net) and [AWSSDK.SSOOIDC](https://github.com/aws/aws-sdk-net). Updates `AWSSDK.S3` from 3.7.411.5 to 3.7.412.2 - [Release notes](https://github.com/aws/aws-sdk-net/releases) - [Changelog](https://github.com/aws/aws-sdk-net/blob/main/SDK.CHANGELOG.MD) - [Commits](https://github.com/aws/aws-sdk-net/commits) Updates `AWSSDK.SecurityToken` from 3.7.401.26 to 3.7.401.31 - [Release notes](https://github.com/aws/aws-sdk-net/releases) - [Changelog](https://github.com/aws/aws-sdk-net/blob/main/SDK.CHANGELOG.MD) - [Commits](https://github.com/aws/aws-sdk-net/commits) Updates `AWSSDK.SSO` from 3.7.400.77 to 3.7.400.82 - [Release notes](https://github.com/aws/aws-sdk-net/releases) - [Changelog](https://github.com/aws/aws-sdk-net/blob/main/SDK.CHANGELOG.MD) - [Commits](https://github.com/aws/aws-sdk-net/commits) Updates `AWSSDK.SSOOIDC` from 3.7.400.77 to 3.7.400.82 - [Release notes](https://github.com/aws/aws-sdk-net/releases) - [Changelog](https://github.com/aws/aws-sdk-net/blob/main/SDK.CHANGELOG.MD) - [Commits](https://github.com/aws/aws-sdk-net/commits) --- updated-dependencies: - dependency-name: AWSSDK.S3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk - dependency-name: AWSSDK.SecurityToken dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk - dependency-name: AWSSDK.SSO dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk - dependency-name: AWSSDK.SSOOIDC dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-sdk ... Signed-off-by: dependabot[bot] --- Directory.Packages.props | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 13014bbcd4..24b992cff9 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -1,9 +1,9 @@ - - - - + + + + From 7cf9646f4bab7c5c867677b9d6c9f50bae91a800 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Jan 2025 01:22:32 +0000 Subject: [PATCH 6/9] Bump Microsoft.Bcl.AsyncInterfaces from 9.0.0 to 9.0.1 Bumps [Microsoft.Bcl.AsyncInterfaces](https://github.com/dotnet/runtime) from 9.0.0 to 9.0.1. - [Release notes](https://github.com/dotnet/runtime/releases) - [Commits](https://github.com/dotnet/runtime/compare/v9.0.0...v9.0.1) --- updated-dependencies: - dependency-name: Microsoft.Bcl.AsyncInterfaces dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Directory.Packages.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 13014bbcd4..f090b242ff 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -11,7 +11,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive From 36bceef993a6af6a97b086e272c2797848e3f731 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Jan 2025 01:22:33 +0000 Subject: [PATCH 7/9] Bump System.Resources.Extensions from 9.0.0 to 9.0.1 Bumps [System.Resources.Extensions](https://github.com/dotnet/runtime) from 9.0.0 to 9.0.1. - [Release notes](https://github.com/dotnet/runtime/releases) - [Commits](https://github.com/dotnet/runtime/compare/v9.0.0...v9.0.1) --- updated-dependencies: - dependency-name: System.Resources.Extensions dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Directory.Packages.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index f090b242ff..22b2447448 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -36,7 +36,7 @@ - + From 5d214d2a74fe0eae935bf139c56bcfbb192f316d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Jan 2025 01:22:35 +0000 Subject: [PATCH 8/9] Bump coverlet.collector from 6.0.3 to 6.0.4 Bumps [coverlet.collector](https://github.com/coverlet-coverage/coverlet) from 6.0.3 to 6.0.4. - [Release notes](https://github.com/coverlet-coverage/coverlet/releases) - [Commits](https://github.com/coverlet-coverage/coverlet/compare/v6.0.3...v6.0.4) --- updated-dependencies: - dependency-name: coverlet.collector dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Directory.Packages.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 22b2447448..075f3be373 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -43,6 +43,6 @@ - + From a7232ce564ca43e7a77b7b58a1147a9c5fb218e2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Jan 2025 01:21:05 +0000 Subject: [PATCH 9/9] Bump dotnet-sdk from 9.0.101 to 9.0.102 Bumps [dotnet-sdk](https://github.com/dotnet/sdk) from 9.0.101 to 9.0.102. - [Release notes](https://github.com/dotnet/sdk/releases) - [Commits](https://github.com/dotnet/sdk/commits/v9.0.102) --- updated-dependencies: - dependency-name: dotnet-sdk dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index 45f790ca74..0c2afa0566 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "9.0.101", + "version": "9.0.102", "rollForward": "minor" } }