clean up code

Author: jchrostek-dd

.gitlab/templates/pipeline.yaml.tpl

@@ -349,14 +349,8 @@ publish integration layer (arm64):
     - echo "Publishing layer with suffix - ${PIPELINE_LAYER_SUFFIX}"
   script:
     - .gitlab/scripts/publish_layers.sh
-    # Get the layer ARN we just published and save it as an artifact
     - LAYER_ARN=$(aws lambda list-layer-versions --layer-name "Datadog-Extension-ARM-${CI_COMMIT_SHORT_SHA}" --query 'LayerVersions[0].LayerVersionArn' --output text --region us-east-1)
     - echo "Published layer ARN - ${LAYER_ARN}"
-    - echo "${LAYER_ARN}" > integration_layer_arn.txt
-  artifacts:
-    paths:
-      - integration_layer_arn.txt
-    expire_in: 1 hour
   {{ end }}
 
 # Integration Tests - Deploy CDK stacks with commit hash prefix
@@ -368,8 +362,6 @@ integration-deploy:
     - when: on_success
   needs:
     - publish integration layer (arm64)
-  dependencies:
-    - publish integration layer (arm64)
   variables:
     IDENTIFIER: ${CI_COMMIT_SHORT_SHA}
     AWS_DEFAULT_REGION: us-east-1
@@ -383,7 +375,7 @@ integration-deploy:
   {{ end }}
   script:
     - echo "Deploying CDK stacks with identifier ${IDENTIFIER}..."
-    - export EXTENSION_LAYER_ARN=$(cat ../integration_layer_arn.txt)
+    - export EXTENSION_LAYER_ARN=$(aws lambda list-layer-versions --layer-name "Datadog-Extension-ARM-${CI_COMMIT_SHORT_SHA}" --query 'LayerVersions[0].LayerVersionArn' --output text --region us-east-1)
     - echo "Using integration test layer - ${EXTENSION_LAYER_ARN}"
     - export CDK_DEFAULT_ACCOUNT=$(aws sts get-caller-identity --query Account --output text)
     - export CDK_DEFAULT_REGION=us-east-1

integration-tests/README.md

@@ -36,7 +36,7 @@ For simplicity, integraiton tests are setup to only test against ARM runtimes.
 First, publish your extension layer. 
 
 ```bash
-./scripts/publish_local.sh
+./scripts/local_publish.sh
 ```
 
 This will create and publish `Datadog-Extension-ARM-<your name>`.
@@ -46,7 +46,7 @@ This will create and publish `Datadog-Extension-ARM-<your name>`.
 Deploy the CDK stacks that create Lambda functions for testing.
 
 ```bash
-./scripts/deploy.sh <stack name> 
+./scripts/local_deploy.sh <stack name> 
 ```
 
 This will create `integ-<your name>-<stack name>`. The stacks will use the lambda extension created in the previous step.
@@ -56,8 +56,15 @@ This will create `integ-<your name>-<stack name>`. The stacks will use the lambd
 Run Jest tests that invoke Lambda functions and verify Datadog telemetry:
 
 ```bash
+# All tests
 npm test
+
+# Single test
+npm test -- <my test file>
 ```
-**Note**: Tests wait 10 minutes after Lambda invocation to allow telemetry to appear in Datadog. 
+
+
+
+**Note**: Tests wait for a few minutes after Lambda invocation to allow telemetry to appear in Datadog. 
 
 

integration-tests/bin/app.ts

@@ -1,40 +1,17 @@
 #!/usr/bin/env node
 import 'source-map-support/register';
 import * as cdk from 'aws-cdk-lib';
-import * as os from 'os';
 import { BaseNodeStack } from '../lib/stacks/base-node-stack';
 import { BasePythonStack } from '../lib/stacks/base-python-stack';
+import { getIdentifier } from '../tests/utils/config';
 
 const app = new cdk.App();
 
-// Get configuration from context or environment variables
 const env = {
   account: process.env.CDK_DEFAULT_ACCOUNT || process.env.AWS_ACCOUNT_ID,
   region: process.env.CDK_DEFAULT_REGION || process.env.AWS_REGION || 'us-east-1',
 };
 
-// Get identifier from environment variable, or derive from username, or default
-function getIdentifier(): string {
-  if (process.env.IDENTIFIER) {
-    return process.env.IDENTIFIER;
-  }
-
-  if (process.env.SUFFIX) {
-    return process.env.SUFFIX;
-  }
-
-  try {
-    const username = os.userInfo().username;
-    const firstName = username.split('.')[0];
-    if (firstName && firstName.length > 0) {
-      return firstName;
-    }
-  } catch (error) {
-  }
-
-  return 'integration';
-}
-
 const identifier = getIdentifier();
 
 new BaseNodeStack(app, `integ-${identifier}-base-node`, {

integration-tests/tests/utils/config.ts

@@ -4,6 +4,7 @@ export function getIdentifier(): string {
   if (process.env.IDENTIFIER) {
     return process.env.IDENTIFIER;
   }
+
   try {
     const username = os.userInfo().username;
     const firstName = username.split('.')[0];
@@ -13,5 +14,6 @@ export function getIdentifier(): string {
   } catch (error) {
     console.error('Error getting identifier:', error);
   }
+
   return 'integration';
 }