Switch to branch deployments in one-click deployments #2647
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,22 @@ | ||
| import { sdk } from '$lib/stores/sdk'; | ||
| import { redirect, isRedirect } from '@sveltejs/kit'; | ||
| import { base } from '$app/paths'; | ||
| import type { PageLoad } from './$types'; | ||
| import { | ||
| getNestedRootDirectory, | ||
| getRepositoryInfo, | ||
| getDefaultBranch, | ||
| validateBranch | ||
| } from '$lib/helpers/github'; | ||
| import { ID, Runtime, Type } from '@appwrite.io/console'; | ||
|
|
||
| export const load: PageLoad = async ({ url, params, parent }) => { | ||
| const { | ||
| installations: vcsInstallations, | ||
| runtimesList, | ||
| specificationsList, | ||
| regionalConsoleVariables | ||
| } = await parent(); | ||
|
|
||
| const repository = url.searchParams.get('repo') || url.searchParams.get('repository'); | ||
|
|
||
|
|
@@ -19,10 +30,112 @@ export const load: PageLoad = async ({ url, params, parent }) => { | |
| } | ||
|
|
||
| const envParam = url.searchParams.get('env'); | ||
|
|
||
| // Parse env vars - supports KEY or KEY=value format | ||
| const envVars: Array<{ key: string; value: string }> = envParam | ||
| ? envParam.split(',').map((entry: string) => { | ||
| const trimmed = entry.trim(); | ||
| const eqIndex = trimmed.indexOf('='); | ||
| if (eqIndex === -1) { | ||
| return { key: trimmed, value: '' }; | ||
| } | ||
| return { | ||
| key: trimmed.substring(0, eqIndex), | ||
| value: trimmed.substring(eqIndex + 1) | ||
| }; | ||
| }) | ||
| : []; | ||
|
|
||
| const runtime = url.searchParams.get('runtime'); | ||
|
|
||
| // Quick mode - create function and redirect directly to function page | ||
| const quickMode = url.searchParams.get('quick') === 'true'; | ||
|
|
||
| if (quickMode) { | ||
| try { | ||
| const runtimeParam = runtime || 'node-18.0'; | ||
atharvadeosthale marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| const selectedRuntime = runtimeParam as Runtime; | ||
|
|
||
| const entrypoint = url.searchParams.get('entrypoint') || ''; | ||
| const installCommand = url.searchParams.get('install') || ''; | ||
| const rootDir = | ||
| getNestedRootDirectory(repository) || url.searchParams.get('rootDir') || '.'; | ||
|
|
||
| // Get branch - validate provided or use default | ||
| const branchParam = url.searchParams.get('branch'); | ||
| let selectedBranch: string; | ||
|
|
||
| if (branchParam) { | ||
| const isValid = await validateBranch(info.owner, info.name, branchParam); | ||
| if (isValid) { | ||
| selectedBranch = branchParam; | ||
| } else { | ||
| selectedBranch = (await getDefaultBranch(info.owner, info.name)) || 'main'; | ||
| } | ||
| } else { | ||
| selectedBranch = (await getDefaultBranch(info.owner, info.name)) || 'main'; | ||
| } | ||
|
|
||
| // Get first available specification | ||
| const specification = | ||
| specificationsList?.specifications?.[0]?.slug || 's-0.5vcpu-512mb'; | ||
|
Comment on lines
+66
to
+68
Contributor
There was a problem hiding this comment. 🧩 Analysis chain🏁 Script executed: #!/bin/bash
# Check if this specification slug is used elsewhere or defined as a constant
rg -n 's-0.5vcpu-512mb' --type tsRepository: appwrite/console Length of output: 236 🏁 Script executed: #!/bin/bash
# Read the file to see the context around lines 79-81
cat -n src/routes/\(console\)/project-\[region\]-\[project\]/functions/create-function/deploy/+page.ts | sed -n '60,100p'Repository: appwrite/console Length of output: 2099 🏁 Script executed: #!/bin/bash
# Read the top of the file to see imports and variable definitions
cat -n src/routes/\(console\)/project-\[region\]-\[project\]/functions/create-function/deploy/+page.ts | head -80Repository: appwrite/console Length of output: 3522 🏁 Script executed: #!/bin/bash
# Find the parent layout file - should be in src/routes/(console)
find src/routes -name '+layout.ts' -o -name '+layout.svelte' | head -20Repository: appwrite/console Length of output: 1394 🏁 Script executed: #!/bin/bash
# Read the project-level layout file
cat -n src/routes/\(console\)/project-\[region\]-\[project\]/+layout.ts | head -150Repository: appwrite/console Length of output: 3874 🏁 Script executed: #!/bin/bash
# Read the console-level layout file and search for specificationsList
rg -n 'specificationsList' src/routes/\(console\)/+layout.ts -A 5 -B 5Repository: appwrite/console Length of output: 42 🏁 Script executed: #!/bin/bash
# Search for specificationsList definition across the codebase
rg -n 'specificationsList' --type ts -B 3 -A 3Repository: appwrite/console Length of output: 13283 🏁 Script executed: #!/bin/bash
# Read the functions layout file to see the full context
cat -n src/routes/\(console\)/project-\[region\]-\[project\]/functions/+layout.ts | head -35Repository: appwrite/console Length of output: 1165 🏁 Script executed: #!/bin/bash
# Search for specification constants or defaults
rg -n 'specification' --type ts -i | grep -i 'const\|default\|fallback' | head -20Repository: appwrite/console Length of output: 1481 🏁 Script executed: #!/bin/bash
# Search for constants files and any specification-related constants
find src -name '*const*' -type f | head -20Repository: appwrite/console Length of output: 80 🏁 Script executed: #!/bin/bash
# Read the constants file and search for specification-related content
rg -n 'specification' src/lib/constants.ts -i -A 2 -B 2Repository: appwrite/console Length of output: 42 🏁 Script executed: #!/bin/bash
# Search for other hardcoded values in the deploy page
rg -n 'node-18\|runtime\|slug' src/routes/\(console\)/project-\[region\]-\[project\]/functions/create-function/deploy/+page.ts -A 1 -B 1Repository: appwrite/console Length of output: 42 🏁 Script executed: #!/bin/bash
# Look at the runtime fallback on line 56
sed -n '54,58p' src/routes/\(console\)/project-\[region\]-\[project\]/functions/create-function/deploy/+page.tsRepository: appwrite/console Length of output: 213 🏁 Script executed: #!/bin/bash
# Search for types or documentation about specifications
rg -n 'SpecificationList|specification.*slug' --type ts -A 2 -B 2 | head -40Repository: appwrite/console Length of output: 1653 Based on my verification, I've found:
Minor Fixes Required The hardcoded specification slug 🤖 Prompt for AI Agents
Member
There was a problem hiding this comment. @atharvadeosthale agreee, see if we have proper constant for this. I think there's a RuntimeSpecification type 🤔
Contributor
There was a problem hiding this comment.
Member
Author
There was a problem hiding this comment. I don't think we have that yet |
||
|
|
||
| // Create function | ||
| const func = await sdk.forProject(params.region, params.project).functions.create({ | ||
| functionId: ID.unique(), | ||
| name: info.name, | ||
| runtime: selectedRuntime, | ||
| execute: ['any'], | ||
| entrypoint: entrypoint || undefined, | ||
| commands: installCommand || undefined, | ||
| providerSilentMode: false, | ||
| specification | ||
| }); | ||
|
|
||
| // Add auto-generated domain | ||
| await sdk.forProject(params.region, params.project).proxy.createFunctionRule({ | ||
| domain: `${ID.unique()}.${regionalConsoleVariables._APP_DOMAIN_FUNCTIONS}`, | ||
| functionId: func.$id | ||
| }); | ||
|
|
||
| // Add variables (empty values used as empty strings) | ||
| await Promise.all( | ||
| envVars.map((variable) => | ||
| sdk.forProject(params.region, params.project).functions.createVariable({ | ||
| functionId: func.$id, | ||
| key: variable.key, | ||
| value: variable.value, | ||
| secret: false | ||
| }) | ||
| ) | ||
| ); | ||
|
Comment on lines
+90
to
+98
Member
There was a problem hiding this comment. unrelated but this has a very bad performance, we need a batch method for this. |
||
|
|
||
| // Create deployment | ||
| await sdk.forProject(params.region, params.project).functions.createTemplateDeployment({ | ||
| functionId: func.$id, | ||
| repository: info.name, | ||
| owner: info.owner, | ||
| rootDirectory: rootDir, | ||
| type: Type.Branch, | ||
| reference: selectedBranch, | ||
| activate: true | ||
| }); | ||
|
|
||
| // Redirect to function page | ||
| redirect( | ||
| 302, | ||
| `${base}/project-${params.region}-${params.project}/functions/function-${func.$id}` | ||
atharvadeosthale marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| ); | ||
| } catch (e) { | ||
| // Re-throw redirects (they're not errors) | ||
| if (isRedirect(e)) { | ||
| throw e; | ||
| } | ||
| // On error, fall through to show the wizard | ||
| console.error('Quick deploy failed:', e); | ||
atharvadeosthale marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| } | ||
| } | ||
|
|
||
| let installations = vcsInstallations || null; | ||
| if (!installations) { | ||
| try { | ||
|
|
@@ -35,7 +148,7 @@ export const load: PageLoad = async ({ url, params, parent }) => { | |
| } | ||
|
|
||
| return { | ||
| envVars, | ||
| runtime, | ||
| runtimesList, | ||
| installations, | ||
|
|
||
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.