diff --git a/build/Version.props b/build/Version.props index 079fb9d43b..17a15a5068 100644 --- a/build/Version.props +++ b/build/Version.props @@ -7,8 +7,8 @@ 5.2.0 10.8.0 7.0.0 - 13.8.0 - 16.1.0 + 14.0.0 + 17.0.0 7.3.0 5.10.0 1.5.0 diff --git a/src/Tgstation.Server.Api/Models/ErrorCode.cs b/src/Tgstation.Server.Api/Models/ErrorCode.cs index 9e1fea2fe9..ca7abbbc8d 100644 --- a/src/Tgstation.Server.Api/Models/ErrorCode.cs +++ b/src/Tgstation.Server.Api/Models/ErrorCode.cs @@ -185,7 +185,7 @@ namespace Tgstation.Server.Api.Models SwarmIntegrityCheckFailed, /// - /// One of and is set while the other isn't. + /// One of and is set while the other isn't. /// [Description("Either both accessUser and accessToken must be set or neither!")] RepoMismatchUserAndAccessToken, @@ -239,13 +239,13 @@ namespace Tgstation.Server.Api.Models RepoDuplicateTestMerge, /// - /// Attempted to set a whitespace . + /// Attempted to set a whitespace . /// [Description("committerName cannot be whitespace!")] RepoWhitespaceCommitterName, /// - /// Attempted to set a whitespace . + /// Attempted to set a whitespace . /// [Description("committerEmail cannot be whitespace!")] RepoWhitespaceCommitterEmail, @@ -377,19 +377,19 @@ namespace Tgstation.Server.Api.Models InstanceMissingDreamMakerSettings, /// - /// Missing in database. + /// Missing in database. /// [Description("Could not retrieve Repository settings from the database!")] InstanceMissingRepositorySettings, /// - /// Performing an automatic update with the flag resulted in merge conflicts. + /// Performing an automatic update with the flag resulted in merge conflicts. /// [Description("Performing this automatic update as a merge would result in conficts. Aborting!")] InstanceUpdateTestMergeConflict, /// - /// and are required for this operation. + /// and are required for this operation. /// [Description("Git credentials are required for this operation!")] RepoCredentialsRequired, diff --git a/src/Tgstation.Server.Api/Models/Internal/RepositorySettings.cs b/src/Tgstation.Server.Api/Models/RepositorySettings.cs similarity index 97% rename from src/Tgstation.Server.Api/Models/Internal/RepositorySettings.cs rename to src/Tgstation.Server.Api/Models/RepositorySettings.cs index 7b916352d2..f54e1e4a6e 100644 --- a/src/Tgstation.Server.Api/Models/Internal/RepositorySettings.cs +++ b/src/Tgstation.Server.Api/Models/RepositorySettings.cs @@ -1,11 +1,11 @@ using System.ComponentModel.DataAnnotations; -namespace Tgstation.Server.Api.Models.Internal +namespace Tgstation.Server.Api.Models { /// /// Represents configurable settings for a git repository. /// - public class RepositorySettings + public abstract class RepositorySettings { /// /// Prefix for TGS encoded app private keys. This is encoded in the format PREFIX + (APP_ID OR CLIENT_ID) + ':' + BASE64(APP_PRIVATE_KEY). diff --git a/src/Tgstation.Server.Api/Rights/RepositoryRights.cs b/src/Tgstation.Server.Api/Rights/RepositoryRights.cs index 407437ce5d..fdd8f4e048 100644 --- a/src/Tgstation.Server.Api/Rights/RepositoryRights.cs +++ b/src/Tgstation.Server.Api/Rights/RepositoryRights.cs @@ -19,7 +19,7 @@ namespace Tgstation.Server.Api.Rights CancelPendingChanges = 1 << 0, /// - /// User may clone the repository if it does not exist. This also allows setting , , and at clone time. + /// User may clone the repository if it does not exist. This also allows setting , , and at clone time. /// SetOrigin = 1 << 1, @@ -39,17 +39,17 @@ namespace Tgstation.Server.Api.Rights UpdateBranch = 1 << 4, /// - /// User may change and . + /// User may change and . /// ChangeCommitter = 1 << 5, /// - /// User may change , , and . + /// User may change , , and . /// ChangeTestMergeCommits = 1 << 6, /// - /// User may read and change and . + /// User may read and change and . /// ChangeCredentials = 1 << 7, @@ -64,7 +64,7 @@ namespace Tgstation.Server.Api.Rights Read = 1 << 9, /// - /// User may change and . + /// User may change and . /// ChangeAutoUpdateSettings = 1 << 10, diff --git a/src/Tgstation.Server.Host/Components/Repository/DefaultGitRemoteFeatures.cs b/src/Tgstation.Server.Host/Components/Repository/DefaultGitRemoteFeatures.cs index 05d9408a67..1c526e9295 100644 --- a/src/Tgstation.Server.Host/Components/Repository/DefaultGitRemoteFeatures.cs +++ b/src/Tgstation.Server.Host/Components/Repository/DefaultGitRemoteFeatures.cs @@ -29,7 +29,7 @@ namespace Tgstation.Server.Host.Components.Repository /// public ValueTask GetTestMerge( TestMergeParameters parameters, - Api.Models.Internal.RepositorySettings repositorySettings, + RepositorySettings repositorySettings, CancellationToken cancellationToken) => throw new NotSupportedException(); } } diff --git a/src/Tgstation.Server.Host/Components/Repository/GitHubRemoteFeatures.cs b/src/Tgstation.Server.Host/Components/Repository/GitHubRemoteFeatures.cs index 7d34f78e54..97eded304c 100644 --- a/src/Tgstation.Server.Host/Components/Repository/GitHubRemoteFeatures.cs +++ b/src/Tgstation.Server.Host/Components/Repository/GitHubRemoteFeatures.cs @@ -6,7 +6,6 @@ using Microsoft.Extensions.Logging; using Octokit; using Tgstation.Server.Api.Models; -using Tgstation.Server.Api.Models.Internal; using Tgstation.Server.Host.Utils.GitHub; namespace Tgstation.Server.Host.Components.Repository diff --git a/src/Tgstation.Server.Host/Components/Repository/GitLabRemoteFeatures.cs b/src/Tgstation.Server.Host/Components/Repository/GitLabRemoteFeatures.cs index 9cf32f3f7b..ffbd577ac2 100644 --- a/src/Tgstation.Server.Host/Components/Repository/GitLabRemoteFeatures.cs +++ b/src/Tgstation.Server.Host/Components/Repository/GitLabRemoteFeatures.cs @@ -6,7 +6,6 @@ using GitLabApiClient; using Microsoft.Extensions.Logging; using Tgstation.Server.Api.Models; -using Tgstation.Server.Api.Models.Internal; namespace Tgstation.Server.Host.Components.Repository { diff --git a/src/Tgstation.Server.Host/Components/Repository/GitRemoteFeaturesBase.cs b/src/Tgstation.Server.Host/Components/Repository/GitRemoteFeaturesBase.cs index d42e928792..4aa58fd1fc 100644 --- a/src/Tgstation.Server.Host/Components/Repository/GitRemoteFeaturesBase.cs +++ b/src/Tgstation.Server.Host/Components/Repository/GitRemoteFeaturesBase.cs @@ -6,7 +6,6 @@ using System.Threading.Tasks; using Microsoft.Extensions.Logging; using Tgstation.Server.Api.Models; -using Tgstation.Server.Api.Models.Internal; namespace Tgstation.Server.Host.Components.Repository { diff --git a/src/Tgstation.Server.Host/Components/Repository/Repository.cs b/src/Tgstation.Server.Host/Components/Repository/Repository.cs index 9a71bcdceb..1aa2fa0842 100644 --- a/src/Tgstation.Server.Host/Components/Repository/Repository.cs +++ b/src/Tgstation.Server.Host/Components/Repository/Repository.cs @@ -12,7 +12,6 @@ using LibGit2Sharp.Handlers; using Microsoft.Extensions.Logging; using Tgstation.Server.Api.Models; -using Tgstation.Server.Api.Models.Internal; using Tgstation.Server.Host.Components.Events; using Tgstation.Server.Host.Configuration; using Tgstation.Server.Host.Extensions; diff --git a/src/Tgstation.Server.Host/Components/Repository/RepositoryUpdateService.cs b/src/Tgstation.Server.Host/Components/Repository/RepositoryUpdateService.cs index 17e820433a..341db7f617 100644 --- a/src/Tgstation.Server.Host/Components/Repository/RepositoryUpdateService.cs +++ b/src/Tgstation.Server.Host/Components/Repository/RepositoryUpdateService.cs @@ -25,7 +25,7 @@ namespace Tgstation.Server.Host.Components.Repository /// /// The current for the . /// - readonly RepositorySettings currentModel; + readonly Models.RepositorySettings currentModel; /// /// The that initiated the repository update. @@ -50,7 +50,7 @@ namespace Tgstation.Server.Host.Components.Repository /// The value of . /// The value of . public RepositoryUpdateService( - RepositorySettings currentModel, + Models.RepositorySettings currentModel, User initiatingUser, ILogger logger, long instanceId) diff --git a/src/Tgstation.Server.Host/Controllers/InstanceController.cs b/src/Tgstation.Server.Host/Controllers/InstanceController.cs index dbcb03b70b..aff77e4869 100644 --- a/src/Tgstation.Server.Host/Controllers/InstanceController.cs +++ b/src/Tgstation.Server.Host/Controllers/InstanceController.cs @@ -770,7 +770,7 @@ namespace Tgstation.Server.Host.Controllers AutoUpdateInterval = initialSettings.AutoUpdateInterval ?? 0, AutoUpdateCron = initialSettings.AutoUpdateCron ?? String.Empty, ChatBotLimit = initialSettings.ChatBotLimit ?? Models.Instance.DefaultChatBotLimit, - RepositorySettings = new RepositorySettings + RepositorySettings = new Models.RepositorySettings { CommitterEmail = Components.Repository.Repository.DefaultCommitterEmail, CommitterName = Components.Repository.Repository.DefaultCommitterName, diff --git a/src/Tgstation.Server.Host/Controllers/RepositoryController.cs b/src/Tgstation.Server.Host/Controllers/RepositoryController.cs index 735b9efa83..4e7f576fd6 100644 --- a/src/Tgstation.Server.Host/Controllers/RepositoryController.cs +++ b/src/Tgstation.Server.Host/Controllers/RepositoryController.cs @@ -369,7 +369,7 @@ namespace Tgstation.Server.Host.Controllers if (currentModel == default) return this.Gone(); - bool CheckModified(Expression> expression, RepositoryRights requiredRight) + bool CheckModified(Expression> expression, RepositoryRights requiredRight) { var memberSelectorExpression = (MemberExpression)expression.Body; var property = (PropertyInfo)memberSelectorExpression.Member; @@ -531,7 +531,7 @@ namespace Tgstation.Server.Host.Controllers /// /// The current . /// A new . - RepositoryUpdateService CreateRepositoryUpdateService(RepositorySettings currentModel) + RepositoryUpdateService CreateRepositoryUpdateService(Models.RepositorySettings currentModel) => new( currentModel, AuthenticationContext.User, diff --git a/src/Tgstation.Server.Host/Database/Migrations/20181124231534_MSToggleTestmergeComments.cs b/src/Tgstation.Server.Host/Database/Migrations/20181124231534_MSToggleTestmergeComments.cs index 30b821ee66..d33370d6a8 100644 --- a/src/Tgstation.Server.Host/Database/Migrations/20181124231534_MSToggleTestmergeComments.cs +++ b/src/Tgstation.Server.Host/Database/Migrations/20181124231534_MSToggleTestmergeComments.cs @@ -5,7 +5,7 @@ using Microsoft.EntityFrameworkCore.Migrations; namespace Tgstation.Server.Host.Database.Migrations { /// - /// Add the column for MSSQL. + /// Add the column for MSSQL. /// public partial class MSToggleTestmergeComments : Migration { diff --git a/src/Tgstation.Server.Host/Database/Migrations/20181124231549_MYToggleTestmergeComments.cs b/src/Tgstation.Server.Host/Database/Migrations/20181124231549_MYToggleTestmergeComments.cs index f91e86a6db..b8c35a193c 100644 --- a/src/Tgstation.Server.Host/Database/Migrations/20181124231549_MYToggleTestmergeComments.cs +++ b/src/Tgstation.Server.Host/Database/Migrations/20181124231549_MYToggleTestmergeComments.cs @@ -5,7 +5,7 @@ using Microsoft.EntityFrameworkCore.Migrations; namespace Tgstation.Server.Host.Database.Migrations { /// - /// Add the column for MySQL/MariaDB. + /// Add the column for MySQL/MariaDB. /// public partial class MYToggleTestmergeComments : Migration { diff --git a/src/Tgstation.Server.Host/Models/RepositorySettings.cs b/src/Tgstation.Server.Host/Models/RepositorySettings.cs index e8fb7f6019..d804162718 100644 --- a/src/Tgstation.Server.Host/Models/RepositorySettings.cs +++ b/src/Tgstation.Server.Host/Models/RepositorySettings.cs @@ -4,8 +4,8 @@ using Tgstation.Server.Api.Models.Response; namespace Tgstation.Server.Host.Models { - /// - public sealed class RepositorySettings : Api.Models.Internal.RepositorySettings, IApiTransformable + /// + public sealed class RepositorySettings : Api.Models.RepositorySettings, IApiTransformable { /// /// The row Id. diff --git a/src/Tgstation.Server.Host/Utils/GitHub/GitHubClientFactory.cs b/src/Tgstation.Server.Host/Utils/GitHub/GitHubClientFactory.cs index d23874a302..1ba4d8d523 100644 --- a/src/Tgstation.Server.Host/Utils/GitHub/GitHubClientFactory.cs +++ b/src/Tgstation.Server.Host/Utils/GitHub/GitHubClientFactory.cs @@ -13,7 +13,7 @@ using Microsoft.IdentityModel.Tokens; using Octokit; -using Tgstation.Server.Api.Models.Internal; +using Tgstation.Server.Api.Models; using Tgstation.Server.Host.Configuration; using Tgstation.Server.Host.System; diff --git a/tests/Tgstation.Server.Host.Tests/Utils/GitHub/TestGitHubClientFactory.cs b/tests/Tgstation.Server.Host.Tests/Utils/GitHub/TestGitHubClientFactory.cs index 605083ca12..5132f8ab01 100644 --- a/tests/Tgstation.Server.Host.Tests/Utils/GitHub/TestGitHubClientFactory.cs +++ b/tests/Tgstation.Server.Host.Tests/Utils/GitHub/TestGitHubClientFactory.cs @@ -12,7 +12,7 @@ using Moq; using Octokit; -using Tgstation.Server.Api.Models.Internal; +using Tgstation.Server.Api.Models; using Tgstation.Server.Host.Configuration; using Tgstation.Server.Host.System;