lint/syntax fixes

Author: gabedos

integration_tests/stacks/python/datadog_cdk_constructs_v2-2.4.0.tar.gz

@@ -7,9 +7,9 @@
  */
 
 import { Duration } from "aws-cdk-lib";
+import { FirelensConfigFileType } from "aws-cdk-lib/aws-ecs";
 import { DatadogECSFargateProps, DatadogECSLogDriverProps, LoggingType } from "./interfaces";
 import { DatadogEcsBaseDefaultProps } from "../constants";
-import { FirelensConfigFileType } from "aws-cdk-lib/aws-ecs";
 
 /**
  * Default environment variables for the Agent in Fargate Tasks

src/ecs/fargate/constants.ts

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

src/ecs/fargate/utils.ts

@@ -82,20 +82,23 @@ export class ExampleStack extends Stack {
       memoryLimitMiB: 1024,
     });
 
-    fargateTaskDefinition.addContainer("DatadogDogstatsd", {
-      containerName: "datadog-dogstatsd-app",
+    // Dummy app emitting custom metrics
+    fargateTaskDefinition.addContainer("DummyDogstatsd", {
+      containerName: "dummy-dogstatsd-app",
       image: ecs.ContainerImage.fromRegistry("ghcr.io/datadog/apps-dogstatsd:main"),
       essential: false,
     });
 
-    fargateTaskDefinition.addContainer("DatadogAPM", {
-      containerName: "datadog-apm-app",
+    // Dummy app emitting APM traces + logs
+    fargateTaskDefinition.addContainer("DummyAPM", {
+      containerName: "dummy-apm-app",
       image: ecs.ContainerImage.fromRegistry("ghcr.io/datadog/apps-tracegen:main"),
       essential: true,
     });
 
-    fargateTaskDefinition.addContainer("DatadogCWS", {
-      containerName: "datadog-cws-app",
+    // Dummy app emitting CWS events + logs
+    fargateTaskDefinition.addContainer("DummyCWS", {
+      containerName: "dummy-cws-app",
       image: ecs.ContainerImage.fromRegistry("public.ecr.aws/ubuntu/ubuntu:22.04_stable"),
       essential: false,
       entryPoint: [
@@ -106,8 +109,8 @@ export class ExampleStack extends Stack {
     });
 
     // no-dd-sa:typescript-code-style/no-new
-    new ecs.FargateService(this, "NginxService", {
-      serviceName: "NginxService",
+    new ecs.FargateService(this, "DatadogMonitoredService", {
+      serviceName: "DatadogMonitoredService",
       cluster,
       taskDefinition: fargateTaskDefinition,
       desiredCount: 1,
@@ -131,8 +134,8 @@ export class ExampleStack extends Stack {
         globalTags: "team:cont-p, owner:container-monitoring",
       },
     );
-    task.addContainer("DatadogDogstatsd", {
-      containerName: "datadog-dogstatsd-app",
+    task.addContainer("DummyDogstatsd", {
+      containerName: "dummy-dogstatsd-app",
       image: ecs.ContainerImage.fromRegistry("ghcr.io/datadog/apps-dogstatsd:main"),
       essential: true,
     });

src/sample/ecs_fargate/index.ts

@@ -287,41 +287,38 @@ describe("DatadogECSFargateTaskDefinition", () => {
       },
     ];
 
-    test.each(cases)(
-      "should %s",
-      ({ isEnabled, traceInferredProxyServices, shouldSet, expectedValue }) => {
-        const template = createTaskWithApmProps({ isEnabled, traceInferredProxyServices });
-        if (shouldSet) {
-          template.hasResourceProperties("AWS::ECS::TaskDefinition", {
-            ContainerDefinitions: Match.arrayWith([
-              Match.objectLike({
-                Name: "app-container",
-                Environment: Match.arrayWith([
+    test.each(cases)("should %s", ({ isEnabled, traceInferredProxyServices, shouldSet, expectedValue }) => {
+      const template = createTaskWithApmProps({ isEnabled, traceInferredProxyServices });
+      if (shouldSet) {
+        template.hasResourceProperties("AWS::ECS::TaskDefinition", {
+          ContainerDefinitions: Match.arrayWith([
+            Match.objectLike({
+              Name: "app-container",
+              Environment: Match.arrayWith([
+                Match.objectLike({
+                  Name: "DD_TRACE_INFERRED_PROXY_SERVICES_ENABLED",
+                  Value: expectedValue,
+                }),
+              ]),
+            }),
+          ]),
+        });
+      } else {
+        template.hasResourceProperties("AWS::ECS::TaskDefinition", {
+          ContainerDefinitions: Match.arrayWith([
+            Match.objectLike({
+              Name: "app-container",
+              Environment: Match.not(
+                Match.arrayWith([
                   Match.objectLike({
                     Name: "DD_TRACE_INFERRED_PROXY_SERVICES_ENABLED",
-                    Value: expectedValue,
                   }),
                 ]),
-              }),
-            ]),
-          });
-        } else {
-          template.hasResourceProperties("AWS::ECS::TaskDefinition", {
-            ContainerDefinitions: Match.arrayWith([
-              Match.objectLike({
-                Name: "app-container",
-                Environment: Match.not(
-                  Match.arrayWith([
-                    Match.objectLike({
-                      Name: "DD_TRACE_INFERRED_PROXY_SERVICES_ENABLED",
-                    }),
-                  ])
-                ),
-              }),
-            ]),
-          });
-        }
+              ),
+            }),
+          ]),
+        });
       }
-    );
+    });
   });
 });

test/ecs/fargate/apm-dsd.spec.ts

@@ -223,7 +223,7 @@ describe("DatadogECSFargateLogging", () => {
           firelensOptions: {
             isParseJson: true,
             configFileValue: "this/value/should/be/overridden.conf",
-          }
+          },
         },
       },
     };
@@ -242,8 +242,8 @@ describe("DatadogECSFargateLogging", () => {
               "enable-ecs-log-metadata": "true",
               "config-file-type": "file",
               "config-file-value": "/fluent-bit/configs/parse-json.conf",
-            }
-          }
+            },
+          },
         }),
       ]),
     });
@@ -259,7 +259,7 @@ describe("DatadogECSFargateLogging", () => {
             isParseJson: false,
             configFileType: ecsDatadog.ParseJsonFirelensConfigFileType,
             configFileValue: "some/other/value.conf",
-          }
+          },
         },
       },
     };
@@ -278,8 +278,8 @@ describe("DatadogECSFargateLogging", () => {
               "enable-ecs-log-metadata": "true",
               "config-file-type": "file",
               "config-file-value": "some/other/value.conf",
-            }
-          }
+            },
+          },
         }),
       ]),
     });