From 2cec098f1f80dcf66c765db876442c2bb08f0038 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 6 Sep 2026 03:11:04 +0000 Subject: [PATCH 1/3] fix(deps): update module github.com/google/go-github/v89 to v91 --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index e9ca4a2e..a34a765f 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.26.0 require ( github.com/bradleyfalzon/ghinstallation/v2 v2.19.0 github.com/golang-migrate/migrate/v4 v4.19.1 - github.com/google/go-github/v89 v89.0.0 + github.com/google/go-github/v91 v91.0.0 github.com/google/go-github/v91 v91.0.0 github.com/jackc/pgx/v5 v5.10.0 github.com/prometheus/client_golang v1.24.1 From 83830c888302bee52b09fb04432eff5bdada7a5e Mon Sep 17 00:00:00 2001 From: Christopher Bartz Date: Mon, 7 Sep 2026 10:25:55 +0000 Subject: [PATCH 2/3] fix(deps): migrate go-github imports to v91 Renovate bumped the go.mod requirement but left the source importing go-github/v89, which produced a duplicate v91 require line and broke every Go build. Point the imports at v91 and tidy the module graph. Claude-Session: https://claude.ai/code/session_01TPzUVqbcngExvxo3oX6S2v --- go.mod | 1 - go.sum | 3 +-- internal/planner/consumer.go | 2 +- internal/planner/telemetry.go | 2 +- internal/planner/telemetry_test.go | 2 +- internal/redelivery/github.go | 2 +- internal/redelivery/redelivery.go | 2 +- internal/redelivery/redelivery_test.go | 2 +- 8 files changed, 7 insertions(+), 9 deletions(-) diff --git a/go.mod b/go.mod index a34a765f..76494426 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,6 @@ require ( github.com/bradleyfalzon/ghinstallation/v2 v2.19.0 github.com/golang-migrate/migrate/v4 v4.19.1 github.com/google/go-github/v91 v91.0.0 - github.com/google/go-github/v91 v91.0.0 github.com/jackc/pgx/v5 v5.10.0 github.com/prometheus/client_golang v1.24.1 github.com/rabbitmq/amqp091-go v1.14.0 diff --git a/go.sum b/go.sum index 714cfa8b..e765200b 100644 --- a/go.sum +++ b/go.sum @@ -45,8 +45,7 @@ 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/v88 v88.0.0 h1:dZA9IKkPK1eXZj4ypngnpRj5FwdpTv4whix2PrQMP7M= github.com/google/go-github/v88 v88.0.0/go.mod h1:rufTDgn2N45wjhukLTyxmvc9nilSp3mr3Rgtt6b1MPw= -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-github/v91 v91.0.0 h1:fpulREh37uBvOj4kF0vLuzjwJ1HHmFcAfquNjJfmpYs= github.com/google/go-github/v91 v91.0.0/go.mod h1:rHtn7haKvmkTLhUK/aCQypiIj/suWSB3rnS+a1FdH6M= github.com/google/go-querystring v1.2.0 h1:yhqkPbu2/OH+V9BfpCVPZkNmUXhb2gBxJArfhIxNtP0= github.com/google/go-querystring v1.2.0/go.mod h1:8IFJqpSRITyJ8QhQ13bmbeMBDfmeEJZD5A0egEOmkqU= diff --git a/internal/planner/consumer.go b/internal/planner/consumer.go index c549ea93..58e8339d 100644 --- a/internal/planner/consumer.go +++ b/internal/planner/consumer.go @@ -14,7 +14,7 @@ import ( "github.com/canonical/github-runner-operators/internal/database" gh "github.com/canonical/github-runner-operators/internal/github" "github.com/canonical/github-runner-operators/internal/queue" - "github.com/google/go-github/v89/github" + "github.com/google/go-github/v91/github" amqp "github.com/rabbitmq/amqp091-go" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/attribute" diff --git a/internal/planner/telemetry.go b/internal/planner/telemetry.go index 933d98b5..b366e4e2 100644 --- a/internal/planner/telemetry.go +++ b/internal/planner/telemetry.go @@ -13,7 +13,7 @@ import ( "github.com/canonical/github-runner-operators/internal/database" "github.com/canonical/github-runner-operators/internal/telemetry" - "github.com/google/go-github/v89/github" + "github.com/google/go-github/v91/github" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/metric" diff --git a/internal/planner/telemetry_test.go b/internal/planner/telemetry_test.go index dac22c9d..def9cf98 100644 --- a/internal/planner/telemetry_test.go +++ b/internal/planner/telemetry_test.go @@ -17,7 +17,7 @@ import ( "github.com/canonical/github-runner-operators/internal/database" "github.com/canonical/github-runner-operators/internal/telemetry" - "github.com/google/go-github/v89/github" + "github.com/google/go-github/v91/github" "github.com/stretchr/testify/assert" "go.opentelemetry.io/otel/sdk/metric/metricdata" ) diff --git a/internal/redelivery/github.go b/internal/redelivery/github.go index 390511c0..4c5e4fb1 100644 --- a/internal/redelivery/github.go +++ b/internal/redelivery/github.go @@ -12,7 +12,7 @@ import ( "time" "github.com/bradleyfalzon/ghinstallation/v2" - "github.com/google/go-github/v89/github" + "github.com/google/go-github/v91/github" ) // GitHubClient abstracts GitHub API operations for webhook delivery management. diff --git a/internal/redelivery/redelivery.go b/internal/redelivery/redelivery.go index 4d96565c..4e83b002 100644 --- a/internal/redelivery/redelivery.go +++ b/internal/redelivery/redelivery.go @@ -14,7 +14,7 @@ import ( "slices" "time" - "github.com/google/go-github/v89/github" + "github.com/google/go-github/v91/github" ) const ( diff --git a/internal/redelivery/redelivery_test.go b/internal/redelivery/redelivery_test.go index 22ebd591..82829b39 100644 --- a/internal/redelivery/redelivery_test.go +++ b/internal/redelivery/redelivery_test.go @@ -17,7 +17,7 @@ import ( "time" "github.com/canonical/github-runner-operators/internal/telemetry" - "github.com/google/go-github/v89/github" + "github.com/google/go-github/v91/github" "github.com/stretchr/testify/assert" ) From a34811f53b0d10ed78d4980dcbfbbfab47e627c6 Mon Sep 17 00:00:00 2001 From: Christopher Bartz Date: Mon, 7 Sep 2026 11:45:06 +0000 Subject: [PATCH 3/3] fix(deps): pair ops-scenario with the pinned ops release The ops bump to 3.8.2 left the two charms that use Scenario pinning ops-scenario==8.8.1, which hard-pins ops==3.8.1, so their unit and coverage-report envs could not resolve a dependency set at all. ops-scenario 8.8.2 requires exactly ops==3.8.2. Claude-Session: https://claude.ai/code/session_01TPzUVqbcngExvxo3oX6S2v --- charms/garm-configurator/tox.toml | 2 +- charms/garm/tox.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charms/garm-configurator/tox.toml b/charms/garm-configurator/tox.toml index 869a0eee..bea7ce20 100644 --- a/charms/garm-configurator/tox.toml +++ b/charms/garm-configurator/tox.toml @@ -40,7 +40,7 @@ commands = [ [env.unit] description = "Run unit tests" -deps = ["pytest", "coverage[toml]", "ops-scenario==8.8.1", "-r requirements.txt"] +deps = ["pytest", "coverage[toml]", "ops-scenario==8.8.2", "-r requirements.txt"] commands = [ [ "coverage", diff --git a/charms/garm/tox.toml b/charms/garm/tox.toml index 6b75a278..8363a5fc 100644 --- a/charms/garm/tox.toml +++ b/charms/garm/tox.toml @@ -40,7 +40,7 @@ description = "Run unit tests" deps = [ "pytest", "coverage[toml]", - "ops-scenario==8.8.1", + "ops-scenario==8.8.2", "tomli; python_version < '3.11'", "-r requirements.txt", ]