update

Author: jchrostek-dd

.gitlab/templates/pipeline.yaml.tpl

@@ -337,12 +337,12 @@ publish integration layer (arm64):
   {{ with $environment := (ds "environments").environments.sandbox }}
   before_script:
     - EXTERNAL_ID_NAME={{ $environment.external_id }} ROLE_TO_ASSUME={{ $environment.role_to_assume }} AWS_ACCOUNT={{ $environment.account }} source .gitlab/scripts/get_secrets.sh
-    - export PIPELINE_LAYER_SUFFIX="${CI_COMMIT_SHORT_SHA}"
+    - export PIPELINE_LAYER_SUFFIX="ARM-${CI_COMMIT_SHORT_SHA}"
     - 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-${CI_COMMIT_SHORT_SHA}" --query 'LayerVersions[0].LayerVersionArn' --output text --region us-east-1)
+    - 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:

integration-tests/lib/util.ts

@@ -7,11 +7,8 @@ import { LayerVersion } from "aws-cdk-lib/aws-lambda";
 export const datadogSecretArn = process.env.DATADOG_API_SECRET_ARN || '';
 export const extensionLayerArn = process.env.EXTENSION_LAYER_ARN || 'arn:aws:lambda:us-east-1:464622532012:layer:Datadog-Extension-ARM:89' 
 
-// TODO
 export const node20LayerArn = 'arn:aws:lambda:us-east-1:464622532012:layer:Datadog-Node20-x:130';
 export const python312LayerArn = 'arn:aws:lambda:us-east-1:464622532012:layer:Datadog-Python312-ARM:117';
-export const javaLayerArn = 'arn:aws:lambda:us-east-1:464622532012:layer:dd-trace-java:21';
-export const dotnetLayerArn = 'arn:aws:lambda:us-east-1:464622532012:layer:dd-trace-dotnet-ARM:19';
 
 export interface Props extends cdk.StackProps{
   identifier: string
@@ -66,20 +63,4 @@ export const getPython312Layer = (scope: Construct) => {
     'DatadogPython312Layer',
     python312LayerArn
   );
-};
-
-export const getJavaLayer = (scope: Construct) => {
-  return LayerVersion.fromLayerVersionArn(
-    scope,
-    'DatadogJavaLayer',
-    javaLayerArn
-  );
-};
-
-export const getDotnetLayer = (scope: Construct) => {
-  return LayerVersion.fromLayerVersionArn(
-    scope,
-    'DatadogDotnetLayer',
-    dotnetLayerArn
-  );
-};
+};