Skip to content

applied makage and standardize the pkg in jobs and fns #621

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

Merged
pyramation merged 5 commits into from
Jan 19, 2026
Merged

applied makage and standardize the pkg in jobs and fns #621

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b360a39
applied makage and standardize the pkg
Zetazzz Jan 19, 2026
8a0bca7
fixed job svc test
Zetazzz Jan 19, 2026
aa0bc91
make the tests in knative job worker passing
Zetazzz Jan 19, 2026
e58a3b8
make fns public
Zetazzz Jan 19, 2026
f4b81cd
fix env var INTERNAL_JOBS_CALLBACK_URL
Zetazzz Jan 19, 2026
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
29 changes: 24 additions & 5 deletions functions/send-email-link/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,35 @@
"name": "@constructive-io/send-email-link-fn",
"version": "0.3.0",
"description": "Knative function to send email links (invite, password reset, email verification) using Constructive jobs",
"author": "Constructive",
"private": true,
"main": "dist/index.js",
"author": "Constructive <developers@constructive.io>",
"homepage": "https://github.com/constructive-io/constructive",
"license": "MIT",
"main": "index.js",
"module": "esm/index.js",
"types": "index.d.ts",
"publishConfig": {
"access": "public",
"directory": "dist"
},
"repository": {
"type": "git",
"url": "https://github.com/constructive-io/constructive"
},
"bugs": {
"url": "https://github.com/constructive-io/constructive/issues"
},
"directories": {
"lib": "src",
"test": "__tests__"
},
"scripts": {
"build": "tsc -p tsconfig.json",
"build:watch": "tsc -p tsconfig.json -w"
"clean": "makage clean",
"prepack": "npm run build",
"build": "makage build",
"build:dev": "makage build --dev"
},
"devDependencies": {
"makage": "^0.1.10"
},
"dependencies": {
"@constructive-io/knative-job-fn": "workspace:^",
Expand Down
29 changes: 24 additions & 5 deletions functions/simple-email/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,35 @@
"name": "@constructive-io/simple-email-fn",
"version": "0.3.0",
"description": "Simple Knative email function that sends emails directly from job payload",
"author": "Constructive",
"private": true,
"main": "dist/index.js",
"author": "Constructive <developers@constructive.io>",
"homepage": "https://github.com/constructive-io/constructive",
"license": "MIT",
"main": "index.js",
"module": "esm/index.js",
"types": "index.d.ts",
"publishConfig": {
"access": "public",
"directory": "dist"
},
"repository": {
"type": "git",
"url": "https://github.com/constructive-io/constructive"
},
"bugs": {
"url": "https://github.com/constructive-io/constructive/issues"
},
"directories": {
"lib": "src",
"test": "__tests__"
},
"scripts": {
"build": "tsc -p tsconfig.json",
"build:watch": "tsc -p tsconfig.json -w"
"clean": "makage clean",
"prepack": "npm run build",
"build": "makage build",
"build:dev": "makage build --dev"
},
"devDependencies": {
"makage": "^0.1.10"
},
"dependencies": {
"@constructive-io/knative-job-fn": "workspace:^",
Expand Down
16 changes: 12 additions & 4 deletions jobs/job-pg/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,16 @@
"author": "Constructive <developers@constructive.io>",
"homepage": "https://github.com/constructive-io/jobs/tree/master/packages/job-pg#readme",
"license": "SEE LICENSE IN LICENSE",
"main": "dist/index.js",
"main": "index.js",
"module": "esm/index.js",
"types": "index.d.ts",
"directories": {
"lib": "src",
"test": "__tests__"
},
"publishConfig": {
"access": "public"
"access": "public",
"directory": "dist"
},
"repository": {
"type": "git",
Expand All @@ -21,12 +24,17 @@
"test": "jest --passWithNoTests",
"test:watch": "jest --watch",
"test:debug": "node --inspect node_modules/.bin/jest --runInBand",
"build": "tsc -p tsconfig.json",
"build:watch": "tsc -p tsconfig.json -w"
"clean": "makage clean",
"prepack": "npm run build",
"build": "makage build",
"build:dev": "makage build --dev"
},
"bugs": {
"url": "https://github.com/constructive-io/jobs/issues"
},
"devDependencies": {
"makage": "^0.1.10"
},
"dependencies": {
"@constructive-io/job-utils": "workspace:^",
"@pgpmjs/logger": "workspace:^",
Expand Down
16 changes: 12 additions & 4 deletions jobs/job-scheduler/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,16 @@
"author": "Constructive <developers@constructive.io>",
"homepage": "https://github.com/constructive-io/jobs/tree/master/packages/job-scheduler#readme",
"license": "SEE LICENSE IN LICENSE",
"main": "dist/index.js",
"main": "index.js",
"module": "esm/index.js",
"types": "index.d.ts",
"directories": {
"lib": "src",
"test": "__tests__"
},
"publishConfig": {
"access": "public"
"access": "public",
"directory": "dist"
},
"repository": {
"type": "git",
Expand All @@ -21,12 +24,17 @@
"test": "jest --passWithNoTests",
"test:watch": "jest --watch",
"test:debug": "node --inspect node_modules/.bin/jest --runInBand",
"build": "tsc -p tsconfig.json",
"build:watch": "tsc -p tsconfig.json -w"
"clean": "makage clean",
"prepack": "npm run build",
"build": "makage build",
"build:dev": "makage build --dev"
},
"bugs": {
"url": "https://github.com/constructive-io/jobs/issues"
},
"devDependencies": {
"makage": "^0.1.10"
},
"dependencies": {
"@constructive-io/job-pg": "workspace:^",
"@constructive-io/job-utils": "workspace:^",
Expand Down
16 changes: 12 additions & 4 deletions jobs/job-utils/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,16 @@
"author": "Constructive <developers@constructive.io>",
"homepage": "https://github.com/constructive-io/jobs/tree/master/packages/job-utils#readme",
"license": "SEE LICENSE IN LICENSE",
"main": "dist/index.js",
"main": "index.js",
"module": "esm/index.js",
"types": "index.d.ts",
"directories": {
"lib": "src",
"test": "__tests__"
},
"publishConfig": {
"access": "public"
"access": "public",
"directory": "dist"
},
"repository": {
"type": "git",
Expand All @@ -21,12 +24,17 @@
"test": "jest --passWithNoTests",
"test:watch": "jest --watch",
"test:debug": "node --inspect node_modules/.bin/jest --runInBand",
"build": "tsc -p tsconfig.json",
"build:watch": "tsc -p tsconfig.json -w"
"clean": "makage clean",
"prepack": "npm run build",
"build": "makage build",
"build:dev": "makage build --dev"
},
"bugs": {
"url": "https://github.com/constructive-io/jobs/issues"
},
"devDependencies": {
"makage": "^0.1.10"
},
"dependencies": {
"@pgpmjs/env": "workspace:^",
"@pgpmjs/logger": "workspace:^",
Expand Down
4 changes: 2 additions & 2 deletions jobs/job-utils/src/runtime.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,8 +145,8 @@ export const getJobsCallbackPort = (): number => {
};

export const getCallbackBaseUrl = (): string => {
if (process.env.JOBS_CALLBACK_BASE_URL) {
return process.env.JOBS_CALLBACK_BASE_URL;
if (process.env.INTERNAL_JOBS_CALLBACK_URL) {
return process.env.INTERNAL_JOBS_CALLBACK_URL;
}
const host = process.env.JOBS_CALLBACK_HOST || 'jobs-callback';
const port = getJobsCallbackPort();
Expand Down
16 changes: 12 additions & 4 deletions jobs/job-worker/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,16 @@
"author": "Constructive <developers@constructive.io>",
"homepage": "https://github.com/constructive-io/jobs/tree/master/packages/job-worker#readme",
"license": "SEE LICENSE IN LICENSE",
"main": "dist/index.js",
"main": "index.js",
"module": "esm/index.js",
"types": "index.d.ts",
"directories": {
"lib": "src",
"test": "__tests__"
},
"publishConfig": {
"access": "public"
"access": "public",
"directory": "dist"
},
"repository": {
"type": "git",
Expand All @@ -21,12 +24,17 @@
"test": "jest --passWithNoTests",
"test:watch": "jest --watch",
"test:debug": "node --inspect node_modules/.bin/jest --runInBand",
"build": "tsc -p tsconfig.json",
"build:watch": "tsc -p tsconfig.json -w"
"clean": "makage clean",
"prepack": "npm run build",
"build": "makage build",
"build:dev": "makage build --dev"
},
"bugs": {
"url": "https://github.com/constructive-io/jobs/issues"
},
"devDependencies": {
"makage": "^0.1.10"
},
"dependencies": {
"@constructive-io/job-utils": "workspace:^",
"@pgpmjs/logger": "workspace:^",
Expand Down
17 changes: 14 additions & 3 deletions jobs/knative-job-example/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,18 @@
"author": "Constructive <developers@constructive.io>",
"homepage": "https://github.com/constructive-io/jobs/tree/master/packages/knative-job-example#readme",
"license": "SEE LICENSE IN LICENSE",
"main": "dist/index.js",
"main": "index.js",
"module": "esm/index.js",
"types": "index.d.ts",
"directories": {
"lib": "src",
"test": "__tests__"
},
"private": true,
"publishConfig": {
"access": "public",
"directory": "dist"
},
"repository": {
"type": "git",
"url": "https://github.com/constructive-io/jobs"
Expand All @@ -19,12 +25,17 @@
"test": "jest --passWithNoTests",
"test:watch": "jest --watch",
"test:debug": "node --inspect node_modules/.bin/jest --runInBand",
"build": "tsc -p tsconfig.json",
"build:watch": "tsc -p tsconfig.json -w"
"clean": "makage clean",
"prepack": "npm run build",
"build": "makage build",
"build:dev": "makage build --dev"
},
"bugs": {
"url": "https://github.com/constructive-io/jobs/issues"
},
"devDependencies": {
"makage": "^0.1.10"
},
"dependencies": {
"@constructive-io/knative-job-fn": "workspace:^"
}
Expand Down
16 changes: 12 additions & 4 deletions jobs/knative-job-fn/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,16 @@
"author": "Constructive <developers@constructive.io>",
"homepage": "https://github.com/constructive-io/jobs/tree/master/packages/knative-job-fn#readme",
"license": "SEE LICENSE IN LICENSE",
"main": "dist/index.js",
"main": "index.js",
"module": "esm/index.js",
"types": "index.d.ts",
"directories": {
"lib": "src",
"test": "__tests__"
},
"publishConfig": {
"access": "public"
"access": "public",
"directory": "dist"
},
"repository": {
"type": "git",
Expand All @@ -21,12 +24,17 @@
"test": "jest --passWithNoTests",
"test:watch": "jest --watch",
"test:debug": "node --inspect node_modules/.bin/jest --runInBand",
"build": "tsc -p tsconfig.json",
"build:watch": "tsc -p tsconfig.json -w"
"clean": "makage clean",
"prepack": "npm run build",
"build": "makage build",
"build:dev": "makage build --dev"
},
"bugs": {
"url": "https://github.com/constructive-io/jobs/issues"
},
"devDependencies": {
"makage": "^0.1.10"
},
"dependencies": {
"@pgpmjs/logger": "workspace:^",
"body-parser": "1.19.0",
Expand Down
18 changes: 13 additions & 5 deletions jobs/knative-job-server/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,19 @@
"author": "Constructive <developers@constructive.io>",
"homepage": "https://github.com/constructive-io/jobs/tree/master/packages/knative-job-server#readme",
"license": "SEE LICENSE IN LICENSE",
"main": "dist/index.js",
"main": "index.js",
"module": "esm/index.js",
"types": "index.d.ts",
"directories": {
"lib": "src",
"test": "__tests__"
},
"bin": {
"faas-job-server": "src/run.ts"
"faas-job-server": "run.js"
},
"publishConfig": {
"access": "public"
"access": "public",
"directory": "dist"
},
"repository": {
"type": "git",
Expand All @@ -24,12 +27,17 @@
"test": "jest --passWithNoTests",
"test:watch": "jest --watch",
"test:debug": "node --inspect node_modules/.bin/jest --runInBand",
"build": "tsc -p tsconfig.json",
"build:watch": "tsc -p tsconfig.json -w"
"clean": "makage clean",
"prepack": "npm run build",
"build": "makage build",
"build:dev": "makage build --dev"
},
"bugs": {
"url": "https://github.com/constructive-io/jobs/issues"
},
"devDependencies": {
"makage": "^0.1.10"
},
"dependencies": {
"@constructive-io/job-pg": "workspace:^",
"@constructive-io/job-utils": "workspace:^",
Expand Down
4 changes: 2 additions & 2 deletions jobs/knative-job-service/__tests__/jobs.e2e.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,7 @@ describe('jobs e2e', () => {
INTERNAL_GATEWAY_DEVELOPMENT_MAP:
process.env.INTERNAL_GATEWAY_DEVELOPMENT_MAP,
INTERNAL_JOBS_CALLBACK_PORT: process.env.INTERNAL_JOBS_CALLBACK_PORT,
JOBS_CALLBACK_BASE_URL: process.env.JOBS_CALLBACK_BASE_URL,
INTERNAL_JOBS_CALLBACK_URL: process.env.INTERNAL_JOBS_CALLBACK_URL,
FEATURES_POSTGIS: process.env.FEATURES_POSTGIS
};

Expand Down Expand Up @@ -407,7 +407,7 @@ describe('jobs e2e', () => {
'mailgun-failure': `http://127.0.0.1:${MAILGUN_FAILURE_PORT}`
});
process.env.INTERNAL_JOBS_CALLBACK_PORT = String(CALLBACK_PORT);
process.env.JOBS_CALLBACK_BASE_URL = callbackUrl;
process.env.INTERNAL_JOBS_CALLBACK_URL = callbackUrl;
process.env.FEATURES_POSTGIS = 'false';

if (pg.config.host) process.env.PGHOST = pg.config.host;
Expand Down
Loading