@xube/kit-aws 0.0.111 → 0.0.112

package/dist/resources/athena/get.d.ts

@@ -14,7 +14,7 @@ type FetchDataRequest = {
     nextToken?: string;
     queryExecutionId?: string;
 };
-export declare const handlePagination: (request: FetchDataRequest) => Promise<string>;
+export declare const handlePagination: (request: FetchDataRequest, glueDatabaseName: string, glueTableName: string, s3BucketName: string, s3BucketAthenaResultsPrefix: string) => Promise<string>;
 export declare const fetchQueryResults: (queryExecutionId: string, paginationParams: PaginationParams, limit: number) => Promise<GetQueryResultsCommandOutput>;
 export declare const formatResponse: (resultsResponse: GetQueryResultsCommandOutput, queryExecutionId: string, paginationParams: PaginationParams) => APIGatewayProxyResult;
 export {};

package/dist/resources/athena/get.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get.d.ts","sourceRoot":"","sources":["../../../src/resources/athena/get.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAGZ,4BAA4B,EAC5B,SAAS,EAEV,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AAEnD,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAIxC,eAAO,MAAM,sBAAsB,WACzB,YAAY,oBACF,MAAM,QACnB,OAAO,kBACG,MAAM,mBACL,MAAM,KACrB,OAAO,CAAC,OAAO,CAgDjB,CAAC;AAEF,eAAO,MAAM,sBAAsB,cACtB,SAAS,GAAG,SAAS,cACpB,OAAO,KAClB,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAsBrB,CAAC;AAEF,UAAU,gBAAgB;IACxB,UAAU,EAAE,OAAO,CAAC;IACpB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,KAAK,gBAAgB,GAAG;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B,CAAC;AA+DF,eAAO,MAAM,gBAAgB,YAClB,gBAAgB,KACxB,OAAO,CAAC,MAAM,CAahB,CAAC;AAEF,eAAO,MAAM,iBAAiB,qBACV,MAAM,oBACN,gBAAgB,SAC3B,MAAM,KACZ,OAAO,CAAC,4BAA4B,CAiBtC,CAAC;AAEF,eAAO,MAAM,cAAc,oBACR,4BAA4B,oBAC3B,MAAM,oBACN,gBAAgB,KACjC,qBAuBF,CAAC"}
+{"version":3,"file":"get.d.ts","sourceRoot":"","sources":["../../../src/resources/athena/get.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAGZ,4BAA4B,EAC5B,SAAS,EAEV,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AAEnD,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAIxC,eAAO,MAAM,sBAAsB,WACzB,YAAY,oBACF,MAAM,QACnB,OAAO,kBACG,MAAM,mBACL,MAAM,KACrB,OAAO,CAAC,OAAO,CAgDjB,CAAC;AAEF,eAAO,MAAM,sBAAsB,cACtB,SAAS,GAAG,SAAS,cACpB,OAAO,KAClB,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAsBrB,CAAC;AAEF,UAAU,gBAAgB;IACxB,UAAU,EAAE,OAAO,CAAC;IACpB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,KAAK,gBAAgB,GAAG;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B,CAAC;AA6DF,eAAO,MAAM,gBAAgB,YAClB,gBAAgB,oBACP,MAAM,iBACT,MAAM,gBACP,MAAM,+BACS,MAAM,KAClC,OAAO,CAAC,MAAM,CAkBhB,CAAC;AAEF,eAAO,MAAM,iBAAiB,qBACV,MAAM,oBACN,gBAAgB,SAC3B,MAAM,KACZ,OAAO,CAAC,4BAA4B,CAiBtC,CAAC;AAEF,eAAO,MAAM,cAAc,oBACR,4BAA4B,oBAC3B,MAAM,oBACN,gBAAgB,KACjC,qBAuBF,CAAC"}

package/dist/resources/athena/get.js

@@ -56,40 +56,33 @@ const transformAthenaResults = (resultSet, isNextPage) => {
     });
 };
 exports.transformAthenaResults = transformAthenaResults;
-const GLUE_DATABASE_NAME = process.env.ATHENA_GLUE_DATABASE ?? "";
-const GLUE_TABLE_NAME = process.env.ATHENA_GLUE_TABLE ?? "";
-const S3_BUCKET_NAME = process.env.ATHENA_RESULTS_BUCKET ?? "";
-const S3_BUCKET_ATHENA_RESULTS_PREFIX = process.env.ATHENA_RESULTS_PREFIX ?? "athena-results";
-const buildQuery = (request) => {
-    const databaseName = GLUE_DATABASE_NAME;
-    const tableName = GLUE_TABLE_NAME;
+const buildQuery = (request, glueDatabaseName, glueTableName) => {
     const { from, to } = request;
     if (to) {
         return `
-      SELECT * FROM "${databaseName}"."${tableName}"
+      SELECT * FROM "${glueDatabaseName}"."${glueTableName}"
       WHERE "s" BETWEEN ${from} AND ${to}
       ORDER BY "s" DESC
     `;
     }
     else {
         return `
-      SELECT * FROM "${databaseName}"."${tableName}"
+      SELECT * FROM "${glueDatabaseName}"."${glueTableName}"
       WHERE "s" >= ${from}
       ORDER BY "s" DESC
     `;
     }
 };
-const executeNewQuery = async (query) => {
+const executeNewQuery = async (query, glueDatabaseName, s3BucketName, s3BucketAthenaResultsPrefix) => {
     const athenaClient = (0, client_1.getAthenaClient)();
-    const databaseName = GLUE_DATABASE_NAME;
     const queryExecution = await athenaClient.send(new client_athena_1.StartQueryExecutionCommand({
         QueryString: query,
         QueryExecutionContext: {
-            Database: databaseName,
+            Database: glueDatabaseName,
         },
         WorkGroup: "primary",
         ResultConfiguration: {
-            OutputLocation: `s3://${S3_BUCKET_NAME}/${S3_BUCKET_ATHENA_RESULTS_PREFIX}`,
+            OutputLocation: `s3://${s3BucketName}/${s3BucketAthenaResultsPrefix}`,
         },
     }));
     if (!queryExecution.QueryExecutionId) {
@@ -101,7 +94,7 @@ const executeNewQuery = async (query) => {
     }
     return queryExecution.QueryExecutionId;
 };
-const handlePagination = async (request) => {
+const handlePagination = async (request, glueDatabaseName, glueTableName, s3BucketName, s3BucketAthenaResultsPrefix) => {
     const paginationParams = {
         isNextPage: !!request.nextToken && !!request.queryExecutionId,
         queryExecutionId: request.queryExecutionId,
@@ -111,8 +104,8 @@ const handlePagination = async (request) => {
         return request.queryExecutionId;
     }
     else {
-        const query = buildQuery(request);
-        return await executeNewQuery(query);
+        const query = buildQuery(request, glueDatabaseName, glueTableName);
+        return await executeNewQuery(query, glueDatabaseName, s3BucketName, s3BucketAthenaResultsPrefix);
     }
 };
 exports.handlePagination = handlePagination;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xube/kit-aws",
-  "version": "0.0.111",
+  "version": "0.0.112",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
@@ -18,7 +18,7 @@
   "homepage": "https://github.com/XubeLtd/dev-kit#readme",
   "devDependencies": {
     "@types/aws-lambda": "^8.10.119",
-    "@xube/kit-build": "^0.0.111"
+    "@xube/kit-build": "^0.0.112"
   },
   "dependencies": {
     "@aws-sdk/client-athena": "^3.656.0",
@@ -29,10 +29,10 @@
     "@aws-sdk/client-ssm": "^3.654.0",
     "@aws-sdk/lib-dynamodb": "^3.656.0",
     "@aws-sdk/util-dynamodb": "^3.656.0",
-    "@xube/kit-aws-schema": "^0.0.111",
-    "@xube/kit-log": "^0.0.111",
-    "@xube/kit-request": "^0.0.111",
-    "@xube/kit-schema": "^0.0.111",
+    "@xube/kit-aws-schema": "^0.0.112",
+    "@xube/kit-log": "^0.0.112",
+    "@xube/kit-request": "^0.0.112",
+    "@xube/kit-schema": "^0.0.112",
     "zod": "^3.23.8"
   }
 }

package/src/resources/athena/get.ts

@@ -108,47 +108,45 @@ type FetchDataRequest = {
   queryExecutionId?: string;
 };
 
-const GLUE_DATABASE_NAME = process.env.ATHENA_GLUE_DATABASE ?? "";
-const GLUE_TABLE_NAME = process.env.ATHENA_GLUE_TABLE ?? "";
-const S3_BUCKET_NAME = process.env.ATHENA_RESULTS_BUCKET ?? "";
-const S3_BUCKET_ATHENA_RESULTS_PREFIX =
-  process.env.ATHENA_RESULTS_PREFIX ?? "athena-results";
-
-const buildQuery = (request: FetchDataRequest): string => {
-  const databaseName = GLUE_DATABASE_NAME;
-  const tableName = GLUE_TABLE_NAME;
-
+const buildQuery = (
+  request: FetchDataRequest,
+  glueDatabaseName: string,
+  glueTableName: string
+): string => {
   const { from, to } = request;
 
   if (to) {
     return `
-      SELECT * FROM "${databaseName}"."${tableName}"
+      SELECT * FROM "${glueDatabaseName}"."${glueTableName}"
       WHERE "s" BETWEEN ${from} AND ${to}
       ORDER BY "s" DESC
     `;
   } else {
     return `
-      SELECT * FROM "${databaseName}"."${tableName}"
+      SELECT * FROM "${glueDatabaseName}"."${glueTableName}"
       WHERE "s" >= ${from}
       ORDER BY "s" DESC
     `;
   }
 };
 
-const executeNewQuery = async (query: string): Promise<string> => {
+const executeNewQuery = async (
+  query: string,
+  glueDatabaseName: string,
+  s3BucketName: string,
+  s3BucketAthenaResultsPrefix: string
+): Promise<string> => {
   const athenaClient = getAthenaClient();
 
-  const databaseName = GLUE_DATABASE_NAME;
-
   const queryExecution = await athenaClient.send(
     new StartQueryExecutionCommand({
       QueryString: query,
       QueryExecutionContext: {
-        Database: databaseName,
+        Database: glueDatabaseName,
       },
       WorkGroup: "primary",
       ResultConfiguration: {
-        OutputLocation: `s3://${S3_BUCKET_NAME}/${S3_BUCKET_ATHENA_RESULTS_PREFIX}`,
+        OutputLocation: `s3://${s3BucketName}/${s3BucketAthenaResultsPrefix}`,
       },
     })
   );
@@ -170,7 +168,11 @@ const executeNewQuery = async (query: string): Promise<string> => {
 };
 
 export const handlePagination = async (
-  request: FetchDataRequest
+  request: FetchDataRequest,
+  glueDatabaseName: string,
+  glueTableName: string,
+  s3BucketName: string,
+  s3BucketAthenaResultsPrefix: string
 ): Promise<string> => {
   const paginationParams: PaginationParams = {
     isNextPage: !!request.nextToken && !!request.queryExecutionId,
@@ -181,8 +183,13 @@ export const handlePagination = async (
   if (paginationParams.isNextPage) {
     return request.queryExecutionId!;
   } else {
-    const query = buildQuery(request);
-    return await executeNewQuery(query);
+    const query = buildQuery(request, glueDatabaseName, glueTableName);
+    return await executeNewQuery(
+      query,
+      glueDatabaseName,
+      s3BucketName,
+      s3BucketAthenaResultsPrefix
+    );
   }
 };