fix tests

Author: joshhunt

backport/backport.go

@@ -164,9 +164,7 @@ func backport(ctx context.Context, log *slog.Logger, client BackportClient, issu
 func Backport(ctx context.Context, log *slog.Logger, backportClient BackportClient, commentClient CommentClient, issueClient IssueClient, execClient CommandRunner, opts BackportOpts) (*github.PullRequest, error) {
 	// Remove any `backport` related labels from the original PR, and mark this PR as a "backport"
 	labels := []*github.Label{
-		&github.Label{
-			Name: github.String("backport"),
-		},
+		{Name: github.String("backport")},
 	}
 
 	for _, v := range opts.Labels {

backport/backport_test.go

@@ -78,14 +78,14 @@ func TestMostRecentBranch(t *testing.T) {
 }
 
 func TestBackportTarget(t *testing.T) {
-	assertError := func(t *testing.T, label *github.Label, branches []*github.Branch) {
+	assertError := func(t *testing.T, label string, branches []*github.Branch) {
 		t.Helper()
 		b, err := BackportTarget(label, branches)
 		assert.Error(t, err)
 		assert.Empty(t, b)
 	}
 
-	assertBranch := func(t *testing.T, label *github.Label, branches []*github.Branch, branch string) {
+	assertBranch := func(t *testing.T, label string, branches []*github.Branch, branch string) {
 		t.Helper()
 		b, err := BackportTarget(label, branches)
 		assert.NoError(t, err)
@@ -107,36 +107,16 @@ func TestBackportTarget(t *testing.T) {
 		{Name: github.String("release-12.2.12")},
 	}
 
-	assertError(t, &github.Label{
-		Name: github.String("backport v3.2.x"),
-	}, branches)
-	assertError(t, &github.Label{
-		Name: github.String("backport v4.0.x"),
-	}, branches)
-	assertError(t, &github.Label{
-		Name: github.String("backport v13.0.x"),
-	}, branches)
-	assertError(t, &github.Label{
-		Name: github.String("backport v10.5.x"),
-	}, branches)
-	assertError(t, &github.Label{
-		Name: github.String("backport v11.8.x"),
-	}, branches)
-	assertBranch(t, &github.Label{
-		Name: github.String("backport v11.0.x"),
-	}, branches, "release-11.0.1")
-	assertBranch(t, &github.Label{
-		Name: github.String("backport v12.1.x"),
-	}, branches, "release-12.1.15")
-	assertBranch(t, &github.Label{
-		Name: github.String("backport v12.0.x"),
-	}, branches, "release-12.0.15")
-	assertBranch(t, &github.Label{
-		Name: github.String("backport v1.2.x"),
-	}, branches, "release-1.2.3")
-	assertBranch(t, &github.Label{
-		Name: github.String("backport v10.2.x"),
-	}, branches, "release-10.2.4")
+	assertError(t, "backport v3.2.x", branches)
+	assertError(t, "backport v4.0.x", branches)
+	assertError(t, "backport v13.0.x", branches)
+	assertError(t, "backport v10.5.x", branches)
+	assertError(t, "backport v11.8.x", branches)
+	assertBranch(t, "backport v11.0.x", branches, "release-11.0.1")
+	assertBranch(t, "backport v12.1.x", branches, "release-12.1.15")
+	assertBranch(t, "backport v12.0.x", branches, "release-12.0.15")
+	assertBranch(t, "backport v1.2.x", branches, "release-1.2.3")
+	assertBranch(t, "backport v10.2.x", branches, "release-10.2.4")
 }
 
 type TestBackportClient struct {

backport/pr_info.go

@@ -36,13 +36,13 @@ func GetBackportPrInfo(ctx context.Context, client *github.Client, ghctx *github
 	// Try to use event data if present
 	eventPath := ghctx.EventPath
 	if eventPath != "" {
-		return getFromEvent(ctx, client, ghctx)
+		return getFromEvent(ghctx)
 	}
 
 	return PrInfo{}, fmt.Errorf("no PR info found")
 }
 
-func getFromEvent(ctx context.Context, client *github.Client, ghctx *githubactions.GitHubContext) (PrInfo, error) {
+func getFromEvent(ghctx *githubactions.GitHubContext) (PrInfo, error) {
 	payload := &github.PullRequestTargetEvent{}
 
 	if err := UnmarshalEventData(ghctx, &payload); err != nil {

backport/release_branches_test.go

@@ -25,16 +25,10 @@ func TestBackportTargets(t *testing.T) {
 	}
 
 	t.Run("with backport labels", func(t *testing.T) {
-		labels := []*github.Label{
-			{
-				Name: github.String("backport v12.2.x"),
-			},
-			{
-				Name: github.String("backport v12.0.x"),
-			},
-			{
-				Name: github.String("backport v11.0.x"),
-			},
+		labels := []string{
+			"backport v12.2.x",
+			"backport v12.0.x",
+			"backport v11.0.x",
 		}
 
 		targets, err := BackportTargets(branches, labels)
@@ -47,28 +41,14 @@ func TestBackportTargets(t *testing.T) {
 	})
 
 	t.Run("with non-backport labels", func(t *testing.T) {
-		labels := []*github.Label{
-			{
-				Name: github.String("type/bug"),
-			},
-			{
-				Name: github.String("backport v12.2.x"),
-			},
-			{
-				Name: github.String("release/latest"),
-			},
-			{
-				Name: github.String("backport v12.0.x"),
-			},
-			{
-				Name: github.String("type/ci"),
-			},
-			{
-				Name: github.String("backport v11.0.x"),
-			},
-			{
-				Name: github.String("add-to-changelog"),
-			},
+		labels := []string{
+			"type/bug",
+			"backport v12.2.x",
+			"release/latest",
+			"backport v12.0.x",
+			"type/ci",
+			"backport v11.0.x",
+			"add-to-changelog",
 		}
 
 		targets, err := BackportTargets(branches, labels)