-
Notifications
You must be signed in to change notification settings - Fork 480
feat(cli): port functions delete & download #5527
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
439d1da
feat
7ttp a261cde
nit
7ttp e19a431
nit
7ttp 2297288
improvements
7ttp 9cb5973
Merge branch 'develop' into feat/functions-management
7ttp bcc27e9
suggestion
7ttp 50e4896
Merge branch 'develop' into feat/functions-management
7ttp File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
40 changes: 35 additions & 5 deletions
40
apps/cli/src/legacy/commands/functions/delete/delete.handler.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,42 @@ | ||
| import { Effect, Option } from "effect"; | ||
| import { LegacyGoProxy } from "../../../../shared/legacy/go-proxy.service.ts"; | ||
| import { deleteFunction } from "../../../../shared/functions/delete.ts"; | ||
| import { LegacyPlatformApi } from "../../../auth/legacy-platform-api.service.ts"; | ||
| import { LegacyProjectRefResolver } from "../../../config/legacy-project-ref.service.ts"; | ||
| import { LegacyLinkedProjectCache } from "../../../telemetry/legacy-linked-project-cache.service.ts"; | ||
| import { LegacyTelemetryState } from "../../../telemetry/legacy-telemetry-state.service.ts"; | ||
| import type { LegacyFunctionsDeleteFlags } from "./delete.command.ts"; | ||
|
|
||
| export const legacyFunctionsDelete = Effect.fn("legacy.functions.delete")(function* ( | ||
| flags: LegacyFunctionsDeleteFlags, | ||
| ) { | ||
| const proxy = yield* LegacyGoProxy; | ||
| const args: string[] = ["functions", "delete", flags.functionName]; | ||
| if (Option.isSome(flags.projectRef)) args.push("--project-ref", flags.projectRef.value); | ||
| yield* proxy.exec(args); | ||
| const api = yield* LegacyPlatformApi; | ||
| const resolver = yield* LegacyProjectRefResolver; | ||
| const linkedProjectCache = yield* LegacyLinkedProjectCache; | ||
| const telemetryState = yield* LegacyTelemetryState; | ||
| let resolvedProjectRef = Option.none<string>(); | ||
|
|
||
| yield* deleteFunction( | ||
| { slug: flags.functionName, projectRef: flags.projectRef }, | ||
| { | ||
| api, | ||
| resolveProjectRef: (projectRef) => | ||
| resolver.resolve(projectRef).pipe( | ||
| Effect.tap((ref) => | ||
| Effect.sync(() => { | ||
| resolvedProjectRef = Option.some(ref); | ||
| }), | ||
| ), | ||
| ), | ||
| }, | ||
| ).pipe( | ||
| Effect.ensuring( | ||
| Effect.suspend(() => | ||
| Option.match(resolvedProjectRef, { | ||
| onNone: () => Effect.void, | ||
| onSome: (ref) => linkedProjectCache.cache(ref), | ||
| }), | ||
| ), | ||
| ), | ||
| Effect.ensuring(telemetryState.flush), | ||
| ); | ||
| }); |
71 changes: 71 additions & 0 deletions
71
apps/cli/src/legacy/commands/functions/delete/delete.integration.test.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,71 @@ | ||
| import { describe, expect, it } from "@effect/vitest"; | ||
| import { Effect, Option } from "effect"; | ||
|
|
||
| import { | ||
| buildLegacyTestRuntime, | ||
| mockLegacyCliConfig, | ||
| mockLegacyLinkedProjectCacheTracked, | ||
| mockLegacyPlatformApi, | ||
| mockLegacyTelemetryStateTracked, | ||
| useLegacyTempWorkdir, | ||
| } from "../../../../../tests/helpers/legacy-mocks.ts"; | ||
| import { mockOutput } from "../../../../../tests/helpers/mocks.ts"; | ||
| import { legacyFunctionsDelete } from "./delete.handler.ts"; | ||
|
|
||
| const tempRoot = useLegacyTempWorkdir("supabase-functions-delete-legacy-"); | ||
|
|
||
| describe("legacy functions delete", () => { | ||
| it.live("deletes a function natively through the Management API", () => { | ||
| const out = mockOutput({ format: "text" }); | ||
| const api = mockLegacyPlatformApi({ response: { status: 200, body: null } }); | ||
| const linkedProjectCache = mockLegacyLinkedProjectCacheTracked(); | ||
| const telemetry = mockLegacyTelemetryStateTracked(); | ||
| const layer = buildLegacyTestRuntime({ | ||
| out, | ||
| api, | ||
| cliConfig: mockLegacyCliConfig({ workdir: tempRoot.current }), | ||
| linkedProjectCache: linkedProjectCache.layer, | ||
| telemetry: telemetry.layer, | ||
| }); | ||
|
|
||
| return Effect.gen(function* () { | ||
| yield* legacyFunctionsDelete({ | ||
| functionName: "hello-world", | ||
| projectRef: Option.none(), | ||
| }); | ||
|
|
||
| expect(api.requests).toHaveLength(1); | ||
| expect(api.requests[0]?.method).toBe("DELETE"); | ||
| expect(api.requests[0]?.url).toBe( | ||
| "https://api.supabase.com/v1/projects/abcdefghijklmnopqrst/functions/hello-world", | ||
| ); | ||
| expect(out.stdoutText).toBe( | ||
| "Deleted Function hello-world from project abcdefghijklmnopqrst.\n", | ||
| ); | ||
| expect(linkedProjectCache.cached).toBe(true); | ||
| expect(telemetry.flushed).toBe(true); | ||
| }).pipe(Effect.provide(layer)); | ||
| }); | ||
|
|
||
| it.live("uses an explicit project ref", () => { | ||
| const out = mockOutput({ format: "text" }); | ||
| const api = mockLegacyPlatformApi({ response: { status: 200, body: null } }); | ||
| const layer = buildLegacyTestRuntime({ | ||
| out, | ||
| api, | ||
| cliConfig: mockLegacyCliConfig({ | ||
| workdir: tempRoot.current, | ||
| projectId: Option.none(), | ||
| }), | ||
| }); | ||
|
|
||
| return Effect.gen(function* () { | ||
| yield* legacyFunctionsDelete({ | ||
| functionName: "hello-world", | ||
| projectRef: Option.some("qrstuvwxyzabcdefghij"), | ||
| }); | ||
|
|
||
| expect(api.requests[0]?.url).toContain("/projects/qrstuvwxyzabcdefghij/functions/"); | ||
| }).pipe(Effect.provide(layer)); | ||
| }); | ||
| }); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
47 changes: 40 additions & 7 deletions
47
apps/cli/src/legacy/commands/functions/download/download.handler.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,16 +1,49 @@ | ||
| import { Effect, Option } from "effect"; | ||
| import { | ||
| downloadFunctions, | ||
| makeGoProxyDownloadArgs, | ||
| } from "../../../../shared/functions/download.ts"; | ||
| import { LegacyGoProxy } from "../../../../shared/legacy/go-proxy.service.ts"; | ||
| import { LegacyPlatformApi } from "../../../auth/legacy-platform-api.service.ts"; | ||
| import { LegacyCliConfig } from "../../../config/legacy-cli-config.service.ts"; | ||
| import { LegacyProjectRefResolver } from "../../../config/legacy-project-ref.service.ts"; | ||
| import { LegacyLinkedProjectCache } from "../../../telemetry/legacy-linked-project-cache.service.ts"; | ||
| import { LegacyTelemetryState } from "../../../telemetry/legacy-telemetry-state.service.ts"; | ||
| import type { LegacyFunctionsDownloadFlags } from "./download.command.ts"; | ||
|
|
||
| export const legacyFunctionsDownload = Effect.fn("legacy.functions.download")(function* ( | ||
| flags: LegacyFunctionsDownloadFlags, | ||
| ) { | ||
| const api = yield* LegacyPlatformApi; | ||
| const cliConfig = yield* LegacyCliConfig; | ||
| const resolver = yield* LegacyProjectRefResolver; | ||
| const linkedProjectCache = yield* LegacyLinkedProjectCache; | ||
| const telemetryState = yield* LegacyTelemetryState; | ||
| const proxy = yield* LegacyGoProxy; | ||
| const args: string[] = ["functions", "download"]; | ||
| if (Option.isSome(flags.functionName)) args.push(flags.functionName.value); | ||
| if (Option.isSome(flags.projectRef)) args.push("--project-ref", flags.projectRef.value); | ||
| if (flags.useApi) args.push("--use-api"); | ||
| if (flags.useDocker) args.push("--use-docker"); | ||
| if (flags.legacyBundle) args.push("--legacy-bundle"); | ||
| yield* proxy.exec(args); | ||
| let resolvedProjectRef = Option.none<string>(); | ||
|
|
||
| yield* downloadFunctions(flags, { | ||
| api, | ||
| projectRoot: cliConfig.workdir, | ||
| resolveProjectRef: (projectRef) => | ||
| resolver.resolve(projectRef).pipe( | ||
| Effect.tap((ref) => | ||
| Effect.sync(() => { | ||
| resolvedProjectRef = Option.some(ref); | ||
| }), | ||
| ), | ||
| ), | ||
| proxyDownload: (proxyFlags, projectRef) => | ||
| proxy.exec(makeGoProxyDownloadArgs(proxyFlags, projectRef)), | ||
| }).pipe( | ||
| Effect.ensuring( | ||
| Effect.suspend(() => | ||
| Option.match(resolvedProjectRef, { | ||
| onNone: () => Effect.void, | ||
| onSome: (ref) => linkedProjectCache.cache(ref), | ||
| }), | ||
| ), | ||
| ), | ||
| Effect.ensuring(telemetryState.flush), | ||
| ); | ||
| }); | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.