Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -2133,6 +2133,17 @@ Octopus.Client.Model
Octopus.Client.Model.RetentionPeriod Retention { get; set; }
Nullable<TimeSpan> StartingFrom { get; set; }
}
class BuiltInArtifactFeedResource
Octopus.Client.Extensibility.IResource
Octopus.Client.Model.IAuditedResource
Octopus.Client.Extensibility.INamedResource
Octopus.Client.Extensibility.IHaveSpaceResource
Octopus.Client.Model.IHaveSlugResource
Octopus.Client.Model.FeedResource
{
.ctor()
Octopus.Client.Model.FeedType FeedType { get; }
}
class BuiltInFeedResource
Octopus.Client.Extensibility.IResource
Octopus.Client.Model.IAuditedResource
Expand Down Expand Up @@ -3238,6 +3249,7 @@ Octopus.Client.Model
AzureContainerRegistry = 11
GoogleContainerRegistry = 12
ArtifactoryGeneric = 13
Artifact = 14
}
class FileUpload
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2150,6 +2150,17 @@ Octopus.Client.Model
Octopus.Client.Model.RetentionPeriod Retention { get; set; }
Nullable<TimeSpan> StartingFrom { get; set; }
}
class BuiltInArtifactFeedResource
Octopus.Client.Extensibility.IResource
Octopus.Client.Model.IAuditedResource
Octopus.Client.Extensibility.INamedResource
Octopus.Client.Extensibility.IHaveSpaceResource
Octopus.Client.Model.IHaveSlugResource
Octopus.Client.Model.FeedResource
{
.ctor()
Octopus.Client.Model.FeedType FeedType { get; }
}
class BuiltInFeedResource
Octopus.Client.Extensibility.IResource
Octopus.Client.Model.IAuditedResource
Expand Down Expand Up @@ -3255,6 +3266,7 @@ Octopus.Client.Model
AzureContainerRegistry = 11
GoogleContainerRegistry = 12
ArtifactoryGeneric = 13
Artifact = 14
}
class FileUpload
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,21 @@ public void BuiltInFeedTypesDeserialize()
Assert.IsAssignableFrom(typeof(BuiltInFeedResource), result);
Assert.AreEqual(input.DeleteUnreleasedPackagesAfterDays, result.DeleteUnreleasedPackagesAfterDays);
}

[Test]
public void BuiltInArtifactFeedTypesDeserialize()
{
var input = new
{
Name = "Blah",
FeedType = FeedType.Artifact,
};

var result = Execute<BuiltInArtifactFeedResource>(input);

Assert.AreEqual(FeedType.Artifact, result.FeedType);
Assert.IsAssignableFrom(typeof(BuiltInArtifactFeedResource), result);
}

[Test]
public void GitHubFeedTypesDeserialize()
Expand Down
10 changes: 10 additions & 0 deletions source/Octopus.Server.Client/Model/BuiltInArtifactFeedResource.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
using Octopus.Client.Extensibility.Attributes;

namespace Octopus.Client.Model
{
public class BuiltInArtifactFeedResource : FeedResource
{
public override FeedType FeedType => FeedType.Artifact;

}
}
3 changes: 2 additions & 1 deletion source/Octopus.Server.Client/Model/FeedType.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ public enum FeedType
S3,
AzureContainerRegistry,
GoogleContainerRegistry,
ArtifactoryGeneric
ArtifactoryGeneric,
Artifact
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ public class FeedConverter : InheritedClassConverter<FeedResource, FeedType>
{FeedType.AzureContainerRegistry, typeof(AzureContainerRegistryFeedResource)},
{FeedType.GoogleContainerRegistry, typeof(GoogleContainerRegistryFeedResource)},
{FeedType.ArtifactoryGeneric, typeof(ArtifactoryGenericFeedResource)},
{FeedType.Artifact, typeof(BuiltInArtifactFeedResource)},
};

static readonly Type defaultType = typeof(NuGetFeedResource);
Expand Down
Loading