diff --git a/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETCore.approved.txt b/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETCore.approved.txt index c02e8e2c1..67d6997e4 100644 --- a/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETCore.approved.txt +++ b/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETCore.approved.txt @@ -3154,12 +3154,18 @@ Octopus.Client.Model .ctor() String ComplianceSummary { get; set; } Int32 DaysToEffectiveExpiryDate { get; set; } + Boolean DoesExpiryBlockKeyActivities { get; set; } + Int32 EffectiveClusterTaskLimit { get; set; } DateTime EffectiveExpiryDate { get; set; } + Int32 EffectiveNodeTaskLimit { get; set; } String HostingEnvironment { get; set; } + Boolean IsClusterTaskLimitControlledByLicense { get; set; } Boolean IsCompliant { get; set; } + Boolean IsNodeTaskLimitControlledByLicense { get; set; } String LicenseKind { get; set; } Octopus.Client.Model.LicenseLimitStatusResource[] Limits { get; set; } Octopus.Client.Model.LicenseMessageResource[] Messages { get; set; } + String PermissionsMode { get; set; } } class LifecycleProgressionResource Octopus.Client.Extensibility.IResource @@ -3768,6 +3774,12 @@ Octopus.Client.Model String Description { get; set; } String[] SupportedRestrictions { get; set; } } + abstract class PermissionModes + { + static System.String Full + static System.String Restricted + static System.String Unspecified + } abstract class PermissionScope { static System.String Environments diff --git a/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETFramework.approved.txt b/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETFramework.approved.txt index f66f7be43..696f10699 100644 --- a/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETFramework.approved.txt +++ b/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETFramework.approved.txt @@ -3170,12 +3170,18 @@ Octopus.Client.Model .ctor() String ComplianceSummary { get; set; } Int32 DaysToEffectiveExpiryDate { get; set; } + Boolean DoesExpiryBlockKeyActivities { get; set; } + Int32 EffectiveClusterTaskLimit { get; set; } DateTime EffectiveExpiryDate { get; set; } + Int32 EffectiveNodeTaskLimit { get; set; } String HostingEnvironment { get; set; } + Boolean IsClusterTaskLimitControlledByLicense { get; set; } Boolean IsCompliant { get; set; } + Boolean IsNodeTaskLimitControlledByLicense { get; set; } String LicenseKind { get; set; } Octopus.Client.Model.LicenseLimitStatusResource[] Limits { get; set; } Octopus.Client.Model.LicenseMessageResource[] Messages { get; set; } + String PermissionsMode { get; set; } } class LifecycleProgressionResource Octopus.Client.Extensibility.IResource @@ -3787,6 +3793,12 @@ Octopus.Client.Model String Description { get; set; } String[] SupportedRestrictions { get; set; } } + abstract class PermissionModes + { + static System.String Full + static System.String Restricted + static System.String Unspecified + } abstract class PermissionScope { static System.String Environments diff --git a/source/Octopus.Client/Model/LicenseStatusResource.cs b/source/Octopus.Client/Model/LicenseStatusResource.cs index 6b0eaa9ec..85c1e1191 100644 --- a/source/Octopus.Client/Model/LicenseStatusResource.cs +++ b/source/Octopus.Client/Model/LicenseStatusResource.cs @@ -20,11 +20,19 @@ public static class LicenseMessageDispositions public static readonly string Error = "Error"; } + public static class PermissionModes + { + public static readonly string Unspecified = "Unspecified"; + public static readonly string Restricted = "Restricted"; + public static readonly string Full = "Full"; + } + public class LicenseStatusResource : Resource { /// - /// One of the values from LicenseKinds + /// One of the values from /// + [Obsolete("No longer supported from 2019.8.6")] public string LicenseKind { get; set; } public bool IsCompliant { get; set; } public string HostingEnvironment { get; set; } @@ -35,6 +43,16 @@ public class LicenseStatusResource : Resource public int DaysToEffectiveExpiryDate { get; set; } public LicenseMessageResource[] Messages { get; set; } public LicenseLimitStatusResource[] Limits { get; set; } + public bool DoesExpiryBlockKeyActivities { get; set; } + public int EffectiveNodeTaskLimit { get; set; } + public int EffectiveClusterTaskLimit { get; set; } + public bool IsClusterTaskLimitControlledByLicense { get; set; } + public bool IsNodeTaskLimitControlledByLicense { get; set; } + + /// + /// One of the values from + /// + public string PermissionsMode { get; set; } } public class LicenseMessageResource