@dataformer/env-service 1.1.0 → 2.0.0

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # @dataformer/env-service
 
+## 2.0.0
+
+### Major Changes
+
+- Simplify GCP project ID resolution by removing SECRET_MANAGER_PROJECT_IDBREAKING: Replace SECRET_MANAGER_PROJECT_ID with GCP_PROJECT_ID for unified project approach. Eliminates cross-project complexity and chicken-and-egg problem with project ID resolution.Migration: Update GitHub repository secrets and CI/CD workflows to use GCP_PROJECT_ID
+
+### Patch Changes
+
+- Updated dependencies
+  - @dataformer/secret-manager-client@2.0.0
+
 ## 1.1.0
 
 ### Minor Changes

package/dist/index.d.ts

@@ -3,7 +3,7 @@ declare function obfuscateCred(cred: string | null): string;
 declare function getEnvVar(baseSecretKey: string): Promise<string | null>;
 declare function getCustomSearchApiKey(): Promise<string>;
 declare function getSearchEngineId(): Promise<string>;
-declare function getFirestoreProjectId(): Promise<string>;
+declare function getGcpProjectId(): Promise<string>;
 declare function setEnvVar(baseSecretKey: string, value: string): Promise<boolean>;
 declare const setLogToConsole: () => Promise<void>;
 declare const setPostgresUser: () => Promise<void>;
@@ -13,6 +13,7 @@ declare const setPostgresHostName: () => Promise<void>;
 declare const setPostgresIpType: () => Promise<void>;
 declare const setPostgresPoolSizeMax: () => Promise<void>;
 declare const setPostgresInstanceConnectionName: () => Promise<void>;
+declare const setPostgresAuthType: () => Promise<void>;
 declare const setBigtableInstanceName: () => Promise<void>;
 declare const setBigtableTableName: () => Promise<void>;
 declare const setBigtableProjectId: () => Promise<void>;
@@ -31,18 +32,19 @@ declare const getPostgresHostName: () => Promise<string | null>;
 declare const getPostgresIpType: () => Promise<string | null>;
 declare const getPostgresPoolSizeMax: () => Promise<number | null>;
 declare const getPostgresInstanceConnectionName: () => Promise<string | null>;
+declare const getPostgresAuthType: () => Promise<string | null>;
 declare const getBigtableInstanceName: () => Promise<string | null>;
 declare const getBigtableTableName: () => Promise<string | null>;
 declare const getBigtableProjectId: () => Promise<string | null>;
+declare const getFirestoreProjectId: () => Promise<string | null>;
 declare const getJiraApiToken: () => Promise<string | null>;
 declare const getJiraApiBaseUrl: () => Promise<string | null>;
 declare const getJiraUserEmail: () => Promise<string | null>;
 declare const getGeminiApiKey: () => Promise<string | null>;
 declare const getNpmToken: () => Promise<string | null>;
 declare const getProjectRoot: () => string;
-declare const getGcpProjectId: () => Promise<string | null>;
 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, getPostgresDatabase, getPostgresHostName, getPostgresInstanceConnectionName, getPostgresIpType, getPostgresPassword, getPostgresPoolSizeMax, getPostgresUser, getProjectRoot, getSearchEngineId, obfuscateCred, printEnv, run, setBigtableInstanceName, setBigtableProjectId, setBigtableTableName, setCustomSearchApiKey, setEnvVar, setFirestoreProjectId, setGeminiApiKey, setJiraApiBaseUrl, setJiraApiToken, setJiraUserEmail, setLogToConsole, setNpmToken, setPostgresDatabase, setPostgresHostName, setPostgresInstanceConnectionName, setPostgresIpType, setPostgresPassword, setPostgresPoolSizeMax, setPostgresUser };
+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 };

package/dist/index.js

@@ -61,12 +61,26 @@ async function getSearchEngineId() {
   }
   return searchEngineId;
 }
-async function getFirestoreProjectId() {
-  const projectId = await getEnvVar("FIRESTORE_PROJECT_ID");
-  if (!projectId) {
-    throw new Error("FIRESTORE_PROJECT_ID not found in environment variables.");
+async function getGcpProjectId() {
+  const envProjectId = process.env.GCP_PROJECT_ID;
+  if (envProjectId) {
+    return envProjectId;
+  }
+  try {
+    const { execSync } = await import("child_process");
+    const projectId = execSync("gcloud config get-value project", {
+      encoding: "utf8",
+      stdio: ["ignore", "pipe", "ignore"]
+    }).trim();
+    if (!projectId || projectId === "(unset)") {
+      throw new Error("No GCP project configured. Run `gcloud config set project YOUR_PROJECT_ID`");
+    }
+    return projectId;
+  } catch (error) {
+    throw new Error(
+      "GCP_PROJECT_ID not found. Either:\n1. Set GCP_PROJECT_ID environment variable (for deployed environments), or\n2. Configure gcloud: `gcloud config set project YOUR_PROJECT_ID` (for local development)"
+    );
   }
-  return projectId;
 }
 async function setEnvVar(baseSecretKey, value) {
   const sm = await getSecretManager();
@@ -124,6 +138,12 @@ var setPostgresInstanceConnectionName = async () => {
     await setEnvVar("POSTGRES_INSTANCE_CONNECTION_NAME", instanceConnectionName);
   }
 };
+var setPostgresAuthType = async () => {
+  const authType = await askQuestion("Enter PostgreSQL Auth Type (PASSWORD, IAM)", "PASSWORD");
+  if (authType) {
+    await setEnvVar("POSTGRES_AUTH_TYPE", authType);
+  }
+};
 var setBigtableInstanceName = async () => {
   const btInstanceName = await askQuestion("Enter Bigtable Instance Name", "");
   if (btInstanceName) {
@@ -191,10 +211,12 @@ var getPostgresPoolSizeMax = async () => {
   return value ? parseInt(value, 10) : null;
 };
 var getPostgresInstanceConnectionName = async () => await getEnvVar("POSTGRES_INSTANCE_CONNECTION_NAME");
+var getPostgresAuthType = async () => await getEnvVar("POSTGRES_AUTH_TYPE");
 var getBigtableInstanceName = async () => await getEnvVar("BIGTABLE_INSTANCE_NAME");
 var getBigtableTableName = async () => await getEnvVar("BIGTABLE_TABLE_NAME");
 var getBigtableProjectId = async () => await getEnvVar("BIGTABLE_PROJECT_ID");
 var _getFirestoreProjectId = async () => await getEnvVar("FIRESTORE_PROJECT_ID");
+var getFirestoreProjectId = _getFirestoreProjectId;
 var getJiraApiToken = async () => await getEnvVar("JIRA_API_TOKEN");
 var getJiraApiBaseUrl = async () => await getEnvVar("JIRA_API_BASE_URL");
 var getJiraUserEmail = async () => await getEnvVar("JIRA_USER_EMAIL");
@@ -204,14 +226,6 @@ var getProjectRoot = () => {
   const currentDir = path.dirname(new URL(import.meta.url).pathname);
   return path.resolve(currentDir, "../..");
 };
-var _getResolvedGcpProjectId = async () => {
-  const sm = await getSecretManager();
-  if (!sm) {
-    console.warn("[EnvService.ts] SecretManager not available for _getResolvedGcpProjectId");
-    return null;
-  }
-  return sm.getResolvedProjectId();
-};
 var _getResolvedGcpUserEmail = async () => {
   const sm = await getSecretManager();
   if (!sm) {
@@ -220,7 +234,6 @@ var _getResolvedGcpUserEmail = async () => {
   }
   return sm.getResolvedUserEmail();
 };
-var getGcpProjectId = _getResolvedGcpProjectId;
 var getGcpUserEmail = _getResolvedGcpUserEmail;
 var printEnv = async () => {
   const logToConsole = await getLogToConsole();
@@ -231,6 +244,7 @@ var printEnv = async () => {
   const postgresIpType = await getPostgresIpType();
   const postgresPoolSizeMax = await getPostgresPoolSizeMax();
   const postgresInstanceConnectionName = await getPostgresInstanceConnectionName();
+  const postgresAuthType = await getPostgresAuthType();
   const bigtableInstanceName = await getBigtableInstanceName();
   const bigtableTableName = await getBigtableTableName();
   const bigtableProjectId = await getBigtableProjectId();
@@ -254,6 +268,7 @@ var printEnv = async () => {
   console.log(`PostgreSQL IP Type: ${postgresIpType}`);
   console.log(`PostgreSQL Pool Size Max: ${postgresPoolSizeMax}`);
   console.log(`PostgreSQL Instance Connection Name: ${postgresInstanceConnectionName}`);
+  console.log(`PostgreSQL Auth Type: ${postgresAuthType}`);
   console.log(`Bigtable Instance Name: ${bigtableInstanceName}`);
   console.log(`Bigtable Table Name: ${bigtableTableName}`);
   console.log(`Bigtable Project ID: ${bigtableProjectId}`);
@@ -292,6 +307,9 @@ var run = async () => {
     case "setPostgresInstanceConnectionName":
       await setPostgresInstanceConnectionName();
       break;
+    case "setPostgresAuthType":
+      await setPostgresAuthType();
+      break;
     case "setBigtableInstanceName":
       await setBigtableInstanceName();
       break;
@@ -353,6 +371,7 @@ export {
   getJiraUserEmail,
   getLogToConsole,
   getNpmToken,
+  getPostgresAuthType,
   getPostgresDatabase,
   getPostgresHostName,
   getPostgresInstanceConnectionName,
@@ -377,6 +396,7 @@ export {
   setJiraUserEmail,
   setLogToConsole,
   setNpmToken,
+  setPostgresAuthType,
   setPostgresDatabase,
   setPostgresHostName,
   setPostgresInstanceConnectionName,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dataformer/env-service",
-  "version": "1.1.0",
+  "version": "2.0.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": "^1.1.0"
+    "@dataformer/secret-manager-client": "^2.0.0"
   },
   "devDependencies": {
     "tsup": "^8.0.0",

package/src/index.ts

@@ -25,10 +25,9 @@
 //      for your GCP project.
 //
 // PROJECT ID DETECTION:
-// The SecretManagerClient automatically detects the GCP project ID from:
-// 1. SECRET_MANAGER_PROJECT_ID environment variable (for CI/CD deployments)
-// 2. Your local gcloud configuration (for development: `gcloud config get-value project`)
-// 3. Explicit override via createSecretManagerClient({ projectId: "your-project" })
+// The GCP project ID is resolved from:
+// 1. GCP_PROJECT_ID environment variable (for deployed environments - set as GitHub repository secret)
+// 2. Local gcloud configuration (for development: `gcloud config get-value project`)
 //
 // SECRET NAMING CONVENTION:
 // Secrets are named using the format: {projectId}_{userEmail}_{secretId}
@@ -108,12 +107,33 @@ export async function getSearchEngineId(): Promise<string> {
   return searchEngineId;
 }
 
-export async function getFirestoreProjectId(): Promise<string> {
-  const projectId = await getEnvVar('FIRESTORE_PROJECT_ID');
-  if (!projectId) {
-    throw new Error('FIRESTORE_PROJECT_ID not found in environment variables.');
+export async function getGcpProjectId(): Promise<string> {
+  // First try environment variable (for deployed environments)
+  const envProjectId = process.env.GCP_PROJECT_ID;
+  if (envProjectId) {
+    return envProjectId;
+  }
+
+  // Fall back to gcloud config for local development
+  try {
+    const { execSync } = await import('child_process');
+    const projectId = execSync('gcloud config get-value project', { 
+      encoding: 'utf8',
+      stdio: ['ignore', 'pipe', 'ignore']
+    }).trim();
+    
+    if (!projectId || projectId === '(unset)') {
+      throw new Error('No GCP project configured. Run `gcloud config set project YOUR_PROJECT_ID`');
+    }
+    
+    return projectId;
+  } catch (error) {
+    throw new Error(
+      'GCP_PROJECT_ID not found. Either:\n' +
+      '1. Set GCP_PROJECT_ID environment variable (for deployed environments), or\n' +
+      '2. Configure gcloud: `gcloud config set project YOUR_PROJECT_ID` (for local development)'
+    );
   }
-  return projectId;
 }
 
 async function setEnvVar(baseSecretKey: string, value: string): Promise<boolean> {
@@ -184,6 +204,13 @@ const setPostgresInstanceConnectionName = async (): Promise<void> => {
   }
 };
 
+const setPostgresAuthType = async (): Promise<void> => {
+  const authType = await askQuestion('Enter PostgreSQL Auth Type (PASSWORD, IAM)', 'PASSWORD');
+  if (authType) {
+      await setEnvVar('POSTGRES_AUTH_TYPE', authType);
+  }
+};
+
 const setBigtableInstanceName = async (): Promise<void> => {
   const btInstanceName = await askQuestion('Enter Bigtable Instance Name', '');
   if (btInstanceName) {
@@ -262,10 +289,14 @@ const getPostgresPoolSizeMax = async (): Promise<number | null> => {
   return value ? parseInt(value, 10) : null;
 };
 const getPostgresInstanceConnectionName = async (): Promise<string | null> => await getEnvVar('POSTGRES_INSTANCE_CONNECTION_NAME');
+const getPostgresAuthType = async (): Promise<string | null> => await getEnvVar('POSTGRES_AUTH_TYPE');
 const getBigtableInstanceName = async (): Promise<string | null> => await getEnvVar('BIGTABLE_INSTANCE_NAME');
 const getBigtableTableName = async (): Promise<string | null> => await getEnvVar('BIGTABLE_TABLE_NAME');
 const getBigtableProjectId = async (): Promise<string | null> => await getEnvVar('BIGTABLE_PROJECT_ID');
 const _getFirestoreProjectId = async (): Promise<string | null> => await getEnvVar('FIRESTORE_PROJECT_ID');
+
+// Export the firestore project ID getter
+export const getFirestoreProjectId = _getFirestoreProjectId;
 const getJiraApiToken = async (): Promise<string | null> => await getEnvVar('JIRA_API_TOKEN');
 const getJiraApiBaseUrl = async (): Promise<string | null> => await getEnvVar('JIRA_API_BASE_URL');
 const getJiraUserEmail = async (): Promise<string | null> => await getEnvVar('JIRA_USER_EMAIL');
@@ -297,7 +328,6 @@ const _getResolvedGcpUserEmail = async (): Promise<string | null> => {
   return sm.getResolvedUserEmail();
 };
 
-const getGcpProjectId = _getResolvedGcpProjectId;
 const getGcpUserEmail = _getResolvedGcpUserEmail;
 
 const printEnv = async (): Promise<void> => {
@@ -309,6 +339,7 @@ const printEnv = async (): Promise<void> => {
   const postgresIpType = await getPostgresIpType();
   const postgresPoolSizeMax = await getPostgresPoolSizeMax();
   const postgresInstanceConnectionName = await getPostgresInstanceConnectionName();
+  const postgresAuthType = await getPostgresAuthType();
   const bigtableInstanceName = await getBigtableInstanceName();
   const bigtableTableName = await getBigtableTableName();
   const bigtableProjectId = await getBigtableProjectId();
@@ -333,6 +364,7 @@ const printEnv = async (): Promise<void> => {
   console.log(`PostgreSQL IP Type: ${postgresIpType}`);
   console.log(`PostgreSQL Pool Size Max: ${postgresPoolSizeMax}`);
   console.log(`PostgreSQL Instance Connection Name: ${postgresInstanceConnectionName}`);
+  console.log(`PostgreSQL Auth Type: ${postgresAuthType}`);
   console.log(`Bigtable Instance Name: ${bigtableInstanceName}`);
   console.log(`Bigtable Table Name: ${bigtableTableName}`);
   console.log(`Bigtable Project ID: ${bigtableProjectId}`);
@@ -356,6 +388,7 @@ const run = async (): Promise<void> => {
     case 'setPostgresIpType': await setPostgresIpType(); break;
     case 'setPostgresPoolSizeMax': await setPostgresPoolSizeMax(); break;
     case 'setPostgresInstanceConnectionName': await setPostgresInstanceConnectionName(); break;
+    case 'setPostgresAuthType': await setPostgresAuthType(); break;
     case 'setBigtableInstanceName': await setBigtableInstanceName(); break;
     case 'setBigtableTableName': await setBigtableTableName(); break;
     case 'setBigtableProjectId': await setBigtableProjectId(); break;
@@ -396,6 +429,7 @@ export {
   setPostgresIpType,
   setPostgresPoolSizeMax,
   setPostgresInstanceConnectionName,
+  setPostgresAuthType,
   setBigtableInstanceName,
   setBigtableTableName,
   setBigtableProjectId,
@@ -416,6 +450,7 @@ export {
   getPostgresIpType,
   getPostgresPoolSizeMax,
   getPostgresInstanceConnectionName,
+  getPostgresAuthType,
   getBigtableInstanceName,
   getBigtableTableName,
   getBigtableProjectId,
@@ -427,7 +462,6 @@ export {
 
   // Synchronous Getters / Utility
   getProjectRoot,
-  getGcpProjectId,
   getGcpUserEmail,
 
   // Generic accessors