chore(ci): phase out aws-sdk usage (#1405)

* chore: removed aws sdk v2 from tests and other places

* chore: removed aws-sdk v2 from cdk example

* chore: bump dev dep

* chore: fixed sam example

* chore: temporarily removed compatible arch from layer

Author: dreamorosi

Diff for: docs/snippets/package.json

@@ -32,6 +32,7 @@
     "@aws-sdk/client-secrets-manager": "^3.250.0",
     "@aws-sdk/client-ssm": "^3.245.0",
     "@aws-sdk/util-dynamodb": "^3.245.0",
+    "aws-sdk": "^2.1354.0",
     "aws-sdk-client-mock": "^2.0.1",
     "aws-sdk-client-mock-jest": "^2.0.1",
     "axios": "^1.2.4"

Diff for: examples/cdk/functions/get-all-items.ts

@@ -67,7 +67,7 @@ const getAllItemsHandler = async (event: APIGatewayProxyEvent, context: Context)
 
     // Logger: All log statements are written to CloudWatch
     logger.debug(`retrieved items: ${items?.length || 0}`);
-    
+
     logger.info(`Response ${event.path}`, {
       statusCode: 200,
       body: items,
@@ -80,7 +80,7 @@ const getAllItemsHandler = async (event: APIGatewayProxyEvent, context: Context)
   } catch (err) {
     tracer.addErrorAsMetadata(err as Error);
     logger.error('Error reading from table. ' + err);
-    
+
     return {
       statusCode: 500,
       body: JSON.stringify({ 'error': 'Error reading from table.' })

Diff for: examples/cdk/functions/get-by-id.ts

@@ -79,24 +79,24 @@ class Lambda implements LambdaInterface {
       const data = await docClient.send(new GetCommand({
         TableName: tableName,
         Key: {
-          id: event.pathParameters.id 
+          id: event.pathParameters.id
         }
       }));
       const item = data.Item;
-      
+
       logger.info(`Response ${event.path}`, {
         statusCode: 200,
         body: item,
       });
-      
+
       return {
         statusCode: 200,
         body: JSON.stringify(item)
       };
     } catch (err) {
       tracer.addErrorAsMetadata(err as Error);
       logger.error('Error reading from table. ' + err);
-      
+
       return {
         statusCode: 500,
         body: JSON.stringify({ 'error': 'Error reading from table.' })

Diff for: examples/cdk/functions/put-item.ts

@@ -4,6 +4,7 @@ import { logger, tracer, metrics } from './common/powertools';
 import { docClient } from './common/dynamodb-client';
 import { PutCommand } from '@aws-sdk/lib-dynamodb';
 import { default as request } from 'phin';
+import type { Subsegment } from 'aws-xray-sdk-core';
 
 /**
  *
@@ -28,8 +29,11 @@ export const handler = async (event: APIGatewayProxyEvent, context: Context): Pr
   const segment = tracer.getSegment();
 
   // Tracer: Create subsegment for the function & set it as active
-  const handlerSegment = segment.addNewSubsegment(`## ${process.env._HANDLER}`);
-  tracer.setSegment(handlerSegment);
+  let handlerSegment: Subsegment | undefined;
+  if (segment) {
+    handlerSegment = segment.addNewSubsegment(`## ${process.env._HANDLER}`);
+    tracer.setSegment(handlerSegment);
+  }
 
   // Tracer: Annotate the subsegment with the cold start & serviceName
   tracer.annotateColdStart();
@@ -79,7 +83,7 @@ export const handler = async (event: APIGatewayProxyEvent, context: Context): Pr
     await docClient.send(new PutCommand({
       TableName: tableName,
       Item: {
-        id, 
+        id,
         name
       }
     }));
@@ -96,15 +100,17 @@ export const handler = async (event: APIGatewayProxyEvent, context: Context): Pr
   } catch (err) {
     tracer.addErrorAsMetadata(err as Error);
     logger.error('Error writing data to table. ' + err);
-    
+
     return {
       statusCode: 500,
       body: JSON.stringify({ 'error': 'Error writing data to table.' })
     };
   } finally {
-    // Tracer: Close subsegment (the AWS Lambda one is closed automatically)
-    handlerSegment.close(); // (## index.handler)
-    // Tracer: Set the facade segment as active again (the one created by AWS Lambda)
-    tracer.setSegment(segment);
+    if (segment && handlerSegment) {
+      // Tracer: Close subsegment (the AWS Lambda one is closed automatically)
+      handlerSegment.close(); // (## index.handler)
+      // Tracer: Set the facade segment as active again (the one created by AWS Lambda)
+      tracer.setSegment(segment);
+    }
   }
 };