From 76e7894ad4bbdf77ed6d06a7dc871d53c17ae0de Mon Sep 17 00:00:00 2001 From: Joshua Blum Date: Fri, 10 Jul 2026 09:13:40 -0400 Subject: [PATCH 1/4] bump github.com/aws/aws-sdk-go-v2/service/s3 --- go.mod | 14 +++++++------- go.sum | 28 ++++++++++++++-------------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/go.mod b/go.mod index b5ea5765..22aa0a98 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.24.0 toolchain go1.25.5 require ( - github.com/aws/aws-sdk-go-v2 v1.41.0 + github.com/aws/aws-sdk-go-v2 v1.42.1 github.com/aws/aws-sdk-go-v2/config v1.32.5 github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.62.2 github.com/aws/aws-sdk-go-v2/service/ses v1.34.17 @@ -27,19 +27,19 @@ require ( require ( filippo.io/edwards25519 v1.1.0 // indirect - github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.4 // indirect + github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.14 // indirect github.com/aws/aws-sdk-go-v2/credentials v1.19.5 // indirect github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.16 // indirect - github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.16 // indirect - github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.16 // indirect + github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.30 // indirect + github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.30 // indirect github.com/aws/aws-sdk-go-v2/internal/ini v1.8.4 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.4 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.16 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.13 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.30 // indirect github.com/aws/aws-sdk-go-v2/service/signin v1.0.4 // indirect github.com/aws/aws-sdk-go-v2/service/sso v1.30.7 // indirect github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.12 // indirect github.com/aws/aws-sdk-go-v2/service/sts v1.41.5 // indirect - github.com/aws/smithy-go v1.24.0 // indirect + github.com/aws/smithy-go v1.27.3 // indirect github.com/go-pkgz/expirable-cache v0.1.0 // indirect github.com/golang-jwt/jwt/v4 v4.5.2 // indirect github.com/google/go-github/v75 v75.0.0 // indirect diff --git a/go.sum b/go.sum index 75064415..d11256cd 100644 --- a/go.sum +++ b/go.sum @@ -5,28 +5,28 @@ cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSR filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA= filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/aws/aws-sdk-go-v2 v1.41.0 h1:tNvqh1s+v0vFYdA1xq0aOJH+Y5cRyZ5upu6roPgPKd4= -github.com/aws/aws-sdk-go-v2 v1.41.0/go.mod h1:MayyLB8y+buD9hZqkCW3kX1AKq07Y5pXxtgB+rRFhz0= -github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.4 h1:489krEF9xIGkOaaX3CE/Be2uWjiXrkCH6gUX+bZA/BU= -github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.4/go.mod h1:IOAPF6oT9KCsceNTvvYMNHy0+kMF8akOjeDvPENWxp4= +github.com/aws/aws-sdk-go-v2 v1.42.1 h1:9eOTgu1z/dVtYpNZ3/8/XbbaX0x/BqE3HUzAzs6K0ek= +github.com/aws/aws-sdk-go-v2 v1.42.1/go.mod h1:5pKeft2eJj+gElQ38Jqg4ibCqh+/AK33/0X3hip7IjM= +github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.14 h1:3IZY0XAJquT3aHzbkHfPzy4ACPcEjVG0x87KOwtpqGY= +github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.14/go.mod h1:zwM6veDkhGgQFqkBy+uT28AAYpLu+uFMlPl+rCg/73E= github.com/aws/aws-sdk-go-v2/config v1.32.5 h1:pz3duhAfUgnxbtVhIK39PGF/AHYyrzGEyRD9Og0QrE8= github.com/aws/aws-sdk-go-v2/config v1.32.5/go.mod h1:xmDjzSUs/d0BB7ClzYPAZMmgQdrodNjPPhd6bGASwoE= github.com/aws/aws-sdk-go-v2/credentials v1.19.5 h1:xMo63RlqP3ZZydpJDMBsH9uJ10hgHYfQFIk1cHDXrR4= github.com/aws/aws-sdk-go-v2/credentials v1.19.5/go.mod h1:hhbH6oRcou+LpXfA/0vPElh/e0M3aFeOblE1sssAAEk= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.16 h1:80+uETIWS1BqjnN9uJ0dBUaETh+P1XwFy5vwHwK5r9k= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.16/go.mod h1:wOOsYuxYuB/7FlnVtzeBYRcjSRtQpAW0hCP7tIULMwo= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.16 h1:rgGwPzb82iBYSvHMHXc8h9mRoOUBZIGFgKb9qniaZZc= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.16/go.mod h1:L/UxsGeKpGoIj6DxfhOWHWQ/kGKcd4I1VncE4++IyKA= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.16 h1:1jtGzuV7c82xnqOVfx2F0xmJcOw5374L7N6juGW6x6U= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.16/go.mod h1:M2E5OQf+XLe+SZGmmpaI2yy+J326aFf6/+54PoxSANc= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.30 h1:xM/Is9cKMHa8Jj8zkvWhvrFkZsXJV9E+BB4g0HW0duQ= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.30/go.mod h1:WueJeNDZvK1fMYEWJIkcivBfEzUkTpBhzlrUKKY8EuA= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.30 h1:jn46zC9LdsVR/ZpMIJqMqb8hHv31BlLx3ulVqNspUOk= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.30/go.mod h1:1hTMsAgbdS/AtUi4bw8+gUuh1pceo+eXRLfpSuSQj3M= github.com/aws/aws-sdk-go-v2/internal/ini v1.8.4 h1:WKuaxf++XKWlHWu9ECbMlha8WOEGm0OUEZqm4K/Gcfk= github.com/aws/aws-sdk-go-v2/internal/ini v1.8.4/go.mod h1:ZWy7j6v1vWGmPReu0iSGvRiise4YI5SkR3OHKTZ6Wuc= github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.62.2 h1:U7ATBzpyD+A3IxzwKUL+meioIs3HO+/eyxghGTy6bkY= github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.62.2/go.mod h1:ESQxVIp7hs1MdsdEF4KITf65SfM3fh/EEiYi+s0S/pE= -github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.4 h1:0ryTNEdJbzUCEWkVXEXoqlXV72J5keC1GvILMOuD00E= -github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.4/go.mod h1:HQ4qwNZh32C3CBeO6iJLQlgtMzqeG17ziAA/3KDJFow= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.16 h1:oHjJHeUy0ImIV0bsrX0X91GkV5nJAyv1l1CC9lnO0TI= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.16/go.mod h1:iRSNGgOYmiYwSCXxXaKb9HfOEj40+oTKn8pTxMlYkRM= +github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.13 h1:mbRIur/BiHK6SKPjoBIXSE/hJ6g6JGRLuxQy1jGjlN4= +github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.13/go.mod h1:ITg9em2KbJx1s0y4aqRX5OYWG6HBZ5TVR//OdpEZ2CQ= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.30 h1:/Z5jmNrKsSD7EmDjzAPsm/3L9IuOkzaynklJZ1qX7S4= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.30/go.mod h1:lEzEZnOosE7zi8Z6royW1cFJTD9fpab4Ul1SBrllewk= github.com/aws/aws-sdk-go-v2/service/ses v1.34.17 h1:XR7CtY988tck2Bhuy1JP4FsV8z0OAwjuh+gb7nAy8/M= github.com/aws/aws-sdk-go-v2/service/ses v1.34.17/go.mod h1:2CspeTVldnJdRixX36SzTZuoIpjyKlfeXyB7/JB5KGk= github.com/aws/aws-sdk-go-v2/service/signin v1.0.4 h1:HpI7aMmJ+mm1wkSHIA2t5EaFFv5EFYXePW30p1EIrbQ= @@ -37,8 +37,8 @@ github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.12 h1:AHDr0DaHIAo8c9t1emrzAlV github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.12/go.mod h1:GQ73XawFFiWxyWXMHWfhiomvP3tXtdNar/fi8z18sx0= github.com/aws/aws-sdk-go-v2/service/sts v1.41.5 h1:SciGFVNZ4mHdm7gpD1dgZYnCuVdX1s+lFTg4+4DOy70= github.com/aws/aws-sdk-go-v2/service/sts v1.41.5/go.mod h1:iW40X4QBmUxdP+fZNOpfmkdMZqsovezbAeO+Ubiv2pk= -github.com/aws/smithy-go v1.24.0 h1:LpilSUItNPFr1eY85RYgTIg5eIEPtvFbskaFcmmIUnk= -github.com/aws/smithy-go v1.24.0/go.mod h1:LEj2LM3rBRQJxPZTB4KuzZkaZYnZPnvgIhb4pu07mx0= +github.com/aws/smithy-go v1.27.3 h1:F3Zb497UhhskkfpJmfkXswyo+t0sh9OTBnIHjogWbVY= +github.com/aws/smithy-go v1.27.3/go.mod h1:YE2RhdIuDbA5E5bTdciG9KrW3+TiEONeUWCqxX9i1Fc= github.com/bradleyfalzon/ghinstallation/v2 v2.17.0 h1:SmbUK/GxpAspRjSQbB6ARvH+ArzlNzTtHydNyXUQ6zg= github.com/bradleyfalzon/ghinstallation/v2 v2.17.0/go.mod h1:vuD/xvJT9Y+ZVZRv4HQ42cMyPFIYqpc7AbB4Gvt/DlY= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= From 81806b95ba23be48dd4abddfc2ffe6f8442186e2 Mon Sep 17 00:00:00 2001 From: Joshua Blum Date: Fri, 10 Jul 2026 09:28:07 -0400 Subject: [PATCH 2/4] bump github.com/google/go-github/v75 --- githubbot/githubbot/handler.go | 2 +- githubbot/githubbot/http.go | 8 ++------ githubbot/githubbot/util.go | 2 +- githubbot/migrations/default_branch.go | 2 +- go.mod | 6 ++---- go.sum | 9 ++------- 6 files changed, 9 insertions(+), 20 deletions(-) diff --git a/githubbot/githubbot/handler.go b/githubbot/githubbot/handler.go index dd4fefd0..f90b7c86 100644 --- a/githubbot/githubbot/handler.go +++ b/githubbot/githubbot/handler.go @@ -9,7 +9,7 @@ import ( "github.com/bradleyfalzon/ghinstallation/v2" - "github.com/google/go-github/v31/github" + "github.com/google/go-github/v75/github" "github.com/keybase/go-keybase-chat-bot/kbchat" "github.com/keybase/go-keybase-chat-bot/kbchat/types/chat1" "github.com/keybase/managed-bots/base" diff --git a/githubbot/githubbot/http.go b/githubbot/githubbot/http.go index 07e8f89c..8d145cd5 100644 --- a/githubbot/githubbot/http.go +++ b/githubbot/githubbot/http.go @@ -12,7 +12,7 @@ import ( "github.com/bradleyfalzon/ghinstallation/v2" - "github.com/google/go-github/v31/github" + "github.com/google/go-github/v75/github" "github.com/keybase/go-keybase-chat-bot/kbchat" "github.com/keybase/managed-bots/base" "golang.org/x/oauth2" @@ -243,11 +243,7 @@ func (h *HTTPSrv) formatMessage(ctx context.Context, convID chat1.ConvIDStr, eve event.GetRepo().GetOwner().GetLogin(), event.GetRepo().GetName(), event.GetSHA(), - &github.PullRequestListOptions{ - State: "open", - Sort: "updated", - Direction: "desc", - }, + nil, ) if err != nil && !strings.Contains(err.Error(), "401 Bad credentials") { h.Errorf("error getting pull requests from commit: %s", err) diff --git a/githubbot/githubbot/util.go b/githubbot/githubbot/util.go index d967ac1b..f9d25ec9 100644 --- a/githubbot/githubbot/util.go +++ b/githubbot/githubbot/util.go @@ -12,7 +12,7 @@ import ( "github.com/keybase/go-keybase-chat-bot/kbchat" "github.com/keybase/managed-bots/base" - "github.com/google/go-github/v31/github" + "github.com/google/go-github/v75/github" ) func getCommitMessages(event *github.PushEvent) []string { diff --git a/githubbot/migrations/default_branch.go b/githubbot/migrations/default_branch.go index a29ec885..950835e4 100644 --- a/githubbot/migrations/default_branch.go +++ b/githubbot/migrations/default_branch.go @@ -13,7 +13,7 @@ import ( "github.com/bradleyfalzon/ghinstallation/v2" _ "github.com/go-sql-driver/mysql" - "github.com/google/go-github/v31/github" + "github.com/google/go-github/v75/github" "github.com/keybase/managed-bots/githubbot/githubbot" ) diff --git a/go.mod b/go.mod index 22aa0a98..88740a99 100644 --- a/go.mod +++ b/go.mod @@ -7,11 +7,11 @@ toolchain go1.25.5 require ( github.com/aws/aws-sdk-go-v2 v1.42.1 github.com/aws/aws-sdk-go-v2/config v1.32.5 - github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.62.2 + github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.79.0 github.com/aws/aws-sdk-go-v2/service/ses v1.34.17 github.com/bradleyfalzon/ghinstallation/v2 v2.17.0 github.com/go-sql-driver/mysql v1.9.3 - github.com/google/go-github/v31 v31.0.0 + github.com/google/go-github/v75 v75.0.0 github.com/gorilla/mux v1.7.3 github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 github.com/keybase/go-codec v0.0.0-20180928230036-164397562123 @@ -42,7 +42,6 @@ require ( github.com/aws/smithy-go v1.27.3 // indirect github.com/go-pkgz/expirable-cache v0.1.0 // indirect github.com/golang-jwt/jwt/v4 v4.5.2 // indirect - github.com/google/go-github/v75 v75.0.0 // indirect ) require ( @@ -59,7 +58,6 @@ require ( github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opencensus.io v0.22.1 // indirect - golang.org/x/crypto v0.46.0 // indirect golang.org/x/net v0.48.0 // indirect golang.org/x/sys v0.39.0 // indirect golang.org/x/text v0.32.0 // indirect diff --git a/go.sum b/go.sum index d11256cd..9fa8d407 100644 --- a/go.sum +++ b/go.sum @@ -21,8 +21,8 @@ github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.30 h1:jn46zC9LdsVR/ZpMIJ github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.30/go.mod h1:1hTMsAgbdS/AtUi4bw8+gUuh1pceo+eXRLfpSuSQj3M= github.com/aws/aws-sdk-go-v2/internal/ini v1.8.4 h1:WKuaxf++XKWlHWu9ECbMlha8WOEGm0OUEZqm4K/Gcfk= github.com/aws/aws-sdk-go-v2/internal/ini v1.8.4/go.mod h1:ZWy7j6v1vWGmPReu0iSGvRiise4YI5SkR3OHKTZ6Wuc= -github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.62.2 h1:U7ATBzpyD+A3IxzwKUL+meioIs3HO+/eyxghGTy6bkY= -github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.62.2/go.mod h1:ESQxVIp7hs1MdsdEF4KITf65SfM3fh/EEiYi+s0S/pE= +github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.79.0 h1:5W/KOwsnZrdi7RD97G5Vto3XEuM70FAavWScfsli7gA= +github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.79.0/go.mod h1:h1Iw2nkdpmAUJaa89RvX3cg/HGLgdSkCWpMNgKvBSHA= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.13 h1:mbRIur/BiHK6SKPjoBIXSE/hJ6g6JGRLuxQy1jGjlN4= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.13/go.mod h1:ITg9em2KbJx1s0y4aqRX5OYWG6HBZ5TVR//OdpEZ2CQ= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.30 h1:/Z5jmNrKsSD7EmDjzAPsm/3L9IuOkzaynklJZ1qX7S4= @@ -62,7 +62,6 @@ github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfb github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.5 h1:F768QJ1E9tib+q5Sc8MkdJi1RxLTbRcTf8LJV56aRls= github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= @@ -71,8 +70,6 @@ github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= -github.com/google/go-github/v31 v31.0.0 h1:JJUxlP9lFK+ziXKimTCprajMApV1ecWD4NB6CCb0plo= -github.com/google/go-github/v31 v31.0.0/go.mod h1:NQPZol8/1sMoWYGN2yaALIBytu17gAWfhbweiEed3pM= github.com/google/go-github/v75 v75.0.0 h1:k7q8Bvg+W5KxRl9Tjq16a9XEgVY1pwuiG5sIL7435Ic= github.com/google/go-github/v75 v75.0.0/go.mod h1:H3LUJEA1TCrzuUqtdAQniBNwuKiQIqdGKgBo1/M/uqI= github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= @@ -134,8 +131,6 @@ go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.1 h1:8dP3SGL7MPB94crU3bEPplMPe83FI4EouesJUeFHv50= go.opencensus.io v0.22.1/go.mod h1:Ap50jQcDJrx6rB6VgeeFPtuPIf3wMRvRfrfYDO6+BmA= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.46.0 h1:cKRW/pmt1pKAfetfu+RCEvjvZkA9RimPbh7bhFjGVBU= -golang.org/x/crypto v0.46.0/go.mod h1:Evb/oLKmMraqjZ2iQTwDwvCtJkczlDuTmdJXoZVzqU0= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= From 4c83eab68d0a0356edaca6ee4cc9e8c4ae9906d0 Mon Sep 17 00:00:00 2001 From: Joshua Blum Date: Fri, 10 Jul 2026 10:45:41 -0400 Subject: [PATCH 3/4] github v89 --- githubbot/githubbot/handler.go | 18 ++++++++++++------ githubbot/githubbot/http.go | 14 ++++++++++---- githubbot/githubbot/util.go | 6 ++++-- githubbot/migrations/default_branch.go | 8 ++++++-- go.mod | 7 ++++--- go.sum | 9 +++++---- 6 files changed, 41 insertions(+), 21 deletions(-) diff --git a/githubbot/githubbot/handler.go b/githubbot/githubbot/handler.go index f90b7c86..cd55e248 100644 --- a/githubbot/githubbot/handler.go +++ b/githubbot/githubbot/handler.go @@ -9,7 +9,7 @@ import ( "github.com/bradleyfalzon/ghinstallation/v2" - "github.com/google/go-github/v75/github" + "github.com/google/go-github/v89/github" "github.com/keybase/go-keybase-chat-bot/kbchat" "github.com/keybase/go-keybase-chat-bot/kbchat/types/chat1" "github.com/keybase/managed-bots/base" @@ -72,7 +72,10 @@ func (h *Handler) HandleCommand(ctx context.Context, msg chat1.MsgSummary) error return h.handleMentionPref(ctx, cmd, msg) } - client := github.NewClient(&http.Client{Transport: h.atr}) + client, err := github.NewClient(github.WithHTTPClient(&http.Client{Transport: h.atr})) + if err != nil { + return fmt.Errorf("error creating github client: %s", err) + } switch { case strings.HasPrefix(cmd, "!github subscribe"): h.stats.Count("subscribe") @@ -202,7 +205,7 @@ func (h *Handler) handleListSubscriptions(ctx context.Context, msg chat1.MsgSumm var res strings.Builder for repo, f := range features { - res.WriteString(fmt.Sprintf("- *%s* (%s)\n", repo, &f)) + fmt.Fprintf(&res, "- *%s* (%s)\n", repo, &f) if f.Commits { branches, err := h.db.GetAllBranchesForRepo(ctx, msg.ConvID, repo) if err != nil { @@ -210,7 +213,7 @@ func (h *Handler) handleListSubscriptions(ctx context.Context, msg chat1.MsgSumm } for _, branch := range branches { - res.WriteString(fmt.Sprintf(" - %s\n", branch)) + fmt.Fprintf(&res, " - %s\n", branch) } } } @@ -224,7 +227,7 @@ func (h *Handler) handleNewSubscription(ctx context.Context, repo string, msg ch h.ChatEcho(msg.ConvID, "`%s` doesn't look like a repository to me! Try sending `!github subscribe `", repo) return false, nil } - repoInstallation, res, err := client.Apps.FindRepositoryInstallation(context.TODO(), parsedRepo[0], parsedRepo[1]) + repoInstallation, res, err := client.Apps.GetRepositoryInstallation(context.TODO(), parsedRepo[0], parsedRepo[1]) if err != nil { switch res.StatusCode { case http.StatusNotFound: @@ -243,7 +246,10 @@ func (h *Handler) handleNewSubscription(ctx context.Context, repo string, msg ch if err != nil || tc == nil { return false, err } - userClient := github.NewClient(tc) + userClient, err := github.NewClient(github.WithHTTPClient(tc)) + if err != nil { + return false, fmt.Errorf("error creating github client: %s", err) + } installations, _, err := userClient.Apps.ListUserInstallations(context.TODO(), nil) if err != nil { return false, fmt.Errorf("Error getting installations for current user: %s", err) diff --git a/githubbot/githubbot/http.go b/githubbot/githubbot/http.go index 8d145cd5..f53a715a 100644 --- a/githubbot/githubbot/http.go +++ b/githubbot/githubbot/http.go @@ -12,7 +12,7 @@ import ( "github.com/bradleyfalzon/ghinstallation/v2" - "github.com/google/go-github/v75/github" + "github.com/google/go-github/v89/github" "github.com/keybase/go-keybase-chat-bot/kbchat" "github.com/keybase/managed-bots/base" "golang.org/x/oauth2" @@ -85,7 +85,11 @@ func (h *HTTPSrv) handleWebhook(_ http.ResponseWriter, r *http.Request) { } itr := ghinstallation.NewFromAppsTransport(h.atr, installationID) - client := github.NewClient(&http.Client{Transport: itr}) + client, err := github.NewClient(github.WithHTTPClient(&http.Client{Transport: itr})) + if err != nil { + h.Errorf("error creating github client: %s", err) + return + } if repo == "" { return @@ -189,7 +193,9 @@ func (h *HTTPSrv) formatMessage(ctx context.Context, convID chat1.ConvIDStr, eve event.GetRepo().GetName(), ), "" case *github.PushEvent: - if len(event.Commits) == 0 { + // event.Commits is deprecated for the Events API polling endpoint, but webhook + // payloads still include it. See: https://docs.github.com/en/webhooks/webhook-events-and-payloads#push + if len(event.Commits) == 0 { //nolint:staticcheck break } @@ -200,7 +206,7 @@ func (h *HTTPSrv) formatMessage(ctx context.Context, convID chat1.ConvIDStr, eve event.GetSender().GetLogin(), event.GetRepo().GetName(), branch, - len(event.Commits), + len(event.Commits), //nolint:staticcheck commitMsgs, event.GetCompare(), ), branch diff --git a/githubbot/githubbot/util.go b/githubbot/githubbot/util.go index f9d25ec9..34d7190d 100644 --- a/githubbot/githubbot/util.go +++ b/githubbot/githubbot/util.go @@ -12,12 +12,14 @@ import ( "github.com/keybase/go-keybase-chat-bot/kbchat" "github.com/keybase/managed-bots/base" - "github.com/google/go-github/v75/github" + "github.com/google/go-github/v89/github" ) func getCommitMessages(event *github.PushEvent) []string { commitMsgs := make([]string, 0) - for _, commit := range event.Commits { + // event.Commits is deprecated for the Events API polling endpoint, but webhook + // payloads still include it. See: https://docs.github.com/en/webhooks/webhook-events-and-payloads#push + for _, commit := range event.Commits { //nolint:staticcheck commitMsgs = append(commitMsgs, commit.GetMessage()) } return commitMsgs diff --git a/githubbot/migrations/default_branch.go b/githubbot/migrations/default_branch.go index 950835e4..e9f5d81b 100644 --- a/githubbot/migrations/default_branch.go +++ b/githubbot/migrations/default_branch.go @@ -13,7 +13,7 @@ import ( "github.com/bradleyfalzon/ghinstallation/v2" _ "github.com/go-sql-driver/mysql" - "github.com/google/go-github/v75/github" + "github.com/google/go-github/v89/github" "github.com/keybase/managed-bots/githubbot/githubbot" ) @@ -89,7 +89,11 @@ func mainInner() int { fmt.Printf("Found %d subscriptions to migrate\n", len(subs)) for i, subscription := range subs { itr := ghinstallation.NewFromAppsTransport(atr, subscription.InstallationID) - client := github.NewClient(&http.Client{Transport: itr}) + client, err := github.NewClient(github.WithHTTPClient(&http.Client{Transport: itr})) + if err != nil { + fmt.Printf("Error creating github client for subscription %d/%d: %s\n", i, len(subs), err) + continue + } defaultBranch, err := githubbot.GetDefaultBranch(subscription.Repo, client) if err != nil { diff --git a/go.mod b/go.mod index 88740a99..5478fb8d 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/keybase/managed-bots -go 1.24.0 +go 1.25.0 toolchain go1.25.5 @@ -11,7 +11,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/ses v1.34.17 github.com/bradleyfalzon/ghinstallation/v2 v2.17.0 github.com/go-sql-driver/mysql v1.9.3 - github.com/google/go-github/v75 v75.0.0 + github.com/google/go-github/v89 v89.0.0 github.com/gorilla/mux v1.7.3 github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 github.com/keybase/go-codec v0.0.0-20180928230036-164397562123 @@ -42,6 +42,7 @@ require ( github.com/aws/smithy-go v1.27.3 // indirect github.com/go-pkgz/expirable-cache v0.1.0 // indirect github.com/golang-jwt/jwt/v4 v4.5.2 // indirect + github.com/google/go-github/v75 v75.0.0 // indirect ) require ( @@ -50,7 +51,7 @@ require ( github.com/didip/tollbooth/v7 v7.0.1 github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6 // indirect github.com/golang/protobuf v1.3.5 // indirect - github.com/google/go-querystring v1.1.0 // indirect + github.com/google/go-querystring v1.2.0 // indirect github.com/googleapis/gax-go/v2 v2.0.5 // indirect github.com/hashicorp/go-cleanhttp v0.5.1 // indirect github.com/hashicorp/go-retryablehttp v0.6.4 // indirect diff --git a/go.sum b/go.sum index 9fa8d407..305cdd77 100644 --- a/go.sum +++ b/go.sum @@ -67,14 +67,16 @@ github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgj github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= github.com/google/go-github/v75 v75.0.0 h1:k7q8Bvg+W5KxRl9Tjq16a9XEgVY1pwuiG5sIL7435Ic= github.com/google/go-github/v75 v75.0.0/go.mod h1:H3LUJEA1TCrzuUqtdAQniBNwuKiQIqdGKgBo1/M/uqI= +github.com/google/go-github/v89 v89.0.0 h1:35bEK5XoEcF3PZrlVbl9XN63f5BcJRA/UGkxeC9xPg0= +github.com/google/go-github/v89 v89.0.0/go.mod h1:QLcbU0ipeAqQuR5KSg8c2lql4Qk1EwJ2dWz/0rP4Nho= github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= -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/google/go-querystring v1.2.0 h1:yhqkPbu2/OH+V9BfpCVPZkNmUXhb2gBxJArfhIxNtP0= +github.com/google/go-querystring v1.2.0/go.mod h1:8IFJqpSRITyJ8QhQ13bmbeMBDfmeEJZD5A0egEOmkqU= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= @@ -181,7 +183,6 @@ golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= google.golang.org/api v0.14.0 h1:uMf5uLi4eQMRrMKhCplNik4U4H8Z6C1br3zOtAa/aDE= google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= From 959d215b92cff4d677bcadab7049df9d582e05ff Mon Sep 17 00:00:00 2001 From: Joshua Blum Date: Fri, 10 Jul 2026 10:47:46 -0400 Subject: [PATCH 4/4] github.com/go-sql-driver/mysql --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 5478fb8d..b6de14f4 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.79.0 github.com/aws/aws-sdk-go-v2/service/ses v1.34.17 github.com/bradleyfalzon/ghinstallation/v2 v2.17.0 - github.com/go-sql-driver/mysql v1.9.3 + github.com/go-sql-driver/mysql v1.10.0 github.com/google/go-github/v89 v89.0.0 github.com/gorilla/mux v1.7.3 github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 @@ -26,7 +26,7 @@ require ( ) require ( - filippo.io/edwards25519 v1.1.0 // indirect + filippo.io/edwards25519 v1.2.0 // indirect github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.14 // indirect github.com/aws/aws-sdk-go-v2/credentials v1.19.5 // indirect github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.16 // indirect diff --git a/go.sum b/go.sum index 305cdd77..5dd8011e 100644 --- a/go.sum +++ b/go.sum @@ -2,8 +2,8 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.38.0 h1:ROfEUZz+Gh5pa62DJWXSaonyu3StP6EA6lPEXPI6mCo= cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= -filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA= -filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4= +filippo.io/edwards25519 v1.2.0 h1:crnVqOiS4jqYleHd9vaKZ+HKtHfllngJIiOpNpoJsjo= +filippo.io/edwards25519 v1.2.0/go.mod h1:xzAOLCNug/yB62zG1bQ8uziwrIqIuxhctzJT18Q77mc= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/aws/aws-sdk-go-v2 v1.42.1 h1:9eOTgu1z/dVtYpNZ3/8/XbbaX0x/BqE3HUzAzs6K0ek= github.com/aws/aws-sdk-go-v2 v1.42.1/go.mod h1:5pKeft2eJj+gElQ38Jqg4ibCqh+/AK33/0X3hip7IjM= @@ -50,8 +50,8 @@ github.com/didip/tollbooth/v7 v7.0.1 h1:TkT4sBKoQoHQFPf7blQ54iHrZiTDnr8TceU+MulV github.com/didip/tollbooth/v7 v7.0.1/go.mod h1:VZhDSGl5bDSPj4wPsih3PFa4Uh9Ghv8hgacaTm5PRT4= github.com/go-pkgz/expirable-cache v0.1.0 h1:3bw0m8vlTK8qlwz5KXuygNBTkiKRTPrAGXU0Ej2AC1g= github.com/go-pkgz/expirable-cache v0.1.0/go.mod h1:GTrEl0X+q0mPNqN6dtcQXksACnzCBQ5k/k1SwXJsZKs= -github.com/go-sql-driver/mysql v1.9.3 h1:U/N249h2WzJ3Ukj8SowVFjdtZKfu9vlLZxjPXV1aweo= -github.com/go-sql-driver/mysql v1.9.3/go.mod h1:qn46aNg1333BRMNU69Lq93t8du/dwxI64Gl8i5p1WMU= +github.com/go-sql-driver/mysql v1.10.0 h1:Q+1LV8DkHJvSYAdR83XzuhDaTykuDx0l6fkXxoWCWfw= +github.com/go-sql-driver/mysql v1.10.0/go.mod h1:M+cqaI7+xxXGG9swrdeUIoPG3Y3KCkF0pZej+SK+nWk= github.com/golang-jwt/jwt/v4 v4.5.2 h1:YtQM7lnr8iZ+j5q71MGKkNw9Mn7AjHM68uc9g5fXeUI= github.com/golang-jwt/jwt/v4 v4.5.2/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58=