Skip to content

Commit 980b0ca

Browse files
committed
fix actionlint
1 parent 35703fa commit 980b0ca

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

.github/workflows/acceptance-tests-runner.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -556,11 +556,14 @@ jobs:
556556
MONGODB_ATLAS_CLIENT_ID: ${{ secrets.mongodb_atlas_client_id }}
557557
MONGODB_ATLAS_CLIENT_SECRET: ${{ secrets.mongodb_atlas_client_secret }}
558558
run: |
559-
ACCESS_TOKEN=$(make generate-oauth2-token)
560-
if [ $? -ne 0 ] || [ -z "$ACCESS_TOKEN" ]; then
559+
if ! ACCESS_TOKEN=$(make generate-oauth2-token); then
561560
echo "Error: Failed to generate access token"
562561
exit 1
563562
fi
563+
if [ -z "$ACCESS_TOKEN" ]; then
564+
echo "Error: Generated access token is empty"
565+
exit 1
566+
fi
564567
echo "access_token=$ACCESS_TOKEN" >> "$GITHUB_OUTPUT"
565568
- name: Acceptance Tests (Access Token)
566569
env:

tools/generate-oauth2-token/main.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,13 @@ import (
1010
)
1111

1212
func main() {
13-
baseURL := os.Getenv("MONGODB_ATLAS_BASE_URL")
13+
baseURL := strings.TrimRight(os.Getenv("MONGODB_ATLAS_BASE_URL"), "/")
1414
clientID := os.Getenv("MONGODB_ATLAS_CLIENT_ID")
1515
clientSecret := os.Getenv("MONGODB_ATLAS_CLIENT_SECRET")
1616
if baseURL == "" || clientID == "" || clientSecret == "" {
1717
fmt.Fprintln(os.Stderr, "Error: MONGODB_ATLAS_BASE_URL, MONGODB_ATLAS_CLIENT_ID, and MONGODB_ATLAS_CLIENT_SECRET environment variables are required")
1818
os.Exit(1)
1919
}
20-
baseURL = strings.TrimRight(baseURL, "/")
2120
conf := clientcredentials.NewConfig(clientID, clientSecret)
2221
conf.TokenURL = baseURL + clientcredentials.TokenAPIPath
2322
token, err := conf.Token(context.Background())

0 commit comments

Comments
 (0)