From 2cde4d3eafb6686987c3dd8eb3ca15858bf7b398 Mon Sep 17 00:00:00 2001 From: Nelson Susanto Date: Tue, 15 Nov 2022 12:12:10 +1100 Subject: [PATCH 1/7] Add ApiKeysEnabled --- .../Model/AuthenticationConfigResource.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/source/Octopus.Server.Client/Model/AuthenticationConfigResource.cs b/source/Octopus.Server.Client/Model/AuthenticationConfigResource.cs index 47bfe3d82..896039730 100644 --- a/source/Octopus.Server.Client/Model/AuthenticationConfigResource.cs +++ b/source/Octopus.Server.Client/Model/AuthenticationConfigResource.cs @@ -35,5 +35,8 @@ public AuthenticationConfigResource() [Writeable] public bool RememberMeEnabled { get; set; } + + [Writeable] + public bool ApiKeysEnabled { get; set; } } } \ No newline at end of file From 4371f1995fc841b76ff884c75de9c677c95d4c29 Mon Sep 17 00:00:00 2001 From: Nelson Susanto Date: Tue, 15 Nov 2022 13:24:18 +1100 Subject: [PATCH 2/7] Update approval file --- ...re.ThePublicSurfaceAreaShouldNotRegress..NETCore.approved.txt | 1 + ...ePublicSurfaceAreaShouldNotRegress..NETFramework.approved.txt | 1 + 2 files changed, 2 insertions(+) diff --git a/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETCore.approved.txt b/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETCore.approved.txt index 2c9f0ee21..9a41c35c8 100644 --- a/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETCore.approved.txt +++ b/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETCore.approved.txt @@ -1946,6 +1946,7 @@ Octopus.Client.Model Octopus.Client.Extensibility.IResource { .ctor() + Boolean ApiKeysEnabled { get; set; } Boolean AutoLoginEnabled { get; set; } String CookieDomain { get; set; } String Id { get; set; } diff --git a/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETFramework.approved.txt b/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETFramework.approved.txt index 31d2813c5..75a8244fb 100644 --- a/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETFramework.approved.txt +++ b/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETFramework.approved.txt @@ -1963,6 +1963,7 @@ Octopus.Client.Model Octopus.Client.Extensibility.IResource { .ctor() + Boolean ApiKeysEnabled { get; set; } Boolean AutoLoginEnabled { get; set; } String CookieDomain { get; set; } String Id { get; set; } From d40dc1f64be5be8d1e382f8645bda44526023726 Mon Sep 17 00:00:00 2001 From: Nelson Susanto Date: Thu, 24 Nov 2022 16:55:02 +1100 Subject: [PATCH 3/7] ApiKeysEnabled -^> ApiKeysEnabledForNonServiceAccounts --- ...e.ThePublicSurfaceAreaShouldNotRegress..NETCore.approved.txt | 2 +- ...PublicSurfaceAreaShouldNotRegress..NETFramework.approved.txt | 2 +- .../Octopus.Server.Client/Model/AuthenticationConfigResource.cs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETCore.approved.txt b/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETCore.approved.txt index 9a41c35c8..175ffb2de 100644 --- a/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETCore.approved.txt +++ b/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETCore.approved.txt @@ -1946,7 +1946,7 @@ Octopus.Client.Model Octopus.Client.Extensibility.IResource { .ctor() - Boolean ApiKeysEnabled { get; set; } + Boolean ApiKeysEnabledForNonServiceAccounts { get; set; } Boolean AutoLoginEnabled { get; set; } String CookieDomain { get; set; } String Id { get; set; } diff --git a/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETFramework.approved.txt b/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETFramework.approved.txt index 75a8244fb..bde14b115 100644 --- a/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETFramework.approved.txt +++ b/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETFramework.approved.txt @@ -1963,7 +1963,7 @@ Octopus.Client.Model Octopus.Client.Extensibility.IResource { .ctor() - Boolean ApiKeysEnabled { get; set; } + Boolean ApiKeysEnabledForNonServiceAccounts { get; set; } Boolean AutoLoginEnabled { get; set; } String CookieDomain { get; set; } String Id { get; set; } diff --git a/source/Octopus.Server.Client/Model/AuthenticationConfigResource.cs b/source/Octopus.Server.Client/Model/AuthenticationConfigResource.cs index 896039730..7d94e865c 100644 --- a/source/Octopus.Server.Client/Model/AuthenticationConfigResource.cs +++ b/source/Octopus.Server.Client/Model/AuthenticationConfigResource.cs @@ -37,6 +37,6 @@ public AuthenticationConfigResource() public bool RememberMeEnabled { get; set; } [Writeable] - public bool ApiKeysEnabled { get; set; } + public bool ApiKeysEnabledForNonServiceAccounts { get; set; } } } \ No newline at end of file From 77e3d2cc05a80e7986e305993bc29dc338a264c7 Mon Sep 17 00:00:00 2001 From: Nelson Susanto Date: Mon, 5 Dec 2022 10:51:11 +1100 Subject: [PATCH 4/7] Rename NonService to Usere --- ...e.ThePublicSurfaceAreaShouldNotRegress..NETCore.approved.txt | 2 +- ...PublicSurfaceAreaShouldNotRegress..NETFramework.approved.txt | 2 +- .../Octopus.Server.Client/Model/AuthenticationConfigResource.cs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETCore.approved.txt b/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETCore.approved.txt index 175ffb2de..3af6cb9c4 100644 --- a/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETCore.approved.txt +++ b/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETCore.approved.txt @@ -1946,7 +1946,7 @@ Octopus.Client.Model Octopus.Client.Extensibility.IResource { .ctor() - Boolean ApiKeysEnabledForNonServiceAccounts { get; set; } + Boolean ApiKeysEnabledForUserAccounts { get; set; } Boolean AutoLoginEnabled { get; set; } String CookieDomain { get; set; } String Id { get; set; } diff --git a/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETFramework.approved.txt b/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETFramework.approved.txt index bde14b115..e5879a43c 100644 --- a/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETFramework.approved.txt +++ b/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETFramework.approved.txt @@ -1963,7 +1963,7 @@ Octopus.Client.Model Octopus.Client.Extensibility.IResource { .ctor() - Boolean ApiKeysEnabledForNonServiceAccounts { get; set; } + Boolean ApiKeysEnabledForUserAccounts { get; set; } Boolean AutoLoginEnabled { get; set; } String CookieDomain { get; set; } String Id { get; set; } diff --git a/source/Octopus.Server.Client/Model/AuthenticationConfigResource.cs b/source/Octopus.Server.Client/Model/AuthenticationConfigResource.cs index 7d94e865c..af7bb378c 100644 --- a/source/Octopus.Server.Client/Model/AuthenticationConfigResource.cs +++ b/source/Octopus.Server.Client/Model/AuthenticationConfigResource.cs @@ -37,6 +37,6 @@ public AuthenticationConfigResource() public bool RememberMeEnabled { get; set; } [Writeable] - public bool ApiKeysEnabledForNonServiceAccounts { get; set; } + public bool ApiKeysEnabledForUserAccounts { get; set; } } } \ No newline at end of file From 15d503731b442aa56cc7396c93123263f757386a Mon Sep 17 00:00:00 2001 From: Shane Date: Mon, 27 Feb 2023 14:29:17 +1000 Subject: [PATCH 5/7] Change name of property --- .../Octopus.Server.Client/Model/AuthenticationConfigResource.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/Octopus.Server.Client/Model/AuthenticationConfigResource.cs b/source/Octopus.Server.Client/Model/AuthenticationConfigResource.cs index af7bb378c..c9fc5ddf3 100644 --- a/source/Octopus.Server.Client/Model/AuthenticationConfigResource.cs +++ b/source/Octopus.Server.Client/Model/AuthenticationConfigResource.cs @@ -37,6 +37,6 @@ public AuthenticationConfigResource() public bool RememberMeEnabled { get; set; } [Writeable] - public bool ApiKeysEnabledForUserAccounts { get; set; } + public bool UserApiKeysEnabled { get; set; } } } \ No newline at end of file From d05f3a6ed5e6f9f401f6ee39a32209cef46342fc Mon Sep 17 00:00:00 2001 From: Shane Date: Mon, 27 Feb 2023 14:51:41 +1000 Subject: [PATCH 6/7] Update test adapter and fix test --- .../Octopus.Client.Tests.csproj | 2 +- ...houldNotRegress..NETFramework.approved.txt | 66 +++++++++++-------- 2 files changed, 40 insertions(+), 28 deletions(-) diff --git a/source/Octopus.Client.Tests/Octopus.Client.Tests.csproj b/source/Octopus.Client.Tests/Octopus.Client.Tests.csproj index 7e9354212..9849e0f07 100644 --- a/source/Octopus.Client.Tests/Octopus.Client.Tests.csproj +++ b/source/Octopus.Client.Tests/Octopus.Client.Tests.csproj @@ -37,7 +37,7 @@ - + diff --git a/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETFramework.approved.txt b/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETFramework.approved.txt index e5879a43c..42c58e8f0 100644 --- a/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETFramework.approved.txt +++ b/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETFramework.approved.txt @@ -1963,7 +1963,6 @@ Octopus.Client.Model Octopus.Client.Extensibility.IResource { .ctor() - Boolean ApiKeysEnabledForUserAccounts { get; set; } Boolean AutoLoginEnabled { get; set; } String CookieDomain { get; set; } String Id { get; set; } @@ -1973,6 +1972,7 @@ Octopus.Client.Model Boolean RememberMeEnabled { get; set; } Int32 SessionTimeoutInSeconds { get; set; } String[] TrustedRedirectUrls { get; set; } + Boolean UserApiKeysEnabled { get; set; } } abstract class AutoDeploy { @@ -2789,6 +2789,7 @@ Octopus.Client.Model Octopus.Client.Model.GuidedFailureMode DefaultGuidedFailureMode { get; set; } Boolean DefaultToSkipIfAlreadyInstalled { get; set; } String DeploymentChangesTemplate { get; set; } + Boolean ForcePackageDownload { get; set; } String ProjectId { get; set; } String ReleaseNotesTemplate { get; set; } String SpaceId { get; set; } @@ -4351,6 +4352,7 @@ Octopus.Client.Model String DeploymentProcessId { get; set; } String Description { get; set; } Boolean DiscreteChannelRelease { get; set; } + Boolean ForcePackageDownload { get; set; } Octopus.Client.Model.IconResource Icon { get; set; } List IncludedLibraryVariableSetIds { get; set; } Boolean IsDisabled { get; set; } @@ -4709,6 +4711,7 @@ Octopus.Client.Model String Description { get; set; } Octopus.Client.Model.ReferenceCollection Environments { get; } Octopus.Client.Model.RunbookEnvironmentScope EnvironmentScope { get; set; } + Boolean ForcePackageDownload { get; set; } Octopus.Client.Model.TenantedDeploymentMode MultiTenancyMode { get; set; } String Name { get; set; } String ProjectId { get; set; } @@ -5727,24 +5730,6 @@ Octopus.Client.Model Octopus.Client.Model.DeploymentActionPackageResource DonorPackage { get; set; } String Template { get; set; } } - class WebPortalConfigResource - Octopus.Client.Extensibility.IResource - { - .ctor() - String Id { get; set; } - Octopus.Client.Extensibility.LinkCollection Links { get; set; } - Octopus.Client.Model.WebPortalSecurityResource Security { get; set; } - } - class WebPortalSecurityResource - { - .ctor() - Boolean ContentSecurityPolicyEnabled { get; set; } - String CorsWhitelist { get; set; } - Boolean HttpStrictTransportSecurityEnabled { get; set; } - Int64 HttpStrictTransportSecurityMaxAge { get; set; } - String ReferrerPolicy { get; set; } - Octopus.Client.Model.XOptionsResource XOptions { get; set; } - } class WorkerPoolResource Octopus.Client.Extensibility.IResource Octopus.Client.Model.IAuditedResource @@ -5806,14 +5791,6 @@ Octopus.Client.Model String Thumbprint { get; set; } Int32 Version { get; set; } } - class XOptionsResource - { - static System.String XFrameAllowFromDescription - static System.String XFrameOptionsDescription - .ctor() - String XFrameOptionAllowFrom { get; set; } - String XFrameOptions { get; set; } - } } Octopus.Client.Model.Accounts { @@ -7056,6 +7033,41 @@ Octopus.Client.Model.Versioning Object GetFormat(Type) } } +Octopus.Client.Model.WebPortalConfiguration +{ + class WebPortalConfigResource + Octopus.Client.Extensibility.IResource + { + .ctor() + String Id { get; set; } + Octopus.Client.Extensibility.LinkCollection Links { get; set; } + Octopus.Client.Model.WebPortalConfiguration.WebPortalLoggingResource Logging { get; set; } + Octopus.Client.Model.WebPortalConfiguration.WebPortalSecurityResource Security { get; set; } + } + class WebPortalLoggingResource + { + .ctor() + String[] TrustedProxies { get; set; } + } + class WebPortalSecurityResource + { + .ctor() + Boolean ContentSecurityPolicyEnabled { get; set; } + String CorsWhitelist { get; set; } + Boolean HttpStrictTransportSecurityEnabled { get; set; } + Int64 HttpStrictTransportSecurityMaxAge { get; set; } + String ReferrerPolicy { get; set; } + Octopus.Client.Model.WebPortalConfiguration.XOptionsResource XOptions { get; set; } + } + class XOptionsResource + { + static System.String XFrameAllowFromDescription + static System.String XFrameOptionsDescription + .ctor() + String XFrameOptionAllowFrom { get; set; } + String XFrameOptions { get; set; } + } +} Octopus.Client.Operations { class InvalidRegistrationArgumentsException From 8eb19d2cf5806ef55e4df3db654d19bae116455e Mon Sep 17 00:00:00 2001 From: Shane Date: Mon, 27 Feb 2023 15:34:55 +1000 Subject: [PATCH 7/7] Missed an approval --- ...e.ThePublicSurfaceAreaShouldNotRegress..NETCore.approved.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETCore.approved.txt b/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETCore.approved.txt index 3af6cb9c4..a2047817e 100644 --- a/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETCore.approved.txt +++ b/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETCore.approved.txt @@ -1946,7 +1946,6 @@ Octopus.Client.Model Octopus.Client.Extensibility.IResource { .ctor() - Boolean ApiKeysEnabledForUserAccounts { get; set; } Boolean AutoLoginEnabled { get; set; } String CookieDomain { get; set; } String Id { get; set; } @@ -1956,6 +1955,7 @@ Octopus.Client.Model Boolean RememberMeEnabled { get; set; } Int32 SessionTimeoutInSeconds { get; set; } String[] TrustedRedirectUrls { get; set; } + Boolean UserApiKeysEnabled { get; set; } } abstract class AutoDeploy {