towk/magellan
1
0
Fork 0
mirror of https://github.com/davidallendj/magellan.git synced 2025-12-20 03:27:03 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Updated warning message and changed SMD client to use pointer receivers

Browse source
This commit is contained in:
David Allen 2024-08-27 15:55:16 -06:00
parent e3ef9d4276
commit 9991f02631
No known key found for this signature in database
GPG key ID: 717C593FF60A2ACC
3 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
internal/collect.go
View file

@ -59,7 +59,7 @@ func CollectInventory(assets *[]RemoteAsset, params *CollectParams) error {
chanAssets = make(chan RemoteAsset, params.Concurrency+1) chanAssets = make(chan RemoteAsset, params.Concurrency+1)
outputPath = path.Clean(params.OutputPath) outputPath = path.Clean(params.OutputPath)
smdClient = client.NewClient( smdClient = client.NewClient(
client.WithSecureTLS[client.SmdClient](params.CaCertPath), client.WithSecureTLS[*client.SmdClient](params.CaCertPath),
) )
) )
// set the client's host from the CLI param // set the client's host from the CLI param

6
pkg/client/client.go
View file

@ -13,7 +13,7 @@ import (
"github.com/rs/zerolog/log" "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 // The 'Client' struct is a wrapper around the default http.Client
// that provides an extended API to work with functional options. // that provides an extended API to work with functional options.
@ -21,8 +21,8 @@ type Option[T Client] func(client T)
type Client interface { type Client interface {
Init() Init()
Name() string Name() string
GetInternalClient() *http.Client
RootEndpoint(endpoint string) string RootEndpoint(endpoint string) string
GetInternalClient() *http.Client
// functions needed to make request // functions needed to make request
Add(data HTTPBody, headers HTTPHeader) error Add(data HTTPBody, headers HTTPHeader) error
@ -46,7 +46,7 @@ func WithCertPool[T Client](certPool *x509.CertPool) func(T) {
return func(client T) { return func(client T) {
// make sure that we can access the internal client // make sure that we can access the internal client
if client.GetInternalClient() == nil { if client.GetInternalClient() == nil {
log.Warn().Msg("internal client is invalid") log.Warn().Any("client", client.GetInternalClient()).Msg("invalid internal HTTP client ()")
return return
} }
client.GetInternalClient().Transport = &http.Transport{ client.GetInternalClient().Transport = &http.Transport{

12
pkg/client/smd.go
View file

@ -16,26 +16,26 @@ type SmdClient struct {
Xname string Xname string
} }
func (c SmdClient) Init() { func (c *SmdClient) Init() {
c.Client = &http.Client{} c.Client = &http.Client{}
} }
func (c SmdClient) Name() string { func (c *SmdClient) Name() string {
return "smd" 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) 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 return c.Client
} }
// Add() has a similar function definition to that of the default implementation, // Add() has a similar function definition to that of the default implementation,
// but also allows further customization and data/header manipulation that would // but also allows further customization and data/header manipulation that would
// be specific and/or unique to SMD's API. // 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 { if data == nil {
return fmt.Errorf("failed to add redfish endpoint: no data found") return fmt.Errorf("failed to add redfish endpoint: no data found")
} }
@ -57,7 +57,7 @@ func (c SmdClient) Add(data HTTPBody, headers HTTPHeader) error {
return err return err
} }
func (c SmdClient) Update(data HTTPBody, headers HTTPHeader) error { func (c *SmdClient) Update(data HTTPBody, headers HTTPHeader) error {
if data == nil { if data == nil {
return fmt.Errorf("failed to add redfish endpoint: no data found") return fmt.Errorf("failed to add redfish endpoint: no data found")
} }