convert all code to use github/v68 (#13950)

ScottSuarez · web-flow · commit 9bcd92ccab59 · 2025-05-14T20:20:02.000Z
diff --git a/.ci/magician/cmd/scheduled_pr_reminders.go b/.ci/magician/cmd/scheduled_pr_reminders.go
@@ -26,7 +26,7 @@ import (
 
 	membership "magician/github"
 
-	"github.com/google/go-github/v61/github"
+	"github.com/google/go-github/v68/github"
 	"github.com/spf13/cobra"
 
 	"golang.org/x/exp/slices"
diff --git a/.ci/magician/cmd/scheduled_pr_reminders_test.go b/.ci/magician/cmd/scheduled_pr_reminders_test.go
@@ -6,7 +6,7 @@ import (
 
 	membership "magician/github"
 
-	"github.com/google/go-github/v61/github"
+	"github.com/google/go-github/v68/github"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/.ci/magician/go.mod b/.ci/magician/go.mod
@@ -16,7 +16,6 @@ require (
 require (
 	cloud.google.com/go/storage v1.50.0
 	github.com/google/go-cmp v0.6.0
-	github.com/google/go-github/v61 v61.0.0
 	github.com/google/go-github/v68 v68.0.0
 	github.com/otiai10/copy v1.12.0
 	github.com/stretchr/testify v1.10.0
diff --git a/.ci/magician/go.sum b/.ci/magician/go.sum
@@ -85,8 +85,6 @@ github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-github.com/google/go-github/v61 v61.0.0 h1:VwQCBwhyE9JclCI+22/7mLB1PuU9eowCXKY5pNlu1go=
-github.com/google/go-github/v61 v61.0.0/go.mod h1:0WR+KmsWX75G2EbpyGsGmradjo3IiciuI4BmdVCobQY=
 github.com/google/go-github/v68 v68.0.0 h1:ZW57zeNZiXTdQ16qrDiZ0k6XucrxZ2CGmoTvcCyQG6s=
 github.com/google/go-github/v68 v68.0.0/go.mod h1:K9HAUBovM2sLwM408A18h+wd9vqdLOEqTUCbnRIcx68=
 github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
diff --git a/tools/issue-labeler/go.mod b/tools/issue-labeler/go.mod
@@ -4,7 +4,7 @@ go 1.23
 
 require (
 	github.com/golang/glog v1.1.1
-	github.com/google/go-github/v61 v61.0.0
+	github.com/google/go-github/v68 v68.0.0
 	github.com/spf13/cobra v1.8.1
 	golang.org/x/exp v0.0.0-20230810033253-352e893a4cad
 	golang.org/x/oauth2 v0.24.0
diff --git a/tools/issue-labeler/go.sum b/tools/issue-labeler/go.sum
@@ -4,8 +4,8 @@ github.com/golang/glog v1.1.1/go.mod h1:zR+okUeTbrL6EL3xHUDxZuEtGv04p5shwip1+mL/
 github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-github.com/google/go-github/v61 v61.0.0 h1:VwQCBwhyE9JclCI+22/7mLB1PuU9eowCXKY5pNlu1go=
-github.com/google/go-github/v61 v61.0.0/go.mod h1:0WR+KmsWX75G2EbpyGsGmradjo3IiciuI4BmdVCobQY=
+github.com/google/go-github/v68 v68.0.0 h1:ZW57zeNZiXTdQ16qrDiZ0k6XucrxZ2CGmoTvcCyQG6s=
+github.com/google/go-github/v68 v68.0.0/go.mod h1:K9HAUBovM2sLwM408A18h+wd9vqdLOEqTUCbnRIcx68=
 github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
 github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU=
 github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
diff --git a/tools/issue-labeler/labeler/backfill.go b/tools/issue-labeler/labeler/backfill.go
@@ -9,7 +9,7 @@ import (
 	"time"
 
 	"github.com/golang/glog"
-	"github.com/google/go-github/v61/github"
+	"github.com/google/go-github/v68/github"
 )
 
 type Label struct {
diff --git a/tools/issue-labeler/labeler/backfill_test.go b/tools/issue-labeler/labeler/backfill_test.go
@@ -7,11 +7,11 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/google/go-github/v61/github"
+	"github.com/google/go-github/v68/github"
 )
 
 func testIssueBodyWithResources(resources []string) *string {
-	return github.String(fmt.Sprintf(`
+	return github.Ptr(fmt.Sprintf(`
 ### New or Affected Resource(s):
 
 %s
@@ -54,7 +54,7 @@ func TestComputeIssueUpdates(t *testing.T) {
 			description: "gracefully handle a nil issue body",
 			issues: []*github.Issue{
 				{
-					Number: github.Int(1),
+					Number: github.Ptr(1),
 				},
 			},
 			regexpLabels:         defaultRegexpLabels,
@@ -75,8 +75,8 @@ func TestComputeIssueUpdates(t *testing.T) {
 			name: "no listed resources",
 			issues: []*github.Issue{
 				{
-					Number: github.Int(1),
-					Body:   github.String("Body with unusual structure"),
+					Number: github.Ptr(1),
+					Body:   github.Ptr("Body with unusual structure"),
 				},
 			},
 			regexpLabels:         defaultRegexpLabels,
@@ -87,14 +87,14 @@ func TestComputeIssueUpdates(t *testing.T) {
 			description: "issues with service/terraform shouldn't get new labels",
 			issues: []*github.Issue{
 				{
-					Number: github.Int(1),
+					Number: github.Ptr(1),
 					Body:   testIssueBodyWithResources([]string{"google_service1_resource1"}),
-					Labels: []*github.Label{{Name: github.String("service/terraform")}},
+					Labels: []*github.Label{{Name: github.Ptr("service/terraform")}},
 				},
 				{
-					Number: github.Int(2),
+					Number: github.Ptr(2),
 					Body:   testIssueBodyWithResources([]string{"google_service1_resource1"}),
-					Labels: []*github.Label{{Name: github.String("forward/exempt")}},
+					Labels: []*github.Label{{Name: github.Ptr("forward/exempt")}},
 				},
 			},
 			regexpLabels:         defaultRegexpLabels,
@@ -105,11 +105,11 @@ func TestComputeIssueUpdates(t *testing.T) {
 			description: "issues with affected resources should normally get new labels added",
 			issues: []*github.Issue{
 				{
-					Number: github.Int(1),
+					Number: github.Ptr(1),
 					Body:   testIssueBodyWithResources([]string{"google_service1_resource1"}),
 				},
 				{
-					Number: github.Int(2),
+					Number: github.Ptr(2),
 					Body:   testIssueBodyWithResources([]string{"google_service2_resource1"}),
 				},
 			},
@@ -130,14 +130,14 @@ func TestComputeIssueUpdates(t *testing.T) {
 			description: "don't update issues if all expected service labels are already present",
 			issues: []*github.Issue{
 				{
-					Number: github.Int(1),
+					Number: github.Ptr(1),
 					Body:   testIssueBodyWithResources([]string{"google_service1_resource1"}),
-					Labels: []*github.Label{{Name: github.String("service/service1")}},
+					Labels: []*github.Label{{Name: github.Ptr("service/service1")}},
 				},
 				{
-					Number: github.Int(2),
+					Number: github.Ptr(2),
 					Body:   testIssueBodyWithResources([]string{"google_service2_resource1"}),
-					Labels: []*github.Label{{Name: github.String("service/service2-subteam1")}},
+					Labels: []*github.Label{{Name: github.Ptr("service/service2-subteam1")}},
 				},
 			},
 			regexpLabels:         defaultRegexpLabels,
@@ -148,14 +148,14 @@ func TestComputeIssueUpdates(t *testing.T) {
 			description: "add missing service labels",
 			issues: []*github.Issue{
 				{
-					Number: github.Int(1),
+					Number: github.Ptr(1),
 					Body:   testIssueBodyWithResources([]string{"google_service1_resource1"}),
-					Labels: []*github.Label{{Name: github.String("service/service2-subteam1")}},
+					Labels: []*github.Label{{Name: github.Ptr("service/service2-subteam1")}},
 				},
 				{
-					Number: github.Int(2),
+					Number: github.Ptr(2),
 					Body:   testIssueBodyWithResources([]string{"google_service2_resource2"}),
-					Labels: []*github.Label{{Name: github.String("service/service1")}},
+					Labels: []*github.Label{{Name: github.Ptr("service/service1")}},
 				},
 			},
 			regexpLabels: defaultRegexpLabels,
@@ -177,9 +177,9 @@ func TestComputeIssueUpdates(t *testing.T) {
 			description: "don't add missing service labels if already linked",
 			issues: []*github.Issue{
 				{
-					Number: github.Int(1),
+					Number: github.Ptr(1),
 					Body:   testIssueBodyWithResources([]string{"google_service1_resource1"}),
-					Labels: []*github.Label{{Name: github.String("service/service2-subteam1")}, {Name: github.String("forward/linked")}},
+					Labels: []*github.Label{{Name: github.Ptr("service/service2-subteam1")}, {Name: github.Ptr("forward/linked")}},
 				},
 			},
 			regexpLabels:         defaultRegexpLabels,
@@ -190,14 +190,14 @@ func TestComputeIssueUpdates(t *testing.T) {
 			description: "add service labels if missed but don't add forward/review label for test failure ticket",
 			issues: []*github.Issue{
 				{
-					Number: github.Int(1),
+					Number: github.Ptr(1),
 					Body:   testIssueBodyWithResources([]string{"google_service1_resource1"}),
-					Labels: []*github.Label{{Name: github.String("test-failure")}, {Name: github.String("test-failure-100")}},
+					Labels: []*github.Label{{Name: github.Ptr("test-failure")}, {Name: github.Ptr("test-failure-100")}},
 				},
 				{
-					Number: github.Int(2),
+					Number: github.Ptr(2),
 					Body:   testIssueBodyWithResources([]string{"google_service2_resource1"}),
-					Labels: []*github.Label{{Name: github.String("test-failure")}, {Name: github.String("test-failure-50")}, {Name: github.String("service/service2-subteam1")}},
+					Labels: []*github.Label{{Name: github.Ptr("test-failure")}, {Name: github.Ptr("test-failure-50")}, {Name: github.Ptr("service/service2-subteam1")}},
 				},
 			},
 			regexpLabels: defaultRegexpLabels,
diff --git a/tools/issue-labeler/labeler/github.go b/tools/issue-labeler/labeler/github.go
@@ -6,7 +6,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/google/go-github/v61/github"
+	"github.com/google/go-github/v68/github"
 	"golang.org/x/oauth2"
 )
 
diff --git a/tools/issue-labeler/labeler/labels.go b/tools/issue-labeler/labeler/labels.go
@@ -10,7 +10,7 @@ import (
 	_ "embed"
 
 	"github.com/golang/glog"
-	"github.com/google/go-github/v61/github"
+	"github.com/google/go-github/v68/github"
 	"gopkg.in/yaml.v2"
 )
 
diff --git a/tools/issue-labeler/labeler/labels_test.go b/tools/issue-labeler/labeler/labels_test.go
@@ -5,7 +5,7 @@ import (
 	"regexp"
 	"testing"
 
-	"github.com/google/go-github/v61/github"
+	"github.com/google/go-github/v68/github"
 	"golang.org/x/exp/slices"
 )
 
@@ -225,9 +225,9 @@ func TestComputeLabelChanges(t *testing.T) {
 		{
 			name: "existing labels with correct color",
 			existingLabels: []*github.Label{
-				{Name: github.String("xyz"), Color: github.String("FF0000")},
-				{Name: github.String("bug"), Color: github.String("FF0000")},
-				{Name: github.String("enhancement"), Color: github.String("FF0000")},
+				{Name: github.Ptr("xyz"), Color: github.Ptr("FF0000")},
+				{Name: github.Ptr("bug"), Color: github.Ptr("FF0000")},
+				{Name: github.Ptr("enhancement"), Color: github.Ptr("FF0000")},
 			},
 			desiredLabels: []string{"bug", "enhancement"},
 			desiredColor:  "FF0000",
@@ -239,8 +239,8 @@ func TestComputeLabelChanges(t *testing.T) {
 		{
 			name: "existing labels with wrong color",
 			existingLabels: []*github.Label{
-				{Name: github.String("bug"), Color: github.String("00FF00")},
-				{Name: github.String("enhancement"), Color: github.String("00FF00")},
+				{Name: github.Ptr("bug"), Color: github.Ptr("00FF00")},
+				{Name: github.Ptr("enhancement"), Color: github.Ptr("00FF00")},
 			},
 			desiredLabels: []string{"bug", "enhancement"},
 			desiredColor:  "FF0000",
@@ -252,7 +252,7 @@ func TestComputeLabelChanges(t *testing.T) {
 		{
 			name: "mixed existing and new labels",
 			existingLabels: []*github.Label{
-				{Name: github.String("bug"), Color: github.String("FF0000")},
+				{Name: github.Ptr("bug"), Color: github.Ptr("FF0000")},
 			},
 			desiredLabels: []string{"bug", "enhancement"},
 			desiredColor:  "FF0000",
@@ -264,7 +264,7 @@ func TestComputeLabelChanges(t *testing.T) {
 		{
 			name: "case insensitive color comparison",
 			existingLabels: []*github.Label{
-				{Name: github.String("bug"), Color: github.String("ff0000")},
+				{Name: github.Ptr("bug"), Color: github.Ptr("ff0000")},
 			},
 			desiredLabels: []string{"bug"},
 			desiredColor:  "FF0000",

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ import (`
`6`	`6`
`7`	`7`	`membership "magician/github"`
`8`	`8`
`9`		`- "github.com/google/go-github/v61/github"`
	`9`	`+ "github.com/google/go-github/v68/github"`
`10`	`10`	`"github.com/stretchr/testify/assert"`
`11`	`11`	`)`
`12`	`12`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ import (`
`9`	`9`	`"time"`
`10`	`10`
`11`	`11`	`"github.com/golang/glog"`
`12`		`- "github.com/google/go-github/v61/github"`
	`12`	`+ "github.com/google/go-github/v68/github"`
`13`	`13`	`)`
`14`	`14`
`15`	`15`	`type Label struct {`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ import (`
`6`	`6`	`"os"`
`7`	`7`	`"strings"`
`8`	`8`
`9`		`- "github.com/google/go-github/v61/github"`
	`9`	`+ "github.com/google/go-github/v68/github"`
`10`	`10`	`"golang.org/x/oauth2"`
`11`	`11`	`)`
`12`	`12`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ import (`
`10`	`10`	`_ "embed"`
`11`	`11`
`12`	`12`	`"github.com/golang/glog"`
`13`		`- "github.com/google/go-github/v61/github"`
	`13`	`+ "github.com/google/go-github/v68/github"`
`14`	`14`	`"gopkg.in/yaml.v2"`
`15`	`15`	`)`
`16`	`16`