Merge pull request #106 from julwrites/staging

We should retrieve Project ID from secrets.yaml

Author: julwrites

pkg/app/api_client.go

@@ -43,7 +43,7 @@ func SetAPIConfigOverride(url, key string) {
 	configInitialized = true
 }
 
-func getAPIConfig() (string, string) {
+func getAPIConfig(projectID string) (string, string) {
 	configMutex.Lock()
 	defer configMutex.Unlock()
 
@@ -56,7 +56,11 @@ func getAPIConfig() (string, string) {
 
 	// If env vars are missing, try to fetch from Secret Manager
 	if url == "" || key == "" {
-		projectID := os.Getenv("GCLOUD_PROJECT_ID")
+		envProjectID := os.Getenv("GCLOUD_PROJECT_ID")
+		if envProjectID != "" {
+			projectID = envProjectID
+		}
+
 		if projectID != "" {
 			if url == "" {
 				var err error
@@ -73,7 +77,7 @@ func getAPIConfig() (string, string) {
 				}
 			}
 		} else {
-			log.Println("GCLOUD_PROJECT_ID is not set, skipping Secret Manager lookup")
+			log.Println("GCLOUD_PROJECT_ID is not set and no project ID passed, skipping Secret Manager lookup")
 		}
 	}
 
@@ -86,8 +90,8 @@ func getAPIConfig() (string, string) {
 
 // SubmitQuery sends the QueryRequest to the Bible API and unmarshals the response into result.
 // result should be a pointer to the expected response struct.
-func SubmitQuery(req QueryRequest, result interface{}) error {
-	apiURL, apiKey := getAPIConfig()
+func SubmitQuery(req QueryRequest, result interface{}, projectID string) error {
+	apiURL, apiKey := getAPIConfig(projectID)
 	if apiURL == "" {
 		return fmt.Errorf("BIBLE_API_URL environment variable is not set")
 	}

pkg/app/api_client_test.go

@@ -49,7 +49,7 @@ func TestSubmitQuery(t *testing.T) {
 	t.Run("Success", func(t *testing.T) {
 		req := QueryRequest{Query: QueryObject{Prompt: "hello"}}
 		var resp VerseResponse
-		err := SubmitQuery(req, &resp)
+		err := SubmitQuery(req, &resp, "")
 		if err != nil {
 			t.Errorf("Unexpected error: %v", err)
 		}
@@ -62,7 +62,7 @@ func TestSubmitQuery(t *testing.T) {
 	t.Run("API Error", func(t *testing.T) {
 		req := QueryRequest{Query: QueryObject{Prompt: "error"}}
 		var resp VerseResponse
-		err := SubmitQuery(req, &resp)
+		err := SubmitQuery(req, &resp, "")
 		if err == nil {
 			t.Error("Expected error, got nil")
 		}
@@ -76,7 +76,7 @@ func TestSubmitQuery(t *testing.T) {
 	t.Run("Bad JSON", func(t *testing.T) {
 		req := QueryRequest{Query: QueryObject{Prompt: "badjson"}}
 		var resp VerseResponse
-		err := SubmitQuery(req, &resp)
+		err := SubmitQuery(req, &resp, "")
 		if err == nil {
 			t.Error("Expected error for bad JSON, got nil")
 		}
@@ -89,10 +89,11 @@ func TestSubmitQuery(t *testing.T) {
 		defer restore()
 		// Also unset PROJECT_ID to avoid Secret Manager lookup
 		defer setEnv("GCLOUD_PROJECT_ID", "")()
+		resetAPIConfigCache()
 
 		req := QueryRequest{}
 		var resp VerseResponse
-		err := SubmitQuery(req, &resp)
+		err := SubmitQuery(req, &resp, "")
 		if err == nil {
 			t.Error("Expected error when BIBLE_API_URL is unset")
 		}
@@ -104,6 +105,7 @@ func TestGetAPIConfig_SecretManagerFallback(t *testing.T) {
 	defer setEnv("BIBLE_API_URL", "")()
 	defer setEnv("BIBLE_API_KEY", "")()
 	defer setEnv("GCLOUD_PROJECT_ID", "test-project")()
+	resetAPIConfigCache()
 
 	// Mock the secret function
 	oldGetSecret := getSecretFunc
@@ -122,7 +124,7 @@ func TestGetAPIConfig_SecretManagerFallback(t *testing.T) {
 		return "", fmt.Errorf("unexpected secret: %s", name)
 	}
 
-	url, key := getAPIConfig()
+	url, key := getAPIConfig("")
 
 	if url != "http://secret-url.com" {
 		t.Errorf("Expected URL 'http://secret-url.com', got '%s'", url)
@@ -131,3 +133,31 @@ func TestGetAPIConfig_SecretManagerFallback(t *testing.T) {
 		t.Errorf("Expected Key 'secret-key', got '%s'", key)
 	}
 }
+
+func TestGetAPIConfig_PassedProjectID(t *testing.T) {
+	// Ensure Env Vars are empty, including GCLOUD_PROJECT_ID
+	defer setEnv("BIBLE_API_URL", "")()
+	defer setEnv("BIBLE_API_KEY", "")()
+	defer setEnv("GCLOUD_PROJECT_ID", "")()
+	resetAPIConfigCache()
+
+	// Mock the secret function
+	oldGetSecret := getSecretFunc
+	defer func() { getSecretFunc = oldGetSecret }()
+
+	getSecretFunc = func(project, name string) (string, error) {
+		if project != "passed-project" {
+			return "", fmt.Errorf("unexpected project: %s", project)
+		}
+		if name == "BIBLE_API_URL" {
+			return "http://secret-url-passed.com", nil
+		}
+		return "", fmt.Errorf("unexpected secret: %s", name)
+	}
+
+	url, _ := getAPIConfig("passed-project")
+
+	if url != "http://secret-url-passed.com" {
+		t.Errorf("Expected URL 'http://secret-url-passed.com', got '%s'", url)
+	}
+}

pkg/app/ask.go

@@ -25,7 +25,7 @@ func GetBibleAsk(env def.SessionData) def.SessionData {
 		}
 
 		var resp OQueryResponse
-		err := SubmitQuery(req, &resp)
+		err := SubmitQuery(req, &resp, env.Secrets.PROJECT_ID)
 		if err != nil {
 			log.Printf("Error asking bible: %v", err)
 			env.Res.Message = "Sorry, I encountered an error processing your question."

pkg/app/passage.go

@@ -146,7 +146,7 @@ func GetBiblePassage(env def.SessionData) def.SessionData {
 		}
 
 		var resp VerseResponse
-		err := SubmitQuery(req, &resp)
+		err := SubmitQuery(req, &resp, env.Secrets.PROJECT_ID)
 		if err != nil {
 			log.Printf("Error retrieving passage: %v", err)
 			// Fallback or error message?

pkg/app/search.go

@@ -38,7 +38,7 @@ func GetBibleSearch(env def.SessionData) def.SessionData {
 		}
 
 		var resp WordSearchResponse
-		err := SubmitQuery(req, &resp)
+		err := SubmitQuery(req, &resp, env.Secrets.PROJECT_ID)
 		if err != nil {
 			log.Printf("Error searching bible: %v", err)
 			env.Res.Message = "Sorry, I encountered an error while searching."