@datadog/datadog-ci 1.2.0 → 1.3.0-alpha

package/dist/commands/junit/__tests__/upload.test.js

@@ -172,6 +172,20 @@ describe('upload', () => {
                 key2: 'value2',
             });
         }));
+        test('should set logsEnabled for each file', () => __awaiter(void 0, void 0, void 0, function* () {
+            process.env.DD_CIVISIBILITY_LOGS_ENABLED = 'true';
+            const context = createMockContext();
+            const command = new upload_1.UploadJUnitXMLCommand();
+            const [firstFile, secondFile] = yield command['getMatchingJUnitXMLFiles'].call({
+                basePaths: ['./src/commands/junit/__tests__/fixtures'],
+                config: {},
+                context,
+                logs: true,
+                service: 'service',
+            });
+            expect(firstFile.logsEnabled).toBe(true);
+            expect(secondFile.logsEnabled).toBe(true);
+        }));
     });
 });
 describe('execute', () => {
@@ -179,7 +193,7 @@ describe('execute', () => {
         const cli = makeCli();
         const context = createMockContext();
         process.env = { DATADOG_API_KEY: 'PLACEHOLDER' };
-        const code = yield cli.run(['junit', 'upload', '--service', 'test-service', '--dry-run', ...paths], context);
+        const code = yield cli.run(['junit', 'upload', '--service', 'test-service', '--dry-run', '--logs', ...paths], context);
         return { context, code };
     });
     test('relative path with double dots', () => __awaiter(void 0, void 0, void 0, function* () {

package/dist/commands/junit/api.js

@@ -39,6 +39,9 @@ const uploadJUnitXML = (request) => (jUnitXML, write) => __awaiter(void 0, void
         fileName = 'default_file_name';
     }
     const spanTags = Object.assign(Object.assign({ service: jUnitXML.service }, jUnitXML.spanTags), { '_dd.cireport_version': '2' });
+    if (jUnitXML.logsEnabled) {
+        spanTags['_dd.junitxml_logs'] = 'true';
+    }
     form.append('event', JSON.stringify(spanTags), { filename: 'event.json' });
     let uniqueFileName = `${fileName}-${jUnitXML.service}-${spanTags[tags_1.GIT_SHA]}`;
     if (spanTags[tags_1.CI_PIPELINE_URL]) {

package/dist/commands/junit/interfaces.d.ts

@@ -3,6 +3,7 @@ import { AxiosPromise, AxiosResponse } from 'axios';
 import { Writable } from 'stream';
 import { SpanTags } from '../../helpers/interfaces';
 export interface Payload {
+    logsEnabled: boolean;
     service: string;
     spanTags: SpanTags;
     xmlPath: string;

package/dist/commands/junit/upload.d.ts

@@ -5,6 +5,7 @@ export declare class UploadJUnitXMLCommand extends Command {
     private config;
     private dryRun;
     private env?;
+    private logs;
     private maxConcurrency;
     private service?;
     private tags?;

package/dist/commands/junit/upload.js

@@ -51,6 +51,7 @@ class UploadJUnitXMLCommand extends clipanion_1.Command {
             envVarTags: process.env.DD_TAGS,
         };
         this.dryRun = false;
+        this.logs = false;
         this.maxConcurrency = 20;
     }
     execute() {
@@ -69,6 +70,11 @@ class UploadJUnitXMLCommand extends clipanion_1.Command {
             if (!this.config.env) {
                 this.config.env = this.env;
             }
+            if (!this.logs &&
+                process.env.DD_CIVISIBILITY_LOGS_ENABLED &&
+                !['false', '0'].includes(process.env.DD_CIVISIBILITY_LOGS_ENABLED.toLowerCase())) {
+                this.logs = true;
+            }
             const api = this.getApiHelper();
             // Normalizing the basePath to resolve .. and .
             // Always using the posix version to avoid \ on Windows.
@@ -113,6 +119,7 @@ class UploadJUnitXMLCommand extends clipanion_1.Command {
                 return true;
             });
             return validUniqueFiles.map((jUnitXMLFilePath) => ({
+                logsEnabled: this.logs,
                 service: this.service,
                 spanTags,
                 xmlPath: jUnitXMLFilePath,
@@ -168,6 +175,10 @@ UploadJUnitXMLCommand.usage = clipanion_1.Command.Usage({
             'Upload all jUnit XML test report files in current directory to the datadoghq.eu site',
             'DATADOG_SITE=datadoghq.eu datadog-ci junit upload --service my-service .',
         ],
+        [
+            'Upload all jUnit XML test report files in current directory while also collecting logs',
+            'datadog-ci junit upload --service my-service --logs .',
+        ],
     ],
 });
 UploadJUnitXMLCommand.addPath('junit', 'upload');
@@ -177,3 +188,4 @@ UploadJUnitXMLCommand.addOption('dryRun', clipanion_1.Command.Boolean('--dry-run
 UploadJUnitXMLCommand.addOption('tags', clipanion_1.Command.Array('--tags'));
 UploadJUnitXMLCommand.addOption('basePaths', clipanion_1.Command.Rest({ required: 1 }));
 UploadJUnitXMLCommand.addOption('maxConcurrency', clipanion_1.Command.String('--max-concurrency'));
+UploadJUnitXMLCommand.addOption('logs', clipanion_1.Command.Boolean('--logs'));

package/dist/commands/lambda/__tests__/functions/commons.test.js

@@ -10,8 +10,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 /* tslint:disable:no-string-literal */
-jest.mock('aws-sdk');
 const aws_sdk_1 = require("aws-sdk");
+jest.mock('aws-sdk');
+const aws_sdk_2 = require("aws-sdk");
 const constants_1 = require("../../constants");
 const commons_1 = require("../../functions/commons");
 const instrument_1 = require("../../instrument");
@@ -149,7 +150,7 @@ describe('commons', () => {
     describe('findLatestLayerVersion', () => {
         test('finds latests version for Python39', () => __awaiter(void 0, void 0, void 0, function* () {
             const layer = `arn:aws:lambda:sa-east-1:${constants_1.DEFAULT_LAYER_AWS_ACCOUNT}:layer:Datadog-Python39`;
-            aws_sdk_1.Lambda.mockImplementation(() => fixtures_1.makeMockLambda({}, {
+            aws_sdk_2.Lambda.mockImplementation(() => fixtures_1.makeMockLambda({}, {
                 [`${layer}:1`]: {
                     LayerVersionArn: `${layer}:1`,
                     Version: 1,
@@ -187,7 +188,7 @@ describe('commons', () => {
         }));
         test('finds latests version for Node14', () => __awaiter(void 0, void 0, void 0, function* () {
             const layer = `arn:aws:lambda:us-east-1:${constants_1.DEFAULT_LAYER_AWS_ACCOUNT}:layer:Datadog-Node14-x`;
-            aws_sdk_1.Lambda.mockImplementation(() => fixtures_1.makeMockLambda({}, {
+            aws_sdk_2.Lambda.mockImplementation(() => fixtures_1.makeMockLambda({}, {
                 [`${layer}:1`]: {
                     LayerVersionArn: `${layer}:1`,
                     Version: 1,
@@ -221,7 +222,7 @@ describe('commons', () => {
         }));
         test('returns 0 when no layer can be found', () => __awaiter(void 0, void 0, void 0, function* () {
             ;
-            aws_sdk_1.Lambda.mockImplementation(() => fixtures_1.makeMockLambda({}, {}));
+            aws_sdk_2.Lambda.mockImplementation(() => fixtures_1.makeMockLambda({}, {}));
             const runtime = 'python3.7';
             const region = 'us-east-1';
             const expectedLatestVersion = 0;
@@ -238,17 +239,28 @@ describe('commons', () => {
         afterAll(() => {
             process.env = OLD_ENV;
         });
-        test('returns true when any AWS credential is missing', () => {
+        test('returns true when only AWS_SECRET_ACCESS_KEY env var is set and `~/.aws/credentials` are missing', () => {
             process.env[constants_1.AWS_SECRET_ACCESS_KEY_ENV_VAR] = 'SOME-AWS-SECRET-ACCESS-KEY';
-            expect(commons_1.isMissingAWSCredentials()).toBe(true);
-            // Reset env
-            process.env = {};
+            aws_sdk_1.config.credentials = undefined;
+            expect(commons_1.isMissingAWSCredentials()).toBe(true); // We return true since AWS_ACCESS_KEY_ID_ENV_VAR is missing
+        });
+        test('returns true when only AWS_ACCESS_KEY_ID environment variable is set and `~/.aws/credentials` are missing', () => {
             process.env[constants_1.AWS_ACCESS_KEY_ID_ENV_VAR] = 'SOME-AWS-ACCESS-KEY-ID';
-            expect(commons_1.isMissingAWSCredentials()).toBe(true);
+            aws_sdk_1.config.credentials = undefined;
+            expect(commons_1.isMissingAWSCredentials()).toBe(true); // We return true since AWS_SECRET_ACCESS_KEY_ENV_VAR is missing
         });
-        test('returns false when AWS credentials are set', () => {
+        test('returns false when AWS credentials via environment variables are set', () => {
             process.env[constants_1.AWS_ACCESS_KEY_ID_ENV_VAR] = 'SOME-AWS-ACCESS-KEY-ID';
             process.env[constants_1.AWS_SECRET_ACCESS_KEY_ENV_VAR] = 'SOME-AWS-SECRET-ACCESS-KEY';
+            aws_sdk_1.config.credentials = { foo: 'bar' };
+            expect(commons_1.isMissingAWSCredentials()).toBe(false);
+        });
+        test('returns true when both environment variables and `~/.aws/credentials` are missing', () => {
+            aws_sdk_1.config.credentials = undefined;
+            expect(commons_1.isMissingAWSCredentials()).toBe(true);
+        });
+        test('returns false when AWS credentials via `~/.aws/credentials` are set', () => {
+            aws_sdk_1.config.credentials = { foo: 'bar' };
             expect(commons_1.isMissingAWSCredentials()).toBe(false);
         });
     });

package/dist/commands/lambda/functions/commons.js

@@ -155,7 +155,10 @@ const findLatestLayerVersion = (layer, region) => __awaiter(void 0, void 0, void
     return latestVersion;
 });
 exports.findLatestLayerVersion = findLatestLayerVersion;
-const isMissingAWSCredentials = () => process.env[constants_1.AWS_ACCESS_KEY_ID_ENV_VAR] === undefined || process.env[constants_1.AWS_SECRET_ACCESS_KEY_ENV_VAR] === undefined;
+const isMissingAWSCredentials = () => 
+// If env vars and aws_sdk_config.credentials are not set return true otherwise return false
+(process.env[constants_1.AWS_ACCESS_KEY_ID_ENV_VAR] === undefined || process.env[constants_1.AWS_SECRET_ACCESS_KEY_ENV_VAR] === undefined) &&
+    !aws_sdk_1.config.credentials;
 exports.isMissingAWSCredentials = isMissingAWSCredentials;
 const isMissingDatadogSiteEnvVar = () => {
     const site = process.env[constants_1.CI_SITE_ENV_VAR];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@datadog/datadog-ci",
-  "version": "1.2.0",
+  "version": "1.3.0-alpha",
   "description": "Run datadog actions from the CI.",
   "repository": "https://github.com/DataDog/datadog-ci",
   "license": "Apache-2.0",