@dataformer/env-service 2.0.0 → 2.3.0

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # @dataformer/env-service
 
+## 2.3.0
+
+### Minor Changes
+
+- LoggerService upgraded
+
+### Patch Changes
+
+- Updated dependencies
+  - @dataformer/secret-manager-client@2.3.0
+
+## 2.2.0
+
+### Minor Changes
+
+- removed requirement for user email from secret manager name
+
+### Patch Changes
+
+- Updated dependencies
+  - @dataformer/secret-manager-client@2.2.0
+
 ## 2.0.0
 
 ### Major Changes

package/dist/index.d.ts

@@ -43,8 +43,7 @@ declare const getJiraUserEmail: () => Promise<string | null>;
 declare const getGeminiApiKey: () => Promise<string | null>;
 declare const getNpmToken: () => Promise<string | null>;
 declare const getProjectRoot: () => string;
-declare const getGcpUserEmail: () => Promise<string | null>;
 declare const printEnv: () => Promise<void>;
 declare const run: () => Promise<void>;
 
-export { askQuestion, getBigtableInstanceName, getBigtableProjectId, getBigtableTableName, getCustomSearchApiKey, getEnvVar, getFirestoreProjectId, getGcpProjectId, getGcpUserEmail, getGeminiApiKey, getJiraApiBaseUrl, getJiraApiToken, getJiraUserEmail, getLogToConsole, getNpmToken, getPostgresAuthType, getPostgresDatabase, getPostgresHostName, getPostgresInstanceConnectionName, getPostgresIpType, getPostgresPassword, getPostgresPoolSizeMax, getPostgresUser, getProjectRoot, getSearchEngineId, obfuscateCred, printEnv, run, setBigtableInstanceName, setBigtableProjectId, setBigtableTableName, setCustomSearchApiKey, setEnvVar, setFirestoreProjectId, setGeminiApiKey, setJiraApiBaseUrl, setJiraApiToken, setJiraUserEmail, setLogToConsole, setNpmToken, setPostgresAuthType, setPostgresDatabase, setPostgresHostName, setPostgresInstanceConnectionName, setPostgresIpType, setPostgresPassword, setPostgresPoolSizeMax, setPostgresUser };
+export { askQuestion, getBigtableInstanceName, getBigtableProjectId, getBigtableTableName, getCustomSearchApiKey, getEnvVar, getFirestoreProjectId, getGcpProjectId, getGeminiApiKey, getJiraApiBaseUrl, getJiraApiToken, getJiraUserEmail, getLogToConsole, getNpmToken, getPostgresAuthType, getPostgresDatabase, getPostgresHostName, getPostgresInstanceConnectionName, getPostgresIpType, getPostgresPassword, getPostgresPoolSizeMax, getPostgresUser, getProjectRoot, getSearchEngineId, obfuscateCred, printEnv, run, setBigtableInstanceName, setBigtableProjectId, setBigtableTableName, setCustomSearchApiKey, setEnvVar, setFirestoreProjectId, setGeminiApiKey, setJiraApiBaseUrl, setJiraApiToken, setJiraUserEmail, setLogToConsole, setNpmToken, setPostgresAuthType, setPostgresDatabase, setPostgresHostName, setPostgresInstanceConnectionName, setPostgresIpType, setPostgresPassword, setPostgresPoolSizeMax, setPostgresUser };

package/dist/index.js

@@ -1,7 +1,7 @@
 // src/index.ts
 import readline from "readline";
 import path from "path";
-import { createSecretManagerClient } from "@dataformer/secret-manager-client";
+import { SecretManagerClient } from "@dataformer/secret-manager-client";
 var secretManager = null;
 var secretManagerInitialized = false;
 async function getSecretManager() {
@@ -9,7 +9,7 @@ async function getSecretManager() {
     return secretManager;
   }
   try {
-    secretManager = await createSecretManagerClient();
+    secretManager = await SecretManagerClient.create();
     secretManagerInitialized = true;
     return secretManager;
   } catch (error) {
@@ -226,15 +226,6 @@ var getProjectRoot = () => {
   const currentDir = path.dirname(new URL(import.meta.url).pathname);
   return path.resolve(currentDir, "../..");
 };
-var _getResolvedGcpUserEmail = async () => {
-  const sm = await getSecretManager();
-  if (!sm) {
-    console.warn("[EnvService.ts] SecretManager not available for _getResolvedGcpUserEmail");
-    return null;
-  }
-  return sm.getResolvedUserEmail();
-};
-var getGcpUserEmail = _getResolvedGcpUserEmail;
 var printEnv = async () => {
   const logToConsole = await getLogToConsole();
   const postgresUser = await getPostgresUser();
@@ -255,11 +246,9 @@ var printEnv = async () => {
   const geminiApiKey = await getGeminiApiKey();
   const customSearchApiKey = await getCustomSearchApiKey();
   const gcpProjectIdVal = await getGcpProjectId();
-  const gcpUserEmailVal = await getGcpUserEmail();
   const npmToken = await getNpmToken();
   console.log(`Project Root: ${getProjectRoot()}`);
   console.log(`GCP Project ID: ${gcpProjectIdVal}`);
-  console.log(`GCP User Email (for Secret Manager naming): ${gcpUserEmailVal}`);
   console.log(`Log to Console: ${logToConsole}`);
   console.log(`PostgreSQL User: ${postgresUser}`);
   console.log(`PostgreSQL Password: ${obfuscateCred(postgresPassword)}`);
@@ -364,7 +353,6 @@ export {
   getEnvVar,
   getFirestoreProjectId,
   getGcpProjectId,
-  getGcpUserEmail,
   getGeminiApiKey,
   getJiraApiBaseUrl,
   getJiraApiToken,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dataformer/env-service",
-  "version": "2.0.0",
+  "version": "2.3.0",
   "description": "Environment service for Dataformer",
   "type": "module",
   "main": "dist/index.js",
@@ -13,7 +13,7 @@
   },
   "dependencies": {
     "@google-cloud/secret-manager": "^5.4.0",
-    "@dataformer/secret-manager-client": "^2.0.0"
+    "@dataformer/secret-manager-client": "^2.3.0"
   },
   "devDependencies": {
     "tsup": "^8.0.0",

package/src/index.ts

@@ -1,12 +1,16 @@
 // EnvService.ts - Manages environment variables and credentials using Google Secret Manager.
 //
 // HOW TO USE:
-// This script is typically invoked via the wrapper `env.js` in the project root.
+// This script can be invoked via the wrapper `env.js` in the project root (after building):
 // Commands are passed as arguments, e.g.:
 //   node env.js printEnv                    - Prints all current environment variable values.
-//   node env.js setApiKey                   - Prompts to set the API key.
+//   node env.js setGeminiApiKey             - Prompts to set the Gemini API key.
+//   node env.js setPostgresUser             - Prompts to set the PostgreSQL user.
 //   ... and so on for other specific setters listed in the `run` function's switch statement.
 //
+// Alternatively, you can run it directly from the compiled output:
+//   node packages/services/env-service/dist/index.js printEnv
+//
 // GCLOUD AUTHENTICATION REQUIREMENT:
 // This script requires you to be authenticated with Google Cloud CLI (`gcloud`).
 // The credentials are used by the underlying SecretManagerClient to access Google Secret Manager.
@@ -30,12 +34,12 @@
 // 2. Local gcloud configuration (for development: `gcloud config get-value project`)
 //
 // SECRET NAMING CONVENTION:
-// Secrets are named using the format: {projectId}_{userEmail}_{secretId}
-// This ensures user-specific secrets that don't conflict across users or projects.
+// Secrets are named using the format: {projectId}_{secretId}
+// This ensures project-specific secrets that don't conflict across projects.
 
 import readline from 'readline';
 import path from 'path';
-import { createSecretManagerClient, SecretManagerClient } from '@dataformer/secret-manager-client';
+import { SecretManagerClient } from '@dataformer/secret-manager-client';
 
 // SecretManager client will be initialized lazily on first use
 let secretManager: SecretManagerClient | null = null;
@@ -47,7 +51,7 @@ async function getSecretManager(): Promise<SecretManagerClient | null> {
   }
   
   try {
-    secretManager = await createSecretManagerClient();
+    secretManager = await SecretManagerClient.create();
     secretManagerInitialized = true;
     return secretManager;
   } catch (error) {
@@ -319,17 +323,6 @@ const _getResolvedGcpProjectId = async (): Promise<string | null> => {
   return sm.getResolvedProjectId();
 };
 
-const _getResolvedGcpUserEmail = async (): Promise<string | null> => {
-  const sm = await getSecretManager();
-  if (!sm) {
-    console.warn('[EnvService.ts] SecretManager not available for _getResolvedGcpUserEmail');
-    return null;
-  }
-  return sm.getResolvedUserEmail();
-};
-
-const getGcpUserEmail = _getResolvedGcpUserEmail;
-
 const printEnv = async (): Promise<void> => {
   const logToConsole = await getLogToConsole();
   const postgresUser = await getPostgresUser();
@@ -350,12 +343,10 @@ const printEnv = async (): Promise<void> => {
   const geminiApiKey = await getGeminiApiKey();
   const customSearchApiKey = await getCustomSearchApiKey();
   const gcpProjectIdVal = await getGcpProjectId(); 
-  const gcpUserEmailVal = await getGcpUserEmail();
   const npmToken = await getNpmToken();
 
   console.log(`Project Root: ${getProjectRoot()}`);
   console.log(`GCP Project ID: ${gcpProjectIdVal}`);
-  console.log(`GCP User Email (for Secret Manager naming): ${gcpUserEmailVal}`);
   console.log(`Log to Console: ${logToConsole}`);
   console.log(`PostgreSQL User: ${postgresUser}`);
   console.log(`PostgreSQL Password: ${obfuscateCred(postgresPassword)}`);
@@ -462,7 +453,6 @@ export {
 
   // Synchronous Getters / Utility
   getProjectRoot,
-  getGcpUserEmail,
 
   // Generic accessors
   getEnvVar,