@datadog/datadog-ci 2.31.2 → 2.32.0
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.
|
@@ -11,10 +11,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.uploadRepository = exports.uploadGitCommitHash = exports.getGitCommitInfo = exports.isGitRepo = void 0;
|
|
13
13
|
const apikey_1 = require("../../helpers/apikey");
|
|
14
|
+
const logger_1 = require("../../helpers/logger");
|
|
14
15
|
const upload_1 = require("../../helpers/upload");
|
|
15
16
|
const utils_1 = require("../../helpers/utils");
|
|
16
17
|
const version_1 = require("../../helpers/version");
|
|
17
18
|
const git_1 = require("./git");
|
|
19
|
+
const gitdb_1 = require("./gitdb");
|
|
18
20
|
const isGitRepo = () => __awaiter(void 0, void 0, void 0, function* () {
|
|
19
21
|
try {
|
|
20
22
|
const simpleGit = yield (0, git_1.newSimpleGit)();
|
|
@@ -39,15 +41,33 @@ const getGitCommitInfo = (filterAndFormatGitRepoUrl = true) => __awaiter(void 0,
|
|
|
39
41
|
return [gitRemote !== null && gitRemote !== void 0 ? gitRemote : '', payload.hash];
|
|
40
42
|
});
|
|
41
43
|
exports.getGitCommitInfo = getGitCommitInfo;
|
|
42
|
-
//
|
|
44
|
+
// uploadGitCommitHash uploads local git metadata and returns the current [repositoryURL, commitHash].
|
|
43
45
|
// The current repositoryURL can be overridden by specifying the 'repositoryURL' arg.
|
|
44
46
|
const uploadGitCommitHash = (apiKey, datadogSite, repositoryURL) => __awaiter(void 0, void 0, void 0, function* () {
|
|
47
|
+
const simpleGit = yield (0, git_1.newSimpleGit)();
|
|
48
|
+
const payload = yield (0, git_1.getCommitInfo)(simpleGit, repositoryURL);
|
|
49
|
+
return Promise.all([
|
|
50
|
+
syncGitDB(simpleGit, apiKey, datadogSite, payload.remote),
|
|
51
|
+
uploadToSrcmapTrack(apiKey, datadogSite, payload),
|
|
52
|
+
]).then(() => [payload.remote, payload.hash]);
|
|
53
|
+
});
|
|
54
|
+
exports.uploadGitCommitHash = uploadGitCommitHash;
|
|
55
|
+
const syncGitDB = (simpleGit, apiKey, datadogSite, repositoryURL) => __awaiter(void 0, void 0, void 0, function* () {
|
|
56
|
+
// no-op logger
|
|
57
|
+
const log = new logger_1.Logger((s) => { }, logger_1.LogLevel.INFO);
|
|
58
|
+
const requestBuilder = (0, utils_1.getRequestBuilder)({
|
|
59
|
+
apiKey,
|
|
60
|
+
baseUrl: 'https://api.' + datadogSite,
|
|
61
|
+
});
|
|
62
|
+
yield (0, gitdb_1.uploadToGitDB)(log, requestBuilder, simpleGit, false, repositoryURL);
|
|
63
|
+
});
|
|
64
|
+
// uploadToSrcmapTrack uploads the payload with tracked files to the sourcemap intake
|
|
65
|
+
// this will be deprecated in the future, as we're transitioning to GitDB
|
|
66
|
+
const uploadToSrcmapTrack = (apiKey, datadogSite, payload) => __awaiter(void 0, void 0, void 0, function* () {
|
|
45
67
|
const apiKeyValidator = (0, apikey_1.newApiKeyValidator)({
|
|
46
68
|
apiKey,
|
|
47
69
|
datadogSite,
|
|
48
70
|
});
|
|
49
|
-
const simpleGit = yield (0, git_1.newSimpleGit)();
|
|
50
|
-
const payload = yield (0, git_1.getCommitInfo)(simpleGit, repositoryURL);
|
|
51
71
|
const requestBuilder = (0, utils_1.getRequestBuilder)({
|
|
52
72
|
apiKey,
|
|
53
73
|
baseUrl: 'https://sourcemap-intake.' + datadogSite,
|
|
@@ -73,9 +93,7 @@ const uploadGitCommitHash = (apiKey, datadogSite, repositoryURL) => __awaiter(vo
|
|
|
73
93
|
if (status !== upload_1.UploadStatus.Success) {
|
|
74
94
|
throw new Error('Error uploading commit information.');
|
|
75
95
|
}
|
|
76
|
-
return [payload.remote, payload.hash];
|
|
77
96
|
});
|
|
78
|
-
exports.uploadGitCommitHash = uploadGitCommitHash;
|
|
79
97
|
const uploadRepository = (requestBuilder, libraryVersion) => (commitInfo, opts) => __awaiter(void 0, void 0, void 0, function* () {
|
|
80
98
|
const payload = commitInfo.asMultipartPayload(libraryVersion);
|
|
81
99
|
return (0, upload_1.upload)(requestBuilder)(payload, opts);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"library.js","sourceRoot":"","sources":["../../../src/commands/git-metadata/library.ts"],"names":[],"mappings":";;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"library.js","sourceRoot":"","sources":["../../../src/commands/git-metadata/library.ts"],"names":[],"mappings":"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"}
|