8598528338

Committed 08 Apr 2024 10:28AM UTC coverage: 56.914% (+0.08%) from 56.837%

Build # 8598528338

Build Type

push

github

Committed by

web-flow

Commit Message

Move 8.1.5 to main for autoupdater (#1797)

* bump to net8

* add sqlcli

* Bump Autoupdater.NET.Official from 1.8.4 to 1.8.5

Bumps [Autoupdater.NET.Official](https://github.com/ravibpatel/AutoUpdater.NET) from 1.8.4 to 1.8.5.
- [Release notes](https://github.com/ravibpatel/AutoUpdater.NET/releases)
- [Commits](https://github.com/ravibpatel/AutoUpdater.NET/compare/v1.8.4...v1.8.5)

---
updated-dependencies:
- dependency-name: Autoupdater.NET.Official
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

* Delete .nuget/packages.config (#1758)

* Delete .nuget/packages.config

Remove  hopefully obsolete package list confusing dependency tracking

* Remove .nuget folder

---------

Co-authored-by: James A Sutherland <>

* Bump svenstaro/upload-release-action from 2.7.0 to 2.9.0 (#1759)

* Bump shogo82148/actions-setup-perl from 1.28.0 to 1.29.0 (#1751)

Bumps [shogo82148/actions-setup-perl](https://github.com/shogo82148/actions-setup-perl) from 1.28.0 to 1.29.0.
- [Release notes](https://github.com/shogo82148/actions-setup-perl/releases)
- [Commits](https://github.com/shogo82148/actions-setup-perl/compare/v1.28.0...v1.29.0)

---
updated-dependencies:
- dependency-name: shogo82148/actions-setup-perl
  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>
Co-authored-by: James Friel <jfriel001@dundee.ac.uk>

* Bump CsvHelper from 30.0.3 to 30.1.0 (#1737)

Bumps [CsvHelper](https://github.com/JoshClose/CsvHelper) from 30.0.3 to 30.1.0.
- [Commits](https://github.com/JoshClose/CsvHelper/compare/30.0.3...30.1.0)

---
updated-dependencies:
- dependency-name: CsvHelper
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

S... (continued)

Run Details

10835 of 20509 branches covered (52.83%)

Branch coverage included in aggregate %.

99 of 176 new or added lines in 33 files covered. (56.25%)

10 existing lines in 7 files now uncovered.

30856 of 52744 relevant lines covered (58.5%)

7400.67 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

0.0

/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandCreateNewExternalDatabaseServer.cs

// Copyright (c) The University of Dundee 2018-2019
// This file is part of the Research Data Management Platform (RDMP).
// RDMP is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
// RDMP is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
// You should have received a copy of the GNU General Public License along with RDMP. If not, see <https://www.gnu.org/licenses/>.

using System;
using FAnsi.Discovery;
using Rdmp.Core.Curation.Data;
using Rdmp.Core.Curation.Data.Defaults;
using Rdmp.Core.Icons.IconOverlays;
using Rdmp.Core.Icons.IconProvision;
using Rdmp.Core.Icons.IconProvision.StateBasedIconProviders;
using Rdmp.Core.MapsDirectlyToDatabaseTable.Versioning;
using Rdmp.Core.Repositories.Construction;
using Rdmp.Core.ReusableLibraryCode;
using Rdmp.Core.ReusableLibraryCode.Icons.IconProvision;
using SixLabors.ImageSharp;
using SixLabors.ImageSharp.PixelFormats;

namespace Rdmp.Core.CommandExecution.AtomicCommands;

public class ExecuteCommandCreateNewExternalDatabaseServer : BasicCommandExecution, IAtomicCommand
{
    private readonly PermissableDefaults _defaultToSet;
    private readonly ExternalDatabaseServerStateBasedIconProvider _databaseIconProvider;
    private readonly IPatcher _patcher;
    private readonly DiscoveredDatabase _database;

    public ExternalDatabaseServer ServerCreatedIfAny { get; private set; }


    [UseWithObjectConstructor]
    public ExecuteCommandCreateNewExternalDatabaseServer(IBasicActivateItems activator,
        PermissableDefaults defaultToSet, DiscoveredDatabase toCreate)
        : this(activator, defaultToSet == PermissableDefaults.None ? null : defaultToSet.ToTier2DatabaseType(),
            defaultToSet)
    {
        _database = toCreate;
    }

    public ExecuteCommandCreateNewExternalDatabaseServer(IBasicActivateItems activator, IPatcher patcher,
        PermissableDefaults defaultToSet) : base(activator)
    {
        _patcher = patcher;
        _defaultToSet = defaultToSet;

        _databaseIconProvider = new ExternalDatabaseServerStateBasedIconProvider();

        //do we already have a default server for this?
        var existingDefault = BasicActivator.ServerDefaults.GetDefaultFor(_defaultToSet);

        if (existingDefault != null)
            SetImpossible($"There is already an existing {_defaultToSet} database");
    }

    public override string GetCommandName()
    {
        if (_defaultToSet != PermissableDefaults.None)
            return
                $"Create New {UsefulStuff.PascalCaseStringToHumanReadable(_defaultToSet.ToString().Replace("_ID", "").Replace("Live", "").Replace("ANO", "Anonymisation"))} Server...";

        return _patcher != null ? $"Create New {_patcher.Name} Server..." : base.GetCommandName();
    }

    public override string GetCommandHelp()
    {
        return _defaultToSet switch
        {
            PermissableDefaults.LiveLoggingServer_ID =>
                "Creates a database for auditing all flows of data (data load, extraction etc) including tables for errors, progress tables/record count loaded etc",
            PermissableDefaults.IdentifierDumpServer_ID =>
                "Creates a database for storing the values of intercepted columns that are discarded during data load because they contain identifiable data",
            PermissableDefaults.DQE =>
                "Creates a database for storing the results of data quality engine runs on your datasets over time.",
            PermissableDefaults.WebServiceQueryCachingServer_ID => "Defines a new server that can be accessed by RDMP",
            PermissableDefaults.RAWDataLoadServer =>
                "Defines which database server should be used for the RAW data in the RAW=>STAGING=>LIVE model of the data load engine",
            PermissableDefaults.ANOStore =>
                "Creates a new anonymisation database which contains mappings of identifiable values to anonymous representations",
            PermissableDefaults.CohortIdentificationQueryCachingServer_ID =>
                "Creates a new Query Cache database which contains the indexed results of executed subqueries in a CohortIdentificationConfiguration",
            _ => "Defines a new server that can be accessed by RDMP"
        };
    }

    public override void Execute()
    {
        base.Execute();

        //user wants to create a new server e.g. a new Logging server
        if (_patcher == null)
        {
            ServerCreatedIfAny = new ExternalDatabaseServer(BasicActivator.RepositoryLocator.CatalogueRepository,
                $"New ExternalDatabaseServer {Guid.NewGuid()}", _patcher);
            if(_database is not null)
                ServerCreatedIfAny.SetProperties(_database);
        }
        else
            //create the new server
            ServerCreatedIfAny = BasicActivator.CreateNewPlatformDatabase(
                BasicActivator.RepositoryLocator.CatalogueRepository,
                _defaultToSet,
                _patcher,
                _database);

        //user cancelled creating a server
        if (ServerCreatedIfAny == null)
            return;

        Publish(ServerCreatedIfAny);
        Activate(ServerCreatedIfAny);
    }

    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
    {
        if (_patcher == null) return iconProvider.GetImage(RDMPConcept.ExternalDatabaseServer, OverlayKind.Add);

        var basicIcon = _databaseIconProvider.GetIconForAssembly(_patcher.GetDbAssembly());
        return IconOverlayProvider.GetOverlay(basicIcon, OverlayKind.Add);
    }
}

1	// Copyright (c) The University of Dundee 2018-2019
2	// This file is part of the Research Data Management Platform (RDMP).
3	// RDMP is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
4	// RDMP is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
5	// You should have received a copy of the GNU General Public License along with RDMP. If not, see <https://www.gnu.org/licenses/>.
6
7	using System;
8	using FAnsi.Discovery;
9	using Rdmp.Core.Curation.Data;
10	using Rdmp.Core.Curation.Data.Defaults;
11	using Rdmp.Core.Icons.IconOverlays;
12	using Rdmp.Core.Icons.IconProvision;
13	using Rdmp.Core.Icons.IconProvision.StateBasedIconProviders;
14	using Rdmp.Core.MapsDirectlyToDatabaseTable.Versioning;
15	using Rdmp.Core.Repositories.Construction;
16	using Rdmp.Core.ReusableLibraryCode;
17	using Rdmp.Core.ReusableLibraryCode.Icons.IconProvision;
18	using SixLabors.ImageSharp;
19	using SixLabors.ImageSharp.PixelFormats;
20
21	namespace Rdmp.Core.CommandExecution.AtomicCommands;
22
23	public class ExecuteCommandCreateNewExternalDatabaseServer : BasicCommandExecution, IAtomicCommand
24	{
25	private readonly PermissableDefaults _defaultToSet;
26	private readonly ExternalDatabaseServerStateBasedIconProvider _databaseIconProvider;
27	private readonly IPatcher _patcher;
28	private readonly DiscoveredDatabase _database;
29
30	public ExternalDatabaseServer ServerCreatedIfAny { get; private set; }	×
31
32
33	[UseWithObjectConstructor]
34	public ExecuteCommandCreateNewExternalDatabaseServer(IBasicActivateItems activator,
35	PermissableDefaults defaultToSet, DiscoveredDatabase toCreate)
36	: this(activator, defaultToSet == PermissableDefaults.None ? null : defaultToSet.ToTier2DatabaseType(),	×
37	defaultToSet)	×
38	{
39	_database = toCreate;	×
40	}	×
41
42	public ExecuteCommandCreateNewExternalDatabaseServer(IBasicActivateItems activator, IPatcher patcher,
43	PermissableDefaults defaultToSet) : base(activator)	×
44	{
45	_patcher = patcher;	×
46	_defaultToSet = defaultToSet;	×
47
48	_databaseIconProvider = new ExternalDatabaseServerStateBasedIconProvider();	×
49
50	//do we already have a default server for this?
51	var existingDefault = BasicActivator.ServerDefaults.GetDefaultFor(_defaultToSet);	×
52
53	if (existingDefault != null)	×
54	SetImpossible($"There is already an existing {_defaultToSet} database");	×
55	}	×
56
57	public override string GetCommandName()
58	{
59	if (_defaultToSet != PermissableDefaults.None)	×
60	return	×
61	$"Create New {UsefulStuff.PascalCaseStringToHumanReadable(_defaultToSet.ToString().Replace("_ID", "").Replace("Live", "").Replace("ANO", "Anonymisation"))} Server...";	×
62
63	return _patcher != null ? $"Create New {_patcher.Name} Server..." : base.GetCommandName();	×
64	}
65
66	public override string GetCommandHelp()
67	{
68	return _defaultToSet switch	×
69	{	×
70	PermissableDefaults.LiveLoggingServer_ID =>	×
71	"Creates a database for auditing all flows of data (data load, extraction etc) including tables for errors, progress tables/record count loaded etc",	×
72	PermissableDefaults.IdentifierDumpServer_ID =>	×
73	"Creates a database for storing the values of intercepted columns that are discarded during data load because they contain identifiable data",	×
74	PermissableDefaults.DQE =>	×
75	"Creates a database for storing the results of data quality engine runs on your datasets over time.",	×
76	PermissableDefaults.WebServiceQueryCachingServer_ID => "Defines a new server that can be accessed by RDMP",	×
77	PermissableDefaults.RAWDataLoadServer =>	×
78	"Defines which database server should be used for the RAW data in the RAW=>STAGING=>LIVE model of the data load engine",	×
79	PermissableDefaults.ANOStore =>	×
80	"Creates a new anonymisation database which contains mappings of identifiable values to anonymous representations",	×
81	PermissableDefaults.CohortIdentificationQueryCachingServer_ID =>	×
82	"Creates a new Query Cache database which contains the indexed results of executed subqueries in a CohortIdentificationConfiguration",	×
83	_ => "Defines a new server that can be accessed by RDMP"	×
84	};	×
85	}
86
87	public override void Execute()
88	{
89	base.Execute();	×
90
91	//user wants to create a new server e.g. a new Logging server
92	if (_patcher == null)	×
93	{
94	ServerCreatedIfAny = new ExternalDatabaseServer(BasicActivator.RepositoryLocator.CatalogueRepository,	×
95	$"New ExternalDatabaseServer {Guid.NewGuid()}", _patcher);	×
NEW 96	if(_database is not null)	×
NEW 97	ServerCreatedIfAny.SetProperties(_database);	×
98	}
99	else
100	//create the new server
101	ServerCreatedIfAny = BasicActivator.CreateNewPlatformDatabase(	×
102	BasicActivator.RepositoryLocator.CatalogueRepository,	×
103	_defaultToSet,	×
104	_patcher,	×
105	_database);	×
106
107	//user cancelled creating a server
108	if (ServerCreatedIfAny == null)	×
109	return;	×
110
111	Publish(ServerCreatedIfAny);	×
112	Activate(ServerCreatedIfAny);	×
113	}	×
114
115	public override Image<Rgba32> GetImage(IIconProvider iconProvider)
116	{
117	if (_patcher == null) return iconProvider.GetImage(RDMPConcept.ExternalDatabaseServer, OverlayKind.Add);	×
118
119	var basicIcon = _databaseIconProvider.GetIconForAssembly(_patcher.GetDbAssembly());	×
120	return IconOverlayProvider.GetOverlay(basicIcon, OverlayKind.Add);	×
121	}
122	}

HicServices / RDMP / 8598528338

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous