Skip to content

Commit 9cb5973

Browse files
authored
Merge branch 'develop' into feat/functions-management
2 parents 2297288 + 2bb1173 commit 9cb5973

5 files changed

Lines changed: 45 additions & 12 deletions

File tree

apps/cli-go/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ require (
4242
github.com/multigres/multigres v0.0.0-20260126223308-f5a52171bbc4
4343
github.com/oapi-codegen/nullable v1.1.0
4444
github.com/olekukonko/tablewriter v1.1.4
45-
github.com/posthog/posthog-go v1.13.1
45+
github.com/posthog/posthog-go v1.13.2
4646
github.com/spf13/afero v1.15.0
4747
github.com/spf13/cobra v1.10.2
4848
github.com/spf13/pflag v1.0.10

apps/cli-go/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -941,8 +941,8 @@ github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRI
941941
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
942942
github.com/polyfloyd/go-errorlint v1.8.0 h1:DL4RestQqRLr8U4LygLw8g2DX6RN1eBJOpa2mzsrl1Q=
943943
github.com/polyfloyd/go-errorlint v1.8.0/go.mod h1:G2W0Q5roxbLCt0ZQbdoxQxXktTjwNyDbEaj3n7jvl4s=
944-
github.com/posthog/posthog-go v1.13.1 h1:7OtfgOEM9fC2n4Hbs4e5mK1uaLuNguoYWFEI4kEnTUY=
945-
github.com/posthog/posthog-go v1.13.1/go.mod h1:xsVOW9YImilUcazwPNEq4PJDqEZf2KeCS758zXjwkPg=
944+
github.com/posthog/posthog-go v1.13.2 h1:tBTocyRXSX/kWOoR68Mxh644mXYpSSERj9KH0BLp8nA=
945+
github.com/posthog/posthog-go v1.13.2/go.mod h1:xsVOW9YImilUcazwPNEq4PJDqEZf2KeCS758zXjwkPg=
946946
github.com/prashantv/gostub v1.1.0 h1:BTyx3RfQjRHnUWaGF9oQos79AlQ5k8WNktv7VGvVH4g=
947947
github.com/prashantv/gostub v1.1.0/go.mod h1:A5zLQHz7ieHGG7is6LLXLz7I8+3LZzsrV0P1IAHhP5U=
948948
github.com/prometheus/client_golang v0.9.0-pre1.0.20180209125602-c332b6f63c06/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=

apps/cli-go/pkg/config/templates/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Exposed for updates by .github/dependabot.yml
2-
FROM supabase/postgres:17.6.1.132 AS pg
2+
FROM supabase/postgres:17.6.1.134 AS pg
33
# Append to ServiceImages when adding new dependencies below
44
FROM library/kong:2.8.1 AS kong
55
FROM axllent/mailpit:v1.22.3 AS mailpit
@@ -11,8 +11,8 @@ FROM supabase/edge-runtime:v1.74.0 AS edgeruntime
1111
FROM timberio/vector:0.53.0-alpine AS vector
1212
FROM supabase/supavisor:2.9.7 AS supavisor
1313
FROM supabase/gotrue:v2.189.0 AS gotrue
14-
FROM supabase/realtime:v2.105.0 AS realtime
15-
FROM supabase/storage-api:v1.60.11 AS storage
14+
FROM supabase/realtime:v2.105.2 AS realtime
15+
FROM supabase/storage-api:v1.60.15 AS storage
1616
FROM supabase/logflare:1.43.4 AS logflare
1717
# Append to JobImages when adding new dependencies below
1818
FROM supabase/pgadmin-schema-diff:cli-0.0.5 AS differ

apps/cli/src/legacy/commands/services/services.integration.test.ts

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,19 @@ import { LegacyLinkedProjectCache } from "../../telemetry/legacy-linked-project-
88
import { LegacyOutputFlag } from "../../../shared/legacy/global-flags.ts";
99
import { mockOutput } from "../../../../tests/helpers/mocks.ts";
1010
import { mockLegacyTelemetryStateTracked } from "../../../../tests/helpers/legacy-mocks.ts";
11+
import { listLocalServiceVersions } from "../../../shared/services/services.shared.ts";
1112
import { legacyServices } from "./services.handler.ts";
1213

14+
const LOCAL_POSTGRES_SERVICE = listLocalServiceVersions().find(
15+
(service) => service.name === "supabase/postgres",
16+
);
17+
18+
if (LOCAL_POSTGRES_SERVICE === undefined) {
19+
throw new Error("Missing supabase/postgres in local service versions.");
20+
}
21+
22+
const LOCAL_POSTGRES_VERSION = LOCAL_POSTGRES_SERVICE.local;
23+
1324
function setup(
1425
opts: {
1526
format?: "text" | "json" | "stream-json";
@@ -106,7 +117,10 @@ describe("legacy services", () => {
106117
remote: string;
107118
}>;
108119
expect(rows).toHaveLength(10);
109-
expect(rows[0]).toMatchObject({ name: "supabase/postgres", local: "17.6.1.132" });
120+
expect(rows[0]).toMatchObject({
121+
name: "supabase/postgres",
122+
local: LOCAL_POSTGRES_VERSION,
123+
});
110124
});
111125
});
112126

@@ -121,7 +135,10 @@ describe("legacy services", () => {
121135
const success = out.messages.find((message) => message.type === "success");
122136
expect(success?.data).toMatchObject({
123137
services: expect.arrayContaining([
124-
expect.objectContaining({ name: "supabase/postgres", local: "17.6.1.132" }),
138+
expect.objectContaining({
139+
name: "supabase/postgres",
140+
local: LOCAL_POSTGRES_VERSION,
141+
}),
125142
]),
126143
});
127144
});
@@ -136,7 +153,10 @@ describe("legacy services", () => {
136153
const success = out.messages.find((message) => message.type === "success");
137154
expect(success?.data).toMatchObject({
138155
services: expect.arrayContaining([
139-
expect.objectContaining({ name: "supabase/postgres", local: "17.6.1.132" }),
156+
expect.objectContaining({
157+
name: "supabase/postgres",
158+
local: LOCAL_POSTGRES_VERSION,
159+
}),
140160
]),
141161
});
142162
});
@@ -160,7 +180,7 @@ describe("legacy services", () => {
160180
yield* legacyServices({}).pipe(Effect.provide(layer));
161181

162182
expect(out.stdoutText).toContain("- name: supabase/postgres");
163-
expect(out.stdoutText).toContain("local: 17.6.1.132");
183+
expect(out.stdoutText).toContain(`local: ${LOCAL_POSTGRES_VERSION}`);
164184
});
165185
});
166186

apps/cli/src/next/commands/services/services.integration.test.ts

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,19 @@ import { InvalidProjectLinkStateError } from "../../config/project-link-state.se
1010
import { Credentials } from "../../auth/credentials.service.ts";
1111
import { mockOutput } from "../../../../tests/helpers/mocks.ts";
1212
import { CommandRuntime } from "../../../shared/runtime/command-runtime.service.ts";
13+
import { listLocalServiceVersions } from "../../../shared/services/services.shared.ts";
1314
import { services } from "./services.handler.ts";
1415

1516
const LINKED_REF = "abcdefghijklmnopqrst";
17+
const LOCAL_POSTGRES_SERVICE = listLocalServiceVersions().find(
18+
(service) => service.name === "supabase/postgres",
19+
);
20+
21+
if (LOCAL_POSTGRES_SERVICE === undefined) {
22+
throw new Error("Missing supabase/postgres in local service versions.");
23+
}
24+
25+
const LOCAL_POSTGRES_VERSION = LOCAL_POSTGRES_SERVICE.local;
1626

1727
function linkedStateFixture(): ProjectLinkStateValue {
1828
return {
@@ -128,7 +138,10 @@ describe("next services", () => {
128138
const success = out.messages.find((message) => message.type === "success");
129139
expect(success?.data).toMatchObject({
130140
services: expect.arrayContaining([
131-
expect.objectContaining({ name: "supabase/postgres", local: "17.6.1.132" }),
141+
expect.objectContaining({
142+
name: "supabase/postgres",
143+
local: LOCAL_POSTGRES_VERSION,
144+
}),
132145
]),
133146
});
134147
});
@@ -200,7 +213,7 @@ describe("next services", () => {
200213
services: expect.arrayContaining([
201214
expect.objectContaining({
202215
name: "supabase/postgres",
203-
local: "17.6.1.132",
216+
local: LOCAL_POSTGRES_VERSION,
204217
remote: "17.6.1.200",
205218
}),
206219
]),

0 commit comments

Comments
 (0)