Skip to content

Commit

Permalink
Updated warning message and changed SMD client to use pointer receivers
Browse files Browse the repository at this point in the history
  • Loading branch information
davidallendj committed Aug 27, 2024
1 parent e3ef9d4 commit 9991f02
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion internal/collect.go
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ func CollectInventory(assets *[]RemoteAsset, params *CollectParams) error {
chanAssets = make(chan RemoteAsset, params.Concurrency+1)
outputPath = path.Clean(params.OutputPath)
smdClient = client.NewClient(
client.WithSecureTLS[client.SmdClient](params.CaCertPath),
client.WithSecureTLS[*client.SmdClient](params.CaCertPath),
)
)
// set the client's host from the CLI param
Expand Down
6 changes: 3 additions & 3 deletions pkg/client/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,16 @@ import (
"github.com/rs/zerolog/log"
)

type Option[T Client] func(client T)
type Option[T Client] func(client *T)

// The 'Client' struct is a wrapper around the default http.Client
// that provides an extended API to work with functional options.
// It also provides functions that work with `collect` data.
type Client interface {
Init()
Name() string
GetInternalClient() *http.Client
RootEndpoint(endpoint string) string
GetInternalClient() *http.Client

// functions needed to make request
Add(data HTTPBody, headers HTTPHeader) error
Expand All @@ -46,7 +46,7 @@ func WithCertPool[T Client](certPool *x509.CertPool) func(T) {
return func(client T) {
// make sure that we can access the internal client
if client.GetInternalClient() == nil {
log.Warn().Msg("internal client is invalid")
log.Warn().Any("client", client.GetInternalClient()).Msg("invalid internal HTTP client ()")
return
}
client.GetInternalClient().Transport = &http.Transport{
Expand Down
12 changes: 6 additions & 6 deletions pkg/client/smd.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,26 +16,26 @@ type SmdClient struct {
Xname string
}

func (c SmdClient) Init() {
func (c *SmdClient) Init() {
c.Client = &http.Client{}
}

func (c SmdClient) Name() string {
func (c *SmdClient) Name() string {
return "smd"
}

func (c SmdClient) RootEndpoint(endpoint string) string {
func (c *SmdClient) RootEndpoint(endpoint string) string {
return fmt.Sprintf("%s/hsm/v2%s", c.URI, endpoint)
}

func (c SmdClient) GetInternalClient() *http.Client {
func (c *SmdClient) GetInternalClient() *http.Client {
return c.Client
}

// Add() has a similar function definition to that of the default implementation,
// but also allows further customization and data/header manipulation that would
// be specific and/or unique to SMD's API.
func (c SmdClient) Add(data HTTPBody, headers HTTPHeader) error {
func (c *SmdClient) Add(data HTTPBody, headers HTTPHeader) error {
if data == nil {
return fmt.Errorf("failed to add redfish endpoint: no data found")
}
Expand All @@ -57,7 +57,7 @@ func (c SmdClient) Add(data HTTPBody, headers HTTPHeader) error {
return err
}

func (c SmdClient) Update(data HTTPBody, headers HTTPHeader) error {
func (c *SmdClient) Update(data HTTPBody, headers HTTPHeader) error {
if data == nil {
return fmt.Errorf("failed to add redfish endpoint: no data found")
}
Expand Down

0 comments on commit 9991f02

Please sign in to comment.