@adobe/aio-cli-plugin-api-mesh 5.2.1-beta → 5.2.2-beta

package/oclif.manifest.json

@@ -1 +1 @@
-{"version":"5.2.1-beta","commands":{"PLUGINNAME":{"id":"PLUGINNAME","description":"Your description here","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"examples":["$ aio PLUGINNAME:some_command"],"flags":{"someflag":{"name":"someflag","type":"option","char":"f","description":"this is some flag"}},"args":[]},"api-mesh:create":{"id":"api-mesh:create","description":"Create a mesh with the given config.","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"flags":{"ignoreCache":{"name":"ignoreCache","type":"boolean","char":"i","description":"Ignore cache and force manual org -> project -> workspace selection","allowNo":false},"autoConfirmAction":{"name":"autoConfirmAction","type":"boolean","char":"c","description":"Auto confirm action prompt. CLI will not check for user approval before executing the action.","allowNo":false},"json":{"name":"json","type":"boolean","description":"Output JSON","allowNo":false},"env":{"name":"env","type":"option","char":"e","description":"Path to env file","default":".env"},"secrets":{"name":"secrets","type":"option","char":"s","description":"Path to secrets file","default":false}},"args":[{"name":"file"}]},"api-mesh:delete":{"id":"api-mesh:delete","description":"Delete the config of a given mesh","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"flags":{"ignoreCache":{"name":"ignoreCache","type":"boolean","char":"i","description":"Ignore cache and force manual org -> project -> workspace selection","allowNo":false},"autoConfirmAction":{"name":"autoConfirmAction","type":"boolean","char":"c","description":"Auto confirm action prompt. CLI will not check for user approval before executing the action.","allowNo":false}},"args":[]},"api-mesh:describe":{"id":"api-mesh:describe","description":"Get details of a mesh","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"flags":{"ignoreCache":{"name":"ignoreCache","type":"boolean","char":"i","description":"Ignore cache and force manual org -> project -> workspace selection","allowNo":false}},"args":[]},"api-mesh:get":{"id":"api-mesh:get","description":"Get the config of a given mesh","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"flags":{"ignoreCache":{"name":"ignoreCache","type":"boolean","char":"i","description":"Ignore cache and force manual org -> project -> workspace selection","allowNo":false},"json":{"name":"json","type":"boolean","description":"Output JSON","allowNo":false}},"args":[{"name":"file"}]},"api-mesh:init":{"id":"api-mesh:init","description":"This command will create a workspace where you can organise your API mesh configuration and other files","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"examples":[{"description":"API mesh workspace init","command":"aio api-mesh init commerce-mesh"},{"description":"API mesh workspace init with flags","command":"aio api-mesh init commerce-mesh --path ./mesh_projects/test_mesh --git y --packageManager yarn"}],"flags":{"path":{"name":"path","type":"option","char":"p","default":"."},"packageManager":{"name":"packageManager","type":"option","char":"m","options":["npm","yarn"]},"git":{"name":"git","type":"option","char":"g","options":["y","n"]}},"args":[{"name":"projectName","description":"Project name","required":true}]},"api-mesh:log-get-bulk":{"id":"api-mesh:log-get-bulk","description":"Download all mesh logs for a selected time period.","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"flags":{"ignoreCache":{"name":"ignoreCache","type":"boolean","char":"i","description":"Ignore cache and force manual org -> project -> workspace selection","allowNo":false},"startTime":{"name":"startTime","type":"option","description":"Start time for the logs in UTC","required":true},"endTime":{"name":"endTime","type":"option","description":"End time for the logs in UTC","required":true},"filename":{"name":"filename","type":"option","description":"Path to the output file for logs","required":true}},"args":[]},"api-mesh:log-get":{"id":"api-mesh:log-get","description":"Get the Log of a given mesh by RayId","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"flags":{"ignoreCache":{"name":"ignoreCache","type":"boolean","char":"i","description":"Ignore cache and force manual org -> project -> workspace selection","allowNo":false}},"args":[{"name":"rayId","description":"Fetch a single log by rayID","required":true}]},"api-mesh:log-list":{"id":"api-mesh:log-list","description":"Get recent logs of requests made to the API Mesh.","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"flags":{"ignoreCache":{"name":"ignoreCache","type":"boolean","char":"i","description":"Ignore cache and force manual org -> project -> workspace selection","allowNo":false},"filename":{"name":"filename","type":"option","description":"Name of CSV file to export the recent logs to"}},"args":[]},"api-mesh:run":{"id":"api-mesh:run","description":"Run a local development server that builds and compiles a mesh locally","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"examples":[],"flags":{"port":{"name":"port","type":"option","char":"p","description":"Port number for the local dev server"},"debug":{"name":"debug","type":"boolean","description":"Enable debugging mode","allowNo":false},"env":{"name":"env","type":"option","char":"e","description":"Path to env file","default":".env"},"autoConfirmAction":{"name":"autoConfirmAction","type":"boolean","char":"c","description":"Auto confirm action prompt. CLI will not check for user approval before executing the action.","allowNo":false},"select":{"name":"select","type":"boolean","description":"Retrieve existing artifacts from the mesh","allowNo":false},"secrets":{"name":"secrets","type":"option","char":"s","description":"Path to secrets file","default":false}},"args":[{"name":"file","description":"Mesh File"}]},"api-mesh:status":{"id":"api-mesh:status","description":"Get a mesh status with a given meshid.","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"flags":{"ignoreCache":{"name":"ignoreCache","type":"boolean","char":"i","description":"Ignore cache and force manual org -> project -> workspace selection","allowNo":false}},"args":[]},"api-mesh:update":{"id":"api-mesh:update","description":"Update a mesh with the given config.","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"flags":{"ignoreCache":{"name":"ignoreCache","type":"boolean","char":"i","description":"Ignore cache and force manual org -> project -> workspace selection","allowNo":false},"autoConfirmAction":{"name":"autoConfirmAction","type":"boolean","char":"c","description":"Auto confirm action prompt. CLI will not check for user approval before executing the action.","allowNo":false},"env":{"name":"env","type":"option","char":"e","description":"Path to env file","default":".env"},"secrets":{"name":"secrets","type":"option","char":"s","description":"Path to secrets file","default":false}},"args":[{"name":"file"}]},"api-mesh:cache:purge":{"id":"api-mesh:cache:purge","description":"Cache purge for a given mesh","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"flags":{"ignoreCache":{"name":"ignoreCache","type":"boolean","char":"i","description":"Ignore cache and force manual org -> project -> workspace selection","allowNo":false},"autoConfirmAction":{"name":"autoConfirmAction","type":"boolean","char":"c","description":"Auto confirm action prompt. CLI will not check for user approval before executing the action.","allowNo":false},"all":{"name":"all","type":"boolean","char":"a","description":"Purge all cache. CLI will purge all cache data.","required":true,"allowNo":false}},"args":[]},"api-mesh:source:discover":{"id":"api-mesh:source:discover","description":"Return the list of avaliable sources","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"flags":{"confirm":{"name":"confirm","type":"boolean","char":"c","description":"Auto confirm install action prompt. CLI will not check ask user to install source.","allowNo":false}},"args":[]},"api-mesh:source:get":{"id":"api-mesh:source:get","description":"Command returns the content of a specific source.","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"examples":["$ aio api-mesh:source:get -s=<version>@<source_name>","$ aio api-mesh:source:get -s<source_name>","$ aio api-mesh:source:get -m"],"flags":{"confirm":{"name":"confirm","type":"boolean","char":"c","description":"Auto confirm print action prompt. CLI will not check ask user to print source.","allowNo":false},"source":{"name":"source","type":"option","char":"s","description":"Source name"},"multiple":{"name":"multiple","type":"boolean","char":"m","description":"Select multiple sources","allowNo":false}},"args":[]},"api-mesh:source:install":{"id":"api-mesh:source:install","description":"Command to install the source to your API mesh.","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"examples":["$ aio api-mesh:source:install <version>@<source_name>","$ aio api-mesh:source:install <source_name> -v <variable_name>=<variable_value>","$ aio api-mesh:source:install <source_name> -f <path_to_variables_file>"],"flags":{"source":{"name":"source","type":"option","char":"s","description":"Source name"},"confirm":{"name":"confirm","type":"boolean","char":"c","description":"Auto confirm override action prompt. CLI will not check ask user to override source.","allowNo":false},"variable":{"name":"variable","type":"option","char":"v","description":"Variables required for the source"},"variable-file":{"name":"variable-file","type":"option","char":"f","description":"Variables file path"},"ignoreCache":{"name":"ignoreCache","type":"boolean","char":"i","description":"Ignore cache and force manual org -> project -> workspace selection","allowNo":false}},"args":[{"name":"source"}]}}}
+{"version":"5.2.2-beta","commands":{"PLUGINNAME":{"id":"PLUGINNAME","description":"Your description here","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"examples":["$ aio PLUGINNAME:some_command"],"flags":{"someflag":{"name":"someflag","type":"option","char":"f","description":"this is some flag"}},"args":[]},"api-mesh:create":{"id":"api-mesh:create","description":"Create a mesh with the given config.","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"flags":{"ignoreCache":{"name":"ignoreCache","type":"boolean","char":"i","description":"Ignore cache and force manual org -> project -> workspace selection","allowNo":false},"autoConfirmAction":{"name":"autoConfirmAction","type":"boolean","char":"c","description":"Auto confirm action prompt. CLI will not check for user approval before executing the action.","allowNo":false},"json":{"name":"json","type":"boolean","description":"Output JSON","allowNo":false},"env":{"name":"env","type":"option","char":"e","description":"Path to env file","default":".env"},"secrets":{"name":"secrets","type":"option","char":"s","description":"Path to secrets file","default":false}},"args":[{"name":"file"}]},"api-mesh:delete":{"id":"api-mesh:delete","description":"Delete the config of a given mesh","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"flags":{"ignoreCache":{"name":"ignoreCache","type":"boolean","char":"i","description":"Ignore cache and force manual org -> project -> workspace selection","allowNo":false},"autoConfirmAction":{"name":"autoConfirmAction","type":"boolean","char":"c","description":"Auto confirm action prompt. CLI will not check for user approval before executing the action.","allowNo":false}},"args":[]},"api-mesh:describe":{"id":"api-mesh:describe","description":"Get details of a mesh","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"flags":{"ignoreCache":{"name":"ignoreCache","type":"boolean","char":"i","description":"Ignore cache and force manual org -> project -> workspace selection","allowNo":false}},"args":[]},"api-mesh:get":{"id":"api-mesh:get","description":"Get the config of a given mesh","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"flags":{"ignoreCache":{"name":"ignoreCache","type":"boolean","char":"i","description":"Ignore cache and force manual org -> project -> workspace selection","allowNo":false},"json":{"name":"json","type":"boolean","description":"Output JSON","allowNo":false}},"args":[{"name":"file"}]},"api-mesh:init":{"id":"api-mesh:init","description":"This command will create a workspace where you can organise your API mesh configuration and other files","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"examples":[{"description":"API mesh workspace init","command":"aio api-mesh init commerce-mesh"},{"description":"API mesh workspace init with flags","command":"aio api-mesh init commerce-mesh --path ./mesh_projects/test_mesh --git y --packageManager yarn"}],"flags":{"path":{"name":"path","type":"option","char":"p","default":"."},"packageManager":{"name":"packageManager","type":"option","char":"m","options":["npm","yarn"]},"git":{"name":"git","type":"option","char":"g","options":["y","n"]}},"args":[{"name":"projectName","description":"Project name","required":true}]},"api-mesh:log-get-bulk":{"id":"api-mesh:log-get-bulk","description":"Download all mesh logs for a selected time period.","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"flags":{"ignoreCache":{"name":"ignoreCache","type":"boolean","char":"i","description":"Ignore cache and force manual org -> project -> workspace selection","allowNo":false},"startTime":{"name":"startTime","type":"option","description":"Start time for the logs in UTC"},"endTime":{"name":"endTime","type":"option","description":"End time for the logs in UTC"},"filename":{"name":"filename","type":"option","description":"Path to the output file for logs","required":true},"past":{"name":"past","type":"option","description":"Past time window in mins"},"from":{"name":"from","type":"option","description":"The from time in YYYY-MM-DD:HH:MM:SS format based on your system's time zone. It is used to fetch logs from the past and is the starting time for the past time duration."}},"args":[]},"api-mesh:log-get":{"id":"api-mesh:log-get","description":"Get the Log of a given mesh by RayId","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"flags":{"ignoreCache":{"name":"ignoreCache","type":"boolean","char":"i","description":"Ignore cache and force manual org -> project -> workspace selection","allowNo":false}},"args":[{"name":"rayId","description":"Fetch a single log by rayID","required":true}]},"api-mesh:log-list":{"id":"api-mesh:log-list","description":"Get recent logs of requests made to the API Mesh.","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"flags":{"ignoreCache":{"name":"ignoreCache","type":"boolean","char":"i","description":"Ignore cache and force manual org -> project -> workspace selection","allowNo":false},"filename":{"name":"filename","type":"option","description":"Name of CSV file to export the recent logs to"}},"args":[]},"api-mesh:run":{"id":"api-mesh:run","description":"Run a local development server that builds and compiles a mesh locally","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"examples":[],"flags":{"port":{"name":"port","type":"option","char":"p","description":"Port number for the local dev server"},"debug":{"name":"debug","type":"boolean","description":"Enable debugging mode","allowNo":false},"env":{"name":"env","type":"option","char":"e","description":"Path to env file","default":".env"},"autoConfirmAction":{"name":"autoConfirmAction","type":"boolean","char":"c","description":"Auto confirm action prompt. CLI will not check for user approval before executing the action.","allowNo":false},"select":{"name":"select","type":"boolean","description":"Retrieve existing artifacts from the mesh","allowNo":false},"secrets":{"name":"secrets","type":"option","char":"s","description":"Path to secrets file","default":false}},"args":[{"name":"file","description":"Mesh File"}]},"api-mesh:status":{"id":"api-mesh:status","description":"Get a mesh status with a given meshid.","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"flags":{"ignoreCache":{"name":"ignoreCache","type":"boolean","char":"i","description":"Ignore cache and force manual org -> project -> workspace selection","allowNo":false}},"args":[]},"api-mesh:update":{"id":"api-mesh:update","description":"Update a mesh with the given config.","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"flags":{"ignoreCache":{"name":"ignoreCache","type":"boolean","char":"i","description":"Ignore cache and force manual org -> project -> workspace selection","allowNo":false},"autoConfirmAction":{"name":"autoConfirmAction","type":"boolean","char":"c","description":"Auto confirm action prompt. CLI will not check for user approval before executing the action.","allowNo":false},"env":{"name":"env","type":"option","char":"e","description":"Path to env file","default":".env"},"secrets":{"name":"secrets","type":"option","char":"s","description":"Path to secrets file","default":false}},"args":[{"name":"file"}]},"api-mesh:cache:purge":{"id":"api-mesh:cache:purge","description":"Cache purge for a given mesh","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"flags":{"ignoreCache":{"name":"ignoreCache","type":"boolean","char":"i","description":"Ignore cache and force manual org -> project -> workspace selection","allowNo":false},"autoConfirmAction":{"name":"autoConfirmAction","type":"boolean","char":"c","description":"Auto confirm action prompt. CLI will not check for user approval before executing the action.","allowNo":false},"all":{"name":"all","type":"boolean","char":"a","description":"Purge all cache. CLI will purge all cache data.","required":true,"allowNo":false}},"args":[]},"api-mesh:source:discover":{"id":"api-mesh:source:discover","description":"Return the list of avaliable sources","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"flags":{"confirm":{"name":"confirm","type":"boolean","char":"c","description":"Auto confirm install action prompt. CLI will not check ask user to install source.","allowNo":false}},"args":[]},"api-mesh:source:get":{"id":"api-mesh:source:get","description":"Command returns the content of a specific source.","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"examples":["$ aio api-mesh:source:get -s=<version>@<source_name>","$ aio api-mesh:source:get -s<source_name>","$ aio api-mesh:source:get -m"],"flags":{"confirm":{"name":"confirm","type":"boolean","char":"c","description":"Auto confirm print action prompt. CLI will not check ask user to print source.","allowNo":false},"source":{"name":"source","type":"option","char":"s","description":"Source name"},"multiple":{"name":"multiple","type":"boolean","char":"m","description":"Select multiple sources","allowNo":false}},"args":[]},"api-mesh:source:install":{"id":"api-mesh:source:install","description":"Command to install the source to your API mesh.","pluginName":"@adobe/aio-cli-plugin-api-mesh","pluginType":"core","aliases":[],"examples":["$ aio api-mesh:source:install <version>@<source_name>","$ aio api-mesh:source:install <source_name> -v <variable_name>=<variable_value>","$ aio api-mesh:source:install <source_name> -f <path_to_variables_file>"],"flags":{"source":{"name":"source","type":"option","char":"s","description":"Source name"},"confirm":{"name":"confirm","type":"boolean","char":"c","description":"Auto confirm override action prompt. CLI will not check ask user to override source.","allowNo":false},"variable":{"name":"variable","type":"option","char":"v","description":"Variables required for the source"},"variable-file":{"name":"variable-file","type":"option","char":"f","description":"Variables file path"},"ignoreCache":{"name":"ignoreCache","type":"boolean","char":"i","description":"Ignore cache and force manual org -> project -> workspace selection","allowNo":false}},"args":[{"name":"source"}]}}}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@adobe/aio-cli-plugin-api-mesh",
-	"version": "5.2.1-beta",
+	"version": "5.2.2-beta",
 	"description": "Adobe I/O CLI plugin to develop and manage API mesh sources",
 	"keywords": [
 		"oclif-plugin"
@@ -37,7 +37,7 @@
 		"version": "oclif-dev readme && git add README.md"
 	},
 	"dependencies": {
-		"@adobe-apimesh/mesh-builder": "2.1.4",
+		"@adobe-apimesh/mesh-builder": "2.1.5",
 		"@adobe/aio-cli-lib-console": "^5.0.0",
 		"@adobe/aio-lib-core-config": "^5.0.0",
 		"@adobe/aio-lib-core-logging": "^3.0.0",
@@ -45,7 +45,7 @@
 		"@adobe/aio-lib-ims": "^7.0.1",
 		"@adobe/plugin-hooks": "0.3.3",
 		"@adobe/plugin-on-fetch": "0.1.1",
-		"@adobe/plugin-source-headers": "^0.0.1",
+		"@adobe/plugin-source-headers": "^0.0.2",
 		"@envelop/disable-introspection": "^6.0.0",
 		"@graphql-mesh/cli": "0.82.30",
 		"@graphql-mesh/graphql": "0.34.13",
@@ -90,6 +90,7 @@
 		"jsmin": "1.0.1",
 		"json-interpolate": "^1.0.3",
 		"lru-cache": "^7.14.1",
+		"ms": "^2.1.3",
 		"node-clipboardy": "^1.0.3",
 		"node-fetch": "2.6.1",
 		"pino": "^9.5.0",

package/src/commands/api-mesh/__tests__/log-get-bulk.test.js

@@ -3,7 +3,11 @@ const path = require('path');
 const GetBulkLogCommand = require('../log-get-bulk');
 const { initRequestId, initSdk, promptConfirm } = require('../../../helpers');
 const { getMeshId, getPresignedUrls } = require('../../../lib/devConsole');
-const { suggestCorrectedDateFormat } = require('../../../utils');
+const {
+	suggestCorrectedDateFormat,
+	validateDateTimeRange,
+	parsePastDuration,
+} = require('../../../utils');
 
 jest.mock('fs');
 jest.mock('axios');
@@ -86,7 +90,7 @@ describe('GetBulkLogCommand', () => {
 
 		const command = new GetBulkLogCommand([], {});
 		await expect(command.run()).rejects.toThrow(
-			'Max duration between startTime and endTime should be 30 minutes. Current duration is 0 hours 45 minutes and 0 seconds.',
+			'The maximum duration between startTime and endTime is 30 minutes. The current duration is 0 hours 45 minutes and 0 seconds.',
 		);
 	});
 
@@ -291,3 +295,267 @@ describe('GetBulkLogCommand startTime and endTime validation', () => {
 		},
 	);
 });
+
+describe('GetBulkLogCommand with --past and --from flags', () => {
+	let parseSpy;
+
+	let now;
+	let fromDate;
+	beforeEach(() => {
+		now = new Date();
+		fromDate = new Date(now);
+		fromDate.setDate(fromDate.getDate() - 29); // Set fromDate to 29 days ago
+		parseSpy = jest.spyOn(GetBulkLogCommand.prototype, 'parse').mockResolvedValue({
+			flags: {
+				past: '20mins',
+				from: fromDate.toISOString().slice(0, 10) + ':12:00:00',
+				filename: 'test.csv',
+				ignoreCache: false,
+			},
+		});
+
+		initSdk.mockResolvedValue({
+			imsOrgId: 'orgId',
+			imsOrgCode: 'orgCode',
+			projectId: 'projectId',
+			workspaceId: 'workspaceId',
+			workspaceName: 'workspaceName',
+		});
+		getMeshId.mockResolvedValue('meshId');
+		getPresignedUrls.mockResolvedValue({
+			presignedUrls: [{ key: 'log1.csv', url: 'http://example.com/someHash' }],
+			totalSize: 2048,
+		});
+		promptConfirm.mockResolvedValue(true);
+		global.requestId = 'dummy_request_id';
+	});
+
+	afterEach(() => {
+		jest.clearAllMocks();
+		// clear the date objects
+		now = null;
+		fromDate = null;
+	});
+
+	test('runs with valid --past and --from flags', async () => {
+		fs.existsSync.mockReturnValue(true);
+		fs.statSync.mockReturnValue({ size: 0 });
+
+		const mockWriteStream = {
+			write: jest.fn(),
+			end: jest.fn(),
+			on: jest.fn((event, callback) => {
+				if (event === 'finish') {
+					callback();
+				}
+			}),
+		};
+		fs.createWriteStream.mockReturnValue(mockWriteStream);
+
+		const command = new GetBulkLogCommand([], {});
+		await command.run();
+
+		expect(initRequestId).toHaveBeenCalled();
+		expect(initSdk).toHaveBeenCalled();
+		expect(getMeshId).toHaveBeenCalledWith('orgCode', 'projectId', 'workspaceId', 'workspaceName');
+		expect(getPresignedUrls).toHaveBeenCalledWith(
+			'orgCode',
+			'projectId',
+			'workspaceId',
+			'meshId',
+			expect.any(String),
+			expect.any(String),
+		);
+		expect(fs.createWriteStream).toHaveBeenCalledWith(path.resolve(process.cwd(), 'test.csv'), {
+			flags: 'a',
+		});
+		expect(mockWriteStream.write).toHaveBeenCalled();
+		expect(mockWriteStream.end).toHaveBeenCalled();
+	});
+
+	test('throws an error with invalid --from date components', async () => {
+		parseSpy.mockResolvedValueOnce({
+			flags: {
+				past: '20mins',
+				from: fromDate.toISOString().slice(0, 10) + ':25:61:61',
+				filename: 'test.csv',
+				ignoreCache: false,
+			},
+		});
+
+		const command = new GetBulkLogCommand([], {});
+		await expect(command.run()).rejects.toThrow(
+			'Invalid date components passed in --from. Correct the date.',
+		);
+	});
+
+	test('throws an error with invalid --from date format', async () => {
+		parseSpy.mockResolvedValueOnce({
+			flags: {
+				past: '15mins',
+				from: fromDate.toISOString().slice(0, 10).replace(/-/g, ':') + ':15:00:00',
+				filename: 'test.csv',
+				ignoreCache: false,
+			},
+		});
+
+		const command = new GetBulkLogCommand([], {});
+		await expect(command.run()).rejects.toThrow(
+			'Invalid format. Use the format YYYY-MM-DD:HH:MM:SS for --from.',
+		);
+	});
+
+	test('runs with valid --past flag without --from', async () => {
+		parseSpy.mockResolvedValueOnce({
+			flags: {
+				past: '15mins',
+				filename: 'test.csv',
+				ignoreCache: false,
+			},
+		});
+
+		fs.existsSync.mockReturnValue(true);
+		fs.statSync.mockReturnValue({ size: 0 });
+
+		const command = new GetBulkLogCommand([], {});
+		await command.run();
+
+		expect(initRequestId).toHaveBeenCalled();
+		expect(initSdk).toHaveBeenCalled();
+		expect(getMeshId).toHaveBeenCalledWith('orgCode', 'projectId', 'workspaceId', 'workspaceName');
+		expect(getPresignedUrls).toHaveBeenCalledWith(
+			'orgCode',
+			'projectId',
+			'workspaceId',
+			'meshId',
+			expect.any(String),
+			expect.any(String),
+		);
+	});
+
+	test('throws an error with edge case for --past duration', async () => {
+		parseSpy.mockResolvedValueOnce({
+			flags: {
+				past: '0s',
+				from: fromDate.toISOString().slice(0, 10) + ':12:00:00',
+				filename: 'test.csv',
+				ignoreCache: false,
+			},
+		});
+
+		const command = new GetBulkLogCommand([], {});
+		await expect(command.run()).rejects.toThrow(
+			'Invalid format. The past time window should be in minutes, for example, "20 mins", "15 minutes".',
+		);
+	});
+
+	test('runs with edge case for --from date', async () => {
+		parseSpy.mockResolvedValueOnce({
+			flags: {
+				past: '15mins',
+				from: fromDate.toISOString().slice(0, 10) + ':00:00:00',
+				filename: 'test.csv',
+				ignoreCache: false,
+			},
+		});
+
+		fs.existsSync.mockReturnValue(true);
+		fs.statSync.mockReturnValue({ size: 0 });
+
+		const command = new GetBulkLogCommand([], {});
+		await command.run();
+
+		expect(initRequestId).toHaveBeenCalled();
+		expect(initSdk).toHaveBeenCalled();
+		expect(getMeshId).toHaveBeenCalledWith('orgCode', 'projectId', 'workspaceId', 'workspaceName');
+		expect(getPresignedUrls).toHaveBeenCalledWith(
+			'orgCode',
+			'projectId',
+			'workspaceId',
+			'meshId',
+			expect.any(String),
+			expect.any(String),
+		);
+	});
+});
+
+describe('validateDateTimeRange', () => {
+	const testCases = [
+		{
+			startTime: '2025-03-09T12:00:00Z',
+			endTime: '2025-03-09T12:45:00Z',
+			error:
+				'The maximum duration between startTime and endTime is 30 minutes. The current duration is 0 hours 45 minutes and 0 seconds.',
+		},
+		{
+			startTime: new Date().toISOString(),
+			endTime: new Date(new Date().getTime() + 45 * 60 * 1000).toISOString(),
+			error: 'endTime cannot be in the future. Provide a valid endTime.',
+		},
+		{
+			startTime: new Date(new Date().setUTCDate(new Date().getUTCDate() - 31)).toISOString(),
+			endTime: '2025-03-10T12:00:00Z',
+			error: 'Cannot get logs more than 30 days old. Adjust your time range.',
+		},
+		{
+			startTime: '2025-03-09T12:00:00Z',
+			endTime: '2025-03-09T12:00:00Z',
+			error: 'The minimum duration is 1 minutes. The current duration is 0 minutes.',
+		},
+		{
+			startTime: '2025-03-09T12:30:00Z',
+			endTime: '2025-03-09T12:00:00Z',
+			error: 'endTime must be greater than startTime',
+		},
+		{
+			startTime: '2025-03-09T12:00:00Z',
+			endTime: '2025-03-09T12:20:00Z',
+			error: null,
+		},
+	];
+
+	test.each(testCases)(
+		'validates time range for startTime: $startTime and endTime: $endTime',
+		({ startTime, endTime, error }) => {
+			if (error) {
+				expect(() => validateDateTimeRange(startTime, endTime)).toThrow(error);
+			} else {
+				expect(() => validateDateTimeRange(startTime, endTime)).not.toThrow();
+			}
+		},
+	);
+});
+
+describe('parsePastDuration', () => {
+	const validDurations = [
+		['20m', 20 * 60 * 1000],
+		['20 m', 20 * 60 * 1000],
+		['20min', 20 * 60 * 1000],
+		['20 min', 20 * 60 * 1000],
+		['20mins', 20 * 60 * 1000],
+		['20 mins', 20 * 60 * 1000],
+		['20minute', 20 * 60 * 1000],
+		['20 minute', 20 * 60 * 1000],
+		['20minutes', 20 * 60 * 1000],
+		['20 minutes', 20 * 60 * 1000],
+	];
+
+	test.each(validDurations)(
+		'parses valid past duration "%s" correctly',
+		(pastDuration, expectedDurationInMs) => {
+			const durationInMs = parsePastDuration(pastDuration);
+			expect(durationInMs).toBe(expectedDurationInMs);
+		},
+	);
+
+	const invalidDurations = ['20h', '20 hours', '20s', '20 seconds'];
+
+	test.each(invalidDurations)(
+		'throws an error for invalid past duration format "%s"',
+		invalidPastDuration => {
+			expect(() => parsePastDuration(invalidPastDuration)).toThrow(
+				'Invalid format. The past time window should be in minutes, for example, "20 mins", "15 minutes".',
+			);
+		},
+	);
+});

package/src/commands/api-mesh/log-get-bulk.js

@@ -10,7 +10,13 @@ const {
 	startTimeFlag,
 	endTimeFlag,
 	logFilenameFlag,
+	pastFlag,
+	fromFlag,
 	suggestCorrectedDateFormat,
+	parsePastDuration,
+	validateDateTimeRange,
+	validateDateTimeFormat,
+	localToUTCTime,
 } = require('../../utils');
 
 require('dotenv').config();
@@ -21,6 +27,8 @@ class GetBulkLogCommand extends Command {
 		startTime: startTimeFlag,
 		endTime: endTimeFlag,
 		filename: logFilenameFlag,
+		past: pastFlag,
+		from: fromFlag,
 	};
 
 	async run() {
@@ -35,64 +43,86 @@ class GetBulkLogCommand extends Command {
 
 		const filename = await flags.filename;
 
+		let calculatedStartTime, calculatedEndTime, formattedStartTime, formattedEndTime;
+
 		// Only supports files that end with .csv
 		if (!filename || path.extname(filename).toLowerCase() !== '.csv') {
 			this.error('Invalid file type. Provide a filename with a .csv extension.');
 			return;
 		}
-		// Regular expression to validate the input date format YYYY-MM-DDTHH:MM:SSZ
-		const dateTimeRegex = /^(?:(\d{4})-(0[1-9]|1[0-2])-(0[1-9]|[12]\d|3[01])T(0[0-9]|1[0-9]|2[0-3]):([0-5]\d):([0-5]\d)Z)$/;
-
-		// Validate user provided startTime format
-		if (!dateTimeRegex.test(flags.startTime)) {
-			const correctedStartTime = suggestCorrectedDateFormat(flags.startTime);
-			if (!correctedStartTime) {
-				this.error('Found invalid date components for startTime. Check and correct the date.');
-			} else {
-				this.error(
-					`Use the format YYYY-MM-DDTHH:MM:SSZ for startTime. Did you mean ${correctedStartTime}?`,
-				);
+
+		if (flags.startTime && flags.endTime) {
+			// Regular expression to validate the input date format YYYY-MM-DDTHH:MM:SSZ
+			const dateTimeRegex = /^(?:(\d{4})-(0[1-9]|1[0-2])-(0[1-9]|[12]\d|3[01])T(0[0-9]|1[0-9]|2[0-3]):([0-5]\d):([0-5]\d)Z)$/;
+
+			// Validate user provided startTime format
+			if (!dateTimeRegex.test(flags.startTime)) {
+				const correctedStartTime = suggestCorrectedDateFormat(flags.startTime);
+				if (!correctedStartTime) {
+					this.error('Invalid date components in startTime. Correct the date.');
+				} else {
+					this.error(
+						`Use the format YYYY-MM-DDTHH:MM:SSZ for startTime. Did you mean ${correctedStartTime}?`,
+					);
+				}
+				return;
 			}
 
-			return;
-		}
+			// Validate user provided endTime format
+			if (!dateTimeRegex.test(flags.endTime)) {
+				const correctedEndTime = suggestCorrectedDateFormat(flags.endTime);
+				// Check for incorrect date components
+				if (!correctedEndTime) {
+					this.error('Found invalid date components for endTime. Check and correct the date.');
+				} else {
+					this.error(
+						`Use the format YYYY-MM-DDTHH:MM:SSZ for endTime. Did you mean ${correctedEndTime}?`,
+					);
+				}
+				return;
+			}
 
-		// Validate user provided endTime format
-		if (!dateTimeRegex.test(flags.endTime)) {
-			const correctedEndTime = suggestCorrectedDateFormat(flags.endTime);
-			//check for incorrect date components
-			if (!correctedEndTime) {
-				this.error('Found invalid date components for endTime. Check and correct the date.');
+			// Validate the date-time range
+			validateDateTimeRange(flags.startTime, flags.endTime);
+
+			// Properly format startTime and endTime strings before handing it over to SMS
+			formattedStartTime = flags.startTime.replace(/-|:|Z/g, '').replace('T', 'T');
+			formattedEndTime = flags.endTime.replace(/-|:|Z/g, '').replace('T', 'T');
+		} else if (flags.past) {
+			const pastTimeWindow = parsePastDuration(flags.past);
+			if (flags.from) {
+				let convertedTime;
+				const dateTimeRegex = /^\d{4}-\d{2}-\d{2}:\d{2}:\d{2}:\d{2}$/;
+				if (!dateTimeRegex.test(flags.from)) {
+					this.error('Invalid format. Use the format YYYY-MM-DD:HH:MM:SS for --from.');
+				} else {
+					try {
+						convertedTime = await localToUTCTime(flags.from.toString());
+					} catch (error) {
+						this.error(`Invalid date components passed in --from. Correct the date.`);
+					}
+				}
+				// add the past window to the converted time to get the end time to fetch logs from the past
+				calculatedStartTime = new Date(convertedTime);
+				calculatedEndTime = new Date(calculatedStartTime.getTime() + pastTimeWindow);
 			} else {
-				this.error(
-					`Use the format YYYY-MM-DDTHH:MM:SSZ for endTime. Did you mean ${correctedEndTime}?`,
-				);
+				// subtract the past window from the current time to get the start time to fetch recent logs from now
+				calculatedEndTime = new Date();
+				calculatedStartTime = new Date(calculatedEndTime.getTime() - pastTimeWindow);
 			}
-			return;
-		}
-
-		// Properly format startTime and endTime strings before handing it over to SMS
-		const formattedStartTime = flags.startTime.replace(/-|:|Z/g, '').replace('T', 'T');
-		const formattedEndTime = flags.endTime.replace(/-|:|Z/g, '').replace('T', 'T');
-
-		// Convert formatted times to Date objects for comparison
-		const startTime = new Date(flags.startTime);
-		const endTime = new Date(flags.endTime);
-		const now = new Date(); // Current time
 
-		// Require both startTime and endTime
-		if (!startTime || !endTime) {
+			// Validate the calculated start and end times range
+			validateDateTimeRange(calculatedStartTime, calculatedEndTime);
+			// Properly format startTime and endTime strings before handing it over to SMS i.e remove the milliseconds
+			formattedStartTime = validateDateTimeFormat(calculatedStartTime);
+			formattedEndTime = validateDateTimeFormat(calculatedEndTime);
+		} else if ((flags.startTime && !flags.endTime) || (!flags.startTime && flags.endTime)) {
 			this.error('Provide both startTime and endTime.');
 			return;
-		}
-
-		// Get the current date and calculate the date 30 days ago, both in UTC
-		const today = new Date();
-		const thirtyDaysAgo = new Date(today);
-		thirtyDaysAgo.setUTCDate(today.getUTCDate() - 30);
-		// Validate that logs from beyond 30 days from today are not available
-		if (startTime < thirtyDaysAgo || endTime < thirtyDaysAgo) {
-			this.error('Cannot get logs more than 30 days old. Adjust your time range.');
+		} else {
+			this.error(
+				'Missing required flags. Provide at least one flag --startTime, --endTime, or --past --from or  type `mesh log:get-bulk --help` for more information.',
+			);
 			return;
 		}
 
@@ -115,37 +145,7 @@ class GetBulkLogCommand extends Command {
 		if (stats.size > 0) {
 			throw new Error(`Make sure the file: ${filename} is empty`);
 		}
-		// truncate milliseconds to ensure comparison is only done up to seconds
-		startTime.setMilliseconds(0);
-		endTime.setMilliseconds(0);
 
-		// Validate startTime < endTime
-		if (startTime > endTime) {
-			this.error('endTime must be greater than startTime');
-		}
-		// Validate that endTime is not greater than the current time (now)
-		if (endTime > now) {
-			this.error('endTime cannot be in the future. Provide a valid endTime.');
-			return;
-		}
-
-		// 4. Check if the duration between start and end times is greater than 30 minutes (1800 seconds)
-		const timeDifferenceInSeconds = (endTime.getTime() - startTime.getTime()) / 1000;
-
-		if (timeDifferenceInSeconds > 1800) {
-			const hours = Math.floor(timeDifferenceInSeconds / 3600); //hours calculation
-			const minutes = Math.floor((timeDifferenceInSeconds % 3600) / 60); //minutes calculation
-			const seconds = timeDifferenceInSeconds % 60; //seconds calculation
-
-			this.error(
-				`Max duration between startTime and endTime should be 30 minutes. Current duration is ${hours} hour${
-					hours !== 1 ? 's' : ''
-				} ${minutes} minute${minutes !== 1 ? 's' : ''} and ${seconds} second${
-					seconds !== 1 ? 's' : ''
-				}.`,
-			);
-			return;
-		}
 		logger.info('Calling initSdk...');
 		const { imsOrgCode, projectId, workspaceId, workspaceName } = await initSdk({
 			ignoreCache,

package/src/utils.js

@@ -6,6 +6,7 @@ const { readFile } = require('fs/promises');
 const { interpolateMesh } = require('./helpers');
 const dotenv = require('dotenv');
 const YAML = require('yaml');
+const ms = require('ms');
 const parseEnv = require('envsub/js/envsub-parser');
 const os = require('os');
 const chalk = require('chalk');
@@ -79,12 +80,18 @@ const fileNameFlag = Flags.string({
 
 const startTimeFlag = Flags.string({
 	description: 'Start time for the logs in UTC',
-	required: true,
 });
 
 const endTimeFlag = Flags.string({
 	description: 'End time for the logs in UTC',
-	required: true,
+});
+
+const pastFlag = Flags.string({
+	description: 'Past time window in mins',
+});
+
+const fromFlag = Flags.string({
+	description: `The from time in YYYY-MM-DD:HH:MM:SS format based on your system's time zone. It is used to fetch logs from the past and is the starting time for the past time duration.`,
 });
 
 const logFilenameFlag = Flags.string({
@@ -605,6 +612,143 @@ function suggestCorrectedDateFormat(inputDate) {
 	return correctedDate;
 }
 
+/**
+ * Parses a duration string representing a past time window and converts it to milliseconds.
+ *
+ * @param {string} pastTimeWindow - The past time duration to parse, e.g., "20 mins", "15 minutes".
+ * @returns {number} The duration in milliseconds.
+ */
+function parsePastDuration(pastTimeWindow) {
+	// Regular expression to match various formats of minute abbreviations
+	const pastDurationRegex = /^(\d+)\s*(m|mins?|minutes?)$/i;
+	const match = pastTimeWindow.match(pastDurationRegex);
+
+	if (!match) {
+		throw new Error(
+			'Invalid format. The past time window should be in minutes, for example, "20 mins", "15 minutes".',
+		);
+	}
+
+	// Convert the matched duration to milliseconds
+	const durationInMs = ms(pastTimeWindow);
+
+	return durationInMs;
+}
+
+/**
+ * Validates the provided startTime and endTime flags.
+ *
+ * @param {string} startTime - The start time in the format YYYY-MM-DDTHH:MM:SSZ
+ * @param {string} endTime - The end time in the format YYYY-MM-DDTHH:MM:SSZ
+ */
+function validateDateTimeRange(startTime, endTime) {
+	// Convert formatted times to Date objects for comparison
+	const start = new Date(startTime);
+	const end = new Date(endTime);
+	const now = new Date(); // Current time
+
+	// Get the current date and calculate the date 30 days ago, both in UTC
+	const today = new Date();
+	const thirtyDaysAgo = new Date(today);
+	thirtyDaysAgo.setUTCDate(today.getUTCDate() - 30);
+
+	// Validate that logs from beyond 30 days from today are not available
+	if (start < thirtyDaysAgo || end < thirtyDaysAgo) {
+		throw new Error('Cannot get logs more than 30 days old. Adjust your time range.');
+	}
+
+	// Truncate milliseconds to ensure comparison is only done up to seconds
+	start.setMilliseconds(0);
+	end.setMilliseconds(0);
+
+	// Validate startTime < endTime
+	if (start > end) {
+		throw new Error('endTime must be greater than startTime');
+	}
+
+	// Validate that endTime is not greater than the current time (now)
+	if (end > now) {
+		throw new Error('endTime cannot be in the future. Provide a valid endTime.');
+	}
+
+	if (start.getTime() === end.getTime()) {
+		throw new Error('The minimum duration is 1 minutes. The current duration is 0 minutes.');
+	}
+
+	// Check if the duration between start and end times is greater than 30 minutes (1800 seconds)
+	const timeDifferenceInSeconds = (end.getTime() - start.getTime()) / 1000;
+
+	if (timeDifferenceInSeconds > 1800) {
+		const hours = Math.floor(timeDifferenceInSeconds / 3600); // Hours calculation
+		const minutes = Math.floor((timeDifferenceInSeconds % 3600) / 60); // Minutes calculation
+		const seconds = timeDifferenceInSeconds % 60; // Seconds calculation
+
+		throw new Error(
+			`The maximum duration between startTime and endTime is 30 minutes. The current duration is ${hours} hour${
+				hours !== 1 ? 's' : ''
+			} ${minutes} minute${minutes !== 1 ? 's' : ''} and ${seconds} second${
+				seconds !== 1 ? 's' : ''
+			}.`,
+		);
+	}
+}
+
+/**
+ * Format and validate a given date string
+ * @param {string} time - The time string in the format YYYY-MM-DDTHH:MM:SSZ
+ * @returns {string|null} The formatted and validated date string or null if invalid
+ */
+function validateDateTimeFormat(time) {
+	// Regular expression to validate the input date format YYYY-MM-DDTHH:MM:SSZ
+	const dateTimeRegex = /^(?:(\d{4})-(0[1-9]|1[0-2])-(0[1-9]|[12]\d|3[01])T(0[0-9]|1[0-9]|2[0-3]):([0-5]\d):([0-5]\d)Z)$/;
+
+	// Convert the Date object to ISO string and remove milliseconds
+	let timeString = time.toISOString().replace(/\.\d{3}Z$/, 'Z');
+
+	// Validate the formatted time string against the regex
+	if (!dateTimeRegex.test(timeString)) {
+		const correctedDate = suggestCorrectedDateFormat(timeString);
+		if (!correctedDate) {
+			throw Error(
+				`Invalid date components in ${timeString}. Confirm the date information is correct.`,
+			);
+		}
+	}
+
+	// Return the formatted time string without dashes, colons, and 'Z'
+	return timeString.replace(/-|:|Z/g, '').replace('T', 'T');
+}
+
+/**
+ * Convert a given local time string to UTC time string
+ * @param {string} timeString - The time string in the format YYYY-MM-DD:HH:MM:SS
+ * @returns {string|null} The UTC time in the format YYYY-MM-DDTHH:mm:ss[Z]
+ */
+async function localToUTCTime(timeString) {
+	// Split the input time string into components
+	let [date, hour, minute, second] = timeString.split(':');
+	// Create a properly formatted date-time string
+	const formattedTimeString = `${date}T${hour}:${minute}:${second}`;
+	try {
+		//Get the local timezone
+		// takes the timezone where the javascript runtime is running
+		// reference https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/DateTimeFormat/resolvedOptions#browser_compatibility:~:text=The%20value%20provided%20for%20this%20property%20in%20the%20options%20argument%2C%20with%20default%20filled%20in%20as%20needed.%20It%20is%20an%20IANA%20time%20zone%20name.%20The%20default%20is%20the%20runtime%27s%20default%20time%20zone.
+		const timeZone = Intl.DateTimeFormat().resolvedOptions().timeZone;
+
+		// Create a Date object from the formatted time string
+		const localTime = new Date(formattedTimeString);
+
+		// Convert to UTC
+		const utcTime = new Date(localTime.toUTCString('en-US', { timeZone: timeZone }));
+
+		// Return the UTC time in ISO format without milliseconds
+		return utcTime.toISOString().replace(/\.\d{3}Z$/, 'Z');
+	} catch (error) {
+		logger.error(`Error: ${error.message}`);
+		throw error;
+	}
+}
+
 module.exports = {
 	ignoreCacheFlag,
 	autoConfirmActionFlag,
@@ -626,6 +770,12 @@ module.exports = {
 	startTimeFlag,
 	endTimeFlag,
 	logFilenameFlag,
+	pastFlag,
+	fromFlag,
 	suggestCorrectedDateFormat,
+	parsePastDuration,
+	validateDateTimeRange,
+	validateDateTimeFormat,
+	localToUTCTime,
 	cachePurgeAllActionFlag,
 };