Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 37 additions & 37 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ require (
github.com/cenkalti/backoff/v5 v5.0.3
github.com/cloudevents/sdk-go/v2 v2.16.2
github.com/google/uuid v1.6.0
github.com/oapi-codegen/runtime v1.1.2
github.com/openshift-hyperfleet/hyperfleet-api-spec v1.0.12
github.com/oapi-codegen/runtime v1.4.0
github.com/openshift-hyperfleet/hyperfleet-api-spec v1.0.14
github.com/openshift-hyperfleet/hyperfleet-broker v1.1.1
github.com/prometheus/client_golang v1.23.2
github.com/spf13/cobra v1.8.0
github.com/spf13/cobra v1.10.2
github.com/spf13/viper v1.21.0
github.com/testcontainers/testcontainers-go v0.42.0
github.com/testcontainers/testcontainers-go/modules/rabbitmq v0.42.0
Expand All @@ -24,10 +24,10 @@ require (
)

require (
cel.dev/expr v0.25.1 // indirect
cel.dev/expr v0.25.2 // indirect
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🔴 Critical

🧩 Analysis chain

🏁 Script executed:

#!/bin/bash
set -euo pipefail

# Verify current repo contract versions (sentinel)
echo "== hyperfleet-sentinel contract deps =="
rg -n 'github.com/google/cel-go|cloud.google.com/go/pubsub/v2|go.opentelemetry.io/(otel|contrib)|google.golang.org/(grpc|api)' go.mod

# Cross-repo spot-check via GitHub API (default branch go.mod files)
# Requires gh auth in the execution environment.
for repo in \
  openshift-hyperfleet/hyperfleet-api \
  openshift-hyperfleet/hyperfleet-adapter \
  openshift-hyperfleet/hyperfleet-broker
do
  echo
  echo "== $repo go.mod contract deps =="
  gh api "repos/$repo/contents/go.mod" \
    --jq '.content' | base64 -d | \
    rg -n 'github.com/google/cel-go|cloud.google.com/go/pubsub/v2|go.opentelemetry.io/(otel|contrib)|google.golang.org/(grpc|api)|github.com/spf13/cobra|github.com/oapi-codegen/runtime'
done

Repository: openshift-hyperfleet/hyperfleet-sentinel

Length of output: 4184


CEL and Pub/Sub v2 version incompatibilities detected across sibling repos—merge blocked.

This PR bumps github.com/google/cel-go to v0.28.1 and cloud.google.com/go/pubsub/v2 to v2.6.0. These are direct or near-direct dependencies in other HyperFleet repositories:

  • hyperfleet-adapter imports github.com/google/cel-go v0.26.1 (2 minor versions behind). CEL is a compile-time evaluation contract; this version gap will cause incompatibility.
  • hyperfleet-broker imports cloud.google.com/go/pubsub/v2 v2.4.0 directly (2 minor versions behind sentinel). Broker's broker/googlepubsub.go will be incompatible with sentinel's v2.6.0.

Additionally, OTel contrib instrumentation version skew exists:

  • sentinel bumps to v0.68.0; adapter and broker remain at v0.65.0 (3 minor versions mismatch).
  • gRPC versions also diverge: sentinel v1.81.1 vs. adapter/broker v1.79.0–1.80.0.

Update sentinel's dependency versions to match or be compatible with the sibling repositories, or coordinate synchronized updates across all four repos before merge.

🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@go.mod` at line 27, The go.mod upgrade introduces incompatible version skew
with sibling repos; update sentinel's versions to align with the rest of the
fleet: change github.com/google/cel-go to v0.26.1 (to match hyperfleet-adapter)
or coordinate a repo-wide bump, change cloud.google.com/go/pubsub/v2 to v2.4.0
(to match hyperfleet-broker) or coordinate a synchronized bump, and align
OpenTelemetry and gRPC versions (e.g., set go.opentelemetry.io/otel/... to
v0.65.0 and google.golang.org/grpc to the same minor version used by
adapter/broker) so all four repos use compatible dependency minors before
merging; update the go.mod entries for github.com/google/cel-go,
cloud.google.com/go/pubsub/v2, the otel contrib packages, and
google.golang.org/grpc accordingly.

github.com/antlr4-go/antlr/v4 v4.13.1 // indirect
github.com/moby/moby/api v1.54.1 // indirect
github.com/moby/moby/client v0.4.0 // indirect
github.com/moby/moby/api v1.54.2 // indirect
github.com/moby/moby/client v0.4.1 // indirect
go.opentelemetry.io/contrib/propagators/aws v1.43.0 // indirect
go.opentelemetry.io/contrib/propagators/b3 v1.43.0 // indirect
go.opentelemetry.io/contrib/propagators/jaeger v1.43.0 // indirect
Expand All @@ -37,16 +37,16 @@ require (

require (
cloud.google.com/go v0.123.0 // indirect
cloud.google.com/go/auth v0.18.1 // indirect
cloud.google.com/go/auth v0.20.0 // indirect
cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
cloud.google.com/go/compute/metadata v0.9.0 // indirect
cloud.google.com/go/iam v1.5.3 // indirect
cloud.google.com/go/pubsub/v2 v2.4.0 // indirect
cloud.google.com/go/iam v1.11.0 // indirect
cloud.google.com/go/pubsub/v2 v2.6.0 // indirect
dario.cat/mergo v1.0.2 // indirect
github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
github.com/Microsoft/go-winio v0.6.2 // indirect
github.com/ThreeDotsLabs/watermill v1.5.1 // indirect
github.com/ThreeDotsLabs/watermill-amqp/v3 v3.0.2 // indirect
github.com/ThreeDotsLabs/watermill v1.5.2 // indirect
github.com/ThreeDotsLabs/watermill-amqp/v3 v3.1.0 // indirect
github.com/ThreeDotsLabs/watermill-googlecloud/v2 v2.0.0 // indirect
github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect
github.com/beorn7/perks v1.0.1 // indirect
Expand All @@ -60,25 +60,25 @@ require (
github.com/cpuguy83/dockercfg v0.3.2 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/distribution/reference v0.6.0 // indirect
github.com/docker/go-connections v0.6.0 // indirect
github.com/docker/go-connections v0.7.0 // indirect
github.com/docker/go-units v0.5.0 // indirect
github.com/ebitengine/purego v0.10.0 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/fsnotify/fsnotify v1.9.0 // indirect
github.com/fsnotify/fsnotify v1.10.1 // indirect
github.com/go-logr/logr v1.4.3 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-ole/go-ole v1.3.0 // indirect
github.com/go-viper/mapstructure/v2 v2.5.0 // indirect
github.com/google/cel-go v0.27.0
github.com/google/cel-go v0.28.1
github.com/google/s2a-go v0.1.9 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.3.12 // indirect
github.com/googleapis/gax-go/v2 v2.17.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.28.0 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.3.15 // indirect
github.com/googleapis/gax-go/v2 v2.22.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.29.0 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-multierror v1.1.1 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/klauspost/compress v1.18.5 // indirect
github.com/klauspost/compress v1.18.6 // indirect
github.com/kylelemons/godebug v1.1.0 // indirect
github.com/lithammer/shortuuid/v3 v3.0.7 // indirect
github.com/lufia/plan9stats v0.0.0-20251013123823-9fd1530e3ec3 // indirect
Expand All @@ -96,49 +96,49 @@ require (
github.com/oklog/ulid v1.3.1 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.1.1 // indirect
github.com/pelletier/go-toml/v2 v2.2.4 // indirect
github.com/pelletier/go-toml/v2 v2.3.1 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
github.com/prometheus/client_model v0.6.2 // indirect
github.com/prometheus/common v0.66.1 // indirect
github.com/prometheus/procfs v0.17.0 // indirect
github.com/rabbitmq/amqp091-go v1.10.0 // indirect
github.com/prometheus/common v0.67.5 // indirect
github.com/prometheus/procfs v0.20.1 // indirect
github.com/rabbitmq/amqp091-go v1.11.0 // indirect
github.com/sagikazarmark/locafero v0.12.0 // indirect
github.com/shirou/gopsutil/v4 v4.26.3 // indirect
github.com/shirou/gopsutil/v4 v4.26.4 // indirect
github.com/sirupsen/logrus v1.9.4 // indirect
github.com/sony/gobreaker v1.0.0 // indirect
github.com/spf13/afero v1.15.0 // indirect
github.com/spf13/cast v1.10.0 // indirect
github.com/spf13/pflag v1.0.10
github.com/stretchr/testify v1.11.1 // indirect
github.com/subosito/gotenv v1.6.0 // indirect
github.com/tklauser/go-sysconf v0.3.16 // indirect
github.com/tklauser/numcpus v0.11.0 // indirect
github.com/tklauser/go-sysconf v0.4.0 // indirect
github.com/tklauser/numcpus v0.12.0 // indirect
github.com/yusufpapurcu/wmi v1.2.4 // indirect
go.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.65.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.65.0
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.68.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.68.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.43.0 // indirect
go.opentelemetry.io/otel/metric v1.43.0 // indirect
go.opentelemetry.io/proto/otlp v1.10.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.27.1 // indirect
go.yaml.in/yaml/v2 v2.4.2 // indirect
go.uber.org/zap v1.28.0 // indirect
go.yaml.in/yaml/v2 v2.4.4 // indirect
go.yaml.in/yaml/v3 v3.0.4 // indirect
golang.org/x/crypto v0.49.0 // indirect
golang.org/x/net v0.52.0 // indirect
golang.org/x/oauth2 v0.35.0 // indirect
golang.org/x/crypto v0.51.0 // indirect
golang.org/x/net v0.54.0 // indirect
golang.org/x/oauth2 v0.36.0 // indirect
golang.org/x/sync v0.20.0 // indirect
golang.org/x/sys v0.42.0 // indirect
golang.org/x/text v0.35.0 // indirect
golang.org/x/time v0.14.0 // indirect
google.golang.org/api v0.266.0 // indirect
golang.org/x/sys v0.44.0 // indirect
golang.org/x/text v0.37.0 // indirect
golang.org/x/time v0.15.0 // indirect
google.golang.org/api v0.279.0 // indirect
google.golang.org/genproto v0.0.0-20260209200024-4cfbd4190f57 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20260401024825-9d38bb4040a9 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20260401024825-9d38bb4040a9 // indirect
google.golang.org/grpc v1.80.0 // indirect
google.golang.org/grpc v1.81.1 // indirect
google.golang.org/protobuf v1.36.11 // indirect
gopkg.in/yaml.v3 v3.0.1
)