update to aws sdk v3/ node 18

Author: steffeng

LICENSE

@@ -1,4 +1,4 @@
-Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+Copyright 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this
 software and associated documentation files (the "Software"), to deal in the Software

functions/createPartitions.js functions/createPartitions.mjsfunctions/createPartitions.js renamed to functions/createPartitions.mjs

@@ -1,13 +1,13 @@
-// Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// Copyright 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: MIT-0
-const util = require('./util');
+import { runQuery } from './util.mjs'
 
 // AWS Glue Data Catalog database and table
 const table = process.env.TABLE;
 const database = process.env.DATABASE;
 
 // creates partitions for the hour after the current hour
-exports.handler = async (event, context, callback) => {
+export const handler = async () => {
   const nextHour = new Date(Date.now() + 60 * 60 * 1000);
   const year = nextHour.getUTCFullYear();
   const month = (nextHour.getUTCMonth() + 1).toString().padStart(2, '0');
@@ -24,5 +24,5 @@ exports.handler = async (event, context, callback) => {
         day = '${day}',
         hour = '${hour}' );`;
 
-  await util.runQuery(createPartitionStatement);
+  await runQuery(createPartitionStatement);
 }

functions/moveAccessLogs.js functions/moveAccessLogs.mjsfunctions/moveAccessLogs.js renamed to functions/moveAccessLogs.mjs

@@ -1,7 +1,9 @@
-// Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// Copyright 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: MIT-0
-const aws = require('aws-sdk');
-const s3 = new aws.S3({ apiVersion: '2006-03-01' });
+import { S3Client } from "@aws-sdk/client-s3";
+import { CopyObjectCommand } from '@aws-sdk/client-s3';
+import { DeleteObjectCommand } from '@aws-sdk/client-s3';
+const s3 = new S3Client();
 
 // prefix to copy partitioned data to w/o leading but w/ trailing slash
 const targetKeyPrefix = process.env.TARGET_KEY_PREFIX;
@@ -14,7 +16,7 @@ const targetKeyPrefix = process.env.TARGET_KEY_PREFIX;
 const datePattern = '[^\\d](\\d{4})-(\\d{2})-(\\d{2})-(\\d{2})[^\\d]';
 const filenamePattern = '[^/]+$';
 
-exports.handler = async (event, context, callback) => {
+export const handler = async (event, _, callback) => {
   const moves = event.Records.map(record => {
     const bucket = record.s3.bucket.name;
     const sourceKey = record.s3.object.key;
@@ -37,13 +39,13 @@ exports.handler = async (event, context, callback) => {
         Bucket: bucket,
         Key: targetKey
       };
-      const copy = s3.copyObject(copyParams).promise();
+      const copy = s3.send(new CopyObjectCommand(copyParams));
 
       const deleteParams = { Bucket: bucket, Key: sourceKey };
 
       return copy.then(function () {
         console.log(`Copied. Now deleting ${sourceKey}.`);
-        const del = s3.deleteObject(deleteParams).promise();
+        const del = s3.send(new DeleteObjectCommand(deleteParams));
         console.log(`Deleted ${sourceKey}.`);
         return del;
       }, function (reason) {

functions/transformPartition.js functions/transformPartition.mjsfunctions/transformPartition.js renamed to functions/transformPartition.mjs

@@ -1,14 +1,14 @@
-// Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// Copyright 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: MIT-0
-const util = require('./util');
+import { runQuery } from './util.mjs'
 
 // AWS Glue Data Catalog database and tables
 const sourceTable = process.env.SOURCE_TABLE;
 const targetTable = process.env.TARGET_TABLE;
 const database = process.env.DATABASE;
 
 // get the partition of 2hours ago
-exports.handler = async (event, context, callback) => {
+export const handler = async () => {
   const partitionHour = new Date(Date.now() - 120 * 60 * 1000);
   const year = partitionHour.getUTCFullYear();
   const month = (partitionHour.getUTCMonth() + 1).toString().padStart(2, '0');
@@ -26,5 +26,5 @@ exports.handler = async (event, context, callback) => {
         AND day = '${day}'
         AND hour = '${hour}';`;
 
-  await util.runQuery(ctasStatement);
+  await runQuery(ctasStatement);
 }

functions/util.js functions/util.mjsfunctions/util.js renamed to functions/util.mjs

@@ -1,16 +1,16 @@
-// Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// Copyright 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: MIT-0
-const aws = require('aws-sdk');
-const athena = new aws.Athena({ apiVersion: '2017-05-18' });
+import { AthenaClient, GetQueryExecutionCommand, StartQueryExecutionCommand } from '@aws-sdk/client-athena';
+const athena = new AthenaClient();
 
 // s3 URL of the query results (without trailing slash)
 const athenaQueryResultsLocation = process.env.ATHENA_QUERY_RESULTS_LOCATION;
 
 async function waitForQueryExecution(queryExecutionId) {
   while (true) {
-    const data = await athena.getQueryExecution({
+    const data = await athena.send(new GetQueryExecutionCommand({
       QueryExecutionId: queryExecutionId
-    }).promise();
+    }));
     const state = data.QueryExecution.Status.State;
     if (state === 'SUCCEEDED') {
       return;
@@ -21,13 +21,14 @@ async function waitForQueryExecution(queryExecutionId) {
   }
 }
 
-exports.runQuery = async (query) => {
+
+export function runQuery(query) {
   const params = {
     QueryString: query,
     ResultConfiguration: {
       OutputLocation: athenaQueryResultsLocation
     }
   };
-  return athena.startQueryExecution(params).promise()
+  return athena.send(new StartQueryExecutionCommand(params))
     .then(data => waitForQueryExecution(data.QueryExecutionId));
 }