Include PRs that use tide squashing

Author: g-gaston

hack/tools/go.mod

@@ -35,7 +35,6 @@ require (
 	cloud.google.com/go/compute v1.23.3 // indirect
 	cloud.google.com/go/compute/metadata v0.2.3 // indirect
 	cloud.google.com/go/iam v1.1.5 // indirect
-	github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
 	github.com/MakeNowJust/heredoc v1.0.0 // indirect
 	github.com/Masterminds/goutils v1.1.1 // indirect
 	github.com/Masterminds/semver/v3 v3.2.0 // indirect

hack/tools/release/notes/list.go

@@ -119,16 +119,24 @@ func (l *githubFromToPRLister) listPRs() ([]pr, error) {
 	return prs, nil
 }
 
-var mergeCommitMessage = regexp.MustCompile(`(?m)^Merge pull request #(\d+) .*$`)
+var (
+	mergeCommitMessage        = regexp.MustCompile(`(?m)^Merge pull request #(\d+) .*$`)
+	tideSquashedCommitMessage = regexp.MustCompile(`(?m)^.+\(#(?P<number>\d+)\)$`)
+)
 
 func buildSetOfPRNumbers(commits []githubCommitNode) map[string]struct{} {
 	prNumbers := make(map[string]struct{})
 	for _, commit := range commits {
 		match := mergeCommitMessage.FindStringSubmatch(commit.Commit.Message)
-		if len(match) != 2 {
+		if len(match) == 2 {
+			prNumbers[match[1]] = struct{}{}
 			continue
 		}
-		prNumbers[match[1]] = struct{}{}
+
+		match = tideSquashedCommitMessage.FindStringSubmatch(commit.Commit.Message)
+		if len(match) == 2 {
+			prNumbers[match[1]] = struct{}{}
+		}
 	}
 
 	return prNumbers

hack/tools/release/notes/list_test.go

@@ -0,0 +1,67 @@
+//go:build tools
+// +build tools
+
+/*
+Copyright 2023 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package main
+
+import (
+	"testing"
+
+	. "github.com/onsi/gomega"
+)
+
+func Test_buildSetOfPRNumbers(t *testing.T) {
+	tests := []struct {
+		name    string
+		commits []githubCommitNode
+		want    map[string]struct{}
+	}{
+		{
+			name: "merge commit",
+			commits: []githubCommitNode{
+				{
+					Commit: githubCommit{
+						Message: "Merge pull request #9072 from k8s-infra-cherrypick-robot/cherry-pick-9070-to-release-1.5\n\n[release-1.5] :bug: Change tilt debug base image to golang",
+					},
+				},
+			},
+			want: map[string]struct{}{
+				"9072": {},
+			},
+		},
+		{
+			name: "squashed commit by tide",
+			commits: []githubCommitNode{
+				{
+					Commit: githubCommit{
+						Message: ":seedling: Add dependabot groups. Allow additional patch updates (#9263)\n\n* Allow patch updates on dependabot ignore list\n\nSigned-off-by: user <[email protected]>\n\n* Add dependency groups for dependabot\n\nSigned-off-by: user <[email protected]>\n\n---------\n\nSigned-off-by: user <[email protected]>",
+					},
+				},
+			},
+			want: map[string]struct{}{
+				"9263": {},
+			},
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			g := NewWithT(t)
+			g.Expect(buildSetOfPRNumbers(tt.commits)).To(Equal(tt.want))
+		})
+	}
+}

hack/tools/release/notes/process.go

@@ -53,7 +53,7 @@ var (
 		"clusterresourceset":                "ClusterResourceSet",
 		"machinedeployment":                 "MachineDeployment",
 		"ipam":                              "IPAM",
-		"provider/bootstrap-kubeadm":        "CAPBK",
+		"provider/bootstrap-kubeadm":        "CABPK",
 		"provider/infrastructure-in-memory": "CAPIM",
 		"provider/core":                     "Core",
 		"runtime-sdk":                       "Runtime SDK",

hack/tools/release/notes/test/golden/v1.5.0.md

@@ -17,7 +17,7 @@ REPLACE ME: A couple sentences describing the deprecation, including links to do
 
 ## Changes since v1.4.0
 ## :chart_with_upwards_trend: Overview
-- 335 new commits merged
+- 339 new commits merged
 - 4 breaking changes :warning:
 - 19 feature additions ✨
 - 67 bugs fixed 🐛
@@ -150,6 +150,7 @@ REPLACE ME: A couple sentences describing the deprecation, including links to do
 - ClusterClass: Cluster/topology: use cached MD list in get current state (#8922)
 - ClusterClass: Deprecate rolloutAfter in cluster topology (#8324)
 - ClusterClass: Upgrading control plane should only be blocked if MD are upgrading (not just rolling out) (#8658)
+- clusterctl: Add CABPOCNE and CACPOCNE Providers (#9068)
 - clusterctl: Add labels to OWNERS file (#8342)
 - clusterctl: Add move annotation on objects for cluster move operation (#8322)
 - clusterctl: Bump controller-tools to v0.12 (#8581)
@@ -179,6 +180,7 @@ REPLACE ME: A couple sentences describing the deprecation, including links to do
 - Dependency: Bump github.com/onsi/ginkgo/v2 from 2.9.5 to 2.9.7 (#8792)
 - Dependency: Bump github.com/onsi/ginkgo/v2 from 2.9.7 to 2.10.0 (#8839)
 - Dependency: Bump github.com/onsi/gomega from 1.27.4 to 1.27.5 (#8390)
+- Dependency: Bump github.com/onsi/gomega from 1.27.5 to 1.27.6 (#8460)
 - Dependency: Bump github.com/onsi/gomega from 1.27.6 to 1.27.7 (#8715)
 - Dependency: Bump github.com/onsi/gomega from 1.27.7 to 1.27.8 (#8841)
 - Dependency: Bump github.com/prometheus/client_golang from 1.14.0 to 1.15.0 (#8541)
@@ -293,7 +295,7 @@ REPLACE ME: A couple sentences describing the deprecation, including links to do
 - util: Move `internal.labels` to `format` package for use by providers (#9006)
 - util: Rename internal/util/ssa util functions for better naming consistency (#8423)
 
-:book: Additionally, there have been 72 contributions to our documentation and book. (#8252, #8279, #8284, #8288, #8293, #8307, #8308, #8309, #8319, #8327, #8351, #8355, #8363, #8375, #8383, #8397, #8416, #8419, #8439, #8446, #8447, #8454, #8508, #8509, #8510, #8511, #8520, #8521, #8552, #8554, #8559, #8580, #8587, #8593, #8596, #8597, #8612, #8613, #8630, #8632, #8651, #8661, #8673, #8686, #8699, #8701, #8712, #8719, #8729, #8740, #8753, #8760, #8762, #8763, #8775, #8779, #8781, #8782, #8787, #8798, #8802, #8805, #8812, #8843, #8854, #8901, #8924, #8932, #8955, #8956, #8958, #8960) 
+:book: Additionally, there have been 74 contributions to our documentation and book. (#8252, #8279, #8284, #8288, #8293, #8307, #8308, #8309, #8319, #8327, #8351, #8355, #8363, #8375, #8383, #8397, #8416, #8419, #8439, #8446, #8447, #8454, #8508, #8509, #8510, #8511, #8520, #8521, #8544, #8552, #8554, #8559, #8580, #8587, #8593, #8596, #8597, #8612, #8613, #8630, #8632, #8651, #8661, #8673, #8686, #8699, #8701, #8712, #8719, #8729, #8740, #8753, #8760, #8762, #8763, #8775, #8779, #8781, #8782, #8787, #8798, #8802, #8805, #8812, #8843, #8854, #8901, #8924, #8932, #8955, #8956, #8958, #8960, #8980) 
 
 
 _Thanks to all our contributors!_ 😊