npm package diff
Package: @forge/cli-shared
Versions: 8.0.0-next.10-experimental-97e4b11 - 8.0.0-next.12
Modified: package/out/app-logs/graphql-client.js
Index: package/out/app-logs/graphql-client.js
===================================================================
--- package/out/app-logs/graphql-client.js
+++ package/out/app-logs/graphql-client.js
@@ -33,9 +33,9 @@
...this.extractInvocationInfo(result.metadata),
logs: result.lines.map(sanitizeLogLine)
};
}
- async viewAppLogsV2(details, invocationMap, totalRecieved) {
+ async viewAppLogsV2(details, invocationMap, logLinesWithInvocation, totalRecieved) {
const query = `
query forge_cli_getApplicationLogsV2(
$appId: String!,
$environmentId: String!,
@@ -78,35 +78,50 @@
if (!result || !result.appLogsWithMetaData || !result.appLogsWithMetaData.appLogs) {
throw new MissingAppLogsError();
}
for (const logLine of result.appLogsWithMetaData.appLogs) {
- let logsMetadata = invocationMap.get(logLine.invocationId);
- if (!logsMetadata) {
- logsMetadata = {
- id: logLine.invocationId,
- appVersion: logLine.appVersion,
- function: logLine.functionKey || undefined,
- trigger: undefined,
- logs: []
- };
+ if (details.grouped) {
+ let logsMetadata = invocationMap.get(logLine.invocationId);
+ if (!logsMetadata) {
+ logsMetadata = {
+ id: logLine.invocationId,
+ appVersion: logLine.appVersion,
+ function: logLine.functionKey || undefined,
+ trigger: undefined,
+ logs: []
+ };
+ }
+ logsMetadata.logs.push({
+ message: logLine.message || undefined,
+ other: logLine.other ? JSON.parse(logLine.other) : [],
+ level: logLine.lvl || undefined,
+ timestamp: logLine.ts
+ });
+ invocationMap.set(logLine.invocationId, logsMetadata);
}
- logsMetadata.logs.push({
- message: logLine.message || undefined,
- other: logLine.other ? JSON.parse(logLine.other) : [],
- level: logLine.lvl || undefined,
- timestamp: logLine.ts
+ logLinesWithInvocation.push({
+ id: logLine.invocationId,
+ appVersion: logLine.appVersion,
+ function: logLine.functionKey || undefined,
+ logs: [
+ {
+ message: logLine.message || undefined,
+ other: logLine.other ? JSON.parse(logLine.other) : [],
+ level: logLine.lvl || undefined,
+ timestamp: logLine.ts
+ }
+ ]
});
- invocationMap.set(logLine.invocationId, logsMetadata);
}
const serverSideMaxLimit = result.appLogsWithMetaData.appLogs.length;
totalRecieved += serverSideMaxLimit;
if (result.appLogsWithMetaData.hasNextPage && details.maxLimit > totalRecieved) {
details.offset = details.offset + serverSideMaxLimit;
details.limit = details.limit - serverSideMaxLimit;
- return this.viewAppLogsV2(details, invocationMap, totalRecieved);
+ return this.viewAppLogsV2(details, invocationMap, logLinesWithInvocation, totalRecieved);
}
const invocations = [...invocationMap.values()];
- return invocations;
+ return details.grouped ? invocations : logLinesWithInvocation;
}
async viewAppLogs(details) {
const query = `
query forge_cli_getApplicationLogs($appId: ID!, $environmentId: [ID!]!, $limit: Int!, $contextAri: [ID!], $startTime: String) {Modified: package/out/graphql/graphql-types.js
Large diffs are not rendered by default.
Modified: package/out/app-logs/view-logs.js
Index: package/out/app-logs/view-logs.js
===================================================================
--- package/out/app-logs/view-logs.js
+++ package/out/app-logs/view-logs.js
@@ -20,9 +20,9 @@
this.globalEdgeClient = globalEdgeClient;
this.logsClient = logsClient;
this.statsigService = statsigService;
}
- async getAll({ environmentKey, limit, context, startTime = null, containers = false }) {
+ async getAll({ environmentKey, limit, context, startTime = null, grouped = false, containers = false }) {
const { id: appId } = await this.getAppConfig();
const [environmentId, cloudId] = await Promise.all([
this.appEnvironmentClient.getAppEnvironmentId(appId, environmentKey),
context ? this.globalEdgeClient.getCloudId(context.site) : undefined
@@ -32,9 +32,10 @@
appId: ari_1.EcosystemAppAri.parse(appId).appId,
environmentId,
limit,
startTime,
- contextAri: contextAri ? [contextAri] : undefined
+ contextAri: contextAri ? [contextAri] : undefined,
+ grouped
};
if (containers) {
details.runtime = Runtime.CONTAINER.toLowerCase();
}
@@ -62,9 +63,9 @@
offset: 0,
dateSearchInput,
queryStartTime: earliestStart.toISOString(),
maxLimit: details.limit
- }, new Map(), 0);
+ }, new Map(), [], 0);
}
async getOne(details) {
return this.logsClient.viewInvocationLogs({ invocationId: details.invocationId });
}Modified: package/package.json
Index: package/package.json
===================================================================
--- package/package.json
+++ package/package.json
@@ -1,7 +1,7 @@
{
"name": "@forge/cli-shared",
- "version": "8.0.0-next.10-experimental-97e4b11",
+ "version": "8.0.0-next.12",
"description": "Common functionality for Forge CLI",
"author": "Atlassian",
"license": "SEE LICENSE IN LICENSE.txt",
"main": "out/index.js",
@@ -11,9 +11,9 @@
"compile": "tsc -b -v",
"generate-graphql-types": "graphql-codegen --config src/graphql/codegen.yml"
},
"dependencies": {
- "@forge/manifest": "10.0.0-next.9-experimental-97e4b11",
+ "@forge/manifest": "10.0.0-next.10",
"@forge/util": "1.4.9",
"@forge/i18n": "0.0.6",
"@sentry/node": "7.106.0",
"adm-zip": "^0.5.10",Modified: package/out/app-logs/graphql-client.d.ts.map
Index: package/out/app-logs/graphql-client.d.ts.map
===================================================================
--- package/out/app-logs/graphql-client.d.ts.map
+++ package/out/app-logs/graphql-client.d.ts.map
@@ -1,1 +1,1 @@
-{"version":3,"file":"graphql-client.d.ts","sourceRoot":"","sources":["../../src/app-logs/graphql-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAA6E,aAAa,EAAE,MAAM,YAAY,CAAC;AAEtH,OAAO,EACL,wBAAwB,EACxB,cAAc,EACd,gBAAgB,EAChB,UAAU,EACV,iBAAiB,EACjB,iBAAiB,EAClB,MAAM,aAAa,CAAC;AAwBrB,qBAAa,mBAAoB,SAAQ,KAAK;CAAG;AACjD,qBAAa,uBAAwB,SAAQ,KAAK;CAAG;AACrD,qBAAa,sBAAuB,SAAQ,KAAK;CAAG;AACpD,qBAAa,oBAAqB,SAAQ,KAAK;CAAG;AAElD,qBAAa,iBAAkB,YAAW,iBAAiB;IAC7C,OAAO,CAAC,QAAQ,CAAC,aAAa;gBAAb,aAAa,EAAE,aAAa;IAE5C,kBAAkB,CAAC,OAAO,EAAE,wBAAwB;;;;;;;IAapD,aAAa,CACxB,OAAO,EAAE,gBAAgB,EACzB,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,EACtC,aAAa,EAAE,MAAM,GACpB,OAAO,CAAC,UAAU,EAAE,CAAC;IAoFX,WAAW,CAAC,OAAO,EAAE,cAAc;IAwEhD,OAAO,CAAC,qBAAqB;IAU7B,OAAO,CAAC,eAAe;YAcT,iBAAiB;CAqDhC"}
\ No newline at end of file
+{"version":3,"file":"graphql-client.d.ts","sourceRoot":"","sources":["../../src/app-logs/graphql-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAA6E,aAAa,EAAE,MAAM,YAAY,CAAC;AAEtH,OAAO,EACL,wBAAwB,EACxB,cAAc,EACd,gBAAgB,EAChB,UAAU,EACV,iBAAiB,EACjB,iBAAiB,EAClB,MAAM,aAAa,CAAC;AAwBrB,qBAAa,mBAAoB,SAAQ,KAAK;CAAG;AACjD,qBAAa,uBAAwB,SAAQ,KAAK;CAAG;AACrD,qBAAa,sBAAuB,SAAQ,KAAK;CAAG;AACpD,qBAAa,oBAAqB,SAAQ,KAAK;CAAG;AAElD,qBAAa,iBAAkB,YAAW,iBAAiB;IAC7C,OAAO,CAAC,QAAQ,CAAC,aAAa;gBAAb,aAAa,EAAE,aAAa;IAE5C,kBAAkB,CAAC,OAAO,EAAE,wBAAwB;;;;;;;IAapD,aAAa,CACxB,OAAO,EAAE,gBAAgB,EACzB,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,EACtC,sBAAsB,EAAE,UAAU,EAAE,EACpC,aAAa,EAAE,MAAM,GACpB,OAAO,CAAC,UAAU,EAAE,CAAC;IAoGX,WAAW,CAAC,OAAO,EAAE,cAAc;IAwEhD,OAAO,CAAC,qBAAqB;IAU7B,OAAO,CAAC,eAAe;YAcT,iBAAiB;CAqDhC"}
\ No newline at end of fileModified: package/out/graphql/graphql-types.d.ts.map
Large diffs are not rendered by default.
Modified: package/out/app-logs/view-logs.d.ts.map
Index: package/out/app-logs/view-logs.d.ts.map
===================================================================
--- package/out/app-logs/view-logs.d.ts.map
+++ package/out/app-logs/view-logs.d.ts.map
@@ -1,1 +1,1 @@
-{"version":3,"file":"view-logs.d.ts","sourceRoot":"","sources":["../../src/app-logs/view-logs.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
+{"version":3,"file":"view-logs.d.ts","sourceRoot":"","sources":["../../src/app-logs/view-logs.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAmB,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAE1B,OAAO,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAE5C,OAAO,EAAE,oBAAoB,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AACnE,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAE5C,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,GAAG,CAAC;IACV,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,kBAAkB;IACjC,cAAc,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,YAAY;IAC3B,cAAc,EAAE,MAAM,CAAC;IACvB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,cAAc,CAAC;IACzB,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,oBAAY,cAAc,GAAG;IAC3B,KAAK,EAAE,MAAM,CAAC;IACd,aAAa,EAAE,MAAM,CAAC;IACtB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,UAAU,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACzB,CAAC;AAEF,oBAAY,gBAAgB,GAAG,cAAc,GAAG;IAC9C,MAAM,EAAE,MAAM,CAAC;IACf,eAAe,EAAE,eAAe,CAAC;IACjC,cAAc,EAAE,MAAM,CAAC;IACvB,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,MAAM,WAAW,sBAAsB;IACrC,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,cAAc,CAAC;CAC1B;AAED,MAAM,WAAW,wBAAwB;IACvC,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,iBAAiB;IAChC,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,GAAG,CAAC;CACb;AAED,MAAM,WAAW,UAAU;IACzB,EAAE,EAAE,MAAM,CAAC;IACX,UAAU,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAAC;IACtC,IAAI,EAAE,iBAAiB,EAAE,CAAC;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,oBAAY,OAAO;IACjB,SAAS,cAAc;IACvB,SAAS,cAAc;CACxB;AAED,MAAM,WAAW,iBAAiB;IAChC,WAAW,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC;IAC5D,aAAa,CACX,OAAO,EAAE,gBAAgB,EACzB,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,EACtC,sBAAsB,EAAE,UAAU,EAAE,EACpC,aAAa,EAAE,MAAM,GACpB,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC;IACzB,kBAAkB,CAAC,OAAO,EAAE,wBAAwB,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;CAC5E;AAED,qBAAa,kBAAkB;IAK3B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,oBAAoB;IACrC,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,cAAc;gBAJd,YAAY,EAAE,iBAAiB,EAC/B,oBAAoB,EAAE,oBAAoB,EAC1C,gBAAgB,EAAE,gBAAgB,EAClC,UAAU,EAAE,iBAAiB,EAC7B,cAAc,EAAE,cAAc;IAGpC,MAAM,CAAC,EAClB,cAAc,EACd,KAAK,EACL,OAAO,EACP,SAAgB,EAChB,OAAe,EACf,UAAkB,EACnB,EAAE,YAAY,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC;IA+B1B,OAAO,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC;IA4BvD,MAAM,CAAC,OAAO,EAAE,sBAAsB,GAAG,OAAO,CAAC,UAAU,CAAC;CAI1E"}
\ No newline at end of fileModified: package/CHANGELOG.md
Large diffs are not rendered by default.
Modified: package/out/app-logs/graphql-client.d.ts
Index: package/out/app-logs/graphql-client.d.ts
===================================================================
--- package/out/app-logs/graphql-client.d.ts
+++ package/out/app-logs/graphql-client.d.ts
@@ -17,9 +17,9 @@
appVersion: string | null | undefined;
function?: string | undefined;
trigger?: string | undefined;
}>;
- viewAppLogsV2(details: AppLogsDetailsV2, invocationMap: Map<string, Invocation>, totalRecieved: number): Promise<Invocation[]>;
+ viewAppLogsV2(details: AppLogsDetailsV2, invocationMap: Map<string, Invocation>, logLinesWithInvocation: Invocation[], totalRecieved: number): Promise<Invocation[]>;
viewAppLogs(details: AppLogsDetails): Promise<Invocation[]>;
private extractInvocationInfo;
private extractLogLines;
private getInvocationLogs;Modified: package/out/graphql/graphql-types.d.ts
Large diffs are not rendered by default.
Modified: package/out/app-logs/view-logs.d.ts
Index: package/out/app-logs/view-logs.d.ts
===================================================================
--- package/out/app-logs/view-logs.d.ts
+++ package/out/app-logs/view-logs.d.ts
@@ -17,13 +17,15 @@
limit: number;
context?: InstallContext;
startTime?: string | null;
containers?: boolean;
+ grouped?: boolean;
}
export declare type AppLogsDetails = {
appId: string;
environmentId: string;
limit: number;
+ grouped?: boolean;
startTime?: string | null;
contextAri?: [Ari];
runtime?: string | null;
};
@@ -59,9 +61,9 @@
CONTAINER = "CONTAINER"
}
export interface ViewAppLogsClient {
viewAppLogs(details: AppLogsDetails): Promise<Invocation[]>;
- viewAppLogsV2(details: AppLogsDetailsV2, invocationMap: Map<string, Invocation>, totalRecieved: number): Promise<Invocation[]>;
+ viewAppLogsV2(details: AppLogsDetailsV2, invocationMap: Map<string, Invocation>, logLinesWithInvocation: Invocation[], totalRecieved: number): Promise<Invocation[]>;
viewInvocationLogs(details: AppInvocationLogsDetails): Promise<Invocation>;
}
export declare class ViewAppLogsCommand {
private readonly getAppConfig;
@@ -69,9 +71,9 @@
private readonly globalEdgeClient;
private readonly logsClient;
private readonly statsigService;
constructor(getAppConfig: AppConfigProvider, appEnvironmentClient: AppEnvironmentClient, globalEdgeClient: GlobalEdgeClient, logsClient: ViewAppLogsClient, statsigService: StatsigService);
- getAll({ environmentKey, limit, context, startTime, containers }: QueryDetails): Promise<Invocation[]>;
+ getAll({ environmentKey, limit, context, startTime, grouped, containers }: QueryDetails): Promise<Invocation[]>;
getLogs(details: AppLogsDetails): Promise<Invocation[]>;
getOne(details: InvocationQueryDetails): Promise<Invocation>;
}
//# sourceMappingURL=view-logs.d.ts.map
\ No newline at end of file