add DeletePackagesAssociatedWithReleases property (#336)

Author: Rose-Northey

pkg/feeds/built_in_feed.go

@@ -8,10 +8,11 @@ import (
 
 // BuiltInFeed represents a built-in feed.
 type BuiltInFeed struct {
-	DeleteUnreleasedPackagesAfterDays int  `json:"DeleteUnreleasedPackagesAfterDays"`
-	DownloadAttempts                  int  `json:"DownloadAttempts"`
-	DownloadRetryBackoffSeconds       int  `json:"DownloadRetryBackoffSeconds"`
-	IsBuiltInRepoSyncEnabled          bool `json:"IsBuiltInRepoSyncEnabled"`
+	DeletePackagesAssociatedWithReleases bool `json:"DeletePackagesAssociatedWithReleases"`
+	DeleteUnreleasedPackagesAfterDays    int  `json:"DeleteUnreleasedPackagesAfterDays"`
+	DownloadAttempts                     int  `json:"DownloadAttempts"`
+	DownloadRetryBackoffSeconds          int  `json:"DownloadRetryBackoffSeconds"`
+	IsBuiltInRepoSyncEnabled             bool `json:"IsBuiltInRepoSyncEnabled"`
 
 	feed
 }
@@ -23,11 +24,12 @@ func NewBuiltInFeed(name string) (*BuiltInFeed, error) {
 	}
 
 	feed := BuiltInFeed{
-		DeleteUnreleasedPackagesAfterDays: 30,
-		DownloadAttempts:                  5,
-		DownloadRetryBackoffSeconds:       10,
-		IsBuiltInRepoSyncEnabled:          false,
-		feed:                              *newFeed(name, FeedTypeBuiltIn),
+		DeletePackagesAssociatedWithReleases: false,
+		DeleteUnreleasedPackagesAfterDays:    30,
+		DownloadAttempts:                     5,
+		DownloadRetryBackoffSeconds:          10,
+		IsBuiltInRepoSyncEnabled:             false,
+		feed:                                 *newFeed(name, FeedTypeBuiltIn),
 	}
 
 	// validate to ensure that all expectations are met

pkg/feeds/feed_resource.go

@@ -12,6 +12,7 @@ type FeedResource struct {
 	AzureContainerRegistryOidcAuthentication   *AzureContainerRegistryOidcAuthentication      `json:"AzureContainerRegistryOidcAuthentication,omitempty"`
 	ElasticContainerRegistryOidcAuthentication *AwsElasticContainerRegistryOidcAuthentication `json:"OidcAuthentication,omitempty"`
 	APIVersion                                 string                                         `json:"ApiVersion,omitempty"`
+	DeletePackagesAssociatedWithReleases       bool                                           `json:"DeletePackagesAssociatedWithReleases"`
 	DeleteUnreleasedPackagesAfterDays          int                                            `json:"DeleteUnreleasedPackagesAfterDays"`
 	DownloadAttempts                           int                                            `json:"DownloadAttempts"`
 	DownloadRetryBackoffSeconds                int                                            `json:"DownloadRetryBackoffSeconds"`

pkg/feeds/feed_utilities.go

@@ -3,6 +3,7 @@ package feeds
 import (
 	"errors"
 	"fmt"
+
 	"github.com/OctopusDeploy/go-octopusdeploy/v2/internal"
 	"github.com/OctopusDeploy/go-octopusdeploy/v2/pkg/resources"
 )
@@ -39,6 +40,7 @@ func ToFeed(feedResource *FeedResource) (IFeed, error) {
 		if err != nil {
 			return nil, err
 		}
+		builtInFeed.DeletePackagesAssociatedWithReleases = feedResource.DeletePackagesAssociatedWithReleases
 		builtInFeed.DeleteUnreleasedPackagesAfterDays = feedResource.DeleteUnreleasedPackagesAfterDays
 		builtInFeed.DownloadAttempts = feedResource.DownloadAttempts
 		builtInFeed.DownloadRetryBackoffSeconds = feedResource.DownloadRetryBackoffSeconds
@@ -189,6 +191,7 @@ func ToFeedResource(feed IFeed) (*FeedResource, error) {
 		}
 	case FeedTypeBuiltIn:
 		builtInFeed := feed.(*BuiltInFeed)
+		feedResource.DeletePackagesAssociatedWithReleases = builtInFeed.DeletePackagesAssociatedWithReleases
 		feedResource.DeleteUnreleasedPackagesAfterDays = builtInFeed.DeleteUnreleasedPackagesAfterDays
 		feedResource.DownloadAttempts = builtInFeed.DownloadAttempts
 		feedResource.DownloadRetryBackoffSeconds = builtInFeed.DownloadRetryBackoffSeconds

pkg/feeds/feed_utilities_test.go

@@ -1,9 +1,10 @@
 package feeds
 
 import (
+	"testing"
+
 	"github.com/OctopusDeploy/go-octopusdeploy/v2/pkg/core"
 	"github.com/OctopusDeploy/go-octopusdeploy/v2/pkg/resources"
-	"testing"
 )
 
 func TestUnexpectedFeed(t *testing.T) {

test/resources/feed_utilities_test.go

@@ -33,4 +33,11 @@ func TestToFeed(t *testing.T) {
 	require.NotNil(t, feed)
 	require.NoError(t, err)
 	require.EqualValues(t, feed.GetFeedType(), "AwsElasticContainerRegistry")
+
+	feedResource = feeds.NewFeedResource(internal.GetRandomName(), feeds.FeedTypeBuiltIn)
+	feed, err = feeds.ToFeed(feedResource)
+	require.NoError(t, err)
+	builtinFeed, ok := feed.(*feeds.BuiltInFeed)
+	require.True(t, ok)
+	require.EqualValues(t, builtinFeed.DeletePackagesAssociatedWithReleases, false)
 }