fix: E2E with safedep API key

safedep · Nov 12, 2024 · 4e4302f · 4e4302f
1 parent 350ab78
commit 4e4302f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -63,6 +63,8 @@ jobs:
         env:
           E2E_INSIGHTS_V2: true
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          # This will not be available when there is a PR from a forked repository
+          SAFEDEP_CLOUD_API_KEY: ${{ secrets.SAFEDEP_CLOUD_API_KEY }}
 
   build-container:
     runs-on: ubuntu-latest

diff --git a/internal/connect/github.go b/internal/connect/github.go
@@ -38,14 +38,14 @@ func GetGithubOAuth2ClientId() string {
 }
 
 func GetGithubClient() (*github.Client, error) {
-	github_token := os.Getenv("GITHUB_TOKEN")
-	if !utils.IsEmptyString(github_token) {
+	githubToken := os.Getenv("GITHUB_TOKEN")
+	if !utils.IsEmptyString(githubToken) {
 		logger.Debugf("Found GITHUB_TOKEN env variable, using it to access Github.")
 	} else {
-		github_token = globalConfig.GithubAccessToken
+		githubToken = globalConfig.GithubAccessToken
 	}
 
-	if utils.IsEmptyString(github_token) {
+	if utils.IsEmptyString(githubToken) {
 		rateLimitedClient, err := githubRateLimitedClient(http.DefaultTransport)
 		if err != nil {
 			return nil, err
@@ -56,7 +56,7 @@ func GetGithubClient() (*github.Client, error) {
 	}
 
 	tokenSource := oauth2.StaticTokenSource(&oauth2.Token{
-		AccessToken: github_token,
+		AccessToken: githubToken,
 	})
 
 	baseClient := oauth2.NewClient(context.Background(), tokenSource)

diff --git a/test/scenarios/all.sh b/test/scenarios/all.sh
@@ -7,7 +7,7 @@ export E2E_ROOT="$E2E_THIS_DIR/../../"
 export E2E_FIXTURES="$E2E_THIS_DIR/fixtures"
 export E2E_VET_BINARY="$E2E_ROOT/vet"
 export E2E_VET_INSIGHTS_V2="${E2E_INSIGHTS_V2:-false}"
-export E2E_VET_SCAN_CMD="$E2E_VET_BINARY scan -s --no-banner --insights-v2 $E2E_VET_INSIGHTS_V2"
+export E2E_VET_SCAN_CMD="$E2E_VET_BINARY scan -s --no-banner --insights-v2=$E2E_VET_INSIGHTS_V2"
 
 bash $E2E_THIS_DIR/scenario-1-vet-scans-vet.sh
 bash $E2E_THIS_DIR/scenario-2-vet-scan-demo-client-java.sh