@sebspark/gcp-iam 1.2.1 → 2.0.1

package/dist/index.d.mts

@@ -1,5 +1,3 @@
-import { Logger } from 'winston';
-
 /**
  * Generate a system token for the API Gateway.
  * This is intended to be run under the context of the service account signing the JWT.
@@ -8,10 +6,9 @@ import { Logger } from 'winston';
  * @param logger An optional logger to use for logging.
  * @returns A JWT.
  */
-declare const getApiGatewayTokenByUrl: ({ apiURL, key, logger, }: {
+declare const getApiGatewayTokenByUrl: ({ apiURL, key, }: {
     apiURL: string;
     key?: string;
-    logger?: Logger;
 }) => Promise<string>;
 /**
  *
@@ -23,6 +20,6 @@ declare const clearCache: (key: string) => Promise<void>;
  * @param clientId OAUTH Client ID.
  * @returns ID Token.
  */
-declare const getApiGatewayTokenByClientId: (clientId: string, logger?: Logger) => Promise<string>;
+declare const getApiGatewayTokenByClientId: (clientId: string) => Promise<string>;
 
 export { clearCache, getApiGatewayTokenByClientId, getApiGatewayTokenByUrl };

package/dist/index.d.ts

@@ -1,5 +1,3 @@
-import { Logger } from 'winston';
-
 /**
  * Generate a system token for the API Gateway.
  * This is intended to be run under the context of the service account signing the JWT.
@@ -8,10 +6,9 @@ import { Logger } from 'winston';
  * @param logger An optional logger to use for logging.
  * @returns A JWT.
  */
-declare const getApiGatewayTokenByUrl: ({ apiURL, key, logger, }: {
+declare const getApiGatewayTokenByUrl: ({ apiURL, key, }: {
     apiURL: string;
     key?: string;
-    logger?: Logger;
 }) => Promise<string>;
 /**
  *
@@ -23,6 +20,6 @@ declare const clearCache: (key: string) => Promise<void>;
  * @param clientId OAUTH Client ID.
  * @returns ID Token.
  */
-declare const getApiGatewayTokenByClientId: (clientId: string, logger?: Logger) => Promise<string>;
+declare const getApiGatewayTokenByClientId: (clientId: string) => Promise<string>;
 
 export { clearCache, getApiGatewayTokenByClientId, getApiGatewayTokenByUrl };

package/dist/index.js

@@ -28,6 +28,7 @@ module.exports = __toCommonJS(index_exports);
 
 // src/apiGatewayToken.ts
 var import_iam_credentials = require("@google-cloud/iam-credentials");
+var import_otel = require("@sebspark/otel");
 var import_google_auth_library = require("google-auth-library");
 
 // src/lruCache.ts
@@ -72,10 +73,10 @@ var LruCache = class {
 // src/apiGatewayToken.ts
 var expInSeconds = 60 * 60;
 var apiGatewayJwtCache = new LruCache();
+var logger = (0, import_otel.getLogger)("gcp-iam");
 var generateTokenByUrl = async ({
   apiURL,
-  key,
-  logger
+  key
 }) => {
   try {
     const iamClient = new import_iam_credentials.IAMCredentialsClient();
@@ -85,7 +86,7 @@ var generateTokenByUrl = async ({
     if (!serviceAccountEmail) {
       throw new Error("No service account e-mail could be found.");
     }
-    logger?.info(`Service account e-mail being used: ${serviceAccountEmail}`);
+    logger.info(`Service account e-mail being used: ${serviceAccountEmail}`);
     const header = {
       alg: "RS256",
       typ: "JWT"
@@ -113,7 +114,7 @@ var generateTokenByUrl = async ({
         "signBlob(...) returned an empty response. Cannot sign JWT."
       );
     }
-    logger?.debug(
+    logger.debug(
       `New JWT for ${key || apiURL} created. Signed with ${response.keyId}.`
     );
     const signature = Buffer.from(response.signedBlob).toString("base64");
@@ -121,22 +122,20 @@ var generateTokenByUrl = async ({
     return signedJWT;
   } catch (error) {
     if (process.env.GCP_IAM_SOFT_FAIL === "true") {
-      logger?.info("Soft fail enabled, returning empty JWT");
+      logger.info("Soft fail enabled, returning empty JWT");
       return "";
     }
-    logger?.error("Error generating system JWT", error);
+    logger.error("Error generating system JWT", error);
     throw new Error(`Error generating system JWT: ${JSON.stringify(error)}`);
   }
 };
 var getApiGatewayTokenByUrl = async ({
   apiURL,
-  key,
-  logger
+  key
 }) => {
   return checkCache({
     cacheKey: key || apiURL,
-    generate: () => generateTokenByUrl({ apiURL, key, logger }),
-    logger
+    generate: () => generateTokenByUrl({ apiURL, key })
   });
 };
 var clearCache = async (key) => {
@@ -144,19 +143,18 @@ var clearCache = async (key) => {
 };
 var checkCache = ({
   cacheKey,
-  generate,
-  logger
+  generate
 }) => {
   const cachedJwt = apiGatewayJwtCache.get(cacheKey);
   if (cachedJwt) {
-    logger?.debug(`JWT for ${cacheKey} found in cache.`);
+    logger.debug(`JWT for ${cacheKey} found in cache.`);
     return cachedJwt;
   }
   const jwtPromise = generate();
   apiGatewayJwtCache.put(cacheKey, jwtPromise, expInSeconds / 2 * 1e3);
   return jwtPromise;
 };
-var generateTokenByClientId = async (clientId, logger) => {
+var generateTokenByClientId = async (clientId) => {
   try {
     const auth = new import_google_auth_library.GoogleAuth({
       scopes: "https://www.googleapis.com/auth/cloud-platform"
@@ -165,19 +163,17 @@ var generateTokenByClientId = async (clientId, logger) => {
     return await client.idTokenProvider.fetchIdToken(clientId);
   } catch (error) {
     if (process.env.GCP_IAM_SOFT_FAIL === "true") {
-      logger?.info("Soft fail enabled, returning empty JWT.");
+      logger.info("Soft fail enabled, returning empty JWT.");
       return "";
     }
-    logger?.error("Error generating system JWT", error);
-    logger?.error(JSON.stringify(error, null, 2));
+    logger.error("Error generating system JWT", error);
     throw new Error(`Error generating system JWT: ${JSON.stringify(error)}`);
   }
 };
-var getApiGatewayTokenByClientId = async (clientId, logger) => {
+var getApiGatewayTokenByClientId = async (clientId) => {
   return checkCache({
     cacheKey: clientId,
-    generate: () => generateTokenByClientId(clientId),
-    logger
+    generate: () => generateTokenByClientId(clientId)
   });
 };
 // Annotate the CommonJS export names for ESM import in node:

package/dist/index.mjs

@@ -1,5 +1,6 @@
 // src/apiGatewayToken.ts
 import { IAMCredentialsClient } from "@google-cloud/iam-credentials";
+import { getLogger } from "@sebspark/otel";
 import { GoogleAuth } from "google-auth-library";
 
 // src/lruCache.ts
@@ -44,10 +45,10 @@ var LruCache = class {
 // src/apiGatewayToken.ts
 var expInSeconds = 60 * 60;
 var apiGatewayJwtCache = new LruCache();
+var logger = getLogger("gcp-iam");
 var generateTokenByUrl = async ({
   apiURL,
-  key,
-  logger
+  key
 }) => {
   try {
     const iamClient = new IAMCredentialsClient();
@@ -57,7 +58,7 @@ var generateTokenByUrl = async ({
     if (!serviceAccountEmail) {
       throw new Error("No service account e-mail could be found.");
     }
-    logger?.info(`Service account e-mail being used: ${serviceAccountEmail}`);
+    logger.info(`Service account e-mail being used: ${serviceAccountEmail}`);
     const header = {
       alg: "RS256",
       typ: "JWT"
@@ -85,7 +86,7 @@ var generateTokenByUrl = async ({
         "signBlob(...) returned an empty response. Cannot sign JWT."
       );
     }
-    logger?.debug(
+    logger.debug(
       `New JWT for ${key || apiURL} created. Signed with ${response.keyId}.`
     );
     const signature = Buffer.from(response.signedBlob).toString("base64");
@@ -93,22 +94,20 @@ var generateTokenByUrl = async ({
     return signedJWT;
   } catch (error) {
     if (process.env.GCP_IAM_SOFT_FAIL === "true") {
-      logger?.info("Soft fail enabled, returning empty JWT");
+      logger.info("Soft fail enabled, returning empty JWT");
       return "";
     }
-    logger?.error("Error generating system JWT", error);
+    logger.error("Error generating system JWT", error);
     throw new Error(`Error generating system JWT: ${JSON.stringify(error)}`);
   }
 };
 var getApiGatewayTokenByUrl = async ({
   apiURL,
-  key,
-  logger
+  key
 }) => {
   return checkCache({
     cacheKey: key || apiURL,
-    generate: () => generateTokenByUrl({ apiURL, key, logger }),
-    logger
+    generate: () => generateTokenByUrl({ apiURL, key })
   });
 };
 var clearCache = async (key) => {
@@ -116,19 +115,18 @@ var clearCache = async (key) => {
 };
 var checkCache = ({
   cacheKey,
-  generate,
-  logger
+  generate
 }) => {
   const cachedJwt = apiGatewayJwtCache.get(cacheKey);
   if (cachedJwt) {
-    logger?.debug(`JWT for ${cacheKey} found in cache.`);
+    logger.debug(`JWT for ${cacheKey} found in cache.`);
     return cachedJwt;
   }
   const jwtPromise = generate();
   apiGatewayJwtCache.put(cacheKey, jwtPromise, expInSeconds / 2 * 1e3);
   return jwtPromise;
 };
-var generateTokenByClientId = async (clientId, logger) => {
+var generateTokenByClientId = async (clientId) => {
   try {
     const auth = new GoogleAuth({
       scopes: "https://www.googleapis.com/auth/cloud-platform"
@@ -137,19 +135,17 @@ var generateTokenByClientId = async (clientId, logger) => {
     return await client.idTokenProvider.fetchIdToken(clientId);
   } catch (error) {
     if (process.env.GCP_IAM_SOFT_FAIL === "true") {
-      logger?.info("Soft fail enabled, returning empty JWT.");
+      logger.info("Soft fail enabled, returning empty JWT.");
       return "";
     }
-    logger?.error("Error generating system JWT", error);
-    logger?.error(JSON.stringify(error, null, 2));
+    logger.error("Error generating system JWT", error);
     throw new Error(`Error generating system JWT: ${JSON.stringify(error)}`);
   }
 };
-var getApiGatewayTokenByClientId = async (clientId, logger) => {
+var getApiGatewayTokenByClientId = async (clientId) => {
   return checkCache({
     cacheKey: clientId,
-    generate: () => generateTokenByClientId(clientId),
-    logger
+    generate: () => generateTokenByClientId(clientId)
   });
 };
 export {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sebspark/gcp-iam",
-  "version": "1.2.1",
+  "version": "2.0.1",
   "license": "Apache-2.0",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -16,10 +16,14 @@
     "typecheck": "vitest --typecheck.only --passWithNoTests"
   },
   "devDependencies": {
-    "tsconfig": "*"
+    "@sebspark/otel": "*",
+    "@sebspark/tsconfig": "*"
   },
   "dependencies": {
-    "@google-cloud/iam-credentials": "3.3.0",
-    "google-auth-library": "9.15.1"
+    "@google-cloud/iam-credentials": "4.2.1",
+    "google-auth-library": "10.4.2"
+  },
+  "peerDependencies": {
+    "@sebspark/otel": ">=1.1.4"
   }
 }