Skip to content

Commit 3f56979

Browse files
ben-fornefeldben-fornefeld
committed
Merge origin/main into feature/supabase-users-sync-worker
Made-with: Cursor
2 parents 84ecd06 + 8a404ee commit 3f56979

File tree

91 files changed

+1103
-542
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+1103
-542
lines changed

‎.github/actions/build-sandbox-template/action.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ runs:
88
env:
99
TEMPLATE_ID: "2j6ly824owf4awgai1xo"
1010
KERNEL_VERSION: "vmlinux-6.1.158"
11-
FIRECRACKER_VERSION: "v1.12.1_a41d3fb"
11+
FIRECRACKER_VERSION: "v1.12.1_210cbac"
1212
run: |
1313
# Generate an unique build ID for the template for this run
1414
export BUILD_ID=$(uuidgen)

‎packages/api/go.mod‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ require (
5454
go.opentelemetry.io/otel/trace v1.41.0
5555
go.uber.org/zap v1.27.1
5656
golang.org/x/net v0.50.0
57-
golang.org/x/sync v0.19.0
57+
golang.org/x/sync v0.20.0
5858
google.golang.org/grpc v1.79.3
5959
google.golang.org/protobuf v1.36.11
6060
)
@@ -380,11 +380,11 @@ require (
380380
golang.org/x/arch v0.18.0 // indirect
381381
golang.org/x/crypto v0.48.0 // indirect
382382
golang.org/x/exp v0.0.0-20260212183809-81e46e3db34a // indirect
383-
golang.org/x/image v0.25.0 // indirect
383+
golang.org/x/image v0.38.0 // indirect
384384
golang.org/x/mod v0.33.0 // indirect
385385
golang.org/x/oauth2 v0.34.0 // indirect
386386
golang.org/x/sys v0.41.0 // indirect
387-
golang.org/x/text v0.34.0 // indirect
387+
golang.org/x/text v0.35.0 // indirect
388388
golang.org/x/time v0.14.0 // indirect
389389
golang.org/x/tools v0.42.0 // indirect
390390
google.golang.org/api v0.257.0 // indirect

‎packages/api/go.sum‎

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/api/internal/api/api.gen.go‎

Lines changed: 142 additions & 139 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/api/internal/clusters/resources_local.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ func (l *LocalClusterResourceProvider) GetSandboxMetrics(ctx context.Context, te
7878
CpuCount: int32(m.CPUCount),
7979
MemTotal: int64(m.MemTotal),
8080
MemUsed: int64(m.MemUsed),
81+
MemCache: int64(m.MemCache),
8182
DiskTotal: int64(m.DiskTotal),
8283
DiskUsed: int64(m.DiskUsed),
8384
}
@@ -105,6 +106,7 @@ func (l *LocalClusterResourceProvider) GetSandboxesMetrics(ctx context.Context,
105106
CpuCount: int32(m.CPUCount),
106107
MemTotal: int64(m.MemTotal),
107108
MemUsed: int64(m.MemUsed),
109+
MemCache: int64(m.MemCache),
108110
DiskTotal: int64(m.DiskTotal),
109111
DiskUsed: int64(m.DiskUsed),
110112
}

‎packages/api/internal/clusters/resources_remote.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ func (r *ClusterResourceProviderImpl) GetSandboxMetrics(ctx context.Context, tea
6666
CpuCount: m.CpuCount,
6767
MemTotal: m.MemTotal,
6868
MemUsed: m.MemUsed,
69+
MemCache: m.MemCache,
6970
DiskTotal: m.DiskTotal,
7071
DiskUsed: m.DiskUsed,
7172
}
@@ -98,6 +99,7 @@ func (r *ClusterResourceProviderImpl) GetSandboxesMetrics(ctx context.Context, t
9899
CpuCount: v.CpuCount,
99100
MemTotal: v.MemTotal,
100101
MemUsed: v.MemUsed,
102+
MemCache: v.MemCache,
101103
DiskTotal: v.DiskTotal,
102104
DiskUsed: v.DiskUsed,
103105
}

‎packages/api/internal/orchestrator/orchestrator.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ func New(
112112

113113
var routingCatalog e2bcatalog.SandboxesCatalog
114114
if redisClient != nil {
115-
routingCatalog = e2bcatalog.NewRedisSandboxesCatalog(redisClient, featureFlags)
115+
routingCatalog = e2bcatalog.NewRedisSandboxCatalog(redisClient, e2bcatalog.NewReadThroughSandboxCache())
116116
} else {
117117
routingCatalog = e2bcatalog.NewMemorySandboxesCatalog()
118118
}

‎packages/auth/go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,9 +123,9 @@ require (
123123
golang.org/x/arch v0.18.0 // indirect
124124
golang.org/x/crypto v0.48.0 // indirect
125125
golang.org/x/net v0.50.0 // indirect
126-
golang.org/x/sync v0.19.0 // indirect
126+
golang.org/x/sync v0.20.0 // indirect
127127
golang.org/x/sys v0.41.0 // indirect
128-
golang.org/x/text v0.34.0 // indirect
128+
golang.org/x/text v0.35.0 // indirect
129129
google.golang.org/genproto/googleapis/api v0.0.0-20251213004720-97cd9d5aeac2 // indirect
130130
google.golang.org/genproto/googleapis/rpc v0.0.0-20260128011058-8636f8732409 // indirect
131131
google.golang.org/grpc v1.79.3 // indirect

‎packages/auth/go.sum‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/clickhouse/go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,9 @@ require (
9595
golang.org/x/exp v0.0.0-20260212183809-81e46e3db34a // indirect
9696
golang.org/x/mod v0.33.0 // indirect
9797
golang.org/x/net v0.50.0 // indirect
98-
golang.org/x/sync v0.19.0 // indirect
98+
golang.org/x/sync v0.20.0 // indirect
9999
golang.org/x/sys v0.41.0 // indirect
100-
golang.org/x/text v0.34.0 // indirect
100+
golang.org/x/text v0.35.0 // indirect
101101
google.golang.org/genproto/googleapis/api v0.0.0-20251213004720-97cd9d5aeac2 // indirect
102102
google.golang.org/genproto/googleapis/rpc v0.0.0-20260128011058-8636f8732409 // indirect
103103
google.golang.org/grpc v1.79.3 // indirect

0 commit comments

Comments
 (0)