submit assignment now creates an fly machine
This commit is contained in:
JBB0807
parent
d326366448
commit
5ce01158ad
8 changed files with 215 additions and 128 deletions
|
|
@ -1,8 +1,9 @@
|
|||
const express = require('express');
|
||||
const fs = require('fs');
|
||||
const path = require('path');
|
||||
const AWS = require('aws-sdk');
|
||||
const axios = require('axios');
|
||||
const express = require("express");
|
||||
const fs = require("fs");
|
||||
const path = require("path");
|
||||
const AWS = require("aws-sdk");
|
||||
const axios = require("axios");
|
||||
require("dotenv").config();
|
||||
|
||||
const {
|
||||
FLY_ORG,
|
||||
|
|
@ -12,47 +13,56 @@ const {
|
|||
AWS_ENDPOINT_URL_S3,
|
||||
AWS_REGION,
|
||||
FLY_ACCESS_TOKEN,
|
||||
IMAGE_REF
|
||||
IMAGE_REF,
|
||||
} = process.env;
|
||||
|
||||
// Log environment variables for debugging
|
||||
console.log('--- ENV START ---');
|
||||
console.log('FLY_ORG: ', FLY_ORG);
|
||||
console.log('COMMON_BUCKET: ', COMMON_BUCKET);
|
||||
console.log('AWS_ACCESS_KEY_ID: ', AWS_ACCESS_KEY_ID ? '(found)' : '(NOT SET)');
|
||||
console.log('AWS_SECRET_ACCESS_KEY:', AWS_SECRET_ACCESS_KEY ? '(found)' : '(NOT SET)');
|
||||
console.log('AWS_ENDPOINT_URL_S3: ', AWS_ENDPOINT_URL_S3);
|
||||
console.log('AWS_REGION: ', AWS_REGION);
|
||||
console.log('FLY_ACCESS_TOKEN: ', FLY_ACCESS_TOKEN ? '(found)' : '(NOT SET)');
|
||||
console.log('IMAGE_REF: ', IMAGE_REF);
|
||||
console.log('--- ENV END ---');
|
||||
console.log("--- ENV START ---");
|
||||
console.log("FLY_ORG: ", FLY_ORG);
|
||||
console.log("COMMON_BUCKET: ", COMMON_BUCKET);
|
||||
console.log(
|
||||
"AWS_ACCESS_KEY_ID: ",
|
||||
AWS_ACCESS_KEY_ID ? "(found)" : "(NOT SET)"
|
||||
);
|
||||
console.log(
|
||||
"AWS_SECRET_ACCESS_KEY:",
|
||||
AWS_SECRET_ACCESS_KEY ? "(found)" : "(NOT SET)"
|
||||
);
|
||||
console.log("AWS_ENDPOINT_URL_S3: ", AWS_ENDPOINT_URL_S3);
|
||||
console.log("AWS_REGION: ", AWS_REGION);
|
||||
console.log(
|
||||
"FLY_ACCESS_TOKEN: ",
|
||||
FLY_ACCESS_TOKEN ? "(found)" : "(NOT SET)"
|
||||
);
|
||||
console.log("IMAGE_REF: ", IMAGE_REF);
|
||||
console.log("--- ENV END ---");
|
||||
|
||||
// Initialize S3 client
|
||||
const s3 = new AWS.S3({
|
||||
endpoint: AWS_ENDPOINT_URL_S3,
|
||||
region: AWS_REGION,
|
||||
credentials: new AWS.Credentials(AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY),
|
||||
s3ForcePathStyle: true
|
||||
s3ForcePathStyle: true,
|
||||
});
|
||||
|
||||
// Create Fly Machines API client
|
||||
function createFlyClient() {
|
||||
return axios.create({
|
||||
baseURL: 'https://api.machines.dev/v1',
|
||||
baseURL: "https://api.machines.dev/v1",
|
||||
headers: {
|
||||
Authorization: `Bearer ${FLY_ACCESS_TOKEN}`,
|
||||
'Content-Type': 'application/json'
|
||||
}
|
||||
"Content-Type": "application/json",
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
// Create Fly GraphQL client (for IP allocation)
|
||||
const gqlClient = axios.create({
|
||||
baseURL: 'https://api.fly.io/graphql',
|
||||
baseURL: "https://api.fly.io/graphql",
|
||||
headers: {
|
||||
Authorization: `Bearer ${FLY_ACCESS_TOKEN}`,
|
||||
'Content-Type': 'application/json'
|
||||
}
|
||||
"Content-Type": "application/json",
|
||||
},
|
||||
});
|
||||
|
||||
// Define GraphQL mutation for IP allocation
|
||||
|
|
@ -68,164 +78,175 @@ mutation AllocateIp($input: AllocateIPAddressInput!) {
|
|||
`;
|
||||
|
||||
const app = express();
|
||||
app.use(express.json({ limit: '10mb' }));
|
||||
app.use(express.json({ limit: "10mb" }));
|
||||
|
||||
app.post('/deploy', async (req, res) => {
|
||||
console.log('Received /deploy:', req.body);
|
||||
const { appName, region, notebookName } = req.body;
|
||||
if (!appName || !notebookName) {
|
||||
return res.status(400).json({ error: 'appName and notebookName required' });
|
||||
app.post("/deploy", async (req, res) => {
|
||||
console.log("Received /deploy:", req.body);
|
||||
const {
|
||||
appName,
|
||||
// , region
|
||||
// , notebookName
|
||||
} = req.body;
|
||||
if (!appName) {
|
||||
return res.status(400).json({ error: "appName required" });
|
||||
}
|
||||
|
||||
const notebookPath = path.join(__dirname, '../snakeapi_service/notebooks', notebookName);
|
||||
console.log('Resolved notebookPath:', notebookPath);
|
||||
if (!fs.existsSync(notebookPath)) {
|
||||
console.error('Notebook not found at:', notebookPath);
|
||||
return res.status(500).json({ error: `Notebook not found: ${notebookPath}` });
|
||||
}
|
||||
// const notebookPath = path.join(__dirname, '../snakeapi_service/notebooks', notebookName);
|
||||
// console.log('Resolved notebookPath:', notebookPath);
|
||||
// if (!fs.existsSync(notebookPath)) {
|
||||
// console.error('Notebook not found at:', notebookPath);
|
||||
// return res.status(500).json({ error: `Notebook not found: ${notebookPath}` });
|
||||
// }
|
||||
|
||||
try {
|
||||
const fly = createFlyClient();
|
||||
|
||||
console.log('Creating Fly app:', appName);
|
||||
await fly.post('/apps', {
|
||||
console.log("Creating Fly app:", appName);
|
||||
await fly.post("/apps", {
|
||||
app_name: appName,
|
||||
org_slug: FLY_ORG,
|
||||
primary_region: region
|
||||
primary_region: "sea",
|
||||
});
|
||||
|
||||
console.log('Uploading notebook to S3');
|
||||
const data = fs.readFileSync(notebookPath);
|
||||
const key = `${appName}/notebooks/${Date.now()}-notebook.ipynb`;
|
||||
console.log('S3 key:', key);
|
||||
await s3.putObject({
|
||||
Bucket: COMMON_BUCKET,
|
||||
Key: key,
|
||||
Body: data,
|
||||
ContentType: 'application/json'
|
||||
}).promise();
|
||||
// console.log('Uploading notebook to S3');
|
||||
// const data = fs.readFileSync(notebookPath);
|
||||
// const key = `${appName}/notebooks/${Date.now()}-notebook.ipynb`;
|
||||
// console.log('S3 key:', key);
|
||||
// await s3.putObject({
|
||||
// Bucket: COMMON_BUCKET,
|
||||
// Key: key,
|
||||
// Body: data,
|
||||
// ContentType: 'application/json'
|
||||
// }).promise();
|
||||
|
||||
console.log('Creating machine');
|
||||
console.log("Creating machine");
|
||||
const machineConfig = {
|
||||
name: `${appName}-machine`,
|
||||
region: 'sea',
|
||||
region: "sea",
|
||||
count: 1,
|
||||
vm_size: 'shared-cpu-1x',
|
||||
vm_size: "shared-cpu-1x",
|
||||
autostart: true,
|
||||
config: {
|
||||
image: IMAGE_REF,
|
||||
env: {
|
||||
INSTANCE_PREFIX: appName,
|
||||
NOTEBOOK_KEY: key,
|
||||
// NOTEBOOK_KEY: key,
|
||||
COMMON_BUCKET: COMMON_BUCKET,
|
||||
AWS_ACCESS_KEY_ID,
|
||||
AWS_SECRET_ACCESS_KEY,
|
||||
AWS_ENDPOINT_URL_S3,
|
||||
AWS_REGION
|
||||
AWS_REGION,
|
||||
},
|
||||
http_service: {
|
||||
internal_port: 8000,
|
||||
force_https: true,
|
||||
auto_stop_machines: 'stop',
|
||||
auto_stop_machines: "stop",
|
||||
auto_start_machines: true,
|
||||
min_machines_running: 0,
|
||||
processes: ['app']
|
||||
processes: ["app"],
|
||||
},
|
||||
services: [
|
||||
{
|
||||
protocol: 'tcp',
|
||||
protocol: "tcp",
|
||||
internal_port: 8000,
|
||||
ports: [
|
||||
{ port: 443, handlers: ['tls', 'http'] },
|
||||
{ port: 80, handlers: ['http'] }
|
||||
]
|
||||
}
|
||||
{ port: 443, handlers: ["tls", "http"] },
|
||||
{ port: 80, handlers: ["http"] },
|
||||
],
|
||||
},
|
||||
],
|
||||
guest: {
|
||||
memory_mb: 512,
|
||||
cpu_kind: 'shared',
|
||||
cpus: 1
|
||||
}
|
||||
}
|
||||
cpu_kind: "shared",
|
||||
cpus: 1,
|
||||
},
|
||||
},
|
||||
};
|
||||
console.log('Machine config:', JSON.stringify(machineConfig, null, 2));
|
||||
console.log("Machine config:", JSON.stringify(machineConfig, null, 2));
|
||||
await fly.post(`/apps/${appName}/machines`, machineConfig);
|
||||
|
||||
console.log('Allocating IPv4 via GraphQL API');
|
||||
const v4resp = await gqlClient.post('', {
|
||||
console.log("Allocating IPv4 via GraphQL API");
|
||||
const v4resp = await gqlClient.post("", {
|
||||
query: ALLOCATE_IP_MUTATION,
|
||||
variables: { input: { appId: appName, type: 'v4' } }
|
||||
variables: { input: { appId: appName, type: "v4" } },
|
||||
});
|
||||
const ipv4 = v4resp.data.data.allocateIpAddress.ipAddress.address;
|
||||
console.log('Allocated IPv4:', ipv4);
|
||||
console.log("Allocated IPv4:", ipv4);
|
||||
|
||||
console.log('Allocating IPv6 via GraphQL API');
|
||||
const v6resp = await gqlClient.post('', {
|
||||
console.log("Allocating IPv6 via GraphQL API");
|
||||
const v6resp = await gqlClient.post("", {
|
||||
query: ALLOCATE_IP_MUTATION,
|
||||
variables: { input: { appId: appName, type: 'v6' } }
|
||||
variables: { input: { appId: appName, type: "v6" } },
|
||||
});
|
||||
const ipv6 = v6resp.data.data.allocateIpAddress.ipAddress.address;
|
||||
console.log('Allocated IPv6:', ipv6);
|
||||
console.log("Allocated IPv6:", ipv6);
|
||||
|
||||
return res.json({
|
||||
status: 'created',
|
||||
status: "created",
|
||||
app: appName,
|
||||
ipv4,
|
||||
ipv6,
|
||||
url_v4: `http://${ipv4}`,
|
||||
url_v6: `http://[${ipv6}]`
|
||||
url_v6: `http://[${ipv6}]`,
|
||||
});
|
||||
} catch (err) {
|
||||
console.error('Deployment error:', err.response?.data || err.stack || err.message);
|
||||
console.error(
|
||||
"Deployment error:",
|
||||
err.response?.data || err.stack || err.message
|
||||
);
|
||||
return res.status(500).json({ error: err.response?.data || err.message });
|
||||
}
|
||||
});
|
||||
|
||||
// Upload notebook to S3 for an existing app
|
||||
app.post('/:appName/upload', async (req, res) => {
|
||||
app.post("/:appName/upload", async (req, res) => {
|
||||
const { appName } = req.params;
|
||||
const { notebookName, fileContentBase64 } = req.body;
|
||||
|
||||
if (!notebookName || !fileContentBase64) {
|
||||
return res.status(400).json({ error: 'notebookName and fileContentBase64 are required' });
|
||||
return res
|
||||
.status(400)
|
||||
.json({ error: "notebookName and fileContentBase64 are required" });
|
||||
}
|
||||
|
||||
try {
|
||||
const buffer = Buffer.from(fileContentBase64, 'base64');
|
||||
const buffer = Buffer.from(fileContentBase64, "base64");
|
||||
const key = `${appName}/notebooks/${notebookName}`;
|
||||
|
||||
console.log(`Uploading notebook to: s3://${COMMON_BUCKET}/${key}`);
|
||||
await s3.putObject({
|
||||
Bucket: COMMON_BUCKET,
|
||||
Key: key,
|
||||
Body: buffer,
|
||||
ContentType: 'application/json'
|
||||
}).promise();
|
||||
await s3
|
||||
.putObject({
|
||||
Bucket: COMMON_BUCKET,
|
||||
Key: key,
|
||||
Body: buffer,
|
||||
ContentType: "application/json",
|
||||
})
|
||||
.promise();
|
||||
|
||||
return res.json({ status: 'uploaded', app: appName, key });
|
||||
return res.json({ status: "uploaded", app: appName, key });
|
||||
} catch (err) {
|
||||
console.error('Notebook upload error:', err);
|
||||
console.error("Notebook upload error:", err);
|
||||
return res.status(500).json({ error: err.message });
|
||||
}
|
||||
});
|
||||
|
||||
// Delete a Fly app
|
||||
app.post('/:appName/delete', async (req, res) => {
|
||||
app.post("/:appName/delete", async (req, res) => {
|
||||
const { appName } = req.params;
|
||||
|
||||
try {
|
||||
const fly = createFlyClient();
|
||||
console.log('Destroying Fly app:', appName);
|
||||
console.log("Destroying Fly app:", appName);
|
||||
await fly.delete(`/apps/${appName}`);
|
||||
|
||||
return res.json({ status: 'deleted', app: appName });
|
||||
return res.json({ status: "deleted", app: appName });
|
||||
} catch (err) {
|
||||
console.error('App deletion error:', err.response?.data || err.message);
|
||||
console.error("App deletion error:", err.response?.data || err.message);
|
||||
return res.status(500).json({ error: err.response?.data || err.message });
|
||||
}
|
||||
});
|
||||
|
||||
const LISTEN_PORT = process.env.PORT || 3006;
|
||||
app.listen(LISTEN_PORT, '0.0.0.0', () => {
|
||||
app.listen(LISTEN_PORT, "0.0.0.0", () => {
|
||||
console.log(`Deployment service listening on port ${LISTEN_PORT}`);
|
||||
});
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue