@certik/skynet 0.11.2 → 0.11.4

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 0.11.4
+
+- support api key in query string
+
+## 0.11.3
+
+- Fixed: get aws credential for production
+
 ## 0.11.2
 
 - Fixed: updated alias option for meow

package/api.js

@@ -42,7 +42,7 @@ async function logEndMiddleware(req, res, next) {
 const apiKeyMiddleware = (key) => {
   async function requireAPIKey(req, res, next) {
     try {
-      const apiKey = req.get("x-api-key");
+      const apiKey = req.get("x-api-key") || req.query["api-key"]; // api key present either in header or query string
 
       if (!apiKey) {
         inline.log("request without api key");

package/dynamodb.js

@@ -8,29 +8,15 @@ import {
   UpdateCommand,
 } from "@aws-sdk/lib-dynamodb";
 import { DynamoDBClient, DescribeTableCommand } from "@aws-sdk/client-dynamodb";
-import { getAWSAccessKeyId, getAWSSecretAccessKey, getAWSRegion } from "./env.js";
+import { getAWSSDKConfig } from "./env.js";
 import { wait } from "./availability.js";
 
 function getDynamoDB() {
-  return new DynamoDBClient({
-    credentials: {
-      accessKeyId: getAWSAccessKeyId(),
-      secretAccessKey: getAWSSecretAccessKey(),
-    },
-    region: getAWSRegion(),
-  });
+  return new DynamoDBClient(getAWSSDKConfig());
 }
 
 function getDocClient() {
-  return DynamoDBDocumentClient.from(
-    new DynamoDBClient({
-      credentials: {
-        accessKeyId: getAWSAccessKeyId(),
-        secretAccessKey: getAWSSecretAccessKey(),
-      },
-      region: getAWSRegion(),
-    }),
-  );
+  return DynamoDBDocumentClient.from(new DynamoDBClient(getAWSSDKConfig()));
 }
 
 function mergeQueries(q1, q2) {

package/env.js

@@ -6,6 +6,24 @@ function getAWSSecretAccessKey() {
   return ensureAndGet(["SKYNET_AWS_SECRET_ACCESS_KEY"], undefined);
 }
 
+function getAWSSDKConfig() {
+  const region = getAWSRegion();
+  const accessKeyId = getAWSAccessKeyId();
+  const secretAccessKey = getAWSSecretAccessKey();
+
+  if (!accessKeyId || !secretAccessKey) {
+    return { region };
+  }
+
+  return {
+    region,
+    credentials: {
+      accessKeyId,
+      secretAccessKey,
+    },
+  };
+}
+
 function getAWSRegion() {
   return ensureAndGet(["SKYNET_AWS_REGION"], "us-east-1");
 }
@@ -56,6 +74,7 @@ export {
   getEnvOrThrow,
   getAWSAccessKeyId,
   getAWSSecretAccessKey,
+  getAWSSDKConfig,
   getAWSRegion,
   getEnvironment,
   isProduction,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@certik/skynet",
-  "version": "0.11.2",
+  "version": "0.11.4",
   "description": "Skynet Shared JS library",
   "type": "module",
   "main": "index.js",

package/s3.js

@@ -7,16 +7,10 @@ import {
   ListObjectsV2Command,
   NotFound,
 } from "@aws-sdk/client-s3";
-import { getAWSAccessKeyId, getAWSSecretAccessKey, getAWSRegion } from "./env.js";
+import { getAWSSDKConfig } from "./env.js";
 
 function getS3() {
-  return new S3Client({
-    credentials: {
-      accessKeyId: getAWSAccessKeyId(),
-      secretAccessKey: getAWSSecretAccessKey(),
-    },
-    region: getAWSRegion(),
-  });
+  return new S3Client(getAWSSDKConfig());
 }
 
 async function readFile(bucketName, key, verbose = false) {

package/sqs.js

@@ -1,10 +1,6 @@
-import { SQS } from "@aws-sdk/client-sqs";
-import { getAWSAccessKeyId, getAWSSecretAccessKey, getAWSRegion } from "./env.js";
+import { SQSClient } from "@aws-sdk/client-sqs";
+import { getAWSSDKConfig } from "./env.js";
 
 export function getSQS() {
-  return new SQS({
-    accessKeyId: getAWSAccessKeyId(),
-    secretAccessKey: getAWSSecretAccessKey(),
-    region: getAWSRegion(),
-  });
+  return new SQSClient(getAWSSDKConfig());
 }