Fix build logic (#109)

Author: lucian-ioan

changelog/fragments/1663757086-Fix-build-logic-for-Github-API-calls.yaml

@@ -0,0 +1,31 @@
+# Kind can be one of:
+# - breaking-change: a change to previously-documented behavior
+# - deprecation: functionality that is being removed in a later release
+# - bug-fix: fixes a problem in a previous version
+# - enhancement: extends functionality but does not break or fix existing behavior
+# - feature: new functionality
+# - known-issue: problems that we are aware of in a given version
+# - security: impacts on the security of a product or a user’s deployment.
+# - upgrade: important information for someone upgrading from a prior version
+# - other: does not fit into any of the other categories
+kind: bug-fix
+
+# Change summary; a 80ish characters long description of the change.
+summary: Fix build logic for Github API calls
+
+# Long description; in case the summary is not enough to describe the change
+# this field accommodate a description without length limits.
+#description:
+
+# Affected component; a word indicating the component this changeset affects.
+component:
+
+# PR number; optional; the PR number that added the changeset.
+# If not present is automatically filled by the tooling finding the PR where this changelog fragment has been added.
+# NOTE: the tooling supports backports, so it's able to fill the original PR number instead of the backport PR number.
+# Please provide it if you are adding a fragment for a different PR.
+#pr: 1234
+
+# Issue number; optional; the GitHub issue related to this changeset (either closes or is part of).
+# If not present is automatically filled by the tooling with the issue linked to the PR number.
+#issue: 1234

internal/changelog/builder.go

@@ -9,6 +9,7 @@ import (
 	"errors"
 	"fmt"
 	"log"
+	"net/url"
 	"os"
 	"os/exec"
 	"path"
@@ -109,6 +110,12 @@ func (b Builder) Build(owner, repo string) error {
 			b.changelog.Entries[i].LinkedPR = prIDs
 		} else {
 			// Applying heuristics to PR fields
+			owner, repo, err := ExtractOwnerRepo(entry.LinkedPR[0])
+			if err != nil {
+				log.Printf("%s: check if the PR field is correct in changelog: %s", entry.File.Name, err.Error())
+				continue
+			}
+
 			originalPR, err := FindOriginalPR(entry.LinkedPR[0], owner, repo, c)
 			if err != nil {
 				log.Printf("%s: check if the PR field is correct in changelog: %s", entry.File.Name, err.Error())
@@ -122,6 +129,12 @@ func (b Builder) Build(owner, repo string) error {
 			linkedIssues := []string{}
 
 			for _, prURL := range b.changelog.Entries[i].LinkedPR {
+				owner, repo, err := ExtractOwnerRepo(prURL)
+				if err != nil {
+					log.Printf("%s: check if the PR field is correct in changelog: %s", entry.File.Name, err.Error())
+					continue
+				}
+
 				tempIssues, err := FindIssues(graphqlClient, context.Background(), owner, repo, prURL, 50)
 				if err != nil {
 					log.Printf("%s: could not find linked issues for pr: %s: %s", entry.File.Name, entry.LinkedPR, err.Error())
@@ -136,7 +149,7 @@ func (b Builder) Build(owner, repo string) error {
 
 			b.changelog.Entries[i].LinkedIssue = linkedIssues
 		} else if len(entry.LinkedIssue) == 1 {
-			_, err := ExtractEventNumber("issue", entry.LinkedIssue[0])
+			_, err = ExtractEventNumber("issue", entry.LinkedIssue[0])
 			if err != nil {
 				log.Printf("%s: check if the issue field is correct in changelog: %s", entry.File.Name, err.Error())
 			}
@@ -168,11 +181,25 @@ func collectFragment(fs afero.Fs, path string, info os.FileInfo, err error, file
 	return nil
 }
 
+func ExtractOwnerRepo(eventURL string) (string, string, error) {
+	urlParsed, err := url.Parse(eventURL)
+	if err != nil {
+		return "", "", fmt.Errorf("invalid url: %w", err)
+	}
+
+	urlParts := strings.Split(urlParsed.Path, "/")
+	if len(urlParts) < 1 {
+		return "", "", fmt.Errorf("can't get owner or repo")
+	}
+
+	return urlParts[1], urlParts[2], nil
+}
+
 func ExtractEventNumber(linkType, eventURL string) (string, error) {
 	urlParts := strings.Split(eventURL, "/")
 
 	if len(urlParts) < 1 {
-		return "", fmt.Errorf("cant get event number")
+		return "", fmt.Errorf("can't get event number")
 	}
 
 	switch linkType {

internal/changelog/builder_test.go

@@ -74,3 +74,9 @@ func TestExtractEventNumber(t *testing.T) {
 	require.NoError(t, err)
 	require.Equal(t, id, "99")
 }
+func TestExtractOwnerRepo(t *testing.T) {
+	owner, repo, err := changelog.ExtractOwnerRepo("https://github.com/elastic/beats/pull/20186")
+	require.NoError(t, err)
+	require.Equal(t, owner, "elastic")
+	require.Equal(t, repo, "beats")
+}