From 99ce81dee1a4c2bc46919064ab5606c175ae9ed5 Mon Sep 17 00:00:00 2001 From: Juan Antonio Osorio Date: Thu, 12 Dec 2024 15:33:51 +0200 Subject: [PATCH] Promote Release properties Signed-off-by: Juan Antonio Osorio --- internal/entities/properties/constants.go | 10 ++++++++++ .../providers/github/properties/release.go | 19 ++++++++----------- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/internal/entities/properties/constants.go b/internal/entities/properties/constants.go index 43dc61c276..3005b76b5e 100644 --- a/internal/entities/properties/constants.go +++ b/internal/entities/properties/constants.go @@ -44,3 +44,13 @@ const ( // ArtifactPropertyType represents the type of the artifact (e.g 'container') ArtifactPropertyType = "type" ) + +// Release property keys +const ( + // ReleasePropertyTag represents the release tag name. + ReleasePropertyTag = "tag" + // ReleasePropertyBranch represents the release branch + ReleasePropertyBranch = "branch" + // ReleaseCommitSHA represents the commit SHA of the release + ReleaseCommitSHA = "commit_sha" +) diff --git a/internal/providers/github/properties/release.go b/internal/providers/github/properties/release.go index 957119f316..6f6b2ad843 100644 --- a/internal/providers/github/properties/release.go +++ b/internal/providers/github/properties/release.go @@ -21,10 +21,6 @@ const ( ReleasePropertyOwner = "github/owner" // ReleasePropertyRepo represents the github repo ReleasePropertyRepo = "github/repo" - // ReleasePropertyTag represents the github release tag name. - ReleasePropertyTag = "github/tag" - // ReleasePropertyBranch represents the github release branch - ReleasePropertyBranch = "github/branch" ) // ReleaseFetcher is a property fetcher for releases @@ -43,8 +39,10 @@ func NewReleaseFetcher() *ReleaseFetcher { properties.PropertyName, properties.PropertyUpstreamID, // general release - ReleasePropertyTag, - ReleasePropertyBranch, + properties.ReleasePropertyTag, + properties.ReleasePropertyBranch, + ReleasePropertyOwner, + ReleasePropertyRepo, }, wrapper: getReleaseWrapper, }, @@ -62,7 +60,7 @@ func (_ *ReleaseFetcher) GetName(props *properties.Properties) (string, error) { return "", fmt.Errorf("failed to get repo name: %w", err) } - tag, err := props.GetProperty(ReleasePropertyTag).AsString() + tag, err := props.GetProperty(properties.ReleasePropertyTag).AsString() if err != nil { return "", fmt.Errorf("failed to get tag name: %w", err) } @@ -115,8 +113,7 @@ func getReleaseWrapper( properties.PropertyName: getReleaseNameFromParams(owner, repo, release.GetTagName()), ReleasePropertyOwner: owner, ReleasePropertyRepo: repo, - ReleasePropertyTag: release.GetTagName(), - ReleasePropertyBranch: release.GetTargetCommitish(), + properties.ReleasePropertyTag: release.GetTagName(), }, nil } @@ -127,12 +124,12 @@ func EntityInstanceV1FromReleaseProperties(props *properties.Properties) (*minde return nil, fmt.Errorf("upstream ID not found or invalid: %w", err) } - tag, err := props.GetProperty(ReleasePropertyTag).AsString() + tag, err := props.GetProperty(properties.ReleasePropertyTag).AsString() if err != nil { return nil, fmt.Errorf("tag not found or invalid: %w", err) } - _, err = props.GetProperty(ReleasePropertyBranch).AsString() + _, err = props.GetProperty(properties.ReleasePropertyBranch).AsString() if err != nil { return nil, fmt.Errorf("branch not found or invalid: %w", err) }