@forge/cli-shared 9.4.0-next.10 → 9.4.0-next.12
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +14 -0
- package/out/app-logs/graphql-client.d.ts.map +1 -1
- package/out/app-logs/graphql-client.js +26 -0
- package/out/app-logs/view-logs.d.ts +15 -3
- package/out/app-logs/view-logs.d.ts.map +1 -1
- package/out/app-logs/view-logs.js +14 -4
- package/out/graphql/graphql-types.d.ts +422 -33
- package/out/graphql/graphql-types.d.ts.map +1 -1
- package/out/graphql/graphql-types.js +82 -50
- package/out/service/statsig-service.d.ts +1 -2
- package/out/service/statsig-service.d.ts.map +1 -1
- package/out/service/statsig-service.js +2 -2
- package/out/ui/text.d.ts +5 -1
- package/out/ui/text.d.ts.map +1 -1
- package/out/ui/text.js +6 -2
- package/package.json +2 -2
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,19 @@
|
|
|
1
1
|
# @forge/cli-shared
|
|
2
2
|
|
|
3
|
+
## 9.4.0-next.12
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- 47c4c75: Add a friendly fail-closed error when Forge CLI proxy setup fails.
|
|
8
|
+
- Updated dependencies [a38aef6]
|
|
9
|
+
- @forge/manifest@13.3.1-next.3
|
|
10
|
+
|
|
11
|
+
## 9.4.0-next.11
|
|
12
|
+
|
|
13
|
+
### Minor Changes
|
|
14
|
+
|
|
15
|
+
- d9f80a3: Add feature-gated combined artifact uploads to `forge build`. Combined builds are queued for server-side processing and can be monitored in the Developer Console.
|
|
16
|
+
|
|
3
17
|
## 9.4.0-next.10
|
|
4
18
|
|
|
5
19
|
### Minor Changes
|
|
@@ -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,sBAAsB,EAAE,UAAU,EAAE,EACpC,aAAa,EAAE,MAAM,GACpB,OAAO,CAAC,UAAU,EAAE,CAAC;
|
|
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,sBAAsB,EAAE,UAAU,EAAE,EACpC,aAAa,EAAE,MAAM,GACpB,OAAO,CAAC,UAAU,EAAE,CAAC;IA6IX,WAAW,CAAC,OAAO,EAAE,cAAc;IAwEhD,OAAO,CAAC,qBAAqB;IAU7B,OAAO,CAAC,eAAe;YAcT,iBAAiB;CAqDhC"}
|
|
@@ -44,6 +44,10 @@ class LogsGraphQLClient {
|
|
|
44
44
|
$limit: Int!,
|
|
45
45
|
$queryStartTime: String!,
|
|
46
46
|
$runtime: String
|
|
47
|
+
$functionKeys: [String]
|
|
48
|
+
$containers: [String]
|
|
49
|
+
$instances: [String]
|
|
50
|
+
$services: [String]
|
|
47
51
|
) {
|
|
48
52
|
appLogsWithMetaData(
|
|
49
53
|
appId: $appId
|
|
@@ -54,6 +58,10 @@ class LogsGraphQLClient {
|
|
|
54
58
|
query: {
|
|
55
59
|
dates: $dateSearchInput
|
|
56
60
|
runtime: $runtime
|
|
61
|
+
functionKeys: $functionKeys
|
|
62
|
+
containers: $containers
|
|
63
|
+
instances: $instances
|
|
64
|
+
services: $services
|
|
57
65
|
}
|
|
58
66
|
) {
|
|
59
67
|
appLogs {
|
|
@@ -68,6 +76,24 @@ class LogsGraphQLClient {
|
|
|
68
76
|
other
|
|
69
77
|
ts
|
|
70
78
|
}
|
|
79
|
+
appLogsFilterBuckets {
|
|
80
|
+
containers {
|
|
81
|
+
key
|
|
82
|
+
count
|
|
83
|
+
__typename
|
|
84
|
+
}
|
|
85
|
+
services {
|
|
86
|
+
key
|
|
87
|
+
count
|
|
88
|
+
__typename
|
|
89
|
+
}
|
|
90
|
+
functionKeys {
|
|
91
|
+
key
|
|
92
|
+
count
|
|
93
|
+
__typename
|
|
94
|
+
}
|
|
95
|
+
__typename
|
|
96
|
+
}
|
|
71
97
|
hasNextPage
|
|
72
98
|
totalLogs
|
|
73
99
|
__typename
|
|
@@ -16,8 +16,11 @@ export interface QueryDetails {
|
|
|
16
16
|
limit: number;
|
|
17
17
|
context?: InstallContext;
|
|
18
18
|
startTime?: string | null;
|
|
19
|
-
containers?: boolean;
|
|
20
19
|
grouped?: boolean;
|
|
20
|
+
containerKey?: string;
|
|
21
|
+
containerInstance?: string;
|
|
22
|
+
serviceKey?: string;
|
|
23
|
+
functionKey?: string;
|
|
21
24
|
}
|
|
22
25
|
export type AppLogsDetails = {
|
|
23
26
|
appId: string;
|
|
@@ -33,6 +36,10 @@ export type AppLogsDetailsV2 = AppLogsDetails & {
|
|
|
33
36
|
dateSearchInput: DateSearchInput;
|
|
34
37
|
queryStartTime: string;
|
|
35
38
|
maxLimit: number;
|
|
39
|
+
containers?: string[];
|
|
40
|
+
instances?: string[];
|
|
41
|
+
services?: string[];
|
|
42
|
+
functionKeys?: string[];
|
|
36
43
|
};
|
|
37
44
|
export interface InvocationQueryDetails {
|
|
38
45
|
environmentKey: string;
|
|
@@ -71,8 +78,13 @@ export declare class ViewAppLogsCommand {
|
|
|
71
78
|
private readonly logsClient;
|
|
72
79
|
private readonly statsigService;
|
|
73
80
|
constructor(getAppConfig: AppConfigProvider, appEnvironmentClient: AppEnvironmentClient, globalEdgeClient: GlobalEdgeClient, logsClient: ViewAppLogsClient, statsigService: StatsigService);
|
|
74
|
-
getAll({ environmentKey, limit, context, startTime, grouped
|
|
75
|
-
getLogs(details: AppLogsDetails
|
|
81
|
+
getAll({ environmentKey, limit, context, containerKey, containerInstance, serviceKey, functionKey, startTime, grouped }: QueryDetails): Promise<Invocation[]>;
|
|
82
|
+
getLogs(details: AppLogsDetails, containerDetails: {
|
|
83
|
+
containerKey?: string;
|
|
84
|
+
containerInstance?: string;
|
|
85
|
+
serviceKey?: string;
|
|
86
|
+
functionKey?: string;
|
|
87
|
+
}): Promise<Invocation[]>;
|
|
76
88
|
getOne(details: InvocationQueryDetails): Promise<Invocation>;
|
|
77
89
|
}
|
|
78
90
|
//# sourceMappingURL=view-logs.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"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,
|
|
1
|
+
{"version":3,"file":"view-logs.d.ts","sourceRoot":"","sources":["../../src/app-logs/view-logs.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,7 +21,7 @@ class ViewAppLogsCommand {
|
|
|
21
21
|
this.logsClient = logsClient;
|
|
22
22
|
this.statsigService = statsigService;
|
|
23
23
|
}
|
|
24
|
-
async getAll({ environmentKey, limit, context,
|
|
24
|
+
async getAll({ environmentKey, limit, context, containerKey, containerInstance, serviceKey, functionKey, startTime = null, grouped = false }) {
|
|
25
25
|
const { id: appId } = await this.getAppConfig();
|
|
26
26
|
const [environmentId, cloudId] = await Promise.all([
|
|
27
27
|
this.appEnvironmentClient.getAppEnvironmentId(appId, environmentKey),
|
|
@@ -36,16 +36,22 @@ class ViewAppLogsCommand {
|
|
|
36
36
|
contextAri: contextAri ? [contextAri] : undefined,
|
|
37
37
|
grouped
|
|
38
38
|
};
|
|
39
|
-
if (
|
|
39
|
+
if (containerKey || containerInstance || serviceKey) {
|
|
40
40
|
details.runtime = Runtime.CONTAINER.toLowerCase();
|
|
41
41
|
}
|
|
42
42
|
const isV2ApiEnabled = await this.statsigService.isLogsV2ApiEnabled();
|
|
43
43
|
if (isV2ApiEnabled) {
|
|
44
|
-
|
|
44
|
+
const containerDetails = {
|
|
45
|
+
containerKey,
|
|
46
|
+
containerInstance,
|
|
47
|
+
serviceKey,
|
|
48
|
+
functionKey
|
|
49
|
+
};
|
|
50
|
+
return this.getLogs(details, containerDetails);
|
|
45
51
|
}
|
|
46
52
|
return this.logsClient.viewAppLogs(details);
|
|
47
53
|
}
|
|
48
|
-
async getLogs(details) {
|
|
54
|
+
async getLogs(details, containerDetails) {
|
|
49
55
|
const latestStart = new Date().toISOString();
|
|
50
56
|
let earliestStart = new Date();
|
|
51
57
|
if (details.startTime) {
|
|
@@ -60,6 +66,10 @@ class ViewAppLogsCommand {
|
|
|
60
66
|
};
|
|
61
67
|
return this.logsClient.viewAppLogsV2({
|
|
62
68
|
...details,
|
|
69
|
+
containers: containerDetails.containerKey ? [containerDetails.containerKey] : [],
|
|
70
|
+
instances: containerDetails.containerInstance ? [containerDetails.containerInstance] : [],
|
|
71
|
+
services: containerDetails.serviceKey ? [containerDetails.serviceKey] : [],
|
|
72
|
+
functionKeys: containerDetails.functionKey ? [containerDetails.functionKey] : [],
|
|
63
73
|
offset: 0,
|
|
64
74
|
dateSearchInput,
|
|
65
75
|
queryStartTime: earliestStart.toISOString(),
|