Skip to content
This repository has been archived by the owner on Apr 24, 2023. It is now read-only.

Commit

Permalink
Merge pull request #6 from aidenkeating/pre-req-api-key
Browse files Browse the repository at this point in the history
add prerequisite check for sendgrid api key on default client
  • Loading branch information
aidenkeating authored Jan 30, 2020
2 parents a0bf9f2 + 825e485 commit 9b3c609
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
2 changes: 1 addition & 1 deletion cmd/cli/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ func main() {
logger := logrus.WithField("service", "rhmi_sendgrid_cli")
smtpdetailsClient, err := sendgrid.NewDefaultClient(logger)
if err != nil {
logger.Fatalf("failed to create sendgrid details client")
logger.Fatalf("failed to create sendgrid details client: %v", err)
os.Exit(1)
}

Expand Down
6 changes: 5 additions & 1 deletion pkg/sendgrid/sendgrid.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,11 @@ func NewDefaultClient(logger *logrus.Entry) (*Client, error) {
if err != nil {
return nil, errors.Wrap(err, "failed to create default password generator")
}
sendgridRESTClient := NewBackendRESTClient(APIHost, os.Getenv(EnvAPIKey), logger)
sendgridAPIKeyEnv := os.Getenv(EnvAPIKey)
if sendgridAPIKeyEnv == "" {
return nil, errors.New("SENDGRID_API_KEY env var must be defined")
}
sendgridRESTClient := NewBackendRESTClient(APIHost, sendgridAPIKeyEnv, logger)
sendgridClient := NewBackendAPIClient(sendgridRESTClient, logger)
return NewClient(sendgridClient, DefaultAPIKeyScopes, passGen, logger.WithField(smtpdetails.LogFieldDetailProvider, ProviderName))
}
Expand Down

0 comments on commit 9b3c609

Please sign in to comment.