using named returns

hashicorp · Jun 23, 2021 · 1016465 · 1016465
1 parent f1e4ded
commit 1016465
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 15 deletions.
diff --git a/internal/ceb/ceb.go b/internal/ceb/ceb.go
@@ -283,7 +283,7 @@ type Option func(*CEB, *config) error
 // environment variables. If this is NOT called, then the environment variable
 // based confiugration will be ignored.
 func WithEnvDefaults() Option {
- return func(ceb *CEB, cfg *config) error {
+ return func(ceb *CEB, cfg *config) (err error) {
  var port int
  portStr := os.Getenv("PORT")
  if portStr == "" {
@@ -301,31 +301,27 @@ func WithEnvDefaults() Option {
  cfg.URLServicePort = port
  cfg.ServerAddr = os.Getenv(envServerAddr)
 
- serverRequiredBool, err := env.GetEnvBool(envCEBServerRequired, false)
+ cfg.ServerRequired, err = env.GetEnvBool(envCEBServerRequired, false)
  if err != nil {
  return err
  }
- cfg.ServerRequired = serverRequiredBool
 
- serverTlsBool, err := env.GetEnvBool(envServerTls, false)
+ cfg.ServerTls, err = env.GetEnvBool(envServerTls, false)
  if err != nil {
  return err
  }
- cfg.ServerTls = serverTlsBool
 
- serverTlsSkipVerifyBool, err := env.GetEnvBool(envServerTlsSkipVerify, false)
+ cfg.ServerTlsSkipVerify, err = env.GetEnvBool(envServerTlsSkipVerify, false)
  if err != nil {
  return err
  }
- cfg.ServerTlsSkipVerify = serverTlsSkipVerifyBool
 
  cfg.InviteToken = os.Getenv(envCEBToken)
 
- disableCEBBool, err := env.GetEnvBool(envCEBDisable, false)
+ cfg.disable, err = env.GetEnvBool(envCEBDisable, false)
  if err != nil {
  return err
  }
- cfg.disable = disableCEBBool
 
  ceb.deploymentId = os.Getenv(envDeploymentId)
 

diff --git a/internal/env/env.go b/internal/env/env.go
@@ -14,7 +14,7 @@ func GetEnvBool(key string, defaultValue bool) (bool, error) {
  if envVal == "" {
  return defaultValue, nil
  }
- value, err := strconv.ParseBool(strings.ToLower(envVal)))
+ value, err := strconv.ParseBool(strings.ToLower(envVal))
  if err != nil {
  return defaultValue, fmt.Errorf("failed to parse a boolean from environment variable %s=%s",key,envVal)
  }

diff --git a/internal/serverclient/client.go b/internal/serverclient/client.go
@@ -124,21 +124,19 @@ type connectConfig struct {
 // FromEnv sources the connection information from the environment
 // using standard environment variables.
 func FromEnv() ConnectOption {
- return func(c *connectConfig) error {
+ return func(c *connectConfig) (err error) {
  if v := os.Getenv(EnvServerAddr); v != "" {
  c.Addr = v
 
- tlsBool, err := env.GetEnvBool(EnvServerTls, false)
+ c.Tls, err = env.GetEnvBool(EnvServerTls, false)
  if err != nil {
  return err
  }
- c.Tls = tlsBool
 
- tlsSkipVerifyBool, err := env.GetEnvBool(EnvServerTlsSkipVerify, false)
+ c.TlsSkipVerify, err = env.GetEnvBool(EnvServerTlsSkipVerify, false)
  if err != nil {
  return err
  }
- c.TlsSkipVerify = tlsSkipVerifyBool
 
  c.Auth = os.Getenv(EnvServerToken) != ""
  }