From 8bbf5461d7def7f57c7748b5e68821a2a5183b77 Mon Sep 17 00:00:00 2001 From: Shannon Lewis Date: Wed, 16 May 2018 19:56:27 +1000 Subject: [PATCH 1/5] aligning the resources against server --- ...AreaShouldNotRegress..NETCore.approved.txt | 142 +++++++++++++---- ...houldNotRegress..NETFramework.approved.txt | 149 +++++++++++++----- .../AmazonWebServicesRoleAccountEditor.cs | 12 -- .../AmazonWebServicesRoleAccountEditor.cs | 12 -- .../Extensions/TypeExtensions.cs | 2 - .../AmazonWebServicesRoleAccountResource.cs | 7 - .../AzureSubscriptionAccountResource.cs | 4 + .../Model/ActionTemplateSearchResource.cs | 1 + .../Octopus.Client/Model/ArtifactResource.cs | 6 + .../Model/AuthenticationConfigResource.cs | 3 + .../Model/AuthenticationMode.cs | 10 -- .../Model/BuiltInFeedStatsResource.cs | 2 - .../BuiltInRepositoryConfigurationResource.cs | 3 + .../Model/CertificateConfigurationResource.cs | 1 + .../Model/CertificateResource.cs | 23 +++ .../Model/CertificateUsageResource.cs | 2 +- .../Model/CommunicationStyle.cs | 4 +- .../Model/DashboardItemResource.cs | 1 + .../Model/DashboardProjectResource.cs | 1 + .../Model/DeploymentActionResource.cs | 1 + .../Model/DeploymentResource.cs | 1 - source/Octopus.Client/Model/EmailPriority.cs | 9 ++ .../AzureServiceFabricCredentialType.cs | 8 + .../AzureServiceFabricSecurityMode.cs | 9 ++ .../Endpoints/AzureWebAppEndpointResource.cs | 4 - .../ServiceFabricEndpointResource.cs | 48 ++++++ .../Endpoints/TentacleEndpointResource.cs | 2 + .../Model/EventNotificationSubscription.cs | 4 + .../Model/FeaturesConfigurationResource.cs | 5 +- .../Octopus.Client/Model/GuidedFailureMode.cs | 9 ++ .../Model/IdentityClaimResource.cs | 19 +++ .../Octopus.Client/Model/IdentityResource.cs | 22 +++ .../Model/InterruptionResource.cs | 8 + .../Octopus.Client/Model/LicenseResource.cs | 2 +- .../Model/NamedReferenceItem.cs | 2 + .../Octopus.Client/Model/NuGetFeedResource.cs | 8 +- .../Octopus.Client/Model/ProjectResource.cs | 3 + source/Octopus.Client/Model/RootResource.cs | 6 - .../Model/ServerStatusResource.cs | 2 +- .../Model/TaskDetailsResource.cs | 2 +- .../DailyScheduledTriggerFilterResource.cs | 2 +- source/Octopus.Client/Model/UserResource.cs | 10 ++ .../Serialization/AccountConverter.cs | 4 +- 43 files changed, 433 insertions(+), 142 deletions(-) delete mode 100644 source/Octopus.Client/Editors/AmazonWebServicesRoleAccountEditor.cs delete mode 100644 source/Octopus.Client/Editors/Async/AmazonWebServicesRoleAccountEditor.cs delete mode 100644 source/Octopus.Client/Model/Accounts/AmazonWebServicesRoleAccountResource.cs delete mode 100644 source/Octopus.Client/Model/AuthenticationMode.cs create mode 100644 source/Octopus.Client/Model/EmailPriority.cs create mode 100644 source/Octopus.Client/Model/Endpoints/AzureServiceFabricCredentialType.cs create mode 100644 source/Octopus.Client/Model/Endpoints/AzureServiceFabricSecurityMode.cs create mode 100644 source/Octopus.Client/Model/Endpoints/ServiceFabricEndpointResource.cs create mode 100644 source/Octopus.Client/Model/GuidedFailureMode.cs create mode 100644 source/Octopus.Client/Model/IdentityClaimResource.cs create mode 100644 source/Octopus.Client/Model/IdentityResource.cs diff --git a/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETCore.approved.txt b/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETCore.approved.txt index 28f1827b5..0db06910f 100644 --- a/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETCore.approved.txt +++ b/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETCore.approved.txt @@ -262,13 +262,6 @@ Octopus.Client.Editors.Async { .ctor(Octopus.Client.Repositories.Async.IAccountRepository) } - class AmazonWebServicesRoleAccountEditor - Octopus.Client.Editors.Async.IResourceEditor - Octopus.Client.Editors.Async.IResourceBuilder - Octopus.Client.Editors.Async.AccountEditor - { - .ctor(Octopus.Client.Repositories.Async.IAccountRepository) - } class AzureServicePrincipalAccountEditor Octopus.Client.Editors.Async.IResourceEditor Octopus.Client.Editors.Async.IResourceBuilder @@ -792,6 +785,7 @@ Octopus.Client.Model { .ctor() String Author { get; set; } + String Category { get; set; } String CommunityActionTemplateId { get; set; } String Description { get; set; } Boolean HasUpdate { get; set; } @@ -979,6 +973,7 @@ Octopus.Client.Model .ctor() DateTimeOffset Created { get; set; } String Filename { get; set; } + String LogCorrelationId { get; set; } Octopus.Client.Model.ReferenceCollection RelatedDocumentIds { get; set; } String Source { get; set; } } @@ -988,14 +983,10 @@ Octopus.Client.Model .ctor() Boolean AutoLoginEnabled { get; set; } String Id { get; set; } + Boolean IsSelfServiceIdentityEditingEnabled { get; set; } Octopus.Client.Extensibility.LinkCollection Links { get; set; } String[] TrustedRedirectUrls { get; set; } } - AuthenticationMode - { - UsernamePassword = 0 - Domain = 1 - } abstract class AutoDeploy { static System.String Name @@ -1044,8 +1035,6 @@ Octopus.Client.Model Octopus.Client.Model.Resource { .ctor() - String IndexingStatus { get; set; } - String SynchronizationStatus { get; set; } Int32 TotalPackages { get; set; } } class BuiltInRepositoryConfigurationResource @@ -1054,6 +1043,7 @@ Octopus.Client.Model Octopus.Client.Model.Resource { .ctor() + Boolean ApplyToDynamicallyReferencedPackages { get; set; } Nullable DeleteUnreleasedPackagesAfterDays { get; set; } } abstract class BuiltInTasks @@ -1184,6 +1174,7 @@ Octopus.Client.Model { .ctor() String Name { get; set; } + String SignatureAlgorithm { get; set; } String Thumbprint { get; set; } } CertificateExportPemOptions @@ -1207,6 +1198,7 @@ Octopus.Client.Model .ctor(String, String) .ctor(String, String, String) Nullable Archived { get; } + IList CertificateChain { get; set; } Octopus.Client.Model.SensitiveValue CertificateData { get; set; } Octopus.Client.Model.CertificateFormat CertificateDataFormat { get; } Octopus.Client.Model.ReferenceCollection EnvironmentIds { get; set; } @@ -1224,6 +1216,7 @@ Octopus.Client.Model Boolean SelfSigned { get; } String SerialNumber { get; } String SignatureAlgorithmName { get; } + IList SubjectAlternativeNames { get; set; } String SubjectCommonName { get; } String SubjectDistinguishedName { get; } String SubjectOrganization { get; } @@ -1232,8 +1225,23 @@ Octopus.Client.Model Octopus.Client.Model.ReferenceCollection TenantTags { get; set; } String Thumbprint { get; } Int32 Version { get; } + class X509Certificate + { + .ctor() + String IssuerDistinguishedName { get; set; } + DateTimeOffset NotAfter { get; set; } + DateTimeOffset NotBefore { get; set; } + String SerialNumber { get; set; } + String SignatureAlgorithmName { get; set; } + String SubjectDistinguishedName { get; set; } + String Thumbprint { get; set; } + Int32 Version { get; set; } + } } class CertificateUsageResource + Octopus.Client.Extensibility.IResource + Octopus.Client.Model.IAuditedResource + Octopus.Client.Model.Resource { .ctor() ICollection LibraryVariableSetUsages { get; set; } @@ -1283,6 +1291,7 @@ Octopus.Client.Model AzureWebApp = 5 Ftp = 6 AzureCloudService = 7 + AzureServiceFabricCluster = 8 } class CommunityActionTemplateResource Octopus.Client.Extensibility.IResource @@ -1371,6 +1380,7 @@ Octopus.Client.Model DateTimeOffset QueueTime { get; set; } String ReleaseId { get; set; } String ReleaseVersion { get; set; } + Nullable StartTime { get; set; } Octopus.Client.Model.TaskState State { get; set; } String TaskId { get; set; } String TenantId { get; set; } @@ -1393,6 +1403,7 @@ Octopus.Client.Model .ctor() Boolean CanPerformUntenantedDeployment { get; set; } Octopus.Client.Model.ReferenceCollection EnvironmentIds { get; set; } + Boolean IsDisabled { get; set; } String Name { get; set; } String ProjectGroupId { get; set; } String Slug { get; set; } @@ -1474,6 +1485,7 @@ Octopus.Client.Model { .ctor() String ActionType { get; set; } + Boolean CanBeUsedForProjectVersioning { get; set; } Octopus.Client.Model.ReferenceCollection Channels { get; } Octopus.Client.Model.ReferenceCollection Environments { get; } Octopus.Client.Model.ReferenceCollection ExcludedEnvironments { get; } @@ -1549,7 +1561,6 @@ Octopus.Client.Model Boolean ForcePackageDownload { get; set; } Boolean ForcePackageRedeployment { get; set; } Dictionary FormValues { get; set; } - Boolean IsFirst { get; set; } String ManifestVariableSetId { get; set; } String Name { get; set; } String ProjectId { get; set; } @@ -1675,6 +1686,12 @@ Octopus.Client.Model Octopus.Client.Model.FeedType FeedType { get; } String RegistryPath { get; set; } } + EmailPriority + { + Normal = 0 + Low = 1 + High = 2 + } class EncryptedBytes { .ctor(Byte[], Byte[]) @@ -1728,9 +1745,12 @@ Octopus.Client.Model Nullable EmailDigestLastProcessed { get; set; } Nullable EmailDigestLastProcessedEventAutoId { get; set; } TimeSpan EmailFrequencyPeriod { get; set; } + Octopus.Client.Model.EmailPriority EmailPriority { get; set; } String EmailShowDatesInTimeZoneId { get; set; } Octopus.Client.Model.ReferenceCollection EmailTeams { get; set; } Octopus.Client.Model.EventNotificationSubscriptionFilter Filter { get; set; } + String WebhookHeaderKey { get; set; } + String WebhookHeaderValue { get; set; } Nullable WebhookLastProcessed { get; set; } Nullable WebhookLastProcessedEventAutoId { get; set; } Octopus.Client.Model.ReferenceCollection WebhookTeams { get; set; } @@ -1795,9 +1815,8 @@ Octopus.Client.Model Octopus.Client.Model.Resource { .ctor() - Boolean IsBrowserCachingEnabled { get; set; } + Boolean IsBuiltInRepoSyncEnabled { get; set; } Boolean IsCommunityActionTemplatesEnabled { get; set; } - Boolean IsDockerEnabled { get; set; } Boolean IsMultiTenancyEnabled { get; set; } } class FeedResource @@ -1839,6 +1858,12 @@ Octopus.Client.Model Int32 DownloadRetryBackoffSeconds { get; set; } Octopus.Client.Model.FeedType FeedType { get; } } + GuidedFailureMode + { + EnvironmentDefault = 0 + Off = 1 + On = 2 + } abstract class Health { static System.String Name @@ -1870,6 +1895,20 @@ Octopus.Client.Model String LastModifiedBy { get; set; } Nullable LastModifiedOn { get; set; } } + class IdentityClaimResource + { + .ctor() + .ctor(String, Boolean) + Boolean IsIdentifyingClaim { get; set; } + String Value { get; set; } + } + class IdentityResource + { + .ctor() + .ctor(String) + Dictionary Claims { get; } + String IdentityProviderName { get; set; } + } class InterruptionResource Octopus.Client.Extensibility.IResource Octopus.Client.Model.IAuditedResource @@ -1881,6 +1920,7 @@ Octopus.Client.Model DateTimeOffset Created { get; set; } Octopus.Client.Model.Forms.Form Form { get; set; } Boolean HasResponsibility { get; set; } + Boolean IsLinkedToOtherInterruption { get; set; } Boolean IsPending { get; set; } Octopus.Client.Model.ReferenceCollection RelatedDocumentIds { get; set; } Octopus.Client.Model.ReferenceCollection ResponsibleTeamIds { get; set; } @@ -1959,6 +1999,7 @@ Octopus.Client.Model .ctor() Boolean IsCompliant { get; set; } String LicenseText { get; set; } + Int32 MaintenanceExpiresIn { get; set; } String NoncomplianceReason { get; set; } Boolean UseFreeVersion { get; set; } } @@ -2185,6 +2226,7 @@ Octopus.Client.Model class NamedReferenceItem { .ctor() + Boolean DisplayIdAndName { get; set; } String DisplayName { get; set; } String Id { get; set; } } @@ -2223,6 +2265,8 @@ Octopus.Client.Model Octopus.Client.Model.FeedResource { .ctor() + Int32 DownloadAttempts { get; set; } + Int32 DownloadRetryBackoffSeconds { get; set; } Boolean EnhancedMode { get; set; } Octopus.Client.Model.FeedType FeedType { get; } } @@ -2509,6 +2553,7 @@ Octopus.Client.Model .ctor(String, String, String) Boolean AutoCreateRelease { get; set; } ISet AutoDeployReleaseOverrides { get; } + Octopus.Client.Model.GuidedFailureMode DefaultGuidedFailureMode { get; set; } Boolean DefaultToSkipIfAlreadyInstalled { get; set; } String DeploymentProcessId { get; set; } String Description { get; set; } @@ -2767,8 +2812,6 @@ Octopus.Client.Model .ctor() String ApiVersion { get; set; } String Application { get; set; } - Boolean FormsLoginEnabled { get; set; } - Boolean GuestLoginEnabled { get; set; } Guid InstallationId { get; set; } Boolean IsEarlyAccessProgram { get; set; } String Version { get; set; } @@ -2939,9 +2982,9 @@ Octopus.Client.Model Octopus.Client.Model.Resource { .ctor() - Octopus.Client.Model.AuthenticationMode AuthenticationMode { get; set; } Boolean IsDatabaseEncrypted { get; set; } Boolean IsInMaintenanceMode { get; set; } + Boolean IsMajorMinorUpgrade { get; set; } Boolean IsUpgradeAvailable { get; set; } String MaintenanceExpires { get; set; } String MaximumAvailableVersion { get; set; } @@ -3084,7 +3127,7 @@ Octopus.Client.Model .ctor() Octopus.Client.Model.ActivityElement ActivityLog { get; set; } IList ActivityLogs { get; set; } - Nullable PhysicalLogSize { get; set; } + Int64 PhysicalLogSize { get; set; } Octopus.Client.Model.TaskProgress Progress { get; set; } Octopus.Client.Model.TaskResource Task { get; set; } } @@ -3297,8 +3340,10 @@ Octopus.Client.Model Octopus.Client.Model.Resource { .ctor() + Boolean CanPasswordBeEdited { get; set; } String DisplayName { get; set; } String EmailAddress { get; set; } + Octopus.Client.Model.IdentityResource[] Identities { get; set; } Boolean IsActive { get; set; } Boolean IsRequestor { get; set; } Boolean IsService { get; set; } @@ -3420,6 +3465,18 @@ Octopus.Client.Model String ReferrerPolicy { get; set; } Octopus.Client.Model.XOptionsResource XOptions { get; set; } } + class X509Certificate + { + .ctor() + String IssuerDistinguishedName { get; set; } + DateTimeOffset NotAfter { get; set; } + DateTimeOffset NotBefore { get; set; } + String SerialNumber { get; set; } + String SignatureAlgorithmName { get; set; } + String SubjectDistinguishedName { get; set; } + String Thumbprint { get; set; } + Int32 Version { get; set; } + } class XOptionsResource { static System.String XFrameAllowFromDescription @@ -3464,15 +3521,6 @@ Octopus.Client.Model.Accounts Octopus.Client.Model.Accounts.AccountType AccountType { get; } Octopus.Client.Model.SensitiveValue SecretKey { get; set; } } - class AmazonWebServicesRoleAccountResource - Octopus.Client.Extensibility.IResource - Octopus.Client.Model.IAuditedResource - Octopus.Client.Extensibility.INamedResource - Octopus.Client.Model.Accounts.AccountResource - { - .ctor() - Octopus.Client.Model.Accounts.AccountType AccountType { get; } - } class AzureCloudService { .ctor() @@ -3525,6 +3573,7 @@ Octopus.Client.Model.Accounts Octopus.Client.Model.SensitiveValue CertificateBytes { get; set; } String CertificateThumbprint { get; set; } String ServiceManagementEndpointBaseUri { get; set; } + String ServiceManagementEndpointSuffix { get; set; } String SubscriptionNumber { get; set; } class WebSite { @@ -3702,6 +3751,17 @@ Octopus.Client.Model.Endpoints Octopus.Client.Model.Endpoints.EndpointResource { } + AzureServiceFabricCredentialType + { + ClientCredential = 0 + UserCredential = 1 + } + AzureServiceFabricSecurityMode + { + Unsecure = 0 + SecureClientCertificate = 1 + SecureAzureAD = 2 + } class AzureWebAppEndpointResource Octopus.Client.Extensibility.IResource Octopus.Client.Model.IAuditedResource @@ -3712,7 +3772,6 @@ Octopus.Client.Model.Endpoints Octopus.Client.Model.CommunicationStyle CommunicationStyle { get; } String ResourceGroupName { get; set; } String WebAppName { get; set; } - String WebSpaceName { get; set; } } abstract class CalamariDotNetCorePlatforms { @@ -3779,6 +3838,24 @@ Octopus.Client.Model.Endpoints Octopus.Client.Model.CommunicationStyle CommunicationStyle { get; } String Uri { get; set; } } + class ServiceFabricEndpointResource + Octopus.Client.Extensibility.IResource + Octopus.Client.Model.IAuditedResource + Octopus.Client.Model.Endpoints.AgentlessEndpointResource + { + .ctor() + String AadClientCredentialSecret { get; set; } + Octopus.Client.Model.Endpoints.AzureServiceFabricCredentialType AadCredentialType { get; set; } + Octopus.Client.Model.SensitiveValue AadUserCredentialPassword { get; set; } + String AadUserCredentialUsername { get; set; } + String CertificateStoreLocation { get; set; } + String CertificateStoreName { get; set; } + String ClientCertVariable { get; set; } + Octopus.Client.Model.CommunicationStyle CommunicationStyle { get; } + String ConnectionEndpoint { get; set; } + Octopus.Client.Model.Endpoints.AzureServiceFabricSecurityMode SecurityMode { get; set; } + String ServerCertThumbprint { get; set; } + } class SshEndpointResource Octopus.Client.Extensibility.IResource Octopus.Client.Model.IAuditedResource @@ -3812,6 +3889,7 @@ Octopus.Client.Model.Endpoints Octopus.Client.Model.IAuditedResource Octopus.Client.Model.Endpoints.EndpointResource { + String CertificateSignatureAlgorithm { get; set; } Octopus.Client.Model.Endpoints.TentacleDetailsResource TentacleVersionDetails { get; set; } String Thumbprint { get; set; } } @@ -4018,7 +4096,7 @@ Octopus.Client.Model.Triggers.ScheduledTriggers Octopus.Client.Model.Triggers.ScheduledTriggers.DailyScheduledTriggerInterval Interval { get; set; } Nullable MinuteInterval { get; set; } Octopus.Client.Model.Triggers.ScheduledTriggers.ScheduledTriggerFilterRunType RunType { get; set; } - DateTime StartTime { get; set; } + Nullable StartTime { get; set; } } DailyScheduledTriggerInterval { diff --git a/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETFramework.approved.txt b/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETFramework.approved.txt index 59c3e5fc6..d6f6fa4ec 100644 --- a/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETFramework.approved.txt +++ b/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETFramework.approved.txt @@ -425,13 +425,6 @@ Octopus.Client.Editors { .ctor(Octopus.Client.Repositories.IAccountRepository) } - class AmazonWebServicesRoleAccountEditor - Octopus.Client.Editors.IResourceEditor - Octopus.Client.Editors.IResourceBuilder - Octopus.Client.Editors.AccountEditor - { - .ctor(Octopus.Client.Repositories.IAccountRepository) - } class AzureServicePrincipalAccountEditor Octopus.Client.Editors.IResourceEditor Octopus.Client.Editors.IResourceBuilder @@ -726,13 +719,6 @@ Octopus.Client.Editors.Async { .ctor(Octopus.Client.Repositories.Async.IAccountRepository) } - class AmazonWebServicesRoleAccountEditor - Octopus.Client.Editors.Async.IResourceEditor - Octopus.Client.Editors.Async.IResourceBuilder - Octopus.Client.Editors.Async.AccountEditor - { - .ctor(Octopus.Client.Repositories.Async.IAccountRepository) - } class AzureServicePrincipalAccountEditor Octopus.Client.Editors.Async.IResourceEditor Octopus.Client.Editors.Async.IResourceBuilder @@ -1268,6 +1254,7 @@ Octopus.Client.Model { .ctor() String Author { get; set; } + String Category { get; set; } String CommunityActionTemplateId { get; set; } String Description { get; set; } Boolean HasUpdate { get; set; } @@ -1456,6 +1443,7 @@ Octopus.Client.Model .ctor() DateTimeOffset Created { get; set; } String Filename { get; set; } + String LogCorrelationId { get; set; } Octopus.Client.Model.ReferenceCollection RelatedDocumentIds { get; set; } String Source { get; set; } } @@ -1465,14 +1453,10 @@ Octopus.Client.Model .ctor() Boolean AutoLoginEnabled { get; set; } String Id { get; set; } + Boolean IsSelfServiceIdentityEditingEnabled { get; set; } Octopus.Client.Extensibility.LinkCollection Links { get; set; } String[] TrustedRedirectUrls { get; set; } } - AuthenticationMode - { - UsernamePassword = 0 - Domain = 1 - } abstract class AutoDeploy { static System.String Name @@ -1521,8 +1505,6 @@ Octopus.Client.Model Octopus.Client.Model.Resource { .ctor() - String IndexingStatus { get; set; } - String SynchronizationStatus { get; set; } Int32 TotalPackages { get; set; } } class BuiltInRepositoryConfigurationResource @@ -1531,6 +1513,7 @@ Octopus.Client.Model Octopus.Client.Model.Resource { .ctor() + Boolean ApplyToDynamicallyReferencedPackages { get; set; } Nullable DeleteUnreleasedPackagesAfterDays { get; set; } } abstract class BuiltInTasks @@ -1661,6 +1644,7 @@ Octopus.Client.Model { .ctor() String Name { get; set; } + String SignatureAlgorithm { get; set; } String Thumbprint { get; set; } } CertificateExportPemOptions @@ -1684,6 +1668,7 @@ Octopus.Client.Model .ctor(String, String) .ctor(String, String, String) Nullable Archived { get; } + IList CertificateChain { get; set; } Octopus.Client.Model.SensitiveValue CertificateData { get; set; } Octopus.Client.Model.CertificateFormat CertificateDataFormat { get; } Octopus.Client.Model.ReferenceCollection EnvironmentIds { get; set; } @@ -1701,6 +1686,7 @@ Octopus.Client.Model Boolean SelfSigned { get; } String SerialNumber { get; } String SignatureAlgorithmName { get; } + IList SubjectAlternativeNames { get; set; } String SubjectCommonName { get; } String SubjectDistinguishedName { get; } String SubjectOrganization { get; } @@ -1709,8 +1695,23 @@ Octopus.Client.Model Octopus.Client.Model.ReferenceCollection TenantTags { get; set; } String Thumbprint { get; } Int32 Version { get; } + class X509Certificate + { + .ctor() + String IssuerDistinguishedName { get; set; } + DateTimeOffset NotAfter { get; set; } + DateTimeOffset NotBefore { get; set; } + String SerialNumber { get; set; } + String SignatureAlgorithmName { get; set; } + String SubjectDistinguishedName { get; set; } + String Thumbprint { get; set; } + Int32 Version { get; set; } + } } class CertificateUsageResource + Octopus.Client.Extensibility.IResource + Octopus.Client.Model.IAuditedResource + Octopus.Client.Model.Resource { .ctor() ICollection LibraryVariableSetUsages { get; set; } @@ -1760,6 +1761,7 @@ Octopus.Client.Model AzureWebApp = 5 Ftp = 6 AzureCloudService = 7 + AzureServiceFabricCluster = 8 } class CommunityActionTemplateResource Octopus.Client.Extensibility.IResource @@ -1848,6 +1850,7 @@ Octopus.Client.Model DateTimeOffset QueueTime { get; set; } String ReleaseId { get; set; } String ReleaseVersion { get; set; } + Nullable StartTime { get; set; } Octopus.Client.Model.TaskState State { get; set; } String TaskId { get; set; } String TenantId { get; set; } @@ -1870,6 +1873,7 @@ Octopus.Client.Model .ctor() Boolean CanPerformUntenantedDeployment { get; set; } Octopus.Client.Model.ReferenceCollection EnvironmentIds { get; set; } + Boolean IsDisabled { get; set; } String Name { get; set; } String ProjectGroupId { get; set; } String Slug { get; set; } @@ -1951,6 +1955,7 @@ Octopus.Client.Model { .ctor() String ActionType { get; set; } + Boolean CanBeUsedForProjectVersioning { get; set; } Octopus.Client.Model.ReferenceCollection Channels { get; } Octopus.Client.Model.ReferenceCollection Environments { get; } Octopus.Client.Model.ReferenceCollection ExcludedEnvironments { get; } @@ -2026,7 +2031,6 @@ Octopus.Client.Model Boolean ForcePackageDownload { get; set; } Boolean ForcePackageRedeployment { get; set; } Dictionary FormValues { get; set; } - Boolean IsFirst { get; set; } String ManifestVariableSetId { get; set; } String Name { get; set; } String ProjectId { get; set; } @@ -2152,6 +2156,12 @@ Octopus.Client.Model Octopus.Client.Model.FeedType FeedType { get; } String RegistryPath { get; set; } } + EmailPriority + { + Normal = 0 + Low = 1 + High = 2 + } class EncryptedBytes { .ctor(Byte[], Byte[]) @@ -2205,9 +2215,12 @@ Octopus.Client.Model Nullable EmailDigestLastProcessed { get; set; } Nullable EmailDigestLastProcessedEventAutoId { get; set; } TimeSpan EmailFrequencyPeriod { get; set; } + Octopus.Client.Model.EmailPriority EmailPriority { get; set; } String EmailShowDatesInTimeZoneId { get; set; } Octopus.Client.Model.ReferenceCollection EmailTeams { get; set; } Octopus.Client.Model.EventNotificationSubscriptionFilter Filter { get; set; } + String WebhookHeaderKey { get; set; } + String WebhookHeaderValue { get; set; } Nullable WebhookLastProcessed { get; set; } Nullable WebhookLastProcessedEventAutoId { get; set; } Octopus.Client.Model.ReferenceCollection WebhookTeams { get; set; } @@ -2272,9 +2285,8 @@ Octopus.Client.Model Octopus.Client.Model.Resource { .ctor() - Boolean IsBrowserCachingEnabled { get; set; } + Boolean IsBuiltInRepoSyncEnabled { get; set; } Boolean IsCommunityActionTemplatesEnabled { get; set; } - Boolean IsDockerEnabled { get; set; } Boolean IsMultiTenancyEnabled { get; set; } } class FeedResource @@ -2316,6 +2328,12 @@ Octopus.Client.Model Int32 DownloadRetryBackoffSeconds { get; set; } Octopus.Client.Model.FeedType FeedType { get; } } + GuidedFailureMode + { + EnvironmentDefault = 0 + Off = 1 + On = 2 + } abstract class Health { static System.String Name @@ -2347,6 +2365,20 @@ Octopus.Client.Model String LastModifiedBy { get; set; } Nullable LastModifiedOn { get; set; } } + class IdentityClaimResource + { + .ctor() + .ctor(String, Boolean) + Boolean IsIdentifyingClaim { get; set; } + String Value { get; set; } + } + class IdentityResource + { + .ctor() + .ctor(String) + Dictionary Claims { get; } + String IdentityProviderName { get; set; } + } class InterruptionResource Octopus.Client.Extensibility.IResource Octopus.Client.Model.IAuditedResource @@ -2358,6 +2390,7 @@ Octopus.Client.Model DateTimeOffset Created { get; set; } Octopus.Client.Model.Forms.Form Form { get; set; } Boolean HasResponsibility { get; set; } + Boolean IsLinkedToOtherInterruption { get; set; } Boolean IsPending { get; set; } Octopus.Client.Model.ReferenceCollection RelatedDocumentIds { get; set; } Octopus.Client.Model.ReferenceCollection ResponsibleTeamIds { get; set; } @@ -2436,6 +2469,7 @@ Octopus.Client.Model .ctor() Boolean IsCompliant { get; set; } String LicenseText { get; set; } + Int32 MaintenanceExpiresIn { get; set; } String NoncomplianceReason { get; set; } Boolean UseFreeVersion { get; set; } } @@ -2662,6 +2696,7 @@ Octopus.Client.Model class NamedReferenceItem { .ctor() + Boolean DisplayIdAndName { get; set; } String DisplayName { get; set; } String Id { get; set; } } @@ -2703,6 +2738,8 @@ Octopus.Client.Model Octopus.Client.Model.FeedResource { .ctor() + Int32 DownloadAttempts { get; set; } + Int32 DownloadRetryBackoffSeconds { get; set; } Boolean EnhancedMode { get; set; } Octopus.Client.Model.FeedType FeedType { get; } } @@ -2989,6 +3026,7 @@ Octopus.Client.Model .ctor(String, String, String) Boolean AutoCreateRelease { get; set; } ISet AutoDeployReleaseOverrides { get; } + Octopus.Client.Model.GuidedFailureMode DefaultGuidedFailureMode { get; set; } Boolean DefaultToSkipIfAlreadyInstalled { get; set; } String DeploymentProcessId { get; set; } String Description { get; set; } @@ -3247,8 +3285,6 @@ Octopus.Client.Model .ctor() String ApiVersion { get; set; } String Application { get; set; } - Boolean FormsLoginEnabled { get; set; } - Boolean GuestLoginEnabled { get; set; } Guid InstallationId { get; set; } Boolean IsEarlyAccessProgram { get; set; } String Version { get; set; } @@ -3420,9 +3456,9 @@ Octopus.Client.Model Octopus.Client.Model.Resource { .ctor() - Octopus.Client.Model.AuthenticationMode AuthenticationMode { get; set; } Boolean IsDatabaseEncrypted { get; set; } Boolean IsInMaintenanceMode { get; set; } + Boolean IsMajorMinorUpgrade { get; set; } Boolean IsUpgradeAvailable { get; set; } String MaintenanceExpires { get; set; } String MaximumAvailableVersion { get; set; } @@ -3567,7 +3603,7 @@ Octopus.Client.Model .ctor() Octopus.Client.Model.ActivityElement ActivityLog { get; set; } IList ActivityLogs { get; set; } - Nullable PhysicalLogSize { get; set; } + Int64 PhysicalLogSize { get; set; } Octopus.Client.Model.TaskProgress Progress { get; set; } Octopus.Client.Model.TaskResource Task { get; set; } } @@ -3782,8 +3818,10 @@ Octopus.Client.Model Octopus.Client.Model.Resource { .ctor() + Boolean CanPasswordBeEdited { get; set; } String DisplayName { get; set; } String EmailAddress { get; set; } + Octopus.Client.Model.IdentityResource[] Identities { get; set; } Boolean IsActive { get; set; } Boolean IsRequestor { get; set; } Boolean IsService { get; set; } @@ -3905,6 +3943,18 @@ Octopus.Client.Model String ReferrerPolicy { get; set; } Octopus.Client.Model.XOptionsResource XOptions { get; set; } } + class X509Certificate + { + .ctor() + String IssuerDistinguishedName { get; set; } + DateTimeOffset NotAfter { get; set; } + DateTimeOffset NotBefore { get; set; } + String SerialNumber { get; set; } + String SignatureAlgorithmName { get; set; } + String SubjectDistinguishedName { get; set; } + String Thumbprint { get; set; } + Int32 Version { get; set; } + } class XOptionsResource { static System.String XFrameAllowFromDescription @@ -3949,15 +3999,6 @@ Octopus.Client.Model.Accounts Octopus.Client.Model.Accounts.AccountType AccountType { get; } Octopus.Client.Model.SensitiveValue SecretKey { get; set; } } - class AmazonWebServicesRoleAccountResource - Octopus.Client.Extensibility.IResource - Octopus.Client.Model.IAuditedResource - Octopus.Client.Extensibility.INamedResource - Octopus.Client.Model.Accounts.AccountResource - { - .ctor() - Octopus.Client.Model.Accounts.AccountType AccountType { get; } - } class AzureCloudService { .ctor() @@ -4010,6 +4051,7 @@ Octopus.Client.Model.Accounts Octopus.Client.Model.SensitiveValue CertificateBytes { get; set; } String CertificateThumbprint { get; set; } String ServiceManagementEndpointBaseUri { get; set; } + String ServiceManagementEndpointSuffix { get; set; } String SubscriptionNumber { get; set; } class WebSite { @@ -4188,6 +4230,17 @@ Octopus.Client.Model.Endpoints Octopus.Client.Model.Endpoints.EndpointResource { } + AzureServiceFabricCredentialType + { + ClientCredential = 0 + UserCredential = 1 + } + AzureServiceFabricSecurityMode + { + Unsecure = 0 + SecureClientCertificate = 1 + SecureAzureAD = 2 + } class AzureWebAppEndpointResource Octopus.Client.Extensibility.IResource Octopus.Client.Model.IAuditedResource @@ -4198,7 +4251,6 @@ Octopus.Client.Model.Endpoints Octopus.Client.Model.CommunicationStyle CommunicationStyle { get; } String ResourceGroupName { get; set; } String WebAppName { get; set; } - String WebSpaceName { get; set; } } abstract class CalamariDotNetCorePlatforms { @@ -4265,6 +4317,24 @@ Octopus.Client.Model.Endpoints Octopus.Client.Model.CommunicationStyle CommunicationStyle { get; } String Uri { get; set; } } + class ServiceFabricEndpointResource + Octopus.Client.Extensibility.IResource + Octopus.Client.Model.IAuditedResource + Octopus.Client.Model.Endpoints.AgentlessEndpointResource + { + .ctor() + String AadClientCredentialSecret { get; set; } + Octopus.Client.Model.Endpoints.AzureServiceFabricCredentialType AadCredentialType { get; set; } + Octopus.Client.Model.SensitiveValue AadUserCredentialPassword { get; set; } + String AadUserCredentialUsername { get; set; } + String CertificateStoreLocation { get; set; } + String CertificateStoreName { get; set; } + String ClientCertVariable { get; set; } + Octopus.Client.Model.CommunicationStyle CommunicationStyle { get; } + String ConnectionEndpoint { get; set; } + Octopus.Client.Model.Endpoints.AzureServiceFabricSecurityMode SecurityMode { get; set; } + String ServerCertThumbprint { get; set; } + } class SshEndpointResource Octopus.Client.Extensibility.IResource Octopus.Client.Model.IAuditedResource @@ -4298,6 +4368,7 @@ Octopus.Client.Model.Endpoints Octopus.Client.Model.IAuditedResource Octopus.Client.Model.Endpoints.EndpointResource { + String CertificateSignatureAlgorithm { get; set; } Octopus.Client.Model.Endpoints.TentacleDetailsResource TentacleVersionDetails { get; set; } String Thumbprint { get; set; } } @@ -4504,7 +4575,7 @@ Octopus.Client.Model.Triggers.ScheduledTriggers Octopus.Client.Model.Triggers.ScheduledTriggers.DailyScheduledTriggerInterval Interval { get; set; } Nullable MinuteInterval { get; set; } Octopus.Client.Model.Triggers.ScheduledTriggers.ScheduledTriggerFilterRunType RunType { get; set; } - DateTime StartTime { get; set; } + Nullable StartTime { get; set; } } DailyScheduledTriggerInterval { diff --git a/source/Octopus.Client/Editors/AmazonWebServicesRoleAccountEditor.cs b/source/Octopus.Client/Editors/AmazonWebServicesRoleAccountEditor.cs deleted file mode 100644 index a6152693c..000000000 --- a/source/Octopus.Client/Editors/AmazonWebServicesRoleAccountEditor.cs +++ /dev/null @@ -1,12 +0,0 @@ -using Octopus.Client.Model.Accounts; -using Octopus.Client.Repositories; - -namespace Octopus.Client.Editors -{ - public class AmazonWebServicesRoleAccountEditor : AccountEditor - { - public AmazonWebServicesRoleAccountEditor(IAccountRepository repository) : base(repository) - { - } - } -} \ No newline at end of file diff --git a/source/Octopus.Client/Editors/Async/AmazonWebServicesRoleAccountEditor.cs b/source/Octopus.Client/Editors/Async/AmazonWebServicesRoleAccountEditor.cs deleted file mode 100644 index 9f5215e82..000000000 --- a/source/Octopus.Client/Editors/Async/AmazonWebServicesRoleAccountEditor.cs +++ /dev/null @@ -1,12 +0,0 @@ -using Octopus.Client.Model.Accounts; -using Octopus.Client.Repositories.Async; - -namespace Octopus.Client.Editors.Async -{ - public class AmazonWebServicesRoleAccountEditor : AccountEditor - { - public AmazonWebServicesRoleAccountEditor(IAccountRepository repository) : base(repository) - { - } - } -} \ No newline at end of file diff --git a/source/Octopus.Client/Extensions/TypeExtensions.cs b/source/Octopus.Client/Extensions/TypeExtensions.cs index 49b6b7970..bb4229bbb 100644 --- a/source/Octopus.Client/Extensions/TypeExtensions.cs +++ b/source/Octopus.Client/Extensions/TypeExtensions.cs @@ -22,8 +22,6 @@ public static AccountType DetermineAccountType(this Type type) accountType = AccountType.AzureSubscription; else if (type == typeof(AmazonWebServicesAccountResource)) accountType = AccountType.AmazonWebServicesAccount; - else if (type == typeof(AmazonWebServicesRoleAccountResource)) - accountType = AccountType.AmazonWebServicesRoleAccount; else throw new ArgumentException($"Account type {type} is not supported"); return accountType; diff --git a/source/Octopus.Client/Model/Accounts/AmazonWebServicesRoleAccountResource.cs b/source/Octopus.Client/Model/Accounts/AmazonWebServicesRoleAccountResource.cs deleted file mode 100644 index 49505c0e9..000000000 --- a/source/Octopus.Client/Model/Accounts/AmazonWebServicesRoleAccountResource.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace Octopus.Client.Model.Accounts -{ - public class AmazonWebServicesRoleAccountResource : AccountResource - { - public override AccountType AccountType => AccountType.AmazonWebServicesRoleAccount; - } -} \ No newline at end of file diff --git a/source/Octopus.Client/Model/Accounts/AzureSubscriptionAccountResource.cs b/source/Octopus.Client/Model/Accounts/AzureSubscriptionAccountResource.cs index 7614c66a0..f1e0f9398 100644 --- a/source/Octopus.Client/Model/Accounts/AzureSubscriptionAccountResource.cs +++ b/source/Octopus.Client/Model/Accounts/AzureSubscriptionAccountResource.cs @@ -36,6 +36,10 @@ public override AccountType AccountType [Trim] [Writeable] public string ServiceManagementEndpointBaseUri { get; set; } + + [Trim] + [Writeable] + public string ServiceManagementEndpointSuffix { get; set; } public class WebSite { diff --git a/source/Octopus.Client/Model/ActionTemplateSearchResource.cs b/source/Octopus.Client/Model/ActionTemplateSearchResource.cs index a63faf2da..a184f9a3e 100644 --- a/source/Octopus.Client/Model/ActionTemplateSearchResource.cs +++ b/source/Octopus.Client/Model/ActionTemplateSearchResource.cs @@ -13,6 +13,7 @@ public class ActionTemplateSearchResource : IResource public string Website { get; set; } public bool IsInstalled { get; set; } public bool IsBuiltIn { get; set; } + public string Category { get; set; } public string CommunityActionTemplateId { get; set; } public bool HasUpdate { get; set; } diff --git a/source/Octopus.Client/Model/ArtifactResource.cs b/source/Octopus.Client/Model/ArtifactResource.cs index c48620b9f..19b2ca34f 100644 --- a/source/Octopus.Client/Model/ArtifactResource.cs +++ b/source/Octopus.Client/Model/ArtifactResource.cs @@ -41,5 +41,11 @@ public class ArtifactResource : Resource /// [JsonProperty(Order = 5)] public DateTimeOffset Created { get; set; } + + /// + /// Gets the correlationId of the log block in which the artifact was captured + /// + [JsonProperty(Order = 6)] + public string LogCorrelationId { get; set; } } } \ No newline at end of file diff --git a/source/Octopus.Client/Model/AuthenticationConfigResource.cs b/source/Octopus.Client/Model/AuthenticationConfigResource.cs index 21b9d7662..dd2dca428 100644 --- a/source/Octopus.Client/Model/AuthenticationConfigResource.cs +++ b/source/Octopus.Client/Model/AuthenticationConfigResource.cs @@ -18,6 +18,9 @@ public AuthenticationConfigResource() [Writeable] public bool AutoLoginEnabled { get; set; } + [Writeable] + public bool IsSelfServiceIdentityEditingEnabled { get; set; } + [Writeable] public string[] TrustedRedirectUrls { get; set; } } diff --git a/source/Octopus.Client/Model/AuthenticationMode.cs b/source/Octopus.Client/Model/AuthenticationMode.cs deleted file mode 100644 index 8ab046396..000000000 --- a/source/Octopus.Client/Model/AuthenticationMode.cs +++ /dev/null @@ -1,10 +0,0 @@ -using System; - -namespace Octopus.Client.Model -{ - public enum AuthenticationMode - { - UsernamePassword, - Domain - } -} \ No newline at end of file diff --git a/source/Octopus.Client/Model/BuiltInFeedStatsResource.cs b/source/Octopus.Client/Model/BuiltInFeedStatsResource.cs index 60466226d..f8385a031 100644 --- a/source/Octopus.Client/Model/BuiltInFeedStatsResource.cs +++ b/source/Octopus.Client/Model/BuiltInFeedStatsResource.cs @@ -5,7 +5,5 @@ namespace Octopus.Client.Model public class BuiltInFeedStatsResource : Resource { public int TotalPackages { get; set; } - public string SynchronizationStatus { get; set; } - public string IndexingStatus { get; set; } } } \ No newline at end of file diff --git a/source/Octopus.Client/Model/BuiltInRepositoryConfigurationResource.cs b/source/Octopus.Client/Model/BuiltInRepositoryConfigurationResource.cs index 867aa2657..8fd72fee7 100644 --- a/source/Octopus.Client/Model/BuiltInRepositoryConfigurationResource.cs +++ b/source/Octopus.Client/Model/BuiltInRepositoryConfigurationResource.cs @@ -7,5 +7,8 @@ public class BuiltInRepositoryConfigurationResource : Resource { [Writeable] public int? DeleteUnreleasedPackagesAfterDays { get; set; } + + [Writeable] + public bool ApplyToDynamicallyReferencedPackages { get; set; } } } \ No newline at end of file diff --git a/source/Octopus.Client/Model/CertificateConfigurationResource.cs b/source/Octopus.Client/Model/CertificateConfigurationResource.cs index 2bf56e468..4d820513b 100644 --- a/source/Octopus.Client/Model/CertificateConfigurationResource.cs +++ b/source/Octopus.Client/Model/CertificateConfigurationResource.cs @@ -6,5 +6,6 @@ public class CertificateConfigurationResource : Resource, INamedResource { public string Name { get; set; } public string Thumbprint { get; set; } + public string SignatureAlgorithm { get; set; } } } \ No newline at end of file diff --git a/source/Octopus.Client/Model/CertificateResource.cs b/source/Octopus.Client/Model/CertificateResource.cs index a2a867a43..7362e4fcb 100644 --- a/source/Octopus.Client/Model/CertificateResource.cs +++ b/source/Octopus.Client/Model/CertificateResource.cs @@ -1,4 +1,5 @@ using System; +using System.Collections.Generic; using System.Diagnostics; using System.Linq; using Octopus.Client.Extensibility.Attributes; @@ -129,5 +130,27 @@ public TenantedDeploymentMode TenantedDeploymentParticipation [JsonProperty] public string SignatureAlgorithmName { get; private set; } + public IList SubjectAlternativeNames { get; set; } + + public IList CertificateChain { get; set; } + + public class X509Certificate + { + public string SubjectDistinguishedName { get; set; } + + public string IssuerDistinguishedName { get; set; } + + public string Thumbprint { get; set; } + + public DateTimeOffset NotAfter { get; set; } + + public DateTimeOffset NotBefore { get; set; } + + public int Version { get; set; } + + public string SerialNumber { get; set; } + + public string SignatureAlgorithmName { get; set; } + } } } \ No newline at end of file diff --git a/source/Octopus.Client/Model/CertificateUsageResource.cs b/source/Octopus.Client/Model/CertificateUsageResource.cs index 64a687d64..4c080d6f5 100644 --- a/source/Octopus.Client/Model/CertificateUsageResource.cs +++ b/source/Octopus.Client/Model/CertificateUsageResource.cs @@ -2,7 +2,7 @@ namespace Octopus.Client.Model { - public class CertificateUsageResource + public class CertificateUsageResource : Resource { public ICollection ProjectUsages { get; set; } diff --git a/source/Octopus.Client/Model/CommunicationStyle.cs b/source/Octopus.Client/Model/CommunicationStyle.cs index 3418f8fa9..bec14a8df 100644 --- a/source/Octopus.Client/Model/CommunicationStyle.cs +++ b/source/Octopus.Client/Model/CommunicationStyle.cs @@ -25,6 +25,8 @@ [ScriptConsoleSupported] [SupportedAccountTypes(AccountType.SshKeyPair, AccountT [SupportedAccountTypes(AccountType.UsernamePassword)] Ftp = 6, - [SupportedAccountTypes(AccountType.AzureSubscription)] [ScriptConsoleSupported] AzureCloudService = 7 + [SupportedAccountTypes(AccountType.AzureSubscription)] [ScriptConsoleSupported] AzureCloudService = 7, + + AzureServiceFabricCluster = 8 } } \ No newline at end of file diff --git a/source/Octopus.Client/Model/DashboardItemResource.cs b/source/Octopus.Client/Model/DashboardItemResource.cs index 4fa73e023..49db467c8 100644 --- a/source/Octopus.Client/Model/DashboardItemResource.cs +++ b/source/Octopus.Client/Model/DashboardItemResource.cs @@ -14,6 +14,7 @@ public class DashboardItemResource : Resource public string ReleaseVersion { get; set; } public DateTimeOffset Created { get; set; } public DateTimeOffset QueueTime { get; set; } + public DateTimeOffset? StartTime { get; set; } public DateTimeOffset? CompletedTime { get; set; } public TaskState State { get; set; } public bool HasPendingInterruptions { get; set; } diff --git a/source/Octopus.Client/Model/DashboardProjectResource.cs b/source/Octopus.Client/Model/DashboardProjectResource.cs index 0713652ee..f691554ef 100644 --- a/source/Octopus.Client/Model/DashboardProjectResource.cs +++ b/source/Octopus.Client/Model/DashboardProjectResource.cs @@ -6,6 +6,7 @@ namespace Octopus.Client.Model public class DashboardProjectResource : Resource { public string Name { get; set; } + public bool IsDisabled { get; set; } public string Slug { get; set; } public string ProjectGroupId { get; set; } public ReferenceCollection EnvironmentIds { get; set; } diff --git a/source/Octopus.Client/Model/DeploymentActionResource.cs b/source/Octopus.Client/Model/DeploymentActionResource.cs index c4dfa20ec..c2362cdcf 100644 --- a/source/Octopus.Client/Model/DeploymentActionResource.cs +++ b/source/Octopus.Client/Model/DeploymentActionResource.cs @@ -10,6 +10,7 @@ public class DeploymentActionResource : Resource public string Name { get; set; } public string ActionType { get; set; } public bool IsDisabled { get; set; } + public bool CanBeUsedForProjectVersioning { get; set; } /// /// If true, this action cannot be skipped when deploying diff --git a/source/Octopus.Client/Model/DeploymentResource.cs b/source/Octopus.Client/Model/DeploymentResource.cs index 8ae2388fd..cf6ba24ea 100644 --- a/source/Octopus.Client/Model/DeploymentResource.cs +++ b/source/Octopus.Client/Model/DeploymentResource.cs @@ -78,6 +78,5 @@ public DeploymentResource() public string Name { get; set; } public DateTimeOffset Created { get; set; } - public bool IsFirst { get; set; } } } \ No newline at end of file diff --git a/source/Octopus.Client/Model/EmailPriority.cs b/source/Octopus.Client/Model/EmailPriority.cs new file mode 100644 index 000000000..1ba765834 --- /dev/null +++ b/source/Octopus.Client/Model/EmailPriority.cs @@ -0,0 +1,9 @@ +namespace Octopus.Client.Model +{ + public enum EmailPriority + { + Normal = 0, + Low = 1, + High = 2 + } +} \ No newline at end of file diff --git a/source/Octopus.Client/Model/Endpoints/AzureServiceFabricCredentialType.cs b/source/Octopus.Client/Model/Endpoints/AzureServiceFabricCredentialType.cs new file mode 100644 index 000000000..c2e2713b2 --- /dev/null +++ b/source/Octopus.Client/Model/Endpoints/AzureServiceFabricCredentialType.cs @@ -0,0 +1,8 @@ +namespace Octopus.Client.Model.Endpoints +{ + public enum AzureServiceFabricCredentialType + { + ClientCredential, + UserCredential, + } +} \ No newline at end of file diff --git a/source/Octopus.Client/Model/Endpoints/AzureServiceFabricSecurityMode.cs b/source/Octopus.Client/Model/Endpoints/AzureServiceFabricSecurityMode.cs new file mode 100644 index 000000000..91fa61874 --- /dev/null +++ b/source/Octopus.Client/Model/Endpoints/AzureServiceFabricSecurityMode.cs @@ -0,0 +1,9 @@ +namespace Octopus.Client.Model.Endpoints +{ + public enum AzureServiceFabricSecurityMode + { + Unsecure, + SecureClientCertificate, + SecureAzureAD, + } +} \ No newline at end of file diff --git a/source/Octopus.Client/Model/Endpoints/AzureWebAppEndpointResource.cs b/source/Octopus.Client/Model/Endpoints/AzureWebAppEndpointResource.cs index 85214c260..2ce0658d8 100644 --- a/source/Octopus.Client/Model/Endpoints/AzureWebAppEndpointResource.cs +++ b/source/Octopus.Client/Model/Endpoints/AzureWebAppEndpointResource.cs @@ -15,10 +15,6 @@ public override CommunicationStyle CommunicationStyle [Writeable] public string AccountId { get; set; } - [Trim] - [Writeable] - public string WebSpaceName { get; set; } - [Trim] [Writeable] public string ResourceGroupName { get; set; } diff --git a/source/Octopus.Client/Model/Endpoints/ServiceFabricEndpointResource.cs b/source/Octopus.Client/Model/Endpoints/ServiceFabricEndpointResource.cs new file mode 100644 index 000000000..0dd5ce316 --- /dev/null +++ b/source/Octopus.Client/Model/Endpoints/ServiceFabricEndpointResource.cs @@ -0,0 +1,48 @@ +using Octopus.Client.Extensibility.Attributes; + +namespace Octopus.Client.Model.Endpoints +{ + public class ServiceFabricEndpointResource : AgentlessEndpointResource + { + public override CommunicationStyle CommunicationStyle => CommunicationStyle.AzureServiceFabricCluster; + + [Trim] + [Writeable] + public string ConnectionEndpoint { get; set; } + + [Trim] + [Writeable] + public AzureServiceFabricSecurityMode SecurityMode { get; set; } + + [Trim] + [Writeable] + public string ServerCertThumbprint { get; set; } + + [Trim] + [Writeable] + public string ClientCertVariable { get; set; } + + [Trim] + [Writeable] + public string CertificateStoreLocation { get; set; } + + [Trim] + [Writeable] + public string CertificateStoreName { get; set; } + + [Trim] + [Writeable] + public AzureServiceFabricCredentialType AadCredentialType { get; set; } + + [Trim] + [Writeable] + public string AadClientCredentialSecret { get; set; } + + [Trim] + [Writeable] + public string AadUserCredentialUsername { get; set; } + + [Writeable] + public SensitiveValue AadUserCredentialPassword { get; set; } + } +} \ No newline at end of file diff --git a/source/Octopus.Client/Model/Endpoints/TentacleEndpointResource.cs b/source/Octopus.Client/Model/Endpoints/TentacleEndpointResource.cs index f7438593f..a30e8adf7 100644 --- a/source/Octopus.Client/Model/Endpoints/TentacleEndpointResource.cs +++ b/source/Octopus.Client/Model/Endpoints/TentacleEndpointResource.cs @@ -13,5 +13,7 @@ public abstract class TentacleEndpointResource : EndpointResource [Writeable] public TentacleDetailsResource TentacleVersionDetails { get; set; } + + public string CertificateSignatureAlgorithm { get; set; } } } \ No newline at end of file diff --git a/source/Octopus.Client/Model/EventNotificationSubscription.cs b/source/Octopus.Client/Model/EventNotificationSubscription.cs index cd4f2d3f4..a1619f135 100644 --- a/source/Octopus.Client/Model/EventNotificationSubscription.cs +++ b/source/Octopus.Client/Model/EventNotificationSubscription.cs @@ -19,6 +19,8 @@ public EventNotificationSubscription() public TimeSpan EmailFrequencyPeriod { get; set; } + public EmailPriority EmailPriority { get; set; } + public DateTimeOffset? EmailDigestLastProcessed { get; set; } public long? EmailDigestLastProcessedEventAutoId { get; set; } @@ -31,6 +33,8 @@ public EventNotificationSubscription() public ReferenceCollection WebhookTeams { get; set; } public TimeSpan WebhookTimeout { get; set; } = TimeSpan.FromSeconds(10); + public string WebhookHeaderKey { get; set; } + public string WebhookHeaderValue { get; set; } public DateTimeOffset? WebhookLastProcessed { get; set; } diff --git a/source/Octopus.Client/Model/FeaturesConfigurationResource.cs b/source/Octopus.Client/Model/FeaturesConfigurationResource.cs index 555362c8e..4ac9bca15 100644 --- a/source/Octopus.Client/Model/FeaturesConfigurationResource.cs +++ b/source/Octopus.Client/Model/FeaturesConfigurationResource.cs @@ -7,13 +7,10 @@ public class FeaturesConfigurationResource : Resource [Writeable] public bool IsMultiTenancyEnabled { get; set; } - [Writeable] - public bool IsDockerEnabled { get; set; } - [Writeable] public bool IsCommunityActionTemplatesEnabled { get; set; } [Writeable] - public bool IsBrowserCachingEnabled { get; set; } + public bool IsBuiltInRepoSyncEnabled { get; set; } } } diff --git a/source/Octopus.Client/Model/GuidedFailureMode.cs b/source/Octopus.Client/Model/GuidedFailureMode.cs new file mode 100644 index 000000000..c95063ada --- /dev/null +++ b/source/Octopus.Client/Model/GuidedFailureMode.cs @@ -0,0 +1,9 @@ +namespace Octopus.Client.Model +{ + public enum GuidedFailureMode + { + EnvironmentDefault, + Off, + On + } +} \ No newline at end of file diff --git a/source/Octopus.Client/Model/IdentityClaimResource.cs b/source/Octopus.Client/Model/IdentityClaimResource.cs new file mode 100644 index 000000000..a90de4304 --- /dev/null +++ b/source/Octopus.Client/Model/IdentityClaimResource.cs @@ -0,0 +1,19 @@ +namespace Octopus.Client.Model +{ + public class IdentityClaimResource + { + public IdentityClaimResource() + { + } + + public IdentityClaimResource(string value, bool isIdentifyingClaim) + { + this.Value = value; + this.IsIdentifyingClaim = isIdentifyingClaim; + } + + public string Value { get; set; } + + public bool IsIdentifyingClaim { get; set; } + } +} \ No newline at end of file diff --git a/source/Octopus.Client/Model/IdentityResource.cs b/source/Octopus.Client/Model/IdentityResource.cs new file mode 100644 index 000000000..e7daa80f7 --- /dev/null +++ b/source/Octopus.Client/Model/IdentityResource.cs @@ -0,0 +1,22 @@ +using System.Collections.Generic; + +namespace Octopus.Client.Model +{ + public sealed class IdentityResource + { + public IdentityResource() + { + Claims = new Dictionary(); + } + + public IdentityResource(string identityProviderName) + : this() + { + IdentityProviderName = identityProviderName; + } + + public string IdentityProviderName { get; set; } + + public Dictionary Claims { get; } + } +} \ No newline at end of file diff --git a/source/Octopus.Client/Model/InterruptionResource.cs b/source/Octopus.Client/Model/InterruptionResource.cs index 54067938b..a5f11f670 100644 --- a/source/Octopus.Client/Model/InterruptionResource.cs +++ b/source/Octopus.Client/Model/InterruptionResource.cs @@ -77,5 +77,13 @@ public class InterruptionResource : Resource /// [JsonProperty(Order = 45)] public string CorrelationId { get; set; } + + /// + /// If this interruption is linked to another it will be + /// automatically completed when the other one is. Used to + /// handle interruptions in child deployments. + /// + [JsonProperty(Order = 50)] + public bool IsLinkedToOtherInterruption { get; set; } } } \ No newline at end of file diff --git a/source/Octopus.Client/Model/LicenseResource.cs b/source/Octopus.Client/Model/LicenseResource.cs index 9dd225b24..a018d865c 100644 --- a/source/Octopus.Client/Model/LicenseResource.cs +++ b/source/Octopus.Client/Model/LicenseResource.cs @@ -13,5 +13,5 @@ public class LicenseResource : Resource public bool IsCompliant { get; set; } public string NoncomplianceReason { get; set; } - } + public int MaintenanceExpiresIn { get; set; } } } \ No newline at end of file diff --git a/source/Octopus.Client/Model/NamedReferenceItem.cs b/source/Octopus.Client/Model/NamedReferenceItem.cs index 3a912fb9f..629cfccb0 100644 --- a/source/Octopus.Client/Model/NamedReferenceItem.cs +++ b/source/Octopus.Client/Model/NamedReferenceItem.cs @@ -6,5 +6,7 @@ public class NamedReferenceItem { public string Id { get; set; } public string DisplayName { get; set; } + + public bool DisplayIdAndName { get; set; } } } \ No newline at end of file diff --git a/source/Octopus.Client/Model/NuGetFeedResource.cs b/source/Octopus.Client/Model/NuGetFeedResource.cs index 1452befbe..6629fd70c 100644 --- a/source/Octopus.Client/Model/NuGetFeedResource.cs +++ b/source/Octopus.Client/Model/NuGetFeedResource.cs @@ -2,12 +2,16 @@ namespace Octopus.Client.Model { -#pragma warning disable 618 public class NuGetFeedResource : FeedResource -#pragma warning restore 618 { public override FeedType FeedType => FeedType.NuGet; + [Writeable] + public int DownloadAttempts { get; set; } + + [Writeable] + public int DownloadRetryBackoffSeconds { get; set; } + [Writeable] public bool EnhancedMode { get; set; } } diff --git a/source/Octopus.Client/Model/ProjectResource.cs b/source/Octopus.Client/Model/ProjectResource.cs index 2d2d615f4..8439ac325 100644 --- a/source/Octopus.Client/Model/ProjectResource.cs +++ b/source/Octopus.Client/Model/ProjectResource.cs @@ -84,6 +84,9 @@ public ProjectResource(string id, string name, string slug) : this() [Writeable] public TenantedDeploymentMode TenantedDeploymentMode { get; set; } + + [Writeable] + public GuidedFailureMode DefaultGuidedFailureMode { get; set; } [Writeable] public VersioningStrategyResource VersioningStrategy { get; set; } diff --git a/source/Octopus.Client/Model/RootResource.cs b/source/Octopus.Client/Model/RootResource.cs index f4914cd9f..ae123e667 100644 --- a/source/Octopus.Client/Model/RootResource.cs +++ b/source/Octopus.Client/Model/RootResource.cs @@ -11,12 +11,6 @@ public class RootResource : Resource public string ApiVersion { get; set; } public Guid InstallationId { get; set; } - [DefaultValue(false)] - [JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore)] - public bool GuestLoginEnabled { get; set; } - - public bool FormsLoginEnabled { get; set; } - [DefaultValue(false)] [JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore)] public bool IsEarlyAccessProgram { get; set; } diff --git a/source/Octopus.Client/Model/ServerStatusResource.cs b/source/Octopus.Client/Model/ServerStatusResource.cs index 1ad5051f2..092f7a0ba 100644 --- a/source/Octopus.Client/Model/ServerStatusResource.cs +++ b/source/Octopus.Client/Model/ServerStatusResource.cs @@ -5,11 +5,11 @@ namespace Octopus.Client.Model public class ServerStatusResource : Resource { public bool IsDatabaseEncrypted { get; set; } - public AuthenticationMode AuthenticationMode { get; set; } public bool IsUpgradeAvailable { get; set; } public string MaximumAvailableVersion { get; set; } public string MaximumAvailableVersionCoveredByLicense { get; set; } public string MaintenanceExpires { get; set; } public bool IsInMaintenanceMode { get; set; } + public bool IsMajorMinorUpgrade { get; set; } } } \ No newline at end of file diff --git a/source/Octopus.Client/Model/TaskDetailsResource.cs b/source/Octopus.Client/Model/TaskDetailsResource.cs index 4daca703f..93d14fa47 100644 --- a/source/Octopus.Client/Model/TaskDetailsResource.cs +++ b/source/Octopus.Client/Model/TaskDetailsResource.cs @@ -31,6 +31,6 @@ public ActivityElement ActivityLog public TaskProgress Progress { get; set; } - public int? PhysicalLogSize { get; set; } + public long PhysicalLogSize { get; set; } } } \ No newline at end of file diff --git a/source/Octopus.Client/Model/Triggers/ScheduledTriggers/DailyScheduledTriggerFilterResource.cs b/source/Octopus.Client/Model/Triggers/ScheduledTriggers/DailyScheduledTriggerFilterResource.cs index 5d6e32112..612a7b78c 100644 --- a/source/Octopus.Client/Model/Triggers/ScheduledTriggers/DailyScheduledTriggerFilterResource.cs +++ b/source/Octopus.Client/Model/Triggers/ScheduledTriggers/DailyScheduledTriggerFilterResource.cs @@ -14,7 +14,7 @@ public class DailyScheduledTriggerFilterResource : ScheduledTriggerFilterResourc public override TriggerFilterType FilterType => TriggerFilterType.DailySchedule; [Writeable] - public DateTime StartTime { get; set; } + public DateTime? StartTime { get; set; } [Writeable] public ScheduledTriggerFilterRunType RunType { get; set; } diff --git a/source/Octopus.Client/Model/UserResource.cs b/source/Octopus.Client/Model/UserResource.cs index dd1c70eae..8ccaa722a 100644 --- a/source/Octopus.Client/Model/UserResource.cs +++ b/source/Octopus.Client/Model/UserResource.cs @@ -8,6 +8,11 @@ namespace Octopus.Client.Model { public class UserResource : Resource { + public UserResource() + { + Identities = new IdentityResource[0]; + } + [Writeable] [Trim] [StringLength(64)] @@ -31,6 +36,8 @@ public class UserResource : Resource [DataType(DataType.EmailAddress)] public string EmailAddress { get; set; } + public bool CanPasswordBeEdited { get; set; } + /// /// Gets or sets a value indicating whether this user resource represents the user who requested it. /// @@ -41,5 +48,8 @@ public class UserResource : Resource [NotReadable] [JsonProperty(NullValueHandling = NullValueHandling.Ignore)] public string Password { get; set; } + + [Writeable] + public IdentityResource[] Identities { get; set; } } } \ No newline at end of file diff --git a/source/Octopus.Client/Serialization/AccountConverter.cs b/source/Octopus.Client/Serialization/AccountConverter.cs index 67635afcf..7601e6d81 100644 --- a/source/Octopus.Client/Serialization/AccountConverter.cs +++ b/source/Octopus.Client/Serialization/AccountConverter.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using Octopus.Client.Model; using Octopus.Client.Model.Accounts; namespace Octopus.Client.Serialization @@ -14,8 +13,7 @@ public class AccountConverter : InheritedClassConverter DerivedTypeMappings => AccountTypeMappings; From 76a6aca454110d0d9fa70b1e818e7f6afe7e9176 Mon Sep 17 00:00:00 2001 From: Shannon Lewis Date: Thu, 17 May 2018 14:44:58 +1000 Subject: [PATCH 2/5] TaskRepository update to allow passing verbose and tail switches to the API --- ...urfaceAreaShouldNotRegress..NETCore.approved.txt | 2 +- ...eAreaShouldNotRegress..NETFramework.approved.txt | 4 ++-- .../Repositories/Async/TaskRepository.cs | 13 ++++++++++--- .../Octopus.Client/Repositories/TaskRepository.cs | 13 ++++++++++--- 4 files changed, 23 insertions(+), 9 deletions(-) diff --git a/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETCore.approved.txt b/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETCore.approved.txt index 0db06910f..da88896d3 100644 --- a/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETCore.approved.txt +++ b/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETCore.approved.txt @@ -4708,7 +4708,7 @@ Octopus.Client.Repositories.Async Task ExecuteHealthCheck(String, Int32, Int32, String, String[]) Task ExecuteTentacleUpgrade(String, String, String[]) Task> GetAllActive(Int32) - Task GetDetails(Octopus.Client.Model.TaskResource) + Task GetDetails(Octopus.Client.Model.TaskResource, Nullable, Nullable) Task> GetQueuedBehindTasks(Octopus.Client.Model.TaskResource) Task GetRawOutputLog(Octopus.Client.Model.TaskResource) Task ModifyState(Octopus.Client.Model.TaskResource, Octopus.Client.Model.TaskState, String) diff --git a/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETFramework.approved.txt b/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETFramework.approved.txt index d6f6fa4ec..3935185f8 100644 --- a/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETFramework.approved.txt +++ b/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETFramework.approved.txt @@ -5193,7 +5193,7 @@ Octopus.Client.Repositories Octopus.Client.Model.TaskResource ExecuteHealthCheck(String, Int32, Int32, String, String[]) Octopus.Client.Model.TaskResource ExecuteTentacleUpgrade(String, String, String[]) List GetAllActive(Int32) - Octopus.Client.Model.TaskDetailsResource GetDetails(Octopus.Client.Model.TaskResource) + Octopus.Client.Model.TaskDetailsResource GetDetails(Octopus.Client.Model.TaskResource, Nullable, Nullable) IReadOnlyList GetQueuedBehindTasks(Octopus.Client.Model.TaskResource) String GetRawOutputLog(Octopus.Client.Model.TaskResource) void ModifyState(Octopus.Client.Model.TaskResource, Octopus.Client.Model.TaskState, String) @@ -5678,7 +5678,7 @@ Octopus.Client.Repositories.Async Task ExecuteHealthCheck(String, Int32, Int32, String, String[]) Task ExecuteTentacleUpgrade(String, String, String[]) Task> GetAllActive(Int32) - Task GetDetails(Octopus.Client.Model.TaskResource) + Task GetDetails(Octopus.Client.Model.TaskResource, Nullable, Nullable) Task> GetQueuedBehindTasks(Octopus.Client.Model.TaskResource) Task GetRawOutputLog(Octopus.Client.Model.TaskResource) Task ModifyState(Octopus.Client.Model.TaskResource, Octopus.Client.Model.TaskState, String) diff --git a/source/Octopus.Client/Repositories/Async/TaskRepository.cs b/source/Octopus.Client/Repositories/Async/TaskRepository.cs index 2b8a14aa3..332588e11 100644 --- a/source/Octopus.Client/Repositories/Async/TaskRepository.cs +++ b/source/Octopus.Client/Repositories/Async/TaskRepository.cs @@ -15,7 +15,7 @@ public interface ITaskRepository : IPaginate, IGet, Task ExecuteBackup(string description = null); Task ExecuteTentacleUpgrade(string description = null, string environmentId = null, string[] machineIds = null); Task ExecuteAdHocScript(string scriptBody, string[] machineIds = null, string[] environmentIds = null, string[] targetRoles = null, string description = null, string syntax = "PowerShell"); - Task GetDetails(TaskResource resource); + Task GetDetails(TaskResource resource, bool? includeVerboseOutput = null, int? tail = null); Task ExecuteActionTemplate(ActionTemplateResource resource, Dictionary properties, string[] machineIds = null, string[] environmentIds = null, string[] targetRoles = null, string description = null); Task ExecuteCommunityActionTemplatesSynchronisation(string description = null); Task> GetAllActive(int pageSize = int.MaxValue); @@ -129,9 +129,16 @@ public Task ExecuteCommunityActionTemplatesSynchronisation(string return Create(resource); } - public Task GetDetails(TaskResource resource) + public Task GetDetails(TaskResource resource, bool? includeVerboseOutput = null, int? tail = null) { - return Client.Get(resource.Link("Details")); + var args = new Dictionary(StringComparer.OrdinalIgnoreCase); + if (includeVerboseOutput.HasValue) + args.Add("verbose", includeVerboseOutput.Value); + + if (tail.HasValue) + args.Add("tail", tail.Value); + + return Client.Get(resource.Link("Details"), args); } public Task GetRawOutputLog(TaskResource resource) diff --git a/source/Octopus.Client/Repositories/TaskRepository.cs b/source/Octopus.Client/Repositories/TaskRepository.cs index d632ccf0f..3b6c6a649 100644 --- a/source/Octopus.Client/Repositories/TaskRepository.cs +++ b/source/Octopus.Client/Repositories/TaskRepository.cs @@ -17,7 +17,7 @@ public interface ITaskRepository : IPaginate, IGet, TaskResource ExecuteActionTemplate(ActionTemplateResource resource, Dictionary properties, string[] machineIds = null, string[] environmentIds = null, string[] targetRoles = null, string description = null); TaskResource ExecuteCommunityActionTemplatesSynchronisation(string description = null); List GetAllActive(int pageSize = Int32.MaxValue); - TaskDetailsResource GetDetails(TaskResource resource); + TaskDetailsResource GetDetails(TaskResource resource, bool? includeVerboseOutput = null, int? tail = null); string GetRawOutputLog(TaskResource resource); void Rerun(TaskResource resource); void Cancel(TaskResource resource); @@ -127,9 +127,16 @@ public TaskResource ExecuteCommunityActionTemplatesSynchronisation(string descri return Create(resource); } - public TaskDetailsResource GetDetails(TaskResource resource) + public TaskDetailsResource GetDetails(TaskResource resource, bool? includeVerboseOutput = null, int? tail = null) { - return Client.Get(resource.Link("Details")); + var args = new Dictionary(StringComparer.OrdinalIgnoreCase); + if (includeVerboseOutput.HasValue) + args.Add("verbose", includeVerboseOutput.Value); + + if (tail.HasValue) + args.Add("tail", tail.Value); + + return Client.Get(resource.Link("Details"), args); } public string GetRawOutputLog(TaskResource resource) From 287af9cd8c2507abe2f194d5157715ea419e6edb Mon Sep 17 00:00:00 2001 From: Shannon Lewis Date: Thu, 17 May 2018 16:58:23 +1000 Subject: [PATCH 3/5] fixed NuGetFeedResource defaults, to retain backward compat --- source/Octopus.Client/Model/NuGetFeedResource.cs | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/source/Octopus.Client/Model/NuGetFeedResource.cs b/source/Octopus.Client/Model/NuGetFeedResource.cs index 6629fd70c..46cf7757f 100644 --- a/source/Octopus.Client/Model/NuGetFeedResource.cs +++ b/source/Octopus.Client/Model/NuGetFeedResource.cs @@ -4,15 +4,19 @@ namespace Octopus.Client.Model { public class NuGetFeedResource : FeedResource { + public static readonly int DefaultDownloadAttempts = 5; + public static readonly int DefaultDownloadRetryBackoffSeconds = 10; + public static readonly bool DefaultEnhancedMode = false; + public override FeedType FeedType => FeedType.NuGet; - + [Writeable] - public int DownloadAttempts { get; set; } + public int DownloadAttempts { get; set; } = DefaultDownloadAttempts; [Writeable] - public int DownloadRetryBackoffSeconds { get; set; } + public int DownloadRetryBackoffSeconds { get; set; } = DefaultDownloadRetryBackoffSeconds; [Writeable] - public bool EnhancedMode { get; set; } + public bool EnhancedMode { get; set; } = DefaultEnhancedMode; } } From 9e3e07116745757a3001e6390ad850f882f595fc Mon Sep 17 00:00:00 2001 From: Shannon Lewis Date: Thu, 17 May 2018 17:10:39 +1000 Subject: [PATCH 4/5] PublicSurfaceAreaFixture again --- ....ThePublicSurfaceAreaShouldNotRegress..NETCore.approved.txt | 3 +++ ...ublicSurfaceAreaShouldNotRegress..NETFramework.approved.txt | 3 +++ 2 files changed, 6 insertions(+) diff --git a/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETCore.approved.txt b/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETCore.approved.txt index da88896d3..800604e31 100644 --- a/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETCore.approved.txt +++ b/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETCore.approved.txt @@ -2264,6 +2264,9 @@ Octopus.Client.Model Octopus.Client.Extensibility.INamedResource Octopus.Client.Model.FeedResource { + static System.Int32 DefaultDownloadAttempts + static System.Int32 DefaultDownloadRetryBackoffSeconds + static System.Boolean DefaultEnhancedMode .ctor() Int32 DownloadAttempts { get; set; } Int32 DownloadRetryBackoffSeconds { 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 3935185f8..589e5a000 100644 --- a/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETFramework.approved.txt +++ b/source/Octopus.Client.Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETFramework.approved.txt @@ -2737,6 +2737,9 @@ Octopus.Client.Model Octopus.Client.Extensibility.INamedResource Octopus.Client.Model.FeedResource { + static System.Int32 DefaultDownloadAttempts + static System.Int32 DefaultDownloadRetryBackoffSeconds + static System.Boolean DefaultEnhancedMode .ctor() Int32 DownloadAttempts { get; set; } Int32 DownloadRetryBackoffSeconds { get; set; } From 9f3167a2f06ca843512314d59016587973d2a7bb Mon Sep 17 00:00:00 2001 From: Shannon Lewis Date: Fri, 18 May 2018 15:41:26 +1000 Subject: [PATCH 5/5] revert GitVersion to release version because the beta isn't coming up with correct versions in TC --- build.cake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.cake b/build.cake index 4a75c976b..29a9688aa 100644 --- a/build.cake +++ b/build.cake @@ -1,7 +1,7 @@ ////////////////////////////////////////////////////////////////////// // TOOLS ////////////////////////////////////////////////////////////////////// -#tool "nuget:?package=GitVersion.CommandLine&version=4.0.0-beta0011" +#tool "nuget:?package=GitVersion.CommandLine&version=3.6.5" #tool "nuget:?package=ILRepack&version=2.0.13" #addin "nuget:?package=SharpCompress&version=0.12.4" #addin "nuget:?package=Cake.Incubator"