fix metal provider flag and env loading, and return error if provider not defined

This commit is contained in:
Mike Mason
2023-07-19 17:48:22 +00:00
parent 6c5073ba9b
commit 02c7895449
6 changed files with 45 additions and 0 deletions

View File

@@ -1,6 +1,9 @@
package metal
import (
"github.com/spf13/pflag"
"github.com/spf13/viper"
"go.equinixmetal.net/infra9-metal-bridge/internal/metal/providers/emapi"
"go.equinixmetal.net/infra9-metal-bridge/internal/metal/providers/emgql"
)
@@ -13,3 +16,9 @@ type Config struct {
// EMAPI sets the provider to Equinix Metal API.
EMAPI emapi.Config
}
// MustViperFlags registers command flags along with the viper bindings.
func MustViperFlags(v *viper.Viper, flags *pflag.FlagSet) {
emgql.MustViperFlags(v, flags)
emapi.MustViperFlags(v, flags)
}

View File

@@ -5,4 +5,7 @@ import "errors"
var (
// ErrUnauthorized is returned when the token provided did not validate to a user.
ErrUnauthorized = errors.New("unauthorized key")
// ErrMetalProviderRequired is returned when no provider has been configured for the metal client.
ErrMetalProviderRequired = errors.New("metal provider required")
)

View File

@@ -61,5 +61,9 @@ func New(options ...Option) (Client, error) {
client.logger = zap.NewNop()
}
if client.provider == nil {
return nil, ErrMetalProviderRequired
}
return client, nil
}

View File

@@ -3,6 +3,10 @@ package emapi
import (
"fmt"
"net/url"
"github.com/spf13/pflag"
"github.com/spf13/viper"
"go.infratographer.com/x/viperx"
)
// Config provides configuration for connecting to the Equinix Metal API provider.
@@ -17,6 +21,18 @@ type Config struct {
ConsumerToken string
}
// MustViperFlags registers command flags along with the viper bindings.
func MustViperFlags(v *viper.Viper, flags *pflag.FlagSet) {
flags.String("emapi-base-url", "", "Equinix Metal Rest API Base URL")
viperx.MustBindFlag(v, "equinixmetal.emapi.baseurl", flags.Lookup("emapi-base-url"))
flags.String("emapi-auth-token", "", "Equinix Metal Rest Auth Token")
viperx.MustBindFlag(v, "equinixmetal.emapi.authtoken", flags.Lookup("emapi-auth-token"))
flags.String("emapi-consumer-token", "", "Equinix Metal Rest Consumer Token")
viperx.MustBindFlag(v, "equinixmetal.emapi.consumertoken", flags.Lookup("emapi-consumer-token"))
}
// Populated checks if any field has been populated.
func (c Config) Populated() bool {
return c.AuthToken != "" || c.ConsumerToken != "" || c.BaseURL != ""

View File

@@ -1,11 +1,23 @@
package emgql
import (
"github.com/spf13/pflag"
"github.com/spf13/viper"
"go.infratographer.com/x/viperx"
)
// Config provides configuration for connecting to the Equinix Metal API provider.
type Config struct {
// BaseURL is the baseurl to use when connecting to the Equinix Metal API Provider.
BaseURL string
}
// MustViperFlags registers command flags along with the viper bindings.
func MustViperFlags(v *viper.Viper, flags *pflag.FlagSet) {
flags.String("emgql-base-url", "", "Equinix Metal GraphQL Base URL")
viperx.MustBindFlag(v, "equinixmetal.emgql.baseurl", flags.Lookup("emgql-base-url"))
}
// Populated checks if any field has been populated.
func (c Config) Populated() bool {
return c.BaseURL != ""