Extract ACTIONS_REQUIRED blocks from releases and PRs. (#40)

pkg/markdown/helpers.go

@@ -0,0 +1,56 @@
+package markdown
+
+import (
+	"fmt"
+	"strings"
+)
+
+var NoSuchBlockError = fmt.Errorf("no such block")
+
+func isHeading(l string) bool {
+	return strings.HasPrefix(l, "#")
+}
+
+func headingLevel(l string) int {
+	level := 0
+	for _, char := range l {
+		if char != '#' {
+			break
+		}
+		level++
+	}
+	return level
+}
+
+func ExtractAnnotatedBlock(annotation string, s string) (string, error) {
+	parts := strings.SplitN(s, "```"+annotation, 2)
+	if len(parts) != 2 {
+		return "", NoSuchBlockError
+	}
+
+	parts = strings.SplitN(parts[1], "```", 2)
+	if len(parts) != 2 {
+		return "", NoSuchBlockError
+	}
+
+	return strings.TrimSpace(parts[0]), nil
+}
+
+func ToListItem(lines string) []string {
+	var result []string
+
+	for i, line := range SplitLines(lines) {
+		if i == 0 {
+			result = append(result, "* "+line)
+			continue
+		}
+
+		result = append(result, "  "+line)
+	}
+
+	return result
+}
+
+func SplitLines(s string) []string {
+	return strings.Split(strings.Replace(s, `\r\n`, "\n", -1), "\n")
+}

pkg/utils/markdown.go → pkg/markdown/markdown.go

@@ -1,44 +1,14 @@
-package utils
+package markdown
 
 import (
-	"fmt"
 	"strings"
 )
 
 type Markdown struct {
 	sections []*MarkdownSection
 }
 
-func (m *Markdown) allSections() []*MarkdownSection {
-	var result []*MarkdownSection
-
-	for _, s := range m.sections {
-		result = append(result, s.allSections()...)
-	}
-
-	return result
-}
-
-func (m *MarkdownSection) allSections() []*MarkdownSection {
-	var result []*MarkdownSection
-
-	result = append(result, m)
-
-	for _, s := range m.SubSections {
-		result = append(result, s.allSections()...)
-	}
-
-	return result
-}
-
-type MarkdownSection struct {
-	Level        int
-	Heading      string
-	ContentLines []string
-	SubSections  []*MarkdownSection
-}
-
-func ParseMarkdown(content string) *Markdown {
+func Parse(content string) *Markdown {
 	m := &Markdown{}
 	lines := strings.Split(content, "\n")
 
@@ -82,19 +52,14 @@ func ParseMarkdown(content string) *Markdown {
 	return m
 }
 
-func isHeading(l string) bool {
-	return strings.HasPrefix(l, "#")
-}
+func (m *Markdown) allSections() []*MarkdownSection {
+	var result []*MarkdownSection
 
-func headingLevel(l string) int {
-	level := 0
-	for _, char := range l {
-		if char != '#' {
-			break
-		}
-		level++
+	for _, s := range m.sections {
+		result = append(result, s.allSections()...)
 	}
-	return level
+
+	return result
 }
 
 func (m *Markdown) AppendSection(s *MarkdownSection) {
@@ -105,22 +70,6 @@ func (m *Markdown) PrependSection(s *MarkdownSection) {
 	m.sections = append([]*MarkdownSection{s}, m.sections...)
 }
 
-func (m *MarkdownSection) AppendContent(contentLines []string) {
-	m.ContentLines = append(m.ContentLines, contentLines...)
-}
-
-func (m *MarkdownSection) PrependContent(contentLines []string) {
-	m.ContentLines = append(contentLines, m.ContentLines...)
-}
-
-func (m *MarkdownSection) AppendChild(child *MarkdownSection) {
-	m.SubSections = append(m.SubSections, child)
-}
-
-func (m *MarkdownSection) PrependChild(child *MarkdownSection) {
-	m.SubSections = append([]*MarkdownSection{child}, m.SubSections...)
-}
-
 func (m *Markdown) FindSectionByHeading(level int, headline string) *MarkdownSection {
 	for _, s := range m.allSections() {
 		if s.Level == level {
@@ -148,28 +97,9 @@ func (m *Markdown) FindSectionByHeadingPrefix(level int, headlinePrefix string)
 func (m *Markdown) String() string {
 	var result string
 	for _, s := range m.sections {
-		result += s.String()
-	}
-	return strings.TrimSpace(result)
-}
-
-func (m *MarkdownSection) String() string {
-	var result string
-
-	if m.Level > 0 {
-		for i := 0; i < m.Level; i++ {
-			result += "#"
-		}
-		result += " " + m.Heading + "\n"
+		result += "\n" + s.String()
+		result = strings.Trim(result, "\n")
 	}
 
-	for _, l := range m.ContentLines {
-		result += fmt.Sprintf("%s\n", l)
-	}
-
-	for _, sub := range m.SubSections {
-		result += sub.String()
-	}
-
-	return result
+	return strings.TrimSpace(result)
 }

pkg/utils/markdown_test.go → pkg/markdown/markdown_test.go

@@ -1,4 +1,4 @@
-package utils
+package markdown
 
 import (
 	"testing"
@@ -173,7 +173,7 @@ content 1b`,
 	for _, tt := range tests {
 		// regex := regexp.MustCompile("\n\n")
 		t.Run(tt.name, func(t *testing.T) {
-			m := ParseMarkdown(tt.content)
+			m := Parse(tt.content)
 			if diff := cmp.Diff(m.sections, tt.want); diff != "" {
 				t.Errorf("parseMarkdown(), differs in sections: %v", diff)
 			}

pkg/markdown/section.go

@@ -0,0 +1,76 @@
+package markdown
+
+import (
+	"fmt"
+	"strings"
+)
+
+type MarkdownSection struct {
+	Level        int
+	Heading      string
+	ContentLines []string
+	SubSections  []*MarkdownSection
+}
+
+func (m *MarkdownSection) allSections() []*MarkdownSection {
+	var result []*MarkdownSection
+
+	result = append(result, m)
+
+	for _, s := range m.SubSections {
+		result = append(result, s.allSections()...)
+	}
+
+	return result
+}
+
+func (m *MarkdownSection) FindSectionByHeading(level int, headline string) *MarkdownSection {
+	for _, s := range m.allSections() {
+		if s.Level == level {
+			if headline == s.Heading {
+				return s
+			}
+		}
+	}
+
+	return nil
+}
+
+func (m *MarkdownSection) AppendContent(contentLines []string) {
+	m.ContentLines = append(m.ContentLines, contentLines...)
+}
+
+func (m *MarkdownSection) PrependContent(contentLines []string) {
+	m.ContentLines = append(contentLines, m.ContentLines...)
+}
+
+func (m *MarkdownSection) AppendChild(child *MarkdownSection) {
+	m.SubSections = append(m.SubSections, child)
+}
+
+func (m *MarkdownSection) PrependChild(child *MarkdownSection) {
+	m.SubSections = append([]*MarkdownSection{child}, m.SubSections...)
+}
+
+func (m *MarkdownSection) String() string {
+	var result string
+
+	if m.Level > 0 {
+		for i := 0; i < m.Level; i++ {
+			result += "#"
+		}
+		result += " " + m.Heading + "\n"
+	}
+
+	for _, l := range m.ContentLines {
+		result += fmt.Sprintf("%s\n", l)
+	}
+
+	result = strings.Trim(result, "\n")
+
+	for _, sub := range m.SubSections {
+		result += "\n" + sub.String()
+	}
+
+	return result
+}

pkg/webhooks/github/actions/common.go

@@ -205,7 +205,8 @@ func (w *WebhookActions) ProcessPullRequestEvent(payload *ghwebhooks.PullRequest
 			}
 
 			params := &releaseDrafterParams{
-				RepositoryName: payload.Repository.Name,
+				RepositoryName:       payload.Repository.Name,
+				ComponentReleaseInfo: &payload.PullRequest.Body,
 			}
 			err := a.appendMergedPR(ctx, payload.PullRequest.Title, payload.PullRequest.Number, payload.PullRequest.User.Login, params)
 			if err != nil {