Skip to content
Merged
Show file tree
Hide file tree
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
50 changes: 29 additions & 21 deletions .test-infra/mock-apis/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -25,35 +25,43 @@ go 1.25.0
toolchain go1.25.2

require (
cloud.google.com/go/logging v1.8.1
cloud.google.com/go/monitoring v1.16.0
github.com/google/go-cmp v0.5.9
cloud.google.com/go/logging v1.13.0
cloud.google.com/go/monitoring v1.24.1
github.com/google/go-cmp v0.7.0
github.com/redis/go-redis/v9 v9.2.1
google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d
google.golang.org/grpc v1.58.3
google.golang.org/protobuf v1.33.0
google.golang.org/genproto/googleapis/api v0.0.0-20260414002931-afd174a4e478
google.golang.org/grpc v1.82.1
google.golang.org/protobuf v1.36.11
)

require (
cloud.google.com/go v0.110.6 // indirect
cloud.google.com/go/compute/metadata v0.3.0 // indirect
cloud.google.com/go/longrunning v0.5.1 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
cloud.google.com/go v0.118.3 // indirect
cloud.google.com/go/auth v0.15.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/longrunning v0.6.5 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/google/s2a-go v0.1.4 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.2.4 // indirect
github.com/googleapis/gax-go/v2 v2.12.0 // indirect
go.opencensus.io v0.24.0 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/go-logr/logr v1.4.3 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/google/s2a-go v0.1.9 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.3.6 // indirect
github.com/googleapis/gax-go/v2 v2.14.1 // indirect
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.59.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0 // indirect
go.opentelemetry.io/otel v1.43.0 // indirect
go.opentelemetry.io/otel/metric v1.43.0 // indirect
go.opentelemetry.io/otel/trace v1.43.0 // indirect
golang.org/x/crypto v0.52.0 // indirect
golang.org/x/net v0.55.0 // indirect
golang.org/x/oauth2 v0.27.0 // indirect
golang.org/x/oauth2 v0.36.0 // indirect
golang.org/x/sync v0.20.0 // indirect
golang.org/x/sys v0.45.0 // indirect
golang.org/x/text v0.37.0 // indirect
google.golang.org/api v0.128.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
golang.org/x/time v0.11.0 // indirect
google.golang.org/api v0.228.0 // indirect
google.golang.org/genproto v0.0.0-20250303144028-a0af3efb3deb // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20260414002931-afd174a4e478 // indirect
)
272 changes: 85 additions & 187 deletions .test-infra/mock-apis/go.sum

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion playground/backend/cmd/server/controller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1486,7 +1486,7 @@ func TestPlaygroundController_GetDefaultPrecompiledObject(t *testing.T) {
}

func getPlaygroundServiceClient(ctx context.Context, t *testing.T) (pb.PlaygroundServiceClient, func()) {
conn, err := grpc.DialContext(ctx, "bufnet", grpc.WithContextDialer(bufDialer), grpc.WithTransportCredentials(insecure.NewCredentials()))
conn, err := grpc.NewClient("passthrough://bufnet", grpc.WithContextDialer(bufDialer), grpc.WithTransportCredentials(insecure.NewCredentials()))
if err != nil {
t.Fatalf("Failed to dial bufnet: %v", err)
}
Expand Down
2 changes: 1 addition & 1 deletion playground/backend/containers/java/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# limitations under the License.
###############################################################################
ARG BEAM_VERSION=2.68.0
FROM golang:1-bullseye AS build
FROM golang:1-bookworm AS build
ARG BEAM_VERSION
ARG GIT_COMMIT="<unknown>"
ARG GIT_TIMESTAMP="0"
Expand Down
2 changes: 1 addition & 1 deletion playground/backend/containers/python/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
###############################################################################
ARG GO_BASE_IMAGE=golang:1-bullseye
ARG GO_BASE_IMAGE=golang:1-bookworm
ARG SDK_TAG
ARG BASE_IMAGE=apache/beam_python3.10_sdk:$SDK_TAG
FROM $GO_BASE_IMAGE AS build
Expand Down
2 changes: 1 addition & 1 deletion playground/backend/containers/python/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ docker {
buildArgs(
['GO_BASE_IMAGE': project.rootProject.hasProperty(["go-base-image"]) ?
project.rootProject["go-base-image"] :
"golang:1-bullseye",
"golang:1-bookworm",
'SDK_TAG' : project.rootProject.hasProperty(["sdk-tag"]) ?
project.rootProject["sdk-tag"] : default_beam_version,
'GIT_COMMIT' : getGitCommitHash(),
Expand Down
15 changes: 5 additions & 10 deletions playground/backend/containers/router/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@
# limitations under the License.
###############################################################################
#Dokerfile to set up the Beam Go SDK
ARG BASE_IMAGE=golang:1-bullseye
ARG BASE_IMAGE=golang:1-bookworm
#Two-stage assembly
FROM $BASE_IMAGE AS build
ARG GIT_COMMIT="<unknown>"
ARG GIT_TIMESTAMP="0"

# Setup Go Environment
ENV GOPATH /go
ENV PATH $GOPATH/bin:$PATH
ENV GOPATH=/go
ENV PATH=$GOPATH/bin:$PATH
RUN mkdir -p "$GOPATH/src" "$GOPATH/bin" && chmod -R 777 "$GOPATH"

# Prepare Application
Expand All @@ -44,18 +44,13 @@ RUN cd cmd/migration_tool &&\
go build -o /go/bin/migration_tool

# Null image
FROM debian:bullseye-slim
FROM debian:bookworm-slim

ENV DEBIAN_FRONTEND=noninteractive
# Install deps being used by sh files
RUN set -eux; \
# 1) use existing HTTP sources to bootstrap CAs
apt-get update; \
apt-get install -y --no-install-recommends ca-certificates; \
# 2) now it’s safe to use HTTPS
sed -ri 's|http://deb\.debian\.org|https://deb.debian.org|g' /etc/apt/sources.list; \
apt-get update; \
apt-get install -y --no-install-recommends curl; \
apt-get install -y --no-install-recommends ca-certificates curl; \
rm -rf /var/lib/apt/lists/*

# Set Environment
Expand Down
2 changes: 1 addition & 1 deletion playground/backend/containers/router/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ docker {
tags containerImageTags()
buildArgs(['BASE_IMAGE' : project.rootProject.hasProperty(["base-image"]) ?
project.rootProject["base-image"] :
"golang:1-bullseye",
"golang:1-bookworm",
'GIT_COMMIT' : getGitCommitHash(),
'GIT_TIMESTAMP': getGitCommitTimestamp()])
}
Expand Down
2 changes: 1 addition & 1 deletion playground/backend/containers/scio/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# limitations under the License.
###############################################################################
ARG BASE_IMAGE=eclipse-temurin:11
FROM golang:1-bullseye AS build
FROM golang:1-bookworm AS build
ARG GIT_COMMIT="<unknown>"
ARG GIT_TIMESTAMP="0"

Expand Down
65 changes: 38 additions & 27 deletions playground/backend/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -15,46 +15,50 @@

module beam.apache.org/playground/backend

go 1.23.0
go 1.25.0

require (
cloud.google.com/go/datastore v1.11.0
cloud.google.com/go/logging v1.7.0
cloud.google.com/go/datastore v1.20.0
cloud.google.com/go/logging v1.13.0
github.com/GoogleCloudPlatform/functions-framework-go v1.6.1
github.com/confluentinc/confluent-kafka-go/v2 v2.1.1
github.com/go-redis/redis/v8 v8.11.5
github.com/go-redis/redismock/v8 v8.0.6
github.com/google/go-cmp v0.5.9
github.com/google/uuid v1.3.0
github.com/google/go-cmp v0.7.0
github.com/google/uuid v1.6.0
github.com/improbable-eng/grpc-web v0.15.0
github.com/linkedin/goavro/v2 v2.11.1
github.com/procyon-projects/chrono v1.1.2
github.com/rs/cors v1.8.2
github.com/spf13/viper v1.14.0
github.com/stretchr/testify v1.8.2
github.com/stretchr/testify v1.11.1
go.uber.org/goleak v1.2.0
google.golang.org/grpc v1.56.3
google.golang.org/protobuf v1.30.0
google.golang.org/grpc v1.82.1
google.golang.org/protobuf v1.36.11
gopkg.in/yaml.v3 v3.0.1
)

require (
cloud.google.com/go v0.110.0 // indirect
cloud.google.com/go/compute/metadata v0.3.0 // indirect
cloud.google.com/go/functions v1.13.0 // indirect
cloud.google.com/go/longrunning v0.4.1 // indirect
cloud.google.com/go v0.117.0 // indirect
cloud.google.com/go/auth v0.15.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/functions v1.19.2 // indirect
cloud.google.com/go/longrunning v0.6.2 // indirect
github.com/cenkalti/backoff/v4 v4.1.3 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/cloudevents/sdk-go/v2 v2.6.1 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f // indirect
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/go-logr/logr v1.4.3 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/golang/snappy v0.0.4 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect
github.com/googleapis/gax-go/v2 v2.7.1 // indirect
github.com/google/s2a-go v0.1.9 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.3.6 // indirect
github.com/googleapis/gax-go/v2 v2.14.1 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/klauspost/compress v1.15.9 // indirect
Expand All @@ -70,19 +74,26 @@ require (
github.com/spf13/jwalterweatherman v1.1.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/subosito/gotenv v1.4.1 // 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.59.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0 // indirect
go.opentelemetry.io/otel v1.43.0 // indirect
go.opentelemetry.io/otel/metric v1.43.0 // indirect
go.opentelemetry.io/otel/trace v1.43.0 // indirect
go.uber.org/atomic v1.9.0 // indirect
go.uber.org/multierr v1.8.0 // indirect
go.uber.org/zap v1.21.0 // indirect
golang.org/x/net v0.9.0 // indirect
golang.org/x/oauth2 v0.27.0 // indirect
golang.org/x/sync v0.1.0 // indirect
golang.org/x/sys v0.7.0 // indirect
golang.org/x/text v0.9.0 // indirect
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
google.golang.org/api v0.114.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
golang.org/x/crypto v0.50.0 // indirect
golang.org/x/net v0.53.0 // indirect
golang.org/x/oauth2 v0.36.0 // indirect
golang.org/x/sync v0.20.0 // indirect
golang.org/x/sys v0.43.0 // indirect
golang.org/x/text v0.36.0 // indirect
golang.org/x/time v0.11.0 // indirect
google.golang.org/api v0.228.0 // indirect
google.golang.org/genproto v0.0.0-20241118233622-e639e219e697 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20260414002931-afd174a4e478 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20260414002931-afd174a4e478 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
nhooyr.io/websocket v1.8.6 // indirect
Expand Down
Loading
Loading