Skip to content

makes API_KEY optional #231

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
justinmahood merged 1 commit into from
Jul 18, 2025
Merged

makes API_KEY optional #231

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 4 additions & 15 deletions Demos/Gemma-on-Cloudrun/proxy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,20 +72,9 @@ func modifyStreamResponse(resp *http.Response) error {
return nil
}

func getApiKey() (string, error) {
apiKey := os.Getenv("API_KEY")
if apiKey == "" {
return "", fmt.Errorf("environment variable 'API_KEY' is required")
}
return apiKey, nil
}

func main() {
// --- Configuration ---
envApiKey, err := getApiKey()
if err != nil {
log.Fatalf("Error reading API_KEY env var: %v", err)
}
envApiKey := os.Getenv("API_KEY")

port := os.Getenv("PORT")
targetURLStr := os.Getenv("OLLAMA_HOST")
Expand All @@ -111,7 +100,7 @@ func main() {
matches := re.FindStringSubmatch(r.URL.Path)

var (
isCurrentRequestGeminiStyle bool = false
isCurrentRequestGeminiStyle bool = false
actionForResponse string // Stores action for response modification
)

Expand Down Expand Up @@ -141,7 +130,7 @@ func main() {
if requestApiKey == "" {
requestApiKey = queryParams.Get("key")
}
if requestApiKey != envApiKey {
if envApiKey != "" && requestApiKey != envApiKey {
log.Printf("Invalid API key provided in the request.")
http.Error(w, "Permission denied. Invalid API Key. Configure your SDK to use this URL, and use the API key provided at deployment (https://github.com/google-gemini/gemma-cookbook/blob/main/Demos/Gemma-on-Cloudrun/README.md)", http.StatusForbidden)
return
Expand Down Expand Up @@ -191,7 +180,7 @@ func main() {
apiKey = r.URL.Query().Get("key")
expectedPrefix = ""
}
if apiKey != expectedPrefix + envApiKey {
if envApiKey != "" && apiKey != expectedPrefix+envApiKey {
log.Printf("Invalid API key provided in the request.")
http.Error(w, "Permission denied. Invalid API Key. Configure your SDK to use this URL, and use the API key provided at deployment (https://github.com/google-gemini/gemma-cookbook/blob/main/Demos/Gemma-on-Cloudrun/README.md)", http.StatusForbidden)
return
Expand Down