@datadog/datadog-ci 2.7.0 → 2.8.1
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/dist/commands/git-metadata/gitdb.d.ts +1 -1
- package/dist/commands/git-metadata/gitdb.js.map +1 -1
- package/dist/commands/git-metadata/upload.js +7 -7
- package/dist/commands/git-metadata/upload.js.map +1 -1
- package/dist/commands/lambda/constants.d.ts +1 -0
- package/dist/commands/lambda/constants.js +3 -2
- package/dist/commands/lambda/constants.js.map +1 -1
- package/dist/commands/lambda/functions/commons.d.ts +26 -25
- package/dist/commands/lambda/functions/commons.js +67 -93
- package/dist/commands/lambda/functions/commons.js.map +1 -1
- package/dist/commands/lambda/functions/instrument.d.ts +6 -5
- package/dist/commands/lambda/functions/instrument.js +11 -11
- package/dist/commands/lambda/functions/instrument.js.map +1 -1
- package/dist/commands/lambda/functions/uninstrument.d.ts +6 -5
- package/dist/commands/lambda/functions/uninstrument.js +11 -10
- package/dist/commands/lambda/functions/uninstrument.js.map +1 -1
- package/dist/commands/lambda/instrument.d.ts +2 -0
- package/dist/commands/lambda/instrument.js +43 -27
- package/dist/commands/lambda/instrument.js.map +1 -1
- package/dist/commands/lambda/interfaces.d.ts +13 -10
- package/dist/commands/lambda/loggroup.d.ts +10 -7
- package/dist/commands/lambda/loggroup.js +45 -26
- package/dist/commands/lambda/loggroup.js.map +1 -1
- package/dist/commands/lambda/tags.d.ts +7 -5
- package/dist/commands/lambda/tags.js +29 -17
- package/dist/commands/lambda/tags.js.map +1 -1
- package/dist/commands/lambda/uninstrument.d.ts +1 -0
- package/dist/commands/lambda/uninstrument.js +32 -18
- package/dist/commands/lambda/uninstrument.js.map +1 -1
- package/dist/commands/react-native/interfaces.d.ts +2 -1
- package/dist/commands/react-native/interfaces.js +3 -1
- package/dist/commands/react-native/interfaces.js.map +1 -1
- package/dist/commands/react-native/renderer.d.ts +1 -1
- package/dist/commands/react-native/renderer.js +6 -7
- package/dist/commands/react-native/renderer.js.map +1 -1
- package/dist/commands/react-native/upload.js +10 -7
- package/dist/commands/react-native/upload.js.map +1 -1
- package/dist/commands/react-native/utils.d.ts +2 -0
- package/dist/commands/react-native/utils.js +14 -1
- package/dist/commands/react-native/utils.js.map +1 -1
- package/dist/commands/react-native/xcode.js +2 -0
- package/dist/commands/react-native/xcode.js.map +1 -1
- package/dist/commands/synthetics/command.d.ts +1 -0
- package/dist/commands/synthetics/command.js +5 -3
- package/dist/commands/synthetics/command.js.map +1 -1
- package/dist/commands/synthetics/mobile.d.ts +1 -2
- package/dist/commands/synthetics/mobile.js +34 -9
- package/dist/commands/synthetics/mobile.js.map +1 -1
- package/dist/commands/synthetics/run-test.js +1 -1
- package/dist/commands/synthetics/run-test.js.map +1 -1
- package/dist/commands/synthetics/utils.d.ts +9 -10
- package/dist/commands/synthetics/utils.js +16 -10
- package/dist/commands/synthetics/utils.js.map +1 -1
- package/dist/constants.js +1 -0
- package/dist/constants.js.map +1 -1
- package/dist/{commands/git-metadata/utils.d.ts → helpers/logger.d.ts} +0 -1
- package/dist/{commands/git-metadata/utils.js → helpers/logger.js} +2 -17
- package/dist/helpers/logger.js.map +1 -0
- package/dist/helpers/utils.d.ts +1 -0
- package/dist/helpers/utils.js +7 -1
- package/dist/helpers/utils.js.map +1 -1
- package/package.json +11 -5
- package/dist/commands/git-metadata/utils.js.map +0 -1
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { CloudWatchLogsClient, CreateLogGroupCommandInput, DeleteSubscriptionFilterCommandInput, PutSubscriptionFilterCommandInput } from '@aws-sdk/client-cloudwatch-logs';
|
|
2
2
|
import { LogGroupConfiguration } from './interfaces';
|
|
3
3
|
export declare enum SubscriptionState {
|
|
4
4
|
Empty = 0,
|
|
@@ -6,9 +6,12 @@ export declare enum SubscriptionState {
|
|
|
6
6
|
WrongDestinationOwned = 2,
|
|
7
7
|
WrongDestinationUnowned = 3
|
|
8
8
|
}
|
|
9
|
-
export declare const applyLogGroupConfig: (
|
|
10
|
-
export declare const
|
|
11
|
-
export declare const
|
|
12
|
-
export declare const
|
|
13
|
-
export declare const
|
|
14
|
-
export declare const
|
|
9
|
+
export declare const applyLogGroupConfig: (client: CloudWatchLogsClient, config: LogGroupConfiguration) => Promise<void>;
|
|
10
|
+
export declare const createLogGroup: (client: CloudWatchLogsClient, input: CreateLogGroupCommandInput) => Promise<void>;
|
|
11
|
+
export declare const deleteSubscriptionFilter: (client: CloudWatchLogsClient, input: DeleteSubscriptionFilterCommandInput) => Promise<void>;
|
|
12
|
+
export declare const putSubscriptionFilter: (client: CloudWatchLogsClient, input: PutSubscriptionFilterCommandInput) => Promise<void>;
|
|
13
|
+
export declare const calculateLogGroupUpdateRequest: (client: CloudWatchLogsClient, logGroupName: string, forwarderARN: string) => Promise<LogGroupConfiguration | undefined>;
|
|
14
|
+
export declare const calculateLogGroupRemoveRequest: (client: CloudWatchLogsClient, logGroupName: string, forwarderARN: string) => Promise<LogGroupConfiguration>;
|
|
15
|
+
export declare const hasLogGroup: (client: CloudWatchLogsClient, logGroupName: string) => Promise<boolean>;
|
|
16
|
+
export declare const getSubscriptionFilterState: (client: CloudWatchLogsClient, logGroupName: string, forwarderARN: string) => Promise<SubscriptionState>;
|
|
17
|
+
export declare const getSubscriptionFilters: (client: CloudWatchLogsClient, logGroupName: string) => Promise<import("@aws-sdk/client-cloudwatch-logs").SubscriptionFilter[] | undefined>;
|
|
@@ -9,7 +9,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
9
9
|
});
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
-
exports.getSubscriptionFilters = exports.getSubscriptionFilterState = exports.hasLogGroup = exports.calculateLogGroupRemoveRequest = exports.calculateLogGroupUpdateRequest = exports.applyLogGroupConfig = exports.SubscriptionState = void 0;
|
|
12
|
+
exports.getSubscriptionFilters = exports.getSubscriptionFilterState = exports.hasLogGroup = exports.calculateLogGroupRemoveRequest = exports.calculateLogGroupUpdateRequest = exports.putSubscriptionFilter = exports.deleteSubscriptionFilter = exports.createLogGroup = exports.applyLogGroupConfig = exports.SubscriptionState = void 0;
|
|
13
|
+
const client_cloudwatch_logs_1 = require("@aws-sdk/client-cloudwatch-logs");
|
|
13
14
|
const constants_1 = require("./constants");
|
|
14
15
|
var SubscriptionState;
|
|
15
16
|
(function (SubscriptionState) {
|
|
@@ -19,36 +20,51 @@ var SubscriptionState;
|
|
|
19
20
|
SubscriptionState[SubscriptionState["WrongDestinationUnowned"] = 3] = "WrongDestinationUnowned";
|
|
20
21
|
})(SubscriptionState = exports.SubscriptionState || (exports.SubscriptionState = {}));
|
|
21
22
|
const MAX_LOG_GROUP_SUBSCRIPTIONS = 2;
|
|
22
|
-
const applyLogGroupConfig = (
|
|
23
|
-
const {
|
|
24
|
-
if (
|
|
25
|
-
yield
|
|
23
|
+
const applyLogGroupConfig = (client, config) => __awaiter(void 0, void 0, void 0, function* () {
|
|
24
|
+
const { createLogGroupCommandInput, deleteSubscriptionFilterCommandInput, putSubscriptionFilterCommandInput } = config;
|
|
25
|
+
if (createLogGroupCommandInput !== undefined) {
|
|
26
|
+
yield exports.createLogGroup(client, createLogGroupCommandInput);
|
|
26
27
|
}
|
|
27
|
-
if (
|
|
28
|
-
yield
|
|
28
|
+
if (deleteSubscriptionFilterCommandInput !== undefined) {
|
|
29
|
+
yield exports.deleteSubscriptionFilter(client, deleteSubscriptionFilterCommandInput);
|
|
29
30
|
}
|
|
30
|
-
if (
|
|
31
|
-
yield
|
|
31
|
+
if (putSubscriptionFilterCommandInput !== undefined) {
|
|
32
|
+
yield exports.putSubscriptionFilter(client, putSubscriptionFilterCommandInput);
|
|
32
33
|
}
|
|
33
34
|
});
|
|
34
35
|
exports.applyLogGroupConfig = applyLogGroupConfig;
|
|
35
|
-
const
|
|
36
|
+
const createLogGroup = (client, input) => __awaiter(void 0, void 0, void 0, function* () {
|
|
37
|
+
const command = new client_cloudwatch_logs_1.CreateLogGroupCommand(input);
|
|
38
|
+
yield client.send(command);
|
|
39
|
+
});
|
|
40
|
+
exports.createLogGroup = createLogGroup;
|
|
41
|
+
const deleteSubscriptionFilter = (client, input) => __awaiter(void 0, void 0, void 0, function* () {
|
|
42
|
+
const command = new client_cloudwatch_logs_1.DeleteSubscriptionFilterCommand(input);
|
|
43
|
+
yield client.send(command);
|
|
44
|
+
});
|
|
45
|
+
exports.deleteSubscriptionFilter = deleteSubscriptionFilter;
|
|
46
|
+
const putSubscriptionFilter = (client, input) => __awaiter(void 0, void 0, void 0, function* () {
|
|
47
|
+
const command = new client_cloudwatch_logs_1.PutSubscriptionFilterCommand(input);
|
|
48
|
+
yield client.send(command);
|
|
49
|
+
});
|
|
50
|
+
exports.putSubscriptionFilter = putSubscriptionFilter;
|
|
51
|
+
const calculateLogGroupUpdateRequest = (client, logGroupName, forwarderARN) => __awaiter(void 0, void 0, void 0, function* () {
|
|
36
52
|
const config = {
|
|
37
53
|
logGroupName,
|
|
38
|
-
|
|
54
|
+
putSubscriptionFilterCommandInput: {
|
|
39
55
|
destinationArn: forwarderARN,
|
|
40
56
|
filterName: constants_1.SUBSCRIPTION_FILTER_NAME,
|
|
41
57
|
filterPattern: '',
|
|
42
58
|
logGroupName,
|
|
43
59
|
},
|
|
44
60
|
};
|
|
45
|
-
const logGroupPresent = yield exports.hasLogGroup(
|
|
61
|
+
const logGroupPresent = yield exports.hasLogGroup(client, logGroupName);
|
|
46
62
|
let subscriptionState = SubscriptionState.Empty;
|
|
47
63
|
if (logGroupPresent) {
|
|
48
|
-
subscriptionState = yield exports.getSubscriptionFilterState(
|
|
64
|
+
subscriptionState = yield exports.getSubscriptionFilterState(client, logGroupName, forwarderARN);
|
|
49
65
|
}
|
|
50
66
|
else {
|
|
51
|
-
config.
|
|
67
|
+
config.createLogGroupCommandInput = {
|
|
52
68
|
logGroupName,
|
|
53
69
|
};
|
|
54
70
|
}
|
|
@@ -63,14 +79,14 @@ const calculateLogGroupUpdateRequest = (logs, logGroupName, forwarderARN) => __a
|
|
|
63
79
|
return config;
|
|
64
80
|
});
|
|
65
81
|
exports.calculateLogGroupUpdateRequest = calculateLogGroupUpdateRequest;
|
|
66
|
-
const calculateLogGroupRemoveRequest = (
|
|
82
|
+
const calculateLogGroupRemoveRequest = (client, logGroupName, forwarderARN) => __awaiter(void 0, void 0, void 0, function* () {
|
|
67
83
|
const config = {
|
|
68
84
|
logGroupName,
|
|
69
85
|
};
|
|
70
|
-
const subscriptionFilters = yield exports.getSubscriptionFilters(
|
|
86
|
+
const subscriptionFilters = yield exports.getSubscriptionFilters(client, logGroupName);
|
|
71
87
|
const subscriptionToRemove = subscriptionFilters === null || subscriptionFilters === void 0 ? void 0 : subscriptionFilters.find((subscription) => subscription.destinationArn === forwarderARN || subscription.filterName === constants_1.SUBSCRIPTION_FILTER_NAME);
|
|
72
88
|
if (subscriptionToRemove) {
|
|
73
|
-
config.
|
|
89
|
+
config.deleteSubscriptionFilterCommandInput = {
|
|
74
90
|
filterName: subscriptionToRemove.filterName,
|
|
75
91
|
logGroupName,
|
|
76
92
|
};
|
|
@@ -78,20 +94,21 @@ const calculateLogGroupRemoveRequest = (logs, logGroupName, forwarderARN) => __a
|
|
|
78
94
|
return config;
|
|
79
95
|
});
|
|
80
96
|
exports.calculateLogGroupRemoveRequest = calculateLogGroupRemoveRequest;
|
|
81
|
-
const hasLogGroup = (
|
|
82
|
-
const
|
|
97
|
+
const hasLogGroup = (client, logGroupName) => __awaiter(void 0, void 0, void 0, function* () {
|
|
98
|
+
const input = {
|
|
83
99
|
logGroupNamePrefix: logGroupName,
|
|
84
100
|
};
|
|
85
|
-
const
|
|
86
|
-
const
|
|
101
|
+
const command = new client_cloudwatch_logs_1.DescribeLogGroupsCommand(input);
|
|
102
|
+
const response = yield client.send(command);
|
|
103
|
+
const { logGroups } = response;
|
|
87
104
|
if (logGroups === undefined || logGroups.length === 0) {
|
|
88
105
|
return false;
|
|
89
106
|
}
|
|
90
107
|
return logGroups.find((lg) => lg.logGroupName === logGroupName) !== undefined;
|
|
91
108
|
});
|
|
92
109
|
exports.hasLogGroup = hasLogGroup;
|
|
93
|
-
const getSubscriptionFilterState = (
|
|
94
|
-
const subscriptionFilters = yield exports.getSubscriptionFilters(
|
|
110
|
+
const getSubscriptionFilterState = (client, logGroupName, forwarderARN) => __awaiter(void 0, void 0, void 0, function* () {
|
|
111
|
+
const subscriptionFilters = yield exports.getSubscriptionFilters(client, logGroupName);
|
|
95
112
|
if (subscriptionFilters === undefined || subscriptionFilters.length === 0) {
|
|
96
113
|
return SubscriptionState.Empty;
|
|
97
114
|
}
|
|
@@ -110,11 +127,13 @@ const getSubscriptionFilterState = (logs, logGroupName, forwarderARN) => __await
|
|
|
110
127
|
return SubscriptionState.WrongDestinationUnowned;
|
|
111
128
|
});
|
|
112
129
|
exports.getSubscriptionFilterState = getSubscriptionFilterState;
|
|
113
|
-
const getSubscriptionFilters = (
|
|
114
|
-
const
|
|
130
|
+
const getSubscriptionFilters = (client, logGroupName) => __awaiter(void 0, void 0, void 0, function* () {
|
|
131
|
+
const input = {
|
|
115
132
|
logGroupName,
|
|
116
133
|
};
|
|
117
|
-
const
|
|
134
|
+
const command = new client_cloudwatch_logs_1.DescribeSubscriptionFiltersCommand(input);
|
|
135
|
+
const response = yield client.send(command);
|
|
136
|
+
const { subscriptionFilters } = response;
|
|
118
137
|
return subscriptionFilters;
|
|
119
138
|
});
|
|
120
139
|
exports.getSubscriptionFilters = getSubscriptionFilters;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loggroup.js","sourceRoot":"","sources":["../../../src/commands/lambda/loggroup.ts"],"names":[],"mappings":";;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"loggroup.js","sourceRoot":"","sources":["../../../src/commands/lambda/loggroup.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,8 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { LambdaClient, TagResourceCommandInput, UntagResourceCommandInput } from '@aws-sdk/client-lambda';
|
|
2
2
|
import { TagConfiguration } from './interfaces';
|
|
3
|
-
export declare const applyTagConfig: (
|
|
4
|
-
export declare const
|
|
5
|
-
export declare const
|
|
6
|
-
export declare const
|
|
3
|
+
export declare const applyTagConfig: (lambdaClient: LambdaClient, config: TagConfiguration) => Promise<void>;
|
|
4
|
+
export declare const tagResource: (client: LambdaClient, input: TagResourceCommandInput) => Promise<void>;
|
|
5
|
+
export declare const untagResource: (client: LambdaClient, input: UntagResourceCommandInput) => Promise<void>;
|
|
6
|
+
export declare const calculateTagUpdateRequest: (lambdaClient: LambdaClient, functionARN: string) => Promise<TagConfiguration | undefined>;
|
|
7
|
+
export declare const calculateTagRemoveRequest: (lambdaClient: LambdaClient, functionARN: string) => Promise<TagConfiguration | undefined>;
|
|
8
|
+
export declare const hasVersionTag: (client: LambdaClient, functionARN: string) => Promise<boolean>;
|
|
@@ -9,24 +9,35 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
9
9
|
});
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
-
exports.hasVersionTag = exports.calculateTagRemoveRequest = exports.calculateTagUpdateRequest = exports.applyTagConfig = void 0;
|
|
12
|
+
exports.hasVersionTag = exports.calculateTagRemoveRequest = exports.calculateTagUpdateRequest = exports.untagResource = exports.tagResource = exports.applyTagConfig = void 0;
|
|
13
|
+
const client_lambda_1 = require("@aws-sdk/client-lambda");
|
|
13
14
|
const constants_1 = require("./constants");
|
|
14
15
|
const { version } = require('../../../package.json');
|
|
15
|
-
const applyTagConfig = (
|
|
16
|
-
const {
|
|
17
|
-
if (
|
|
18
|
-
yield
|
|
16
|
+
const applyTagConfig = (lambdaClient, config) => __awaiter(void 0, void 0, void 0, function* () {
|
|
17
|
+
const { tagResourceCommandInput, untagResourceCommandInput } = config;
|
|
18
|
+
if (tagResourceCommandInput !== undefined) {
|
|
19
|
+
yield exports.tagResource(lambdaClient, tagResourceCommandInput);
|
|
19
20
|
}
|
|
20
|
-
if (
|
|
21
|
-
yield
|
|
21
|
+
if (untagResourceCommandInput !== undefined) {
|
|
22
|
+
yield exports.untagResource(lambdaClient, untagResourceCommandInput);
|
|
22
23
|
}
|
|
23
24
|
});
|
|
24
25
|
exports.applyTagConfig = applyTagConfig;
|
|
25
|
-
const
|
|
26
|
+
const tagResource = (client, input) => __awaiter(void 0, void 0, void 0, function* () {
|
|
27
|
+
const command = new client_lambda_1.TagResourceCommand(input);
|
|
28
|
+
yield client.send(command);
|
|
29
|
+
});
|
|
30
|
+
exports.tagResource = tagResource;
|
|
31
|
+
const untagResource = (client, input) => __awaiter(void 0, void 0, void 0, function* () {
|
|
32
|
+
const command = new client_lambda_1.UntagResourceCommand(input);
|
|
33
|
+
yield client.send(command);
|
|
34
|
+
});
|
|
35
|
+
exports.untagResource = untagResource;
|
|
36
|
+
const calculateTagUpdateRequest = (lambdaClient, functionARN) => __awaiter(void 0, void 0, void 0, function* () {
|
|
26
37
|
const config = {};
|
|
27
|
-
const versionTagPresent = yield exports.hasVersionTag(
|
|
38
|
+
const versionTagPresent = yield exports.hasVersionTag(lambdaClient, functionARN);
|
|
28
39
|
if (!versionTagPresent) {
|
|
29
|
-
config.
|
|
40
|
+
config.tagResourceCommandInput = {
|
|
30
41
|
Resource: functionARN,
|
|
31
42
|
Tags: {
|
|
32
43
|
[constants_1.TAG_VERSION_NAME]: `v${version}`,
|
|
@@ -37,11 +48,11 @@ const calculateTagUpdateRequest = (lambda, functionARN) => __awaiter(void 0, voi
|
|
|
37
48
|
return;
|
|
38
49
|
});
|
|
39
50
|
exports.calculateTagUpdateRequest = calculateTagUpdateRequest;
|
|
40
|
-
const calculateTagRemoveRequest = (
|
|
51
|
+
const calculateTagRemoveRequest = (lambdaClient, functionARN) => __awaiter(void 0, void 0, void 0, function* () {
|
|
41
52
|
const config = {};
|
|
42
|
-
const versionTagPresent = yield exports.hasVersionTag(
|
|
53
|
+
const versionTagPresent = yield exports.hasVersionTag(lambdaClient, functionARN);
|
|
43
54
|
if (versionTagPresent) {
|
|
44
|
-
config.
|
|
55
|
+
config.untagResourceCommandInput = {
|
|
45
56
|
Resource: functionARN,
|
|
46
57
|
TagKeys: [constants_1.TAG_VERSION_NAME],
|
|
47
58
|
};
|
|
@@ -50,12 +61,13 @@ const calculateTagRemoveRequest = (lambda, functionARN) => __awaiter(void 0, voi
|
|
|
50
61
|
return;
|
|
51
62
|
});
|
|
52
63
|
exports.calculateTagRemoveRequest = calculateTagRemoveRequest;
|
|
53
|
-
const hasVersionTag = (
|
|
54
|
-
const
|
|
64
|
+
const hasVersionTag = (client, functionARN) => __awaiter(void 0, void 0, void 0, function* () {
|
|
65
|
+
const input = {
|
|
55
66
|
Resource: functionARN,
|
|
56
67
|
};
|
|
57
|
-
const
|
|
58
|
-
const
|
|
68
|
+
const command = new client_lambda_1.ListTagsCommand(input);
|
|
69
|
+
const response = yield client.send(command);
|
|
70
|
+
const { Tags } = response;
|
|
59
71
|
return Tags !== undefined && Tags[constants_1.TAG_VERSION_NAME] === `v${version}`;
|
|
60
72
|
});
|
|
61
73
|
exports.hasVersionTag = hasVersionTag;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tags.js","sourceRoot":"","sources":["../../../src/commands/lambda/tags.ts"],"names":[],"mappings":";;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"tags.js","sourceRoot":"","sources":["../../../src/commands/lambda/tags.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,0DAQ+B;AAE/B,2CAA4C;AAG5C,MAAM,EAAC,OAAO,EAAC,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAA;AAE3C,MAAM,cAAc,GAAG,CAAO,YAA0B,EAAE,MAAwB,EAAE,EAAE;IAC3F,MAAM,EAAC,uBAAuB,EAAE,yBAAyB,EAAC,GAAG,MAAM,CAAA;IACnE,IAAI,uBAAuB,KAAK,SAAS,EAAE;QACzC,MAAM,mBAAW,CAAC,YAAY,EAAE,uBAAuB,CAAC,CAAA;KACzD;IACD,IAAI,yBAAyB,KAAK,SAAS,EAAE;QAC3C,MAAM,qBAAa,CAAC,YAAY,EAAE,yBAAyB,CAAC,CAAA;KAC7D;AACH,CAAC,CAAA,CAAA;AARY,QAAA,cAAc,kBAQ1B;AAEM,MAAM,WAAW,GAAG,CAAO,MAAoB,EAAE,KAA8B,EAAE,EAAE;IACxF,MAAM,OAAO,GAAG,IAAI,kCAAkB,CAAC,KAAK,CAAC,CAAA;IAC7C,MAAM,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;AAC5B,CAAC,CAAA,CAAA;AAHY,QAAA,WAAW,eAGvB;AAEM,MAAM,aAAa,GAAG,CAAO,MAAoB,EAAE,KAAgC,EAAE,EAAE;IAC5F,MAAM,OAAO,GAAG,IAAI,oCAAoB,CAAC,KAAK,CAAC,CAAA;IAC/C,MAAM,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;AAC5B,CAAC,CAAA,CAAA;AAHY,QAAA,aAAa,iBAGzB;AAEM,MAAM,yBAAyB,GAAG,CAAO,YAA0B,EAAE,WAAmB,EAAE,EAAE;IACjG,MAAM,MAAM,GAAqB,EAAE,CAAA;IAEnC,MAAM,iBAAiB,GAAG,MAAM,qBAAa,CAAC,YAAY,EAAE,WAAW,CAAC,CAAA;IAExE,IAAI,CAAC,iBAAiB,EAAE;QACtB,MAAM,CAAC,uBAAuB,GAAG;YAC/B,QAAQ,EAAE,WAAW;YACrB,IAAI,EAAE;gBACJ,CAAC,4BAAgB,CAAC,EAAE,IAAI,OAAO,EAAE;aAClC;SACF,CAAA;QAED,OAAO,MAAM,CAAA;KACd;IAED,OAAM;AACR,CAAC,CAAA,CAAA;AAjBY,QAAA,yBAAyB,6BAiBrC;AAEM,MAAM,yBAAyB,GAAG,CAAO,YAA0B,EAAE,WAAmB,EAAE,EAAE;IACjG,MAAM,MAAM,GAAqB,EAAE,CAAA;IACnC,MAAM,iBAAiB,GAAG,MAAM,qBAAa,CAAC,YAAY,EAAE,WAAW,CAAC,CAAA;IACxE,IAAI,iBAAiB,EAAE;QACrB,MAAM,CAAC,yBAAyB,GAAG;YACjC,QAAQ,EAAE,WAAW;YACrB,OAAO,EAAE,CAAC,4BAAgB,CAAC;SAC5B,CAAA;QAED,OAAO,MAAM,CAAA;KACd;IAED,OAAM;AACR,CAAC,CAAA,CAAA;AAbY,QAAA,yBAAyB,6BAarC;AAEM,MAAM,aAAa,GAAG,CAAO,MAAoB,EAAE,WAAmB,EAAoB,EAAE;IACjG,MAAM,KAAK,GAAyB;QAClC,QAAQ,EAAE,WAAW;KACtB,CAAA;IACD,MAAM,OAAO,GAAG,IAAI,+BAAe,CAAC,KAAK,CAAC,CAAA;IAC1C,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IAC3C,MAAM,EAAC,IAAI,EAAC,GAAG,QAAQ,CAAA;IAEvB,OAAO,IAAI,KAAK,SAAS,IAAI,IAAI,CAAC,4BAAgB,CAAC,KAAK,IAAI,OAAO,EAAE,CAAA;AACvE,CAAC,CAAA,CAAA;AATY,QAAA,aAAa,iBASzB"}
|
|
@@ -29,7 +29,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
29
29
|
};
|
|
30
30
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
31
31
|
exports.UninstrumentCommand = void 0;
|
|
32
|
-
const
|
|
32
|
+
const client_cloudwatch_logs_1 = require("@aws-sdk/client-cloudwatch-logs");
|
|
33
|
+
const client_lambda_1 = require("@aws-sdk/client-lambda");
|
|
33
34
|
const chalk_1 = require("chalk");
|
|
34
35
|
const clipanion_1 = require("clipanion");
|
|
35
36
|
const utils_1 = require("../../helpers/utils");
|
|
@@ -58,7 +59,7 @@ class UninstrumentCommand extends clipanion_1.Command {
|
|
|
58
59
|
const profile = (_a = this.profile) !== null && _a !== void 0 ? _a : this.config.profile;
|
|
59
60
|
if (profile) {
|
|
60
61
|
try {
|
|
61
|
-
yield commons_1.
|
|
62
|
+
this.credentials = yield commons_1.getAWSProfileCredentials(profile);
|
|
62
63
|
}
|
|
63
64
|
catch (err) {
|
|
64
65
|
this.context.stdout.write(renderer.renderError(err));
|
|
@@ -82,9 +83,13 @@ class UninstrumentCommand extends clipanion_1.Command {
|
|
|
82
83
|
if (!hasSpecifiedFunctions) {
|
|
83
84
|
const spinner = renderer.fetchingFunctionsSpinner();
|
|
84
85
|
try {
|
|
85
|
-
const
|
|
86
|
+
const lambdaClientConfig = {
|
|
87
|
+
region,
|
|
88
|
+
credentials: this.credentials,
|
|
89
|
+
};
|
|
90
|
+
const lambdaClient = new client_lambda_1.LambdaClient(lambdaClientConfig);
|
|
86
91
|
spinner.start();
|
|
87
|
-
const functionNames = (_d = (yield commons_1.getAllLambdaFunctionConfigs(
|
|
92
|
+
const functionNames = (_d = (yield commons_1.getAllLambdaFunctionConfigs(lambdaClient)).map((config) => config.FunctionName).sort()) !== null && _d !== void 0 ? _d : [];
|
|
88
93
|
if (functionNames.length === 0) {
|
|
89
94
|
this.context.stdout.write(renderer.renderCouldntFindLambdaFunctionsInRegionError());
|
|
90
95
|
return 1;
|
|
@@ -125,12 +130,16 @@ class UninstrumentCommand extends clipanion_1.Command {
|
|
|
125
130
|
}
|
|
126
131
|
const spinner = renderer.fetchingFunctionsSpinner();
|
|
127
132
|
try {
|
|
128
|
-
const
|
|
129
|
-
const
|
|
133
|
+
const cloudWatchLogsClient = new client_cloudwatch_logs_1.CloudWatchLogsClient({ region });
|
|
134
|
+
const lambdaClientConfig = {
|
|
135
|
+
region,
|
|
136
|
+
credentials: this.credentials,
|
|
137
|
+
};
|
|
138
|
+
const lambdaClient = new client_lambda_1.LambdaClient(lambdaClientConfig);
|
|
130
139
|
spinner.start();
|
|
131
|
-
const configs = yield uninstrument_1.getUninstrumentedFunctionConfigsFromRegEx(
|
|
140
|
+
const configs = yield uninstrument_1.getUninstrumentedFunctionConfigsFromRegEx(lambdaClient, cloudWatchLogsClient, this.regExPattern, this.forwarder);
|
|
132
141
|
spinner.succeed(renderer.renderFetchedLambdaFunctions(configs.length));
|
|
133
|
-
configGroups.push({ configs,
|
|
142
|
+
configGroups.push({ configs, lambdaClient, cloudWatchLogsClient, region });
|
|
134
143
|
}
|
|
135
144
|
catch (err) {
|
|
136
145
|
spinner.fail(renderer.renderFailedFetchingLambdaFunctions());
|
|
@@ -150,11 +159,15 @@ class UninstrumentCommand extends clipanion_1.Command {
|
|
|
150
159
|
for (const [region, functionARNs] of Object.entries(functionGroups)) {
|
|
151
160
|
const spinner = renderer.fetchingFunctionsConfigSpinner(region);
|
|
152
161
|
spinner.start();
|
|
153
|
-
const
|
|
154
|
-
|
|
162
|
+
const lambdaClientConfig = {
|
|
163
|
+
region,
|
|
164
|
+
credentials: this.credentials,
|
|
165
|
+
};
|
|
166
|
+
const lambdaClient = new client_lambda_1.LambdaClient(lambdaClientConfig);
|
|
167
|
+
const cloudWatchLogsClient = new client_cloudwatch_logs_1.CloudWatchLogsClient({ region });
|
|
155
168
|
try {
|
|
156
|
-
const configs = yield uninstrument_1.getUninstrumentedFunctionConfigs(
|
|
157
|
-
configGroups.push({ configs,
|
|
169
|
+
const configs = yield uninstrument_1.getUninstrumentedFunctionConfigs(lambdaClient, cloudWatchLogsClient, functionARNs, this.forwarder);
|
|
170
|
+
configGroups.push({ configs, lambdaClient, cloudWatchLogsClient, region });
|
|
158
171
|
spinner.succeed(renderer.renderFetchedLambdaConfigurationsFromRegion(region, configs.length));
|
|
159
172
|
}
|
|
160
173
|
catch (err) {
|
|
@@ -204,15 +217,15 @@ class UninstrumentCommand extends clipanion_1.Command {
|
|
|
204
217
|
}
|
|
205
218
|
this.context.stdout.write(renderer.renderWillApplyUpdates(this.dryRun));
|
|
206
219
|
for (const config of configs) {
|
|
207
|
-
if (config.
|
|
208
|
-
this.context.stdout.write(`UpdateFunctionConfiguration -> ${config.functionARN}\n${JSON.stringify(config.
|
|
220
|
+
if (config.updateFunctionConfigurationCommandInput) {
|
|
221
|
+
this.context.stdout.write(`UpdateFunctionConfiguration -> ${config.functionARN}\n${JSON.stringify(config.updateFunctionConfigurationCommandInput, undefined, 2)}\n`);
|
|
209
222
|
}
|
|
210
223
|
const { logGroupConfiguration, tagConfiguration } = config;
|
|
211
|
-
if (tagConfiguration === null || tagConfiguration === void 0 ? void 0 : tagConfiguration.
|
|
212
|
-
this.context.stdout.write(`UntagResource -> ${tagConfiguration.
|
|
224
|
+
if (tagConfiguration === null || tagConfiguration === void 0 ? void 0 : tagConfiguration.untagResourceCommandInput) {
|
|
225
|
+
this.context.stdout.write(`UntagResource -> ${tagConfiguration.untagResourceCommandInput.Resource}\n${JSON.stringify(tagConfiguration.untagResourceCommandInput.TagKeys, undefined, 2)}\n`);
|
|
213
226
|
}
|
|
214
|
-
if (logGroupConfiguration === null || logGroupConfiguration === void 0 ? void 0 : logGroupConfiguration.
|
|
215
|
-
this.context.stdout.write(`DeleteSubscriptionFilter -> ${logGroupConfiguration.logGroupName}\n${JSON.stringify(logGroupConfiguration.
|
|
227
|
+
if (logGroupConfiguration === null || logGroupConfiguration === void 0 ? void 0 : logGroupConfiguration.deleteSubscriptionFilterCommandInput) {
|
|
228
|
+
this.context.stdout.write(`DeleteSubscriptionFilter -> ${logGroupConfiguration.logGroupName}\n${JSON.stringify(logGroupConfiguration.deleteSubscriptionFilterCommandInput, undefined, 2)}\n`);
|
|
216
229
|
}
|
|
217
230
|
}
|
|
218
231
|
}
|
|
@@ -240,6 +253,7 @@ UninstrumentCommand.addOption('logLevel', clipanion_1.Command.String('--log-leve
|
|
|
240
253
|
UninstrumentCommand.addOption('service', clipanion_1.Command.String('--service', { hidden: true }));
|
|
241
254
|
UninstrumentCommand.addOption('environment', clipanion_1.Command.String('--env', { hidden: true }));
|
|
242
255
|
UninstrumentCommand.addOption('version', clipanion_1.Command.String('--version', { hidden: true }));
|
|
256
|
+
UninstrumentCommand.addOption('apmFlushDeadline', clipanion_1.Command.String('--apm-flush-deadline', { hidden: true }));
|
|
243
257
|
UninstrumentCommand.addOption('extraTags', clipanion_1.Command.String('--extra-tags,--extraTags', { hidden: true }));
|
|
244
258
|
UninstrumentCommand.addOption('captureLambdaPayload', clipanion_1.Command.String('--capture-lambda-payload,--captureLambdaPayload', { hidden: true }));
|
|
245
259
|
//# sourceMappingURL=uninstrument.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"uninstrument.js","sourceRoot":"","sources":["../../../src/commands/lambda/uninstrument.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"uninstrument.js","sourceRoot":"","sources":["../../../src/commands/lambda/uninstrument.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import { MultipartPayload } from '../../helpers/upload';
|
|
2
2
|
export declare class RNSourcemap {
|
|
3
|
+
bundleName: string;
|
|
3
4
|
gitData?: GitData;
|
|
4
5
|
sourcemapPath: string;
|
|
5
|
-
constructor(sourcemapPath: string);
|
|
6
|
+
constructor(bundleName: string, sourcemapPath: string);
|
|
6
7
|
addRepositoryData(gitData: GitData): void;
|
|
7
8
|
asMultipartPayload(cliVersion: string, service: string, version: string, projectPath: string, platform: RNPlatform, build: string): MultipartPayload;
|
|
8
9
|
removeSourcesContentFromSourceMap: () => void;
|
|
@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.RN_SUPPORTED_PLATFORMS = exports.RNSourcemap = void 0;
|
|
7
7
|
const fs_1 = __importDefault(require("fs"));
|
|
8
8
|
class RNSourcemap {
|
|
9
|
-
constructor(sourcemapPath) {
|
|
9
|
+
constructor(bundleName, sourcemapPath) {
|
|
10
10
|
this.removeSourcesContentFromSourceMap = () => {
|
|
11
11
|
const newSourcemapFilePath = `${this.sourcemapPath}.no-sources-content`;
|
|
12
12
|
const data = fs_1.default.readFileSync(this.sourcemapPath, 'utf8');
|
|
@@ -15,6 +15,7 @@ class RNSourcemap {
|
|
|
15
15
|
fs_1.default.writeFileSync(newSourcemapFilePath, JSON.stringify(sourcemap), 'utf8');
|
|
16
16
|
this.sourcemapPath = newSourcemapFilePath;
|
|
17
17
|
};
|
|
18
|
+
this.bundleName = bundleName;
|
|
18
19
|
this.sourcemapPath = sourcemapPath;
|
|
19
20
|
}
|
|
20
21
|
addRepositoryData(gitData) {
|
|
@@ -41,6 +42,7 @@ class RNSourcemap {
|
|
|
41
42
|
getMetadataPayload(cliVersion, service, version, projectPath, platform, build) {
|
|
42
43
|
const metadata = {
|
|
43
44
|
build_number: build,
|
|
45
|
+
bundle_name: this.bundleName,
|
|
44
46
|
cli_version: cliVersion,
|
|
45
47
|
platform,
|
|
46
48
|
project_path: projectPath,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"interfaces.js","sourceRoot":"","sources":["../../../src/commands/react-native/interfaces.ts"],"names":[],"mappings":";;;;;;AAAA,4CAAmB;AAInB,MAAa,WAAW;
|
|
1
|
+
{"version":3,"file":"interfaces.js","sourceRoot":"","sources":["../../../src/commands/react-native/interfaces.ts"],"names":[],"mappings":";;;;;;AAAA,4CAAmB;AAInB,MAAa,WAAW;IAKtB,YAAY,UAAkB,EAAE,aAAqB;QAoC9C,sCAAiC,GAAG,GAAG,EAAE;YAC9C,MAAM,oBAAoB,GAAG,GAAG,IAAI,CAAC,aAAa,qBAAqB,CAAA;YACvE,MAAM,IAAI,GAAG,YAAE,CAAC,YAAY,CAAC,IAAI,CAAC,aAAa,EAAE,MAAM,CAAC,CAAA;YACxD,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;YAClC,OAAO,SAAS,CAAC,cAAc,CAAA;YAE/B,YAAE,CAAC,aAAa,CAAC,oBAAoB,EAAE,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC,CAAA;YACzE,IAAI,CAAC,aAAa,GAAG,oBAAoB,CAAA;QAC3C,CAAC,CAAA;QA3CC,IAAI,CAAC,UAAU,GAAG,UAAU,CAAA;QAC5B,IAAI,CAAC,aAAa,GAAG,aAAa,CAAA;IACpC,CAAC;IAEM,iBAAiB,CAAC,OAAgB;QACvC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;IACxB,CAAC;IAEM,kBAAkB,CACvB,UAAkB,EAClB,OAAe,EACf,OAAe,EACf,WAAmB,EACnB,QAAoB,EACpB,KAAa;QAEb,MAAM,OAAO,GAAG,IAAI,GAAG,CAAyB;YAC9C,CAAC,OAAO,EAAE,IAAI,CAAC,kBAAkB,CAAC,UAAU,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC;YAC9F,CAAC,YAAY,EAAE,EAAC,KAAK,EAAE,YAAE,CAAC,gBAAgB,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,OAAO,EAAE,EAAC,QAAQ,EAAE,YAAY,EAAC,EAAC,CAAC;SACpG,CAAC,CAAA;QACF,IAAI,IAAI,CAAC,OAAO,KAAK,SAAS,IAAI,IAAI,CAAC,OAAO,CAAC,oBAAoB,KAAK,SAAS,EAAE;YACjF,OAAO,CAAC,GAAG,CAAC,YAAY,EAAE;gBACxB,OAAO,EAAE;oBACP,WAAW,EAAE,kBAAkB;oBAC/B,QAAQ,EAAE,YAAY;iBACvB;gBACD,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,oBAAoB;aACzC,CAAC,CAAA;SACH;QAED,OAAO;YACL,OAAO;SACR,CAAA;IACH,CAAC;IAYO,kBAAkB,CACxB,UAAkB,EAClB,OAAe,EACf,OAAe,EACf,WAAmB,EACnB,QAAoB,EACpB,KAAa;QAEb,MAAM,QAAQ,GAAuB;YACnC,YAAY,EAAE,KAAK;YACnB,WAAW,EAAE,IAAI,CAAC,UAAU;YAC5B,WAAW,EAAE,UAAU;YACvB,QAAQ;YACR,YAAY,EAAE,WAAW;YACzB,OAAO;YACP,IAAI,EAAE,wBAAwB;YAC9B,OAAO;SACR,CAAA;QACD,IAAI,IAAI,CAAC,OAAO,KAAK,SAAS,EAAE;YAC9B,QAAQ,CAAC,kBAAkB,GAAG,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAA;YAC3D,QAAQ,CAAC,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC,YAAY,CAAA;SACpD;QAED,OAAO;YACL,OAAO,EAAE;gBACP,WAAW,EAAE,kBAAkB;gBAC/B,QAAQ,EAAE,OAAO;aAClB;YACD,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC;SAChC,CAAA;IACH,CAAC;CACF;AAlFD,kCAkFC;AAQY,QAAA,sBAAsB,GAAG,CAAC,KAAK,EAAE,SAAS,CAAU,CAAA"}
|
|
@@ -16,5 +16,5 @@ export declare const renderFailedSourcesContentRemovalError: (payload: RNSourcem
|
|
|
16
16
|
* This comment should be removed once the multiple file upload is available.
|
|
17
17
|
*/
|
|
18
18
|
export declare const renderSuccessfulCommand: (statuses: UploadStatus[], duration: number, dryRun: boolean) => string;
|
|
19
|
-
export declare const renderCommandInfo: (bundlePath: string | undefined, sourcemapPath: string, platform: string, releaseVersion: string, service: string, poolLimit: number, dryRun: boolean, projectPath: string, buildVersion: string) => string;
|
|
19
|
+
export declare const renderCommandInfo: (bundlePath: string | undefined, sourcemapPath: string, platform: string, releaseVersion: string, service: string, poolLimit: number, dryRun: boolean, projectPath: string, buildVersion: string, bundleName: string) => string;
|
|
20
20
|
export declare const renderUpload: (sourcemap: RNSourcemap) => string;
|
|
@@ -88,23 +88,22 @@ const renderSuccessfulCommand = (statuses, duration, dryRun) => {
|
|
|
88
88
|
return output.join('\n') + '\n';
|
|
89
89
|
};
|
|
90
90
|
exports.renderSuccessfulCommand = renderSuccessfulCommand;
|
|
91
|
-
const renderCommandInfo = (bundlePath, sourcemapPath, platform, releaseVersion, service, poolLimit, dryRun, projectPath, buildVersion) => {
|
|
91
|
+
const renderCommandInfo = (bundlePath, sourcemapPath, platform, releaseVersion, service, poolLimit, dryRun, projectPath, buildVersion, bundleName) => {
|
|
92
92
|
let fullStr = '';
|
|
93
93
|
if (dryRun) {
|
|
94
94
|
fullStr += chalk_1.default.yellow(`${formatting_1.ICONS.WARNING} DRY-RUN MODE ENABLED. WILL NOT UPLOAD SOURCEMAPS\n`);
|
|
95
95
|
}
|
|
96
|
-
if (bundlePath) {
|
|
97
|
-
fullStr += chalk_1.default.yellow(`${formatting_1.ICONS.WARNING} ${chalk_1.default.bold('--bundle')} option has been deprecated. The js bundle won't be sent. This will not affect the error tracking of your app.\n`);
|
|
98
|
-
}
|
|
99
96
|
const startStr = chalk_1.default.green('Starting upload. \n');
|
|
100
97
|
fullStr += startStr;
|
|
101
|
-
|
|
102
|
-
|
|
98
|
+
if (!bundlePath) {
|
|
99
|
+
fullStr += chalk_1.default.red(`${formatting_1.ICONS.WARNING} --bundle option was not provided. A default bundle name will be used. Please update @datadog/mobile-react-native or pass a --bundle option.\n`);
|
|
100
|
+
}
|
|
101
|
+
fullStr += chalk_1.default.green(`Upload of ${sourcemapPath} for bundle ${bundleName} on platform ${platform} with project path ${projectPath}\n`);
|
|
103
102
|
const serviceVersionProjectPathStr = chalk_1.default.green(`version: ${releaseVersion} build: ${buildVersion} service: ${service}\n`);
|
|
104
103
|
fullStr += serviceVersionProjectPathStr;
|
|
105
104
|
return fullStr;
|
|
106
105
|
};
|
|
107
106
|
exports.renderCommandInfo = renderCommandInfo;
|
|
108
|
-
const renderUpload = (sourcemap) => `Uploading sourcemap ${sourcemap.sourcemapPath}\n`;
|
|
107
|
+
const renderUpload = (sourcemap) => `Uploading sourcemap ${sourcemap.sourcemapPath} for JS file ${sourcemap.bundleName}\n`;
|
|
109
108
|
exports.renderUpload = renderUpload;
|
|
110
109
|
//# sourceMappingURL=renderer.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"renderer.js","sourceRoot":"","sources":["../../../src/commands/react-native/renderer.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"renderer.js","sourceRoot":"","sources":["../../../src/commands/react-native/renderer.ts"],"names":[],"mappings":"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"}
|