Skip to content

fix: Return clearer error when team name empty or not set #1354

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
merged 2 commits into from
Nov 2, 2023
Merged

fix: Return clearer error when team name empty or not set #1354

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6c4942a
Infer team name if none specified
hermanschaaf Nov 1, 2023
e61e591
Update
hermanschaaf Nov 2, 2023
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
25 changes: 16 additions & 9 deletions premium/usage.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@ package premium

import (
"context"
"errors"
"fmt"
"math/rand"
"net/http"
"os"
"sync/atomic"
"time"

Expand Down Expand Up @@ -166,15 +168,6 @@ func NewUsageClient(pluginTeam cqapi.PluginTeam, pluginKind cqapi.PluginKind, pl
op(u)
}

// Set team name from configuration if not provided
if u.teamName == "" {
teamName, err := config.GetValue("team")
if err != nil {
return nil, fmt.Errorf("failed to get team name from config: %w", err)
}
u.teamName = teamName
}

// Create a default api client if none was provided
if u.apiClient == nil {
tokenClient := auth.NewTokenClient()
Expand All @@ -192,6 +185,20 @@ func NewUsageClient(pluginTeam cqapi.PluginTeam, pluginKind cqapi.PluginKind, pl
u.apiClient = ac
}

// Set team name from configuration if not provided
if u.teamName == "" {
teamName, err := config.GetValue("team")
if errors.Is(err, os.ErrNotExist) {
return nil, fmt.Errorf("config file for reading team name not found (%w). Hint: use `cloudquery login` and/or `cloudquery switch <team>`", err)
} else if err != nil {
return nil, fmt.Errorf("failed to get team name from config: %w", err)
}
if teamName == "" {
return nil, fmt.Errorf("team name not set. Hint: use `cloudquery switch <team>`")
}
u.teamName = teamName
}

u.backgroundUpdater()

return u, nil
Expand Down