Skip to content

Allow blink deploy to be ran from CI #28

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+113 −58
Open

Allow blink deploy to be ran from CI #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
160 changes: 104 additions & 56 deletions packages/blink/src/cli/deploy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@ export default async function deploy(
directory = process.cwd();
}

// Detect CI environment
const isCI = process.env.CI === "true" || !process.stdout.isTTY;

// Auto-migrate data to .blink if it exists
await migrateDataToBlink(directory);

Expand Down Expand Up @@ -63,6 +66,14 @@ export default async function deploy(
deployConfig = JSON.parse(deployConfigContent);
}

// Environment variables take precedence over config file
if (process.env.BLINK_ORGANIZATION_ID) {
deployConfig.organizationId = process.env.BLINK_ORGANIZATION_ID;
}
if (process.env.BLINK_AGENT_ID) {
deployConfig.agentId = process.env.BLINK_AGENT_ID;
}

// Select organization
let organizationName!: string;
if (deployConfig?.organizationId) {
Expand All @@ -79,6 +90,11 @@ export default async function deploy(
if (organizations.length === 1) {
deployConfig.organizationId = organizations[0]!.id;
organizationName = organizations[0]!.name;
} else if (isCI) {
throw new Error(
"Multiple organizations found. In CI mode, you must first deploy locally to select an organization, " +
"or set the organization in .blink/config.json"
);
Comment on lines +94 to +97
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
throw new Error(
"Multiple organizations found. In CI mode, you must first deploy locally to select an organization, " +
"or set the organization in .blink/config.json"
);
throw new Error(
"Multiple organizations found. To use CI mode, please deploy in interactive mode first to select an organization and generate .blink/config.json"
);

} else {
const selectedId = await select({
message: "Which organization should contain this agent?",
Expand Down Expand Up @@ -252,59 +268,78 @@ export default async function deploy(
const missingEnvVars = Object.keys(localEnv).filter((key) => !prodEnv[key]);

if (missingEnvVars.length > 0) {
console.log("\n" + chalk.cyan("Environment Variables"));
console.log(
chalk.dim(
` Missing ${missingEnvVars.length} var${missingEnvVars.length === 1 ? "" : "s"} in .env.production: ${missingEnvVars.join(", ")}`
)
);

const confirmed = await confirm({
message: "Copy missing vars from .env.local to .env.production?",
initialValue: true,
});
if (isCancel(confirmed)) {
return;
}
// Add a newline for visual separation.
console.log();
if (confirmed) {
for (const key of missingEnvVars) {
prodEnv[key] = localEnv[key]!;
}
await writeFile(
prodEnvFile,
`# Environment variables for production deployment\n${Object.entries(
prodEnv
if (isCI) {
console.log(
chalk.yellow("Warning:") +
` Missing ${missingEnvVars.length} var${missingEnvVars.length === 1 ? "" : "s"} in .env.production: ${missingEnvVars.join(", ")}`
);
console.log(
chalk.dim(
" Skipping in CI mode. Set these in .env.production if needed."
)
);
} else {
console.log("\n" + chalk.cyan("Environment Variables"));
console.log(
chalk.dim(
` Missing ${missingEnvVars.length} var${missingEnvVars.length === 1 ? "" : "s"} in .env.production: ${missingEnvVars.join(", ")}`
)
.map(([key, value]) => `${key}=${value}`)
.join("\n")}`,
"utf-8"
);

const confirmed = await confirm({
message: "Copy missing vars from .env.local to .env.production?",
initialValue: true,
});
if (isCancel(confirmed)) {
return;
}
// Add a newline for visual separation.
console.log();
if (confirmed) {
for (const key of missingEnvVars) {
prodEnv[key] = localEnv[key]!;
}
await writeFile(
prodEnvFile,
`# Environment variables for production deployment\n${Object.entries(
prodEnv
)
.map(([key, value]) => `${key}=${value}`)
.join("\n")}`,
"utf-8"
);
}
}
}

// Prompt to migrate devhook to production
const devhookID = getDevhookID(directory);
if (devhookID) {
const productionUrl = `https://${devhookID}.blink.host`;
console.log("\n" + chalk.cyan("Webhook Tunnel"));
console.log(chalk.dim(` Current: ${productionUrl} → local dev`));
console.log(chalk.dim(` After: ${productionUrl} → production`));
console.log(
chalk.dim(" Migrating will keep your webhooks working in production")
);
if (isCI) {
// Skip devhook migration in CI mode
console.log(
chalk.dim(" Skipping webhook tunnel migration in CI mode")
);
} else {
const productionUrl = `https://${devhookID}.blink.host`;
console.log("\n" + chalk.cyan("Webhook Tunnel"));
console.log(chalk.dim(` Current: ${productionUrl} → local dev`));
console.log(chalk.dim(` After: ${productionUrl} → production`));
console.log(
chalk.dim(" Migrating will keep your webhooks working in production")
);

const confirmed = await confirm({
message: "Migrate tunnel to production?",
});
if (isCancel(confirmed)) {
return;
}
// Add a newline for visual separation.
console.log();
if (confirmed) {
migratedDevhook = true;
const confirmed = await confirm({
message: "Migrate tunnel to production?",
});
if (isCancel(confirmed)) {
return;
}
// Add a newline for visual separation.
console.log();
if (confirmed) {
migratedDevhook = true;
}
}
}
}
Expand Down Expand Up @@ -362,17 +397,28 @@ export default async function deploy(
(key) => !Object.keys(prodEnv).includes(key)
);
if (missingEnvVars.length > 0) {
console.log(
"Warning: The following environment variables are set in .env.local but not in .env.production:"
);
for (const v of missingEnvVars) {
console.log(`- ${v}`);
}
const confirmed = await confirm({
message: "Do you want to deploy anyway?",
});
if (confirmed === false || isCancel(confirmed)) {
return;
if (isCI) {
console.log(
chalk.yellow("Warning:") +
" The following environment variables are set in .env.local but not in .env.production:"
);
for (const v of missingEnvVars) {
console.log(`- ${v}`);
}
console.log(chalk.dim(" Continuing deployment in CI mode"));
} else {
console.log(
"Warning: The following environment variables are set in .env.local but not in .env.production:"
);
for (const v of missingEnvVars) {
console.log(`- ${v}`);
}
const confirmed = await confirm({
message: "Do you want to deploy anyway?",
});
if (confirmed === false || isCancel(confirmed)) {
return;
}
}
}

Expand All @@ -398,7 +444,9 @@ export default async function deploy(
console.log(chalk.gray(`View Deployment ${chalk.dim(inspectUrl)}`));

// Write deploy config on success
await writeDeployConfig(deployConfigPath, deployConfig);
if (!isCI) {
await writeDeployConfig(deployConfigPath, deployConfig);
}

// Poll for deployment completion
const s = spinner();
Expand Down
11 changes: 9 additions & 2 deletions packages/blink/src/cli/lib/auth.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,15 +68,22 @@ function getAuthTokenConfigPath() {

export async function loginIfNeeded(): Promise<string> {
const client = new Client();
let token = getAuthToken();

// Check for BLINK_TOKEN environment variable first (for CI)
let token = process.env.BLINK_TOKEN || getAuthToken();

if (token) {
client.authToken = token;

try {
// Ensure that the token is valid.
await client.users.me();
} catch (_err) {
// The token is invalid, so we need to login again.
// The token is invalid
if (process.env.BLINK_TOKEN) {
throw new Error("BLINK_TOKEN environment variable is invalid");
}
// Try to login again
token = await login();
}
} else {
Expand Down