fix conditionals

diggerhq · Nov 13, 2024 · 8785f8c · 8785f8c
1 parent 504dfc8
commit 8785f8c
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/backend/utils/github.go b/backend/utils/github.go
@@ -114,10 +114,6 @@ func (gh DiggerGithubRealClientProvider) FetchCredentials(githubAppId string) (s
 	clientSecret := os.Getenv("GITHUB_APP_CLIENT_SECRET")
 	webhookSecret := os.Getenv("GITHUB_WEBHOOK_SECRET")
 	privateKeyb64 := os.Getenv("GITHUB_APP_PRIVATE_KEY_BASE64")
-
-	if clientId == "" || clientSecret == "" || webhookSecret == "" || privateKeyb64 == "" {
-		return "", "", "", "", fmt.Errorf("the values of GITHUB_APP_CLIENT_ID or GITHUB_APP_CLIENT_SECRET are not set")
-	}
 	return clientId, clientSecret, webhookSecret, privateKeyb64, nil
 }
 

diff --git a/ee/backend/providers/github/providers.go b/ee/backend/providers/github/providers.go
@@ -101,7 +101,7 @@ func (gh DiggerGithubEEClientProvider) FetchCredentials(githubAppId string) (str
 	webhookSecret := os.Getenv("GITHUB_WEBHOOK_SECRET")
 	privateKeyb64 := os.Getenv("GITHUB_APP_PRIVATE_KEY_BASE64")
 
-	if clientId == "" || clientSecret == "" || webhookSecret == "" || privateKeyb64 == "" {
+	if clientId != "" && clientSecret != "" && webhookSecret != "" && privateKeyb64 != "" {
 		log.Printf("Info: found github client credentials from env variables, using those")
 		return clientId, clientSecret, webhookSecret, privateKeyb64, nil
 	}