Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 8 additions & 8 deletions .github/workflows/common-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ jobs:
working-directory: test/cdk-basic
- name: Test
run: npx vitest --retry 1 test/cdk-basic.test.ts
- name: Test - observable mode
- name: Test - observability mode
run: OBSERVABLE_MODE=true npx vitest --retry 1 test/cdk-basic.test.ts

test-cdk-esm:
Expand Down Expand Up @@ -116,7 +116,7 @@ jobs:
working-directory: test/cdk-esm
- name: Test
run: npx vitest --retry 1 test/cdk-esm.test.ts
- name: Test - observable mode
- name: Test - observability mode
run: OBSERVABLE_MODE=true npx vitest --retry 1 test/cdk-esm.test.ts

test-sls-basic:
Expand Down Expand Up @@ -164,7 +164,7 @@ jobs:
working-directory: test/sls-basic
- name: Test
run: npx vitest --retry 1 test/sls-basic.test.ts
- name: Test - observable mode
- name: Test - observability mode
run: OBSERVABLE_MODE=true npx vitest --retry 1 test/sls-basic.test.ts

test-sls-esbuild-cjs:
Expand Down Expand Up @@ -212,7 +212,7 @@ jobs:
working-directory: test/sls-esbuild-cjs
- name: Test
run: npx vitest --retry 1 test/sls-esbuild-cjs.test.ts
- name: Test - observable mode
- name: Test - observability mode
run: OBSERVABLE_MODE=true npx vitest --retry 1 test/sls-esbuild-cjs.test.ts

test-sls-esbuild-esm:
Expand Down Expand Up @@ -260,7 +260,7 @@ jobs:
working-directory: test/sls-esbuild-esm
- name: Test
run: npx vitest --retry 1 test/sls-esbuild-esm.test.ts
- name: Test - observable mode
- name: Test - observability mode
run: OBSERVABLE_MODE=true npx vitest --retry 1 test/sls-esbuild-esm.test.ts

test-sam-basic:
Expand Down Expand Up @@ -311,7 +311,7 @@ jobs:
working-directory: test/sam-basic
- name: Test
run: npx vitest --retry 1 test/sam-basic.test.ts
- name: Test - observable mode
- name: Test - observability mode
run: OBSERVABLE_MODE=true npx vitest --retry 1 test/sam-basic.test.ts

test-sam-alt:
Expand Down Expand Up @@ -362,7 +362,7 @@ jobs:
working-directory: test/sam-alt
- name: Test
run: npx vitest --retry 1 test/sam-alt.test.ts
- name: Test - observable mode
- name: Test - observability mode
run: OBSERVABLE_MODE=true npx vitest --retry 1 test/sam-alt.test.ts

test-terraform-basic:
Expand Down Expand Up @@ -416,5 +416,5 @@ jobs:
working-directory: test/terraform-basic
- name: Test
run: npx vitest --retry 1 test/terraform-basic.test.ts
- name: Test - observable mode
- name: Test - observability mode
run: OBSERVABLE_MODE=true npx vitest --retry 1 test/terraform-basic.test.ts
16 changes: 8 additions & 8 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"cwd": "${workspaceRoot}/test/cdk-basic"
},
{
"name": "LLDebugger - CDK basic - observable",
"name": "LLDebugger - CDK basic - observability",
"program": "${workspaceRoot}/node_modules/tsx/dist/cli.mjs",
"args": ["../../src/lldebugger.ts", "-c environment=test", "-o"],
"request": "launch",
Expand All @@ -35,7 +35,7 @@
"cwd": "${workspaceRoot}/test/cdk-esm"
},
{
"name": "LLDebugger - CDK ESM - observable",
"name": "LLDebugger - CDK ESM - observability",
"program": "${workspaceRoot}/node_modules/tsx/dist/cli.mjs",
"args": ["../../src/lldebugger.ts", "-c environment=test", "-o"],
"request": "launch",
Expand All @@ -55,7 +55,7 @@
"cwd": "${workspaceRoot}/test/sls-basic"
},
{
"name": "LLDebugger - SLS basic - observable",
"name": "LLDebugger - SLS basic - observability",
"program": "${workspaceRoot}/node_modules/tsx/dist/cli.mjs",
"args": ["../../src/lldebugger.ts", "--stage=test", "-o"],
"request": "launch",
Expand All @@ -75,7 +75,7 @@
"cwd": "${workspaceRoot}/test/sls-esbuild-cjs"
},
{
"name": "LLDebugger - SLS EsBuild CJS - observable",
"name": "LLDebugger - SLS EsBuild CJS - observability",
"program": "${workspaceRoot}/node_modules/tsx/dist/cli.mjs",
"args": ["../../src/lldebugger.ts", "-o"],
"request": "launch",
Expand All @@ -96,7 +96,7 @@
"cwd": "${workspaceRoot}/test/sls-esbuild-esm"
},
{
"name": "LLDebugger - SLS EsBuild ESM - observable",
"name": "LLDebugger - SLS EsBuild ESM - observability",
"program": "${workspaceRoot}/node_modules/tsx/dist/cli.mjs",
"args": ["../../src/lldebugger.ts", "-o"],
"request": "launch",
Expand All @@ -116,7 +116,7 @@
"cwd": "${workspaceRoot}/test/sam-basic"
},
{
"name": "LLDebugger - SAM basic - observable",
"name": "LLDebugger - SAM basic - observability",
"program": "${workspaceRoot}/node_modules/tsx/dist/cli.mjs",
"args": ["../../src/lldebugger.ts", "--config-env=test", "-o"],
"request": "launch",
Expand All @@ -141,7 +141,7 @@
"cwd": "${workspaceRoot}/test/sam-alt"
},
{
"name": "LLDebugger - SAM alt - observable",
"name": "LLDebugger - SAM alt - observability",
"program": "${workspaceRoot}/node_modules/tsx/dist/cli.mjs",
"args": [
"../../src/lldebugger.ts",
Expand All @@ -167,7 +167,7 @@
"cwd": "${workspaceRoot}/test/terraform-basic"
},
{
"name": "LLDebugger - Terraform basic - observable",
"name": "LLDebugger - Terraform basic - observability",
"program": "${workspaceRoot}/node_modules/tsx/dist/cli.mjs",
"args": ["../../src/lldebugger.ts", "--config-env=test", "-o"],
"request": "launch",
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,8 @@ The configuration is saved to `lldebugger.config.ts`.
-s, --stage <stage> Serverless Framework stage
-f, --function <function name> Filter by function name. You can use * as a wildcard
-m, --subfolder <subfolder> Monorepo subfolder
-o, --observable Observable mode
-i --interval <interval> Observable mode interval (default: "3000")
-o, --observable Observability mode
-i --interval <interval> Observability mode interval (default: "3000")
--config-env <evironment> SAM environment
--sam-config-file <file> SAM configuration file
--sam-template-file <file> SAM template file
Expand Down
4 changes: 2 additions & 2 deletions src/configuration/getConfigFromCliArgs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@ export async function getConfigFromCliArgs(
'Filter by function name. You can use * as a wildcard',
);
program.option('-m, --subfolder <subfolder>', 'Monorepo subfolder');
program.option('-o, --observable', 'Observable mode');
program.option('-o, --observable', 'Observability mode');
program.option(
'-i --interval <interval>',
'Observable mode interval',
'Observability mode interval',
defaultObservableInterval.toString(),
);
program.option('--config-env <evironment>', 'SAM environment');
Expand Down
8 changes: 4 additions & 4 deletions src/configuration/getConfigFromWizard.ts
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ export async function getConfigFromWizard({
type: 'input',
name: 'subfolder',
message:
'If you are using monorepo, enter subfolder where the framework is instaled.',
'If you are using monorepo, enter the subfolder where the framework is installed.',
default: configFromCliArgs.subfolder ?? currentConfig?.subfolder,
},
]);
Expand All @@ -159,13 +159,13 @@ export async function getConfigFromWizard({
process.chdir(answers.subfolder);
}

// do you want to use observable mode?
// do you want to use Observability mode?
const answersObservable = await inquirer.prompt([
{
type: 'confirm',
name: 'observable',
message:
'Do you want to use observable mode, which just sends events to the debugger and do not use the respose?',
'Do you want to use Observability mode, which just sends events to the debugger and does not use the response?',
default: !!(configFromCliArgs.observable !== undefined
? configFromCliArgs.observable
: currentConfig?.observable),
Expand All @@ -179,7 +179,7 @@ export async function getConfigFromWizard({
{
type: 'number',
name: 'interval',
message: `Would you like to enter observable mode interval at which events are sent to the debugger? Default is ${defaultObservableInterval}`,
message: `Would you like to enter Observability mode interval at which events are sent to the debugger? Default is ${defaultObservableInterval}`,
default:
configFromCliArgs.observable !== undefined
? configFromCliArgs.observable
Expand Down
2 changes: 1 addition & 1 deletion src/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ export const outputFolder = '.lldebugger';
// we drop compiled files in this folder
export const assetsFolder = `${outputFolder}/assets`;

// the period in which we receive events in observable mode
// the period in which we receive events in Observability mode
export const defaultObservableInterval = 3000;

// the default name of the configuration file
Expand Down
2 changes: 1 addition & 1 deletion src/lambdaConnection.ts
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ async function onMessageFromLambda(message: IoTMessage) {
`${topic}/${message.data.workerId}`,
);
} else {
// if we are in observable mode, mark the worker as processed
// if we are in Observability mode, mark the worker as processed
lambdasProcessingObservableMode.delete(message.data.functionId);
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/lldebugger.ts
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ async function run() {

let message = `Starting the debugger ${
Configuration.config.observable
? 'in observable mode'
? 'in Observability mode'
: `(ID ${Configuration.config.debuggerId})`
}...`;

Expand Down