Update ecs exports

Author: gabedos

src/ecs/constants.ts

@@ -40,11 +40,6 @@ export const DatadogEcsBaseDefaultProps: DatadogECSBaseProps = {
   },
 };
 
-/**
- * Default CWS entrypoint prefix for application containers
- */
-export const entryPointPrefixCWS = ["/cws-instrumentation-volume/cws-instrumentation", "trace", "--"];
-
 /**
  * Valid Datadog site URLs
  */

src/ecs/fargate/constants.ts

@@ -63,6 +63,11 @@ export const DatadogEcsFargateDefaultProps: DatadogECSFargateProps = {
   },
 };
 
+/**
+ * Default CWS entrypoint prefix for application containers
+ */
+export const EntryPointPrefixCWS = ["/cws-instrumentation-volume/cws-instrumentation", "trace", "--"];
+
 /**
  * Config file type for the Firelens configuration parsing JSON
  */

src/ecs/fargate/datadog-ecs-fargate.ts

@@ -9,18 +9,18 @@
 import * as ecs from "aws-cdk-lib/aws-ecs";
 import { Construct } from "constructs";
 import log from "loglevel";
-import { DatadogEcsFargateDefaultProps } from "./constants";
+import { DatadogEcsFargateDefaultProps, EntryPointPrefixCWS } from "./constants";
 import { FargateEnvVarManager } from "./environment";
-import { DatadogECSFargateInternalProps, DatadogECSFargateProps, LoggingType } from "./interfaces";
+import { DatadogECSFargateProps, LoggingType } from "./interfaces";
 import { mergeFargateProps, validateECSFargateProps } from "./utils";
-import { entryPointPrefixCWS } from "../constants";
 import {
   addCdkConstructVersionTag,
   configureEcsPolicies,
   getSecretApiKey,
   isOperatingSystemLinux,
   validateECSBaseProps,
 } from "../utils";
+import { DatadogECSFargateInternalProps } from "./internal.interfaces";
 
 /**
  * The Datadog ECS Fargate construct manages the Datadog
@@ -134,7 +134,7 @@ export class DatadogECSFargateTaskDefinition extends ecs.FargateTaskDefinition {
         instrumentedProps.linuxParameters.addCapabilities(ecs.Capability.SYS_PTRACE);
       }
       if (instrumentedProps.entryPoint !== undefined) {
-        instrumentedProps.entryPoint.unshift(...entryPointPrefixCWS);
+        instrumentedProps.entryPoint.unshift(...EntryPointPrefixCWS);
       } else {
         log.debug("Failed to add CWS entrypoint for container:", id);
       }

src/ecs/fargate/interfaces.ts

@@ -6,8 +6,7 @@
  * Copyright 2021 Datadog, Inc.
  */
 
-import { HealthCheck, Secret, FirelensOptions } from "aws-cdk-lib/aws-ecs";
-import { EnvVarManager } from "../environment";
+import { HealthCheck, FirelensOptions } from "aws-cdk-lib/aws-ecs";
 import { CWSFeatureConfig, DatadogECSBaseProps, LogCollectionFeatureConfig } from "../interfaces";
 
 export interface DatadogECSFargateProps extends DatadogECSBaseProps {
@@ -80,17 +79,6 @@ export interface FluentbitConfig {
   readonly memoryLimitMiB?: number;
 }
 
-/**
- * Internal props for the Datadog ECS Fargate construct.
- */
-export interface DatadogECSFargateInternalProps extends DatadogECSFargateProps {
-  readonly envVarManager: EnvVarManager;
-  readonly isLinux: boolean;
-  readonly isSocketRequired: boolean;
-  readonly isProtocolRequired: boolean;
-  readonly datadogSecret?: Secret;
-}
-
 /**
  * Type of datadog logging configuration.
  */

src/ecs/fargate/internal.interfaces.ts

@@ -0,0 +1,14 @@
+import { Secret } from "aws-cdk-lib/aws-ecs";
+import { EnvVarManager } from "../environment";
+import { DatadogECSFargateProps } from "./interfaces";
+
+/**
+ * Internal props for the Datadog ECS Fargate construct.
+ */
+export interface DatadogECSFargateInternalProps extends DatadogECSFargateProps {
+  readonly envVarManager: EnvVarManager;
+  readonly isLinux: boolean;
+  readonly isSocketRequired: boolean;
+  readonly isProtocolRequired: boolean;
+  readonly datadogSecret?: Secret;
+}

src/ecs/fargate/utils.ts

@@ -8,7 +8,8 @@
 
 import log from "loglevel";
 import { ParseJsonFirelensConfigFileType, ParseJsonFirelensConfigFileValue } from "./constants";
-import { DatadogECSFargateInternalProps, DatadogECSFargateProps, LoggingType } from "./interfaces";
+import { DatadogECSFargateProps, LoggingType } from "./interfaces";
+import { DatadogECSFargateInternalProps } from "./internal.interfaces";
 
 export function mergeFargateProps(
   lowerPrecedence: DatadogECSFargateProps,

src/ecs/index.ts

@@ -1,8 +1,4 @@
-// Internal index
-export * from "./environment";
-export * from "./constants";
+// External index
 export * from "./interfaces";
-export * from "./utils";
 export * from "./fargate/interfaces";
-export * from "./fargate/constants";
 export * from "./fargate/datadog-ecs-fargate";

src/index.ts

@@ -18,16 +18,6 @@ export * from "./interfaces";
 export * from "./redirect";
 export * from "./transport";
 
-export * from "./ecs/interfaces";
-export * from "./ecs/fargate/datadog-ecs-fargate";
-export {
-  DatadogECSFargateProps,
-  DatadogECSLogDriverProps,
-  LoggingType,
-  FargateLogCollectionFeatureConfig,
-  FluentbitConfig,
-  DatadogFirelensOptions,
-  FargateCWSFeatureConfig,
-} from "./ecs/fargate/interfaces";
+export * from "./ecs";
 
 export * from "./apigateway";

test/datadog-lambda.spec.ts

@@ -809,7 +809,7 @@ describe("overrideGitMetadata", () => {
       expect((<any>f).environment[DD_TAGS].value.split(",")).toEqual(
         expect.arrayContaining([
           "git.commit.sha:fake-sha",
-          "git.repository_url:github.com/DataDog/datadog-cdk-constructs",
+          "git.repository_url:github.com/DataDog/datadog-cdk-constructs.git",
         ]),
       );
     });
@@ -837,7 +837,7 @@ describe("overrideGitMetadata", () => {
       (<any>hello).environment[DD_TAGS].value.split(",").some((item: string) => item.includes("git.commit.sha")),
     ).toEqual(true);
     expect((<any>hello).environment[DD_TAGS].value.split(",")).toEqual(
-      expect.arrayContaining(["git.repository_url:github.com/DataDog/datadog-cdk-constructs"]),
+      expect.arrayContaining(["git.repository_url:github.com/DataDog/datadog-cdk-constructs.git"]),
     );
   });
 

test/ecs/fargate/cws.spec.ts

@@ -3,6 +3,7 @@ import { Template, Match } from "aws-cdk-lib/assertions";
 import * as ecs from "aws-cdk-lib/aws-ecs";
 import { Construct } from "constructs";
 import * as ecsDatadog from "../../../src/ecs";
+import { EntryPointPrefixCWS } from "../../../src/ecs/fargate/constants";
 
 describe("DatadogECSFargateTaskDefinition", () => {
   let app: cdk.App;
@@ -62,7 +63,7 @@ describe("DatadogECSFargateTaskDefinition", () => {
     taskDefinition.addContainer("app-container", containerProps);
 
     // Expected entry point with CWS prefix
-    entryPoint.unshift(...ecsDatadog.entryPointPrefixCWS);
+    entryPoint.unshift(...EntryPointPrefixCWS);
     const template = Template.fromStack(stack);
 
     // Validate that the entry point prefix and volume mount are added