Migrating code to aws sdk v3

tstibbs · Jan 16, 2025 · f47ef81 · f47ef81
1 parent 07acee1
commit f47ef81
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 17 deletions.
diff --git a/backend/src/handlers/message.js b/backend/src/handlers/message.js
@@ -1,4 +1,4 @@
-import {aws} from '../utils.js'
+import {ApiGatewayManagementApi} from '@aws-sdk/client-apigatewaymanagementapi'
 import {getPoolId, getConnectionIdsInPool, deleteConnection} from '../persistance.js'
 import {buildClientsCounterMessageFromEvent} from './client-count.js'
 import {messageTypeClientJoined, messageTypeMulti} from '../../../ui-additions/src/constants.js'
@@ -27,8 +27,8 @@ export async function sendMessageToPoolId(event, poolId, message) {
 }
 
 async function sendMessageToConnections(event, connectionIds, message) {
-	const apigwManagementApi = new aws.ApiGatewayManagementApi({
-		endpoint: event.requestContext.domainName + '/' + event.requestContext.stage
+	const apigwManagementApi = new ApiGatewayManagementApi({
+		endpoint: 'https://' + event.requestContext.domainName + '/' + event.requestContext.stage
 	})
 
 	if (Array.isArray(message)) {
@@ -43,7 +43,7 @@ async function sendMessageToConnections(event, connectionIds, message) {
 		try {
 			await apigwManagementApi.postToConnection({ConnectionId: connectionId, Data: JSON.stringify(message)})
 		} catch (e) {
-			if (e.statusCode === 410) {
+			if (e['$metadata'].httpStatusCode === 410) {
 				console.log(`Found stale connection, deleting ${connectionId}`)
 				await deleteConnection(connectionId)
 			} else {

diff --git a/backend/src/persistance.js b/backend/src/persistance.js
@@ -1,9 +1,11 @@
-import {TABLE_NAME, aws} from './utils.js'
+import {TABLE_NAME} from './utils.js'
 import {TABLE_SCHEMA} from './constants.js'
+import {DynamoDBDocument} from '@aws-sdk/lib-dynamodb'
+import {DynamoDB} from '@aws-sdk/client-dynamodb'
 
 const expirationTime = 1.5 * 24 * 60 * 60 //one and a half days in seconds
 
-export const dydbClient = new aws.DynamoDB.DocumentClient()
+export const dydbClient = DynamoDBDocument.from(new DynamoDB())
 
 export async function deleteConnection(connectionId) {
 	const params = {

diff --git a/backend/src/utils.js b/backend/src/utils.js
@@ -1,14 +1,5 @@
 import dotenv from 'dotenv'
-import aws from 'aws-sdk'
 
 dotenv.config()
 
-aws.config.apiVersions = {
-	dynamodb: '2012-08-10',
-	apigatewaymanagementapi: '2018-11-29',
-	s3: '2006-03-01'
-}
-
-export {aws}
-
 export const {TABLE_NAME, BUCKET} = process.env
diff --git a/backend/tools/generate-pdf-index.js b/backend/tools/generate-pdf-index.js
@@ -3,7 +3,7 @@
 import {strict as assert} from 'assert'
 
 import {IndexGenerator} from '@tstibbs/cloud-core-utils/src/tools/generate-s3-index.js'
-import {awsServiceConfig} from '@tstibbs/cloud-core-utils/src/tools/aws-client-config.js'
+import {defaultAwsClientConfig} from '@tstibbs/cloud-core-utils/src/tools/aws-client-config.js'
 
 import yargs from 'yargs'
 import {hideBin} from 'yargs/helpers'
@@ -35,7 +35,7 @@ const {pdfSyncCredentialsProfile, localPath, basePath, websiteStackName, pdfSync
 
 function buildApi(credentialsProfileName) {
 	let options = {
-		...awsServiceConfig('CloudFormation')
+		...defaultAwsClientConfig
 	}
 	if (credentialsProfileName != null) {
 		options.credentials = fromIni({