From b3575246bd1525a25af0ceb918f0db0ade5c447d Mon Sep 17 00:00:00 2001 From: Brian Seymour Date: Thu, 22 Apr 2021 18:43:21 -0500 Subject: [PATCH] change urls, fix docker compose file --- api/src/index.js | 10 +- cli/commands/ppman_commands/install.js | 6 +- cli/commands/ppman_commands/list.js | 6 +- cli/commands/ppman_commands/uninstall.js | 6 +- cli/package-lock.json | 233 +---------------------- docker-compose.dev.yaml | 10 +- docker-compose.yaml | 5 +- readme.md | 10 +- 8 files changed, 29 insertions(+), 257 deletions(-) diff --git a/api/src/index.js b/api/src/index.js index 00b55b8..ce4a1ae 100644 --- a/api/src/index.js +++ b/api/src/index.js @@ -78,15 +78,15 @@ const app = express(); const ppman_routes = require('./ppman/routes'); const executor_routes = require('./executor/routes'); - app.get('/packages', ppman_routes.package_list); - app.post('/packages/:language/:version', ppman_routes.package_install); - app.delete('/packages/:language/:version', ppman_routes.package_uninstall); - app.post('/jobs', + app.get('/api/v1/packages', ppman_routes.package_list); + app.post('/api/v1/packages/:language/:version', ppman_routes.package_install); + app.delete('/api/v1/packages/:language/:version', ppman_routes.package_uninstall); + app.post('/api/v1/execute', executor_routes.run_job_validators, validate, executor_routes.run_job ); - app.get('/runtimes', (req, res) => { + app.get('/api/v1/runtimes', (req, res) => { const runtimes = runtime .map(rt => { return { diff --git a/cli/commands/ppman_commands/install.js b/cli/commands/ppman_commands/install.js index 151ab1d..4211510 100644 --- a/cli/commands/ppman_commands/install.js +++ b/cli/commands/ppman_commands/install.js @@ -14,10 +14,10 @@ const msg_format = { exports.handler = async function({axios, language, languageVersion}){ try{ - const install = await axios.post(`/packages/${language}/${languageVersion}`) - + const install = await axios.post(`/api/v1/packages/${language}/${languageVersion}`) + console.log(msg_format.color(install.data)); }catch({response}){ console.error(response.data.message) } -} \ No newline at end of file +} diff --git a/cli/commands/ppman_commands/list.js b/cli/commands/ppman_commands/list.js index b4ad16c..fa3cb27 100644 --- a/cli/commands/ppman_commands/list.js +++ b/cli/commands/ppman_commands/list.js @@ -15,12 +15,12 @@ const msg_format = { exports.handler = async function({axios}){ - const packages = await axios.get('/packages'); + const packages = await axios.get('/api/v1/packages'); + - const pkg_msg = packages.data .map(msg_format.color) .join('\n'); console.log(pkg_msg); -} \ No newline at end of file +} diff --git a/cli/commands/ppman_commands/uninstall.js b/cli/commands/ppman_commands/uninstall.js index c8230ae..dc5bd87 100644 --- a/cli/commands/ppman_commands/uninstall.js +++ b/cli/commands/ppman_commands/uninstall.js @@ -14,10 +14,10 @@ const msg_format = { exports.handler = async function({axios, language, languageVersion}){ try{ - const uninstall = await axios.delete(`/packages/${language}/${languageVersion}`) - + const uninstall = await axios.delete(`/api/v1/packages/${language}/${languageVersion}`) + console.log(msg_format.color(uninstall.data)); }catch({response}){ console.error(response.data.message) } -} \ No newline at end of file +} diff --git a/cli/package-lock.json b/cli/package-lock.json index f997f96..66fb04d 100644 --- a/cli/package-lock.json +++ b/cli/package-lock.json @@ -1,239 +1,8 @@ { "name": "piston-cli", "version": "1.0.0", - "lockfileVersion": 2, + "lockfileVersion": 1, "requires": true, - "packages": { - "": { - "name": "piston-cli", - "version": "1.0.0", - "license": "MIT", - "dependencies": { - "axios": "^0.21.1", - "chalk": "^4.1.0", - "yargs": "^16.2.0" - } - }, - "node_modules/ansi-regex": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", - "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", - "engines": { - "node": ">=8" - } - }, - "node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/axios": { - "version": "0.21.1", - "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.1.tgz", - "integrity": "sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==", - "dependencies": { - "follow-redirects": "^1.10.0" - } - }, - "node_modules/chalk": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", - "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, - "node_modules/cliui": { - "version": "7.0.4", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", - "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", - "dependencies": { - "string-width": "^4.2.0", - "strip-ansi": "^6.0.0", - "wrap-ansi": "^7.0.0" - } - }, - "node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" - } - }, - "node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" - }, - "node_modules/emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" - }, - "node_modules/escalade": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", - "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", - "engines": { - "node": ">=6" - } - }, - "node_modules/follow-redirects": { - "version": "1.13.3", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.3.tgz", - "integrity": "sha512-DUgl6+HDzB0iEptNQEXLx/KhTmDb8tZUHSeLqpnjpknR70H0nC2t9N73BK6fN4hOvJ84pKlIQVQ4k5FFlBedKA==", - "funding": [ - { - "type": "individual", - "url": "https://github.com/sponsors/RubenVerborgh" - } - ], - "engines": { - "node": ">=4.0" - }, - "peerDependenciesMeta": { - "debug": { - "optional": true - } - } - }, - "node_modules/get-caller-file": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", - "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", - "engines": { - "node": "6.* || 8.* || >= 10.*" - } - }, - "node_modules/has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "engines": { - "node": ">=8" - } - }, - "node_modules/is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "engines": { - "node": ">=8" - } - }, - "node_modules/require-directory": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", - "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/string-width": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz", - "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==", - "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/strip-ansi": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", - "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", - "dependencies": { - "ansi-regex": "^5.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/wrap-ansi": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", - "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", - "dependencies": { - "ansi-styles": "^4.0.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/wrap-ansi?sponsor=1" - } - }, - "node_modules/y18n": { - "version": "5.0.5", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.5.tgz", - "integrity": "sha512-hsRUr4FFrvhhRH12wOdfs38Gy7k2FFzB9qgN9v3aLykRq0dRcdcpz5C9FxdS2NuhOrI/628b/KSTJ3rwHysYSg==", - "engines": { - "node": ">=10" - } - }, - "node_modules/yargs": { - "version": "16.2.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", - "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", - "dependencies": { - "cliui": "^7.0.2", - "escalade": "^3.1.1", - "get-caller-file": "^2.0.5", - "require-directory": "^2.1.1", - "string-width": "^4.2.0", - "y18n": "^5.0.5", - "yargs-parser": "^20.2.2" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/yargs-parser": { - "version": "20.2.7", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.7.tgz", - "integrity": "sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw==", - "engines": { - "node": ">=10" - } - } - }, "dependencies": { "ansi-regex": { "version": "5.0.0", diff --git a/docker-compose.dev.yaml b/docker-compose.dev.yaml index cafae5c..f2b3a14 100644 --- a/docker-compose.dev.yaml +++ b/docker-compose.dev.yaml @@ -1,9 +1,10 @@ -version: '2.7' +version: '3.2' services: - piston_api: + api: build: api - cap_add: + container_name: piston_api + cap_add: - CAP_SYS_ADMIN restart: always ports: @@ -13,8 +14,9 @@ services: tmpfs: - /piston/jobs:exec - piston_fs_repo: # Local testing of packages + repo: # Local testing of packages build: repo + container_name: piston_repo command: ['dart-2.12.1'] # Only build dart volumes: - .:/piston diff --git a/docker-compose.yaml b/docker-compose.yaml index 3202a28..764a55b 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -1,8 +1,9 @@ -version: '2.7' +version: '3.2' services: - piston_api: + api: image: ghcr.io/engineer-man/piston + container_name: piston_api restart: always ports: - 2000:2000 diff --git a/readme.md b/readme.md index cbc8826..190464e 100644 --- a/readme.md +++ b/readme.md @@ -101,11 +101,11 @@ git clone https://github.com/engineer-man/piston ### Installation ```sh -docker-compose up -d piston_api # Start the API container +docker-compose up -d api -cd cli && npm i && cd - # Install all the dependencies for the cli +cd cli && npm i && cd - ``` ## Just Piston (no CLI) @@ -158,10 +158,10 @@ cli/index.js -u http://piston.server:2000 ppman list ### API The container exposes an API on port 2000 by default. -This is used by the CLI to carry out running jobs and package managment. +This is used by the CLI to carry out running jobs and package management. #### Runtimes Endpoint -`GET /runtimes` +`GET /api/v1/runtimes` This endpoint will return the supported languages along with the current version and aliases. To execute code for a particular language using the `/jobs` endpoint, either the name or one of the aliases must be provided, along with the version. @@ -190,7 +190,7 @@ Content-Type: application/json ``` #### Execute Endpoint -`POST /jobs` +`POST /api/v1/execute` This endpoint requests execution of some arbitrary code. - `language` (**required**) The language to use for execution, must be a string and must be installed. - `version` (**required**) The version of the language to use for execution, must be a string containing a SemVer selector for the version or the specific version number to use.