Skip to content

Commit 2e6b6ba

Browse files
authored
chore: migrate to base datadog-ci package (#699)
* chore: migrate to base datadog-ci package * fix import
1 parent 62004bb commit 2e6b6ba

3 files changed

Lines changed: 1013 additions & 582 deletions

File tree

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
]
5858
},
5959
"dependencies": {
60-
"@datadog/datadog-ci": "5.13.1",
60+
"@datadog/datadog-ci-base": "^5.14.0",
6161
"simple-git": "^3.36.0"
6262
},
6363
"peerDependencies": {

src/index.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import { FunctionDefinition } from "serverless";
1111
import Service from "serverless/classes/Service";
1212
import Aws, { Provider } from "serverless/plugins/aws/provider/awsProvider";
1313
import { version } from "../package.json";
14-
import { gitMetadata } from "@datadog/datadog-ci";
14+
import { getGitCommitInfo, uploadGitCommitHash } from "@datadog/datadog-ci-base/commands/git-metadata/library";
1515
import {
1616
Configuration,
1717
ddEnvEnvVar,
@@ -261,13 +261,13 @@ module.exports = class ServerlessPlugin {
261261
const simpleGit = await newSimpleGit();
262262
if (simpleGit !== undefined && (await simpleGit.checkIsRepo())) {
263263
try {
264-
const [gitRemote, gitHash] = await gitMetadata.getGitCommitInfo();
264+
const [gitRemote, gitHash] = await getGitCommitInfo();
265265
handlers.forEach(({ handler }) => {
266266
setSourceCodeIntegrationEnvVar(handler, gitHash, gitRemote);
267267
});
268268
if (config.uploadGitMetadata) {
269269
this.logToCliOnce(`Uploading git metadata`);
270-
await gitMetadata.uploadGitCommitHash((process.env.DATADOG_API_KEY ?? config.apiKey)!, config.site);
270+
await uploadGitCommitHash((process.env.DATADOG_API_KEY ?? config.apiKey)!, config.site);
271271
}
272272
} catch (err) {
273273
this.logToCliOnce(`Error occurred when adding source code integration: ${err}`);

0 commit comments

Comments
 (0)