adam/bridge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

correct providers package name

Browse Source
This commit is contained in:
Mike Mason
2023-07-17 15:43:22 +00:00
parent 2f9f0675f9
commit 70f17de14b
5 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
internal/metal/metal.go
View File

@@ -7,14 +7,14 @@ import (
"go.uber.org/zap" "go.uber.org/zap"
"go.equinixmetal.net/infra9-metal-bridge/internal/metal/models" "go.equinixmetal.net/infra9-metal-bridge/internal/metal/models"
provider "go.equinixmetal.net/infra9-metal-bridge/internal/metal/providers" "go.equinixmetal.net/infra9-metal-bridge/internal/metal/providers"
) )
// Client is the Equinix Metal API Client struct. // Client is the Equinix Metal API Client struct.
type Client struct { type Client struct {
logger *zap.Logger logger *zap.Logger
provider provider.Provider provider providers.Provider
} }
func (c *Client) GetOrganizationDetails(ctx context.Context, id gidx.PrefixedID) (*models.OrganizationDetails, error) { func (c *Client) GetOrganizationDetails(ctx context.Context, id gidx.PrefixedID) (*models.OrganizationDetails, error) {

7
internal/metal/options.go
View File

@@ -1,17 +1,18 @@
package metal package metal
import ( import (
provider "go.equinixmetal.net/infra9-metal-bridge/internal/metal/providers" "go.uber.org/zap"
"go.equinixmetal.net/infra9-metal-bridge/internal/metal/providers"
"go.equinixmetal.net/infra9-metal-bridge/internal/metal/providers/emapi" "go.equinixmetal.net/infra9-metal-bridge/internal/metal/providers/emapi"
"go.equinixmetal.net/infra9-metal-bridge/internal/metal/providers/emgql" "go.equinixmetal.net/infra9-metal-bridge/internal/metal/providers/emgql"
"go.uber.org/zap"
) )
// Option is a Client configuration Option definition. // Option is a Client configuration Option definition.
type Option func(c *Client) error type Option func(c *Client) error
// WithProvider sets the provider on the client. // WithProvider sets the provider on the client.
func WithProvider(provider provider.Provider) Option { func WithProvider(provider providers.Provider) Option {
return func(c *Client) error { return func(c *Client) error {
c.provider = provider c.provider = provider

4
internal/metal/providers/emapi/client.go
View File

@@ -12,7 +12,7 @@ import (
"go.uber.org/zap" "go.uber.org/zap"
provider "go.equinixmetal.net/infra9-metal-bridge/internal/metal/providers" "go.equinixmetal.net/infra9-metal-bridge/internal/metal/providers"
) )
const ( const (
@@ -29,7 +29,7 @@ var DefaultHTTPClient = &http.Client{
Timeout: defaultHTTPTimeout, Timeout: defaultHTTPTimeout,
} }
var _ provider.Provider = &Client{} var _ providers.Provider = &Client{}
type Client struct { type Client struct {
logger *zap.SugaredLogger logger *zap.SugaredLogger

13
internal/metal/providers/emgql/client.go
View File

@@ -5,21 +5,20 @@ import (
"net/url" "net/url"
"time" "time"
provider "go.equinixmetal.net/infra9-metal-bridge/internal/metal/providers"
"go.uber.org/zap" "go.uber.org/zap"
"go.equinixmetal.net/infra9-metal-bridge/internal/metal/providers"
) )
const ( const (
defaultHTTPTimeout = 5 * time.Second defaultHTTPTimeout = 5 * time.Second
) )
var ( var DefaultHTTPClient = &http.Client{
DefaultHTTPClient = &http.Client{ Timeout: defaultHTTPTimeout,
Timeout: defaultHTTPTimeout, }
}
)
var _ provider.Provider = &Client{} var _ providers.Provider = &Client{}
type Client struct { type Client struct {
logger *zap.SugaredLogger logger *zap.SugaredLogger

2
internal/metal/providers/provider.go
View File

@@ -1,4 +1,4 @@
package provider package providers
import ( import (
"context" "context"