From 76d6111bc107209de0701ecd89c71f57f50dca82 Mon Sep 17 00:00:00 2001 From: Ahmed Abdrabo Date: Wed, 25 Nov 2020 01:24:05 +0100 Subject: [PATCH] Update bmclib to v0.4.5 --- go.mod | 2 +- go.sum | 4 +- .../bmc-toolbox/bmclib/internal/utils.go | 7 +++ .../bmclib/providers/dell/idrac8/configure.go | 17 +++--- .../bmclib/providers/dell/idrac8/query.go | 5 +- .../bmclib/providers/dell/idrac9/configure.go | 58 ++++++++++--------- .../bmclib/providers/dell/idrac9/idrac9.go | 5 -- .../bmclib/providers/dell/idrac9/query.go | 9 +-- .../bmclib/providers/dell/m1000e/configure.go | 3 +- .../bmclib/providers/dell/m1000e/m1000e.go | 7 ++- .../bmclib/providers/hp/c7000/configure.go | 39 +++++++------ .../bmclib/providers/hp/ilo/configure.go | 31 +++++----- .../bmclib/providers/hp/ilo/query.go | 25 ++++---- .../supermicro/supermicrox/configure.go | 25 ++++---- .../supermicro/supermicrox/supermicrox.go | 3 +- vendor/modules.txt | 2 +- 16 files changed, 129 insertions(+), 113 deletions(-) diff --git a/go.mod b/go.mod index 0a1aac3f..5d23ac08 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/bmc-toolbox/bmcbutler go 1.14 require ( - github.com/bmc-toolbox/bmclib v0.4.4 + github.com/bmc-toolbox/bmclib v0.4.5 github.com/bmc-toolbox/bmclogin v0.0.3 github.com/bmc-toolbox/gin-go-metrics v0.0.0-20190425145145-130c9ad985ff github.com/gammazero/deque v0.0.0-20190130191400-2afb3858e9c7 // indirect diff --git a/go.sum b/go.sum index c884dc35..e7ef8adf 100644 --- a/go.sum +++ b/go.sum @@ -29,8 +29,8 @@ github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kB github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84= github.com/bmc-toolbox/bmclib v0.2.8 h1:oP4DJ0NG2UWsRkmU+v7nCI2pWU9OLPm0bQU1sY4R53A= github.com/bmc-toolbox/bmclib v0.2.8/go.mod h1:V1ynUIaaWF6Ycxs5/h1mhCURaYhu4rRWn2NsvP74/KA= -github.com/bmc-toolbox/bmclib v0.4.4 h1:IYv5BzxTBdLUobi5X0E9okt6tGb9v/q8TBFNaK4VC0c= -github.com/bmc-toolbox/bmclib v0.4.4/go.mod h1:ih4FjnI3PZpVD/eG1cNvph0WXovZFktQG9o3BAlphUU= +github.com/bmc-toolbox/bmclib v0.4.5 h1:6x4Udyf3efTmKf6MVH/VG8NEZvKFfUjzgPHmpEaUEIY= +github.com/bmc-toolbox/bmclib v0.4.5/go.mod h1:ih4FjnI3PZpVD/eG1cNvph0WXovZFktQG9o3BAlphUU= github.com/bmc-toolbox/bmclogin v0.0.3 h1:TlaiA+9qhL5zGLm8LWSLKqfknV8ByR5Ge0HCGNQhtpE= github.com/bmc-toolbox/bmclogin v0.0.3/go.mod h1:eKb7WSyDadrzy0//gHywlz1FjgpZQXbW/ro8AsLbO4o= github.com/bmc-toolbox/gin-go-metrics v0.0.0-20190425145145-130c9ad985ff h1:fcp5EaStADQBTjrYL4pUtn4xknLA3CqJKkQd1HSSEdQ= diff --git a/vendor/github.com/bmc-toolbox/bmclib/internal/utils.go b/vendor/github.com/bmc-toolbox/bmclib/internal/utils.go index 5096f8a5..2fdc6248 100644 --- a/vendor/github.com/bmc-toolbox/bmclib/internal/utils.go +++ b/vendor/github.com/bmc-toolbox/bmclib/internal/utils.go @@ -6,3 +6,10 @@ import "unicode" func IsntLetterOrNumber(c rune) bool { return !unicode.IsLetter(c) && !unicode.IsNumber(c) } + +func ErrStringOrEmpty(err error) string { + if err == nil { + return "" + } + return err.Error() +} diff --git a/vendor/github.com/bmc-toolbox/bmclib/providers/dell/idrac8/configure.go b/vendor/github.com/bmc-toolbox/bmclib/providers/dell/idrac8/configure.go index 6b56222d..ad9af2ec 100644 --- a/vendor/github.com/bmc-toolbox/bmclib/providers/dell/idrac8/configure.go +++ b/vendor/github.com/bmc-toolbox/bmclib/providers/dell/idrac8/configure.go @@ -13,6 +13,7 @@ import ( "github.com/bmc-toolbox/bmclib/cfgresources" "github.com/bmc-toolbox/bmclib/devices" + "github.com/bmc-toolbox/bmclib/internal" "github.com/bmc-toolbox/bmclib/internal/helper" ) @@ -90,7 +91,7 @@ func (i *IDrac8) User(cfgUsers []*cfgresources.User) (err error) { "step", "applyUserParams", "IP", i.ip, "Model", i.HardwareType(), - "Error", err.Error(), + "Error", internal.ErrStringOrEmpty(err), ) return err } @@ -103,7 +104,7 @@ func (i *IDrac8) User(cfgUsers []*cfgresources.User) (err error) { "step", "applyUserParams", "IP", i.ip, "Model", i.HardwareType(), - "Error", err.Error(), + "Error", internal.ErrStringOrEmpty(err), ) return err } @@ -124,7 +125,7 @@ func (i *IDrac8) User(cfgUsers []*cfgresources.User) (err error) { "Model", i.HardwareType(), "step", helper.WhosCalling(), "User", cfgUser.Name, - "Error", err.Error(), + "Error", internal.ErrStringOrEmpty(err), ) continue } @@ -151,7 +152,7 @@ func (i *IDrac8) User(cfgUsers []*cfgresources.User) (err error) { "Model", i.HardwareType(), "step", helper.WhosCalling(), "User", cfgUser.Name, - "Error", err.Error(), + "Error", internal.ErrStringOrEmpty(err), ) continue } @@ -174,7 +175,7 @@ func (i *IDrac8) User(cfgUsers []*cfgresources.User) (err error) { "Model", i.HardwareType(), "step", helper.WhosCalling(), "User", cfgUser.Name, - "Error", err.Error(), + "Error", internal.ErrStringOrEmpty(err), ) } } @@ -666,7 +667,7 @@ func (i *IDrac8) GenerateCSR(cert *cfgresources.HTTPSCertAttributes) ([]byte, er "Model", i.HardwareType(), "endpoint", endpoint, "step", helper.WhosCalling(), - "Error", err.Error(), + "Error", internal.ErrStringOrEmpty(err), ) return []byte{}, err } @@ -737,7 +738,7 @@ func (i *IDrac8) UploadHTTPSCert(cert []byte, certFileName string, key []byte, k "step", helper.WhosCalling(), "IP", i.ip, "Model", i.HardwareType(), - "Error", err.Error(), + "Error", internal.ErrStringOrEmpty(err), ) return false, err } @@ -748,7 +749,7 @@ func (i *IDrac8) UploadHTTPSCert(cert []byte, certFileName string, key []byte, k "step", helper.WhosCalling(), "IP", i.ip, "Model", i.HardwareType(), - "Error", err.Error(), + "Error", internal.ErrStringOrEmpty(err), ) return false, err } diff --git a/vendor/github.com/bmc-toolbox/bmclib/providers/dell/idrac8/query.go b/vendor/github.com/bmc-toolbox/bmclib/providers/dell/idrac8/query.go index 7aa24e3c..8101a0c2 100644 --- a/vendor/github.com/bmc-toolbox/bmclib/providers/dell/idrac8/query.go +++ b/vendor/github.com/bmc-toolbox/bmclib/providers/dell/idrac8/query.go @@ -10,6 +10,7 @@ import ( "strings" "time" + "github.com/bmc-toolbox/bmclib/internal" "github.com/bmc-toolbox/bmclib/internal/helper" ) @@ -81,7 +82,7 @@ func (i *IDrac8) queryUsers() (userInfo UserInfo, err error) { "Model", i.HardwareType(), "endpoint", endpoint, "step", helper.WhosCalling(), - "Error", err.Error(), + "Error", internal.ErrStringOrEmpty(err), ) return userInfo, err } @@ -94,7 +95,7 @@ func (i *IDrac8) queryUsers() (userInfo UserInfo, err error) { "resource", "User", "IP", i.ip, "Model", i.HardwareType(), - "Error", err.Error(), + "Error", internal.ErrStringOrEmpty(err), ) return userInfo, err } diff --git a/vendor/github.com/bmc-toolbox/bmclib/providers/dell/idrac9/configure.go b/vendor/github.com/bmc-toolbox/bmclib/providers/dell/idrac9/configure.go index 909c0f4d..6a64b764 100644 --- a/vendor/github.com/bmc-toolbox/bmclib/providers/dell/idrac9/configure.go +++ b/vendor/github.com/bmc-toolbox/bmclib/providers/dell/idrac9/configure.go @@ -11,6 +11,7 @@ import ( "github.com/bmc-toolbox/bmclib/cfgresources" "github.com/bmc-toolbox/bmclib/devices" + "github.com/bmc-toolbox/bmclib/internal" "github.com/bmc-toolbox/bmclib/internal/helper" "gopkg.in/go-playground/validator.v9" @@ -55,7 +56,7 @@ func (i *IDrac9) Bios(cfg *cfgresources.Bios) (err error) { validate := validator.New() err = validate.Struct(newBiosSettings) if err != nil { - i.log.V(1).Error(err, "Config validation failed.", "step", "applyBiosParams", "Error", err.Error()) + i.log.V(1).Error(err, "Config validation failed.", "step", "applyBiosParams", "Error", internal.ErrStringOrEmpty(err)) return err } @@ -67,7 +68,7 @@ func (i *IDrac9) Bios(cfg *cfgresources.Bios) (err error) { "IP", i.ip, "Model", i.HardwareType(), "step", helper.WhosCalling(), - "Error", err.Error(), + "Error", internal.ErrStringOrEmpty(err), ) return errors.New(msg) } @@ -82,7 +83,7 @@ func (i *IDrac9) Bios(cfg *cfgresources.Bios) (err error) { "IP", i.ip, "Model", i.HardwareType(), "step", helper.WhosCalling(), - "Error", err.Error(), + "Error", internal.ErrStringOrEmpty(err), ) return err } @@ -103,7 +104,7 @@ func (i *IDrac9) Bios(cfg *cfgresources.Bios) (err error) { "resource", "Bios", "IP", i.ip, "Model", i.HardwareType(), - "Bios settings pending", err.Error(), + "Bios settings pending", internal.ErrStringOrEmpty(err), ) } @@ -114,7 +115,7 @@ func (i *IDrac9) Bios(cfg *cfgresources.Bios) (err error) { "IP", i.ip, "Model", i.HardwareType(), "step", helper.WhosCalling(), - "Error", err.Error(), + "Error", internal.ErrStringOrEmpty(err), ) return errors.New(msg) } @@ -143,7 +144,10 @@ func (i *IDrac9) Bios(cfg *cfgresources.Bios) (err error) { // Iterate over iDrac users and adds/removes/modifies user accounts // nolint: gocyclo func (i *IDrac9) User(cfgUsers []*cfgresources.User) (err error) { - + err = i.httpLogin() + if err != nil { + return err + } err = i.validateCfg(cfgUsers) if err != nil { msg := "Config validation failed." @@ -151,7 +155,7 @@ func (i *IDrac9) User(cfgUsers []*cfgresources.User) (err error) { "step", "applyUserParams", "IP", i.ip, "Model", i.HardwareType(), - "Error", err.Error(), + "Error", internal.ErrStringOrEmpty(err), ) return errors.New(msg) } @@ -163,7 +167,7 @@ func (i *IDrac9) User(cfgUsers []*cfgresources.User) (err error) { "step", "applyUserParams", "IP", i.ip, "Model", i.HardwareType(), - "Error", err.Error(), + "Error", internal.ErrStringOrEmpty(err), ) return errors.New(msg) } @@ -185,7 +189,7 @@ func (i *IDrac9) User(cfgUsers []*cfgresources.User) (err error) { "Model", i.HardwareType(), "step", helper.WhosCalling(), "User", cfgUser.Name, - "Error", err.Error(), + "Error", internal.ErrStringOrEmpty(err), ) continue } @@ -212,7 +216,7 @@ func (i *IDrac9) User(cfgUsers []*cfgresources.User) (err error) { "Model", i.HardwareType(), "step", helper.WhosCalling(), "User", cfgUser.Name, - "Error", err.Error(), + "Error", internal.ErrStringOrEmpty(err), ) continue } @@ -229,7 +233,7 @@ func (i *IDrac9) User(cfgUsers []*cfgresources.User) (err error) { "Model", i.HardwareType(), "step", helper.WhosCalling(), "User", cfgUser.Name, - "Error", err.Error(), + "Error", internal.ErrStringOrEmpty(err), "StatusCode", statusCode, "Response", response, ) @@ -323,7 +327,7 @@ func (i *IDrac9) Ldap(cfg *cfgresources.Ldap) (err error) { "IP", i.ip, "Model", i.HardwareType(), "step", helper.WhosCalling(), - "Error", err.Error(), + "Error", internal.ErrStringOrEmpty(err), ) return err } @@ -344,7 +348,7 @@ func (i *IDrac9) LdapGroup(cfg []*cfgresources.LdapGroup, cfgLdap *cfgresources. "step", "applyUserParams", "IP", i.ip, "Model", i.HardwareType(), - "Error", err.Error(), + "Error", internal.ErrStringOrEmpty(err), ) return err } @@ -372,7 +376,7 @@ func (i *IDrac9) LdapGroup(cfg []*cfgresources.LdapGroup, cfgLdap *cfgresources. "step", helper.WhosCalling(), "Ldap Role Group", cfgRole.Group, "Role Group DN", cfgRole.Role, - "Error", err.Error(), + "Error", internal.ErrStringOrEmpty(err), ) continue } @@ -395,7 +399,7 @@ func (i *IDrac9) LdapGroup(cfg []*cfgresources.LdapGroup, cfgLdap *cfgresources. "step", helper.WhosCalling(), "Ldap Role Group", cfgRole.Group, "Role Group DN", cfgRole.Role, - "Error", err.Error(), + "Error", internal.ErrStringOrEmpty(err), ) continue } @@ -415,7 +419,7 @@ func (i *IDrac9) LdapGroup(cfg []*cfgresources.LdapGroup, cfgLdap *cfgresources. "step", helper.WhosCalling(), "Ldap Role Group", cfgRole.Group, "Role Group DN", cfgRole.Role, - "Error", err.Error(), + "Error", internal.ErrStringOrEmpty(err), ) continue } @@ -488,7 +492,7 @@ func (i *IDrac9) Ntp(cfg *cfgresources.Ntp) (err error) { "Model", i.HardwareType(), "step", helper.WhosCalling(), "Timezone", cfg.Timezone, - "Error", err.Error(), + "Error", internal.ErrStringOrEmpty(err), ) return err } @@ -506,7 +510,7 @@ func (i *IDrac9) Ntp(cfg *cfgresources.Ntp) (err error) { "IP", i.ip, "Model", i.HardwareType(), "step", helper.WhosCalling(), - "Error", err.Error(), + "Error", internal.ErrStringOrEmpty(err), ) return err } @@ -565,7 +569,7 @@ func (i *IDrac9) Syslog(cfg *cfgresources.Syslog) (err error) { "IP", i.ip, "Model", i.HardwareType(), "step", helper.WhosCalling(), - "Error", err.Error(), + "Error", internal.ErrStringOrEmpty(err), ) return err } @@ -577,7 +581,7 @@ func (i *IDrac9) Syslog(cfg *cfgresources.Syslog) (err error) { "IP", i.ip, "Model", i.HardwareType(), "step", helper.WhosCalling(), - "Error", err.Error(), + "Error", internal.ErrStringOrEmpty(err), ) return err } @@ -589,7 +593,7 @@ func (i *IDrac9) Syslog(cfg *cfgresources.Syslog) (err error) { "IP", i.ip, "Model", i.HardwareType(), "step", helper.WhosCalling(), - "Error", err.Error(), + "Error", internal.ErrStringOrEmpty(err), ) return err } @@ -653,7 +657,7 @@ func (i *IDrac9) Network(cfg *cfgresources.Network) (reset bool, err error) { "IP", i.ip, "Model", i.HardwareType(), "step", helper.WhosCalling(), - "Error", err.Error(), + "Error", internal.ErrStringOrEmpty(err), ) } @@ -663,7 +667,7 @@ func (i *IDrac9) Network(cfg *cfgresources.Network) (reset bool, err error) { "IP", i.ip, "Model", i.HardwareType(), "step", helper.WhosCalling(), - "Error", err.Error(), + "Error", internal.ErrStringOrEmpty(err), ) } @@ -673,7 +677,7 @@ func (i *IDrac9) Network(cfg *cfgresources.Network) (reset bool, err error) { "IP", i.ip, "Model", i.HardwareType(), "step", helper.WhosCalling(), - "Error", err.Error(), + "Error", internal.ErrStringOrEmpty(err), ) } @@ -683,7 +687,7 @@ func (i *IDrac9) Network(cfg *cfgresources.Network) (reset bool, err error) { "IP", i.ip, "Model", i.HardwareType(), "step", helper.WhosCalling(), - "Error", err.Error(), + "Error", internal.ErrStringOrEmpty(err), ) } @@ -776,7 +780,7 @@ func (i *IDrac9) UploadHTTPSCert(cert []byte, certFileName string, key []byte, k "step", helper.WhosCalling(), "IP", i.ip, "Model", i.HardwareType(), - "Error", err.Error(), + "Error", internal.ErrStringOrEmpty(err), ) return false, err } @@ -787,7 +791,7 @@ func (i *IDrac9) UploadHTTPSCert(cert []byte, certFileName string, key []byte, k "step", helper.WhosCalling(), "IP", i.ip, "Model", i.HardwareType(), - "Error", err.Error(), + "Error", internal.ErrStringOrEmpty(err), ) return false, err } diff --git a/vendor/github.com/bmc-toolbox/bmclib/providers/dell/idrac9/idrac9.go b/vendor/github.com/bmc-toolbox/bmclib/providers/dell/idrac9/idrac9.go index 95e045eb..80999cfa 100644 --- a/vendor/github.com/bmc-toolbox/bmclib/providers/dell/idrac9/idrac9.go +++ b/vendor/github.com/bmc-toolbox/bmclib/providers/dell/idrac9/idrac9.go @@ -48,11 +48,6 @@ func New(ctx context.Context, host string, httpHost string, username string, pas } idrac := &IDrac9{ip: httpHost, username: username, password: password, sshClient: sshClient, ctx: ctx, log: log} - err = idrac.httpLogin() - if err != nil { - return nil, err - } - return idrac, nil } diff --git a/vendor/github.com/bmc-toolbox/bmclib/providers/dell/idrac9/query.go b/vendor/github.com/bmc-toolbox/bmclib/providers/dell/idrac9/query.go index e5aeb979..2c52e9d4 100644 --- a/vendor/github.com/bmc-toolbox/bmclib/providers/dell/idrac9/query.go +++ b/vendor/github.com/bmc-toolbox/bmclib/providers/dell/idrac9/query.go @@ -7,6 +7,7 @@ import ( "net" "time" + "github.com/bmc-toolbox/bmclib/internal" "github.com/bmc-toolbox/bmclib/internal/helper" ) @@ -65,7 +66,7 @@ func (i *IDrac9) queryUsers() (users map[int]User, err error) { "Model", i.HardwareType(), "endpoint", endpoint, "step", helper.WhosCalling(), - "Error", err.Error(), + "Error", internal.ErrStringOrEmpty(err), ) return users, err } @@ -78,7 +79,7 @@ func (i *IDrac9) queryUsers() (users map[int]User, err error) { "Model", i.HardwareType(), "resource", "User", "step", "queryUserInfo", - "Error", err.Error(), + "Error", internal.ErrStringOrEmpty(err), ) return users, err } @@ -97,7 +98,7 @@ func (i *IDrac9) queryLdapRoleGroups() (ldapRoleGroups LdapRoleGroups, err error "Model", i.HardwareType(), "endpoint", endpoint, "step", helper.WhosCalling(), - "Error", err.Error(), + "Error", internal.ErrStringOrEmpty(err), ) return ldapRoleGroups, err } @@ -110,7 +111,7 @@ func (i *IDrac9) queryLdapRoleGroups() (ldapRoleGroups LdapRoleGroups, err error "Model", i.HardwareType(), "resource", "User", "step", "queryUserInfo", - "Error", err.Error(), + "Error", internal.ErrStringOrEmpty(err), ) return ldapRoleGroups, err } diff --git a/vendor/github.com/bmc-toolbox/bmclib/providers/dell/m1000e/configure.go b/vendor/github.com/bmc-toolbox/bmclib/providers/dell/m1000e/configure.go index d9362771..77d5493f 100644 --- a/vendor/github.com/bmc-toolbox/bmclib/providers/dell/m1000e/configure.go +++ b/vendor/github.com/bmc-toolbox/bmclib/providers/dell/m1000e/configure.go @@ -11,6 +11,7 @@ import ( "github.com/bmc-toolbox/bmclib/cfgresources" "github.com/bmc-toolbox/bmclib/devices" + "github.com/bmc-toolbox/bmclib/internal" "github.com/google/go-querystring/query" ) @@ -197,7 +198,7 @@ func (m *M1000e) LdapGroup(cfg []*cfgresources.LdapGroup, cfgLdap *cfgresources. "Ldap role", group.Role, "IP", m.ip, "Model", m.HardwareType(), - "Error", err.Error(), + "Error", internal.ErrStringOrEmpty(err), ) return err } diff --git a/vendor/github.com/bmc-toolbox/bmclib/providers/dell/m1000e/m1000e.go b/vendor/github.com/bmc-toolbox/bmclib/providers/dell/m1000e/m1000e.go index 9375feb2..82d9d3cc 100644 --- a/vendor/github.com/bmc-toolbox/bmclib/providers/dell/m1000e/m1000e.go +++ b/vendor/github.com/bmc-toolbox/bmclib/providers/dell/m1000e/m1000e.go @@ -13,6 +13,7 @@ import ( "github.com/bmc-toolbox/bmclib/devices" "github.com/bmc-toolbox/bmclib/errors" + "github.com/bmc-toolbox/bmclib/internal" "github.com/bmc-toolbox/bmclib/internal/sshclient" "github.com/bmc-toolbox/bmclib/providers/dell" "github.com/go-logr/logr" @@ -349,7 +350,7 @@ func (m *M1000e) StorageBlades() (storageBlades []*devices.StorageBlade, err err "ip", m.ip, "position", storageBlade.BladePosition, "type", "chassis", - "error", err.Error(), + "error", internal.ErrStringOrEmpty(err), ) continue } @@ -390,7 +391,7 @@ func (m *M1000e) Blades() (blades []*devices.Blade, err error) { blade.PowerKw = float64(dellBlade.ActualPwrConsump) / 1000 temp, err := strconv.Atoi(dellBlade.BladeTemperature) if err != nil { - m.log.V(1).Info(err.Error(), + m.log.V(1).Info(internal.ErrStringOrEmpty(err), "operation", "connection", "ip", m.ip, "position", blade.BladePosition, @@ -431,7 +432,7 @@ func (m *M1000e) Blades() (blades []*devices.Blade, err error) { if strings.HasPrefix(blade.BmcAddress, "[") { payload, err := m.get(fmt.Sprintf("blade_status?id=%d&cat=C10&tab=T41&id=P78", blade.BladePosition)) if err != nil { - m.log.V(1).Info(err.Error(), + m.log.V(1).Info(internal.ErrStringOrEmpty(err), "operation", "connection", "ip", m.ip, "position", blade.BladePosition, diff --git a/vendor/github.com/bmc-toolbox/bmclib/providers/hp/c7000/configure.go b/vendor/github.com/bmc-toolbox/bmclib/providers/hp/c7000/configure.go index cd2f7252..5687b239 100644 --- a/vendor/github.com/bmc-toolbox/bmclib/providers/hp/c7000/configure.go +++ b/vendor/github.com/bmc-toolbox/bmclib/providers/hp/c7000/configure.go @@ -6,6 +6,7 @@ import ( "github.com/bmc-toolbox/bmclib/cfgresources" "github.com/bmc-toolbox/bmclib/devices" + "github.com/bmc-toolbox/bmclib/internal" ) // This ensures the compiler errors if this type is missing @@ -75,7 +76,7 @@ func (c *C7000) Ldap(cfg *cfgresources.Ldap) (err error) { "resource", "Ldap", "IP", c.ip, "Model", c.HardwareType(), - "Error", err.Error(), + "Error", internal.ErrStringOrEmpty(err), ) return err } @@ -87,7 +88,7 @@ func (c *C7000) Ldap(cfg *cfgresources.Ldap) (err error) { "resource", "Ldap", "IP", c.ip, "Model", c.HardwareType(), - "Error", err.Error(), + "Error", internal.ErrStringOrEmpty(err), ) return err } @@ -161,7 +162,7 @@ func (c *C7000) applysetLdapInfo4(cfg *cfgresources.Ldap) (err error) { "IP", c.ip, "Model", c.HardwareType(), "statusCode", statusCode, - "Error", err.Error(), + "Error", internal.ErrStringOrEmpty(err), ) return err } @@ -187,7 +188,7 @@ func (c *C7000) applyEnableLdapAuth(enable bool) (err error) { "IP", c.ip, "Model", c.HardwareType(), "statusCode", statusCode, - "Error", err.Error(), + "Error", internal.ErrStringOrEmpty(err), ) return err } @@ -227,7 +228,7 @@ func (c *C7000) LdapGroup(cfg []*cfgresources.LdapGroup, cfgLdap *cfgresources.L "resource", "Ldap", "IP", c.ip, "Model", c.HardwareType(), - "Error", err.Error(), + "Error", internal.ErrStringOrEmpty(err), ) return } @@ -252,7 +253,7 @@ func (c *C7000) LdapGroup(cfg []*cfgresources.LdapGroup, cfgLdap *cfgresources.L "resource", "Ldap", "IP", c.ip, "Model", c.HardwareType(), - "Error", err.Error(), + "Error", internal.ErrStringOrEmpty(err), ) return } @@ -265,7 +266,7 @@ func (c *C7000) LdapGroup(cfg []*cfgresources.LdapGroup, cfgLdap *cfgresources.L "resource", "Ldap", "IP", c.ip, "Model", c.HardwareType(), - "Error", err.Error(), + "Error", internal.ErrStringOrEmpty(err), ) return } @@ -278,7 +279,7 @@ func (c *C7000) LdapGroup(cfg []*cfgresources.LdapGroup, cfgLdap *cfgresources.L "resource", "Ldap", "IP", c.ip, "Model", c.HardwareType(), - "Error", err.Error(), + "Error", internal.ErrStringOrEmpty(err), ) return } @@ -385,7 +386,7 @@ func (c *C7000) applyLdapGroupBayACL(role string, group string) (err error) { "IP", c.ip, "Model", c.HardwareType(), "statusCode", statusCode, - "Error", err.Error(), + "Error", internal.ErrStringOrEmpty(err), ) return err } @@ -470,7 +471,7 @@ func (c *C7000) applyAddLdapGroupBayAccess(group string) (err error) { "IP", c.ip, "Model", c.HardwareType(), "statusCode", statusCode, - "Error", err.Error(), + "Error", internal.ErrStringOrEmpty(err), ) return err } @@ -600,7 +601,7 @@ func (c *C7000) setUserPassword(user string, password string) (err error) { "IP", c.ip, "Model", c.HardwareType(), "return code", statusCode, - "Error", err.Error(), + "Error", internal.ErrStringOrEmpty(err), ) return err } @@ -636,7 +637,7 @@ func (c *C7000) setUserACL(user string, role string) (err error) { "IP", c.ip, "Model", c.HardwareType(), "return code", statusCode, - "Error", err.Error(), + "Error", internal.ErrStringOrEmpty(err), ) return err } @@ -697,7 +698,7 @@ func (c *C7000) applyAddUserBayAccess(user string) (err error) { "IP", c.ip, "Model", c.HardwareType(), "statusCode", statusCode, - "Error", err.Error(), + "Error", internal.ErrStringOrEmpty(err), ) return err } @@ -766,7 +767,7 @@ func (c *C7000) Ntp(cfg *cfgresources.Ntp) (err error) { "IP", c.ip, "Model", c.HardwareType(), "StatusCode", statusCode, - "Error", err.Error(), + "Error", internal.ErrStringOrEmpty(err), ) return err } @@ -777,7 +778,7 @@ func (c *C7000) Ntp(cfg *cfgresources.Ntp) (err error) { "step", "applyNtpParams", "IP", c.ip, "Model", c.HardwareType(), - "Error", err.Error(), + "Error", internal.ErrStringOrEmpty(err), ) return err } @@ -802,7 +803,7 @@ func (c *C7000) applyNtpTimezoneParam(timezone string) (err error) { "step", "applyNtpTimezoneParam", "IP", c.ip, "Model", c.HardwareType(), - "Error", err.Error(), + "Error", internal.ErrStringOrEmpty(err), "StatusCode", statusCode, ) return err @@ -877,7 +878,7 @@ func (c *C7000) applySyslogServer(server string) { "step", "applySyslogServer", "IP", c.ip, "Model", c.HardwareType(), - "Error", err.Error(), + "Error", internal.ErrStringOrEmpty(err), "StatusCode", statusCode, ) return @@ -901,7 +902,7 @@ func (c *C7000) applySyslogPort(port int) { "step", "applySyslogPort", "IP", c.ip, "Model", c.HardwareType(), - "Error", err.Error(), + "Error", internal.ErrStringOrEmpty(err), "StatusCode", statusCode, ) return @@ -926,7 +927,7 @@ func (c *C7000) applySyslogEnabled(enabled bool) { "step", "SetRemoteSyslogEnabled", "IP", c.ip, "Model", c.HardwareType(), - "Error", err.Error(), + "Error", internal.ErrStringOrEmpty(err), "StatusCode", statusCode, ) return diff --git a/vendor/github.com/bmc-toolbox/bmclib/providers/hp/ilo/configure.go b/vendor/github.com/bmc-toolbox/bmclib/providers/hp/ilo/configure.go index c90961a4..686199c5 100644 --- a/vendor/github.com/bmc-toolbox/bmclib/providers/hp/ilo/configure.go +++ b/vendor/github.com/bmc-toolbox/bmclib/providers/hp/ilo/configure.go @@ -7,6 +7,7 @@ import ( "github.com/bmc-toolbox/bmclib/cfgresources" "github.com/bmc-toolbox/bmclib/devices" + "github.com/bmc-toolbox/bmclib/internal" "github.com/bmc-toolbox/bmclib/internal/helper" ) @@ -98,7 +99,7 @@ func (i *Ilo) User(users []*cfgresources.User) (err error) { "IP", i.ip, "Model", i.HardwareType(), "step", "applyUserParams", - "Error", err.Error(), + "Error", internal.ErrStringOrEmpty(err), ) return errors.New(msg) } @@ -185,7 +186,7 @@ func (i *Ilo) User(users []*cfgresources.User) (err error) { "Model", i.HardwareType(), "step", helper.WhosCalling(), "User", user.Name, - "Error", err.Error(), + "Error", internal.ErrStringOrEmpty(err), ) continue } @@ -202,7 +203,7 @@ func (i *Ilo) User(users []*cfgresources.User) (err error) { "User", user.Name, "StatusCode", statusCode, "response", string(response), - "Error", err.Error(), + "Error", internal.ErrStringOrEmpty(err), ) continue @@ -260,7 +261,7 @@ func (i *Ilo) Syslog(cfg *cfgresources.Syslog) (err error) { "IP", i.ip, "Model", i.HardwareType(), "step", helper.WhosCalling(), - "Error", err.Error(), + "Error", internal.ErrStringOrEmpty(err), ) return errors.New(msg) } @@ -276,7 +277,7 @@ func (i *Ilo) Syslog(cfg *cfgresources.Syslog) (err error) { "step", helper.WhosCalling(), "StatusCode", statusCode, "response", string(response), - "Error", err.Error(), + "Error", internal.ErrStringOrEmpty(err), ) return errors.New(msg) } @@ -309,7 +310,7 @@ func (i *Ilo) SetLicense(cfg *cfgresources.License) (err error) { "IP", i.ip, "Model", i.HardwareType(), "step", helper.WhosCalling(), - "Error", err.Error(), + "Error", internal.ErrStringOrEmpty(err), ) return errors.New(msg) } @@ -325,7 +326,7 @@ func (i *Ilo) SetLicense(cfg *cfgresources.License) (err error) { "step", helper.WhosCalling(), "StatusCode", statusCode, "response", string(response), - "Error", err.Error(), + "Error", internal.ErrStringOrEmpty(err), ) return errors.New(msg) } @@ -381,7 +382,7 @@ func (i *Ilo) Ntp(cfg *cfgresources.Ntp) (err error) { "IP", i.ip, "Model", i.HardwareType(), "step", helper.WhosCalling(), - "Error", err.Error(), + "Error", internal.ErrStringOrEmpty(err), ) return errors.New(msg) } @@ -414,7 +415,7 @@ func (i *Ilo) Ntp(cfg *cfgresources.Ntp) (err error) { "IP", i.ip, "Model", i.HardwareType(), "step", helper.WhosCalling(), - "Error", err.Error(), + "Error", internal.ErrStringOrEmpty(err), ) return errors.New(msg) } @@ -430,7 +431,7 @@ func (i *Ilo) Ntp(cfg *cfgresources.Ntp) (err error) { "step", helper.WhosCalling(), "StatusCode", statusCode, "response", string(response), - "Error", err.Error(), + "Error", internal.ErrStringOrEmpty(err), ) return errors.New(msg) } @@ -452,7 +453,7 @@ func (i *Ilo) LdapGroup(cfg []*cfgresources.LdapGroup, cfgLdap *cfgresources.Lda "IP", i.ip, "Model", i.HardwareType(), "step", helper.WhosCalling(), - "Error", err.Error(), + "Error", internal.ErrStringOrEmpty(err), ) return errors.New(msg) } @@ -532,7 +533,7 @@ func (i *Ilo) LdapGroup(cfg []*cfgresources.LdapGroup, cfgLdap *cfgresources.Lda "Model", i.HardwareType(), "step", helper.WhosCalling(), "Group", group.Group, - "Error", err.Error(), + "Error", internal.ErrStringOrEmpty(err), ) continue } @@ -548,7 +549,7 @@ func (i *Ilo) LdapGroup(cfg []*cfgresources.LdapGroup, cfgLdap *cfgresources.Lda "Group", group.Group, "StatusCode", statusCode, "response", string(response), - "Error", err.Error(), + "Error", internal.ErrStringOrEmpty(err), ) continue } @@ -623,7 +624,7 @@ func (i *Ilo) Ldap(cfg *cfgresources.Ldap) (err error) { "IP", i.ip, "Model", i.HardwareType(), "step", helper.WhosCalling(), - "Error", err.Error(), + "Error", internal.ErrStringOrEmpty(err), ) return err } @@ -639,7 +640,7 @@ func (i *Ilo) Ldap(cfg *cfgresources.Ldap) (err error) { "step", helper.WhosCalling(), "StatusCode", statusCode, "response", string(response), - "Error", err.Error(), + "Error", internal.ErrStringOrEmpty(err), ) return err } diff --git a/vendor/github.com/bmc-toolbox/bmclib/providers/hp/ilo/query.go b/vendor/github.com/bmc-toolbox/bmclib/providers/hp/ilo/query.go index 62586a67..713d7db7 100644 --- a/vendor/github.com/bmc-toolbox/bmclib/providers/hp/ilo/query.go +++ b/vendor/github.com/bmc-toolbox/bmclib/providers/hp/ilo/query.go @@ -8,6 +8,7 @@ import ( "time" "github.com/bmc-toolbox/bmclib/errors" + "github.com/bmc-toolbox/bmclib/internal" "github.com/bmc-toolbox/bmclib/internal/helper" ) @@ -67,7 +68,7 @@ func (i *Ilo) queryDirectoryGroups() (directoryGroups []DirectoryGroups, err err "Model", i.HardwareType(), "endpoint", endpoint, "step", helper.WhosCalling(), - "Error", err.Error(), + "Error", internal.ErrStringOrEmpty(err), ) return directoryGroups, err } @@ -81,7 +82,7 @@ func (i *Ilo) queryDirectoryGroups() (directoryGroups []DirectoryGroups, err err "IP", i.ip, "Model", i.HardwareType(), "step", helper.WhosCalling(), - "Error", err.Error(), + "Error", internal.ErrStringOrEmpty(err), ) return directoryGroups, err } @@ -101,7 +102,7 @@ func (i *Ilo) queryUsers() (usersInfo []UserInfo, err error) { "Model", i.HardwareType(), "endpoint", endpoint, "step", helper.WhosCalling(), - "Error", err.Error(), + "Error", internal.ErrStringOrEmpty(err), ) return usersInfo, err } @@ -116,7 +117,7 @@ func (i *Ilo) queryUsers() (usersInfo []UserInfo, err error) { "Model", i.HardwareType(), "resource", "User", "step", "queryUserInfo", - "Error", err.Error(), + "Error", internal.ErrStringOrEmpty(err), ) return usersInfo, err } @@ -136,7 +137,7 @@ func (i *Ilo) queryNetworkSntp() (networkSntp NetworkSntp, err error) { "Model", i.HardwareType(), "endpoint", endpoint, "step", helper.WhosCalling(), - "Error", err.Error(), + "Error", internal.ErrStringOrEmpty(err), ) return networkSntp, err } @@ -148,7 +149,7 @@ func (i *Ilo) queryNetworkSntp() (networkSntp NetworkSntp, err error) { "IP", i.ip, "Model", i.HardwareType(), "step", helper.WhosCalling(), - "Error", err.Error(), + "Error", internal.ErrStringOrEmpty(err), ) return networkSntp, err } @@ -170,7 +171,7 @@ func (i *Ilo) queryAccessSettings() (AccessSettings, error) { "Model", i.HardwareType(), "endpoint", endpoint, "step", helper.WhosCalling(), - "Error", err.Error(), + "Error", internal.ErrStringOrEmpty(err), ) return accessSettings, err } @@ -182,7 +183,7 @@ func (i *Ilo) queryAccessSettings() (AccessSettings, error) { "IP", i.ip, "Model", i.HardwareType(), "step", helper.WhosCalling(), - "Error", err.Error(), + "Error", internal.ErrStringOrEmpty(err), ) return accessSettings, err } @@ -204,7 +205,7 @@ func (i *Ilo) queryNetworkIPv4() (NetworkIPv4, error) { "Model", i.HardwareType(), "endpoint", endpoint, "step", helper.WhosCalling(), - "Error", err.Error(), + "Error", internal.ErrStringOrEmpty(err), ) return networkIPv4, err } @@ -216,7 +217,7 @@ func (i *Ilo) queryNetworkIPv4() (NetworkIPv4, error) { "IP", i.ip, "Model", i.HardwareType(), "step", helper.WhosCalling(), - "Error", err.Error(), + "Error", internal.ErrStringOrEmpty(err), ) return networkIPv4, err } @@ -238,7 +239,7 @@ func (i *Ilo) queryPowerRegulator() (PowerRegulator, error) { "Model", i.HardwareType(), "endpoint", endpoint, "step", helper.WhosCalling(), - "Error", err.Error(), + "Error", internal.ErrStringOrEmpty(err), ) return PowerRegulator{}, err } @@ -250,7 +251,7 @@ func (i *Ilo) queryPowerRegulator() (PowerRegulator, error) { "IP", i.ip, "Model", i.HardwareType(), "step", helper.WhosCalling(), - "Error", err.Error(), + "Error", internal.ErrStringOrEmpty(err), ) return PowerRegulator{}, err } diff --git a/vendor/github.com/bmc-toolbox/bmclib/providers/supermicro/supermicrox/configure.go b/vendor/github.com/bmc-toolbox/bmclib/providers/supermicro/supermicrox/configure.go index a6df79d5..9392e5d0 100644 --- a/vendor/github.com/bmc-toolbox/bmclib/providers/supermicro/supermicrox/configure.go +++ b/vendor/github.com/bmc-toolbox/bmclib/providers/supermicro/supermicrox/configure.go @@ -13,6 +13,7 @@ import ( "github.com/bmc-toolbox/bmclib/cfgresources" "github.com/bmc-toolbox/bmclib/devices" + "github.com/bmc-toolbox/bmclib/internal" "github.com/bmc-toolbox/bmclib/internal/helper" "github.com/google/go-querystring/query" @@ -83,7 +84,7 @@ func (s *SupermicroX) queryUserAccounts() (userAccounts map[string]int, err erro userAccounts = make(map[string]int) ipmi, err := s.query("CONFIG_INFO.XML=(0,0)") if err != nil { - s.log.V(1).Info("error querying user accounts", "error", err.Error()) + s.log.V(1).Info("error querying user accounts", "error", internal.ErrStringOrEmpty(err)) return userAccounts, err } @@ -106,7 +107,7 @@ func (s *SupermicroX) User(users []*cfgresources.User) (err error) { currentUsers, err := s.queryUserAccounts() if err != nil { msg := "Unable to query current user accounts." - s.log.V(1).Info(msg, "ip", s.ip, "model", s.HardwareType(), "step", helper.WhosCalling(), "error", err.Error()) + s.log.V(1).Info(msg, "ip", s.ip, "model", s.HardwareType(), "step", helper.WhosCalling(), "error", internal.ErrStringOrEmpty(err)) return errors.New(msg) } @@ -169,7 +170,7 @@ func (s *SupermicroX) User(users []*cfgresources.User) (err error) { "endpoint", endpoint, "statusCode", statusCode, "step", helper.WhosCalling(), - "error", err.Error()) + "error", internal.ErrStringOrEmpty(err)) return errors.New(msg) } @@ -221,7 +222,7 @@ func (s *SupermicroX) Network(cfg *cfgresources.Network) (reset bool, err error) "endpoint", endpoint, "statusCode", statusCode, "step", helper.WhosCalling(), - "error", err.Error()) + "error", internal.ErrStringOrEmpty(err)) return reset, errors.New(msg) } @@ -254,7 +255,7 @@ func (s *SupermicroX) Ntp(cfg *cfgresources.Ntp) (err error) { "step", "applyNtpParams", "model", s.HardwareType(), "declaredTtimezone", cfg.Timezone, - "error", err.Error()) + "error", internal.ErrStringOrEmpty(err)) return } @@ -307,7 +308,7 @@ func (s *SupermicroX) Ntp(cfg *cfgresources.Ntp) (err error) { "endpoint", endpoint, "statusCode", statusCode, "step", helper.WhosCalling(), - "error", err.Error()) + "error", internal.ErrStringOrEmpty(err)) return errors.New(msg) } @@ -431,7 +432,7 @@ func (s *SupermicroX) LdapGroup(cfgGroup []*cfgresources.LdapGroup, cfgLdap *cfg "model", s.HardwareType(), "endpoint", endpoint, "statusCode", statusCode, - "error", err.Error()) + "error", internal.ErrStringOrEmpty(err)) return errors.New(msg) } } @@ -493,7 +494,7 @@ func (s *SupermicroX) Syslog(cfg *cfgresources.Syslog) (err error) { "model", s.HardwareType(), "endpoint", endpoint, "statusCode", statusCode, - "error", err.Error()) + "error", internal.ErrStringOrEmpty(err)) return errors.New(msg) } @@ -512,7 +513,7 @@ func (s *SupermicroX) Syslog(cfg *cfgresources.Syslog) (err error) { "model", s.HardwareType(), "endpoint", endpoint, "statusCode", statusCode, - "error", err.Error()) + "error", internal.ErrStringOrEmpty(err)) return errors.New(msg) } @@ -575,7 +576,7 @@ func (s *SupermicroX) UploadHTTPSCert(cert []byte, certFileName string, key []by "model", s.HardwareType(), "endpoint", endpoint, "statusCode", status, - "error", err.Error()) + "error", internal.ErrStringOrEmpty(err)) return false, err } @@ -617,7 +618,7 @@ func (s *SupermicroX) validateSSL() error { "model", s.HardwareType(), "endpoint", endpoint, "statusCode", status, - "error", err.Error()) + "error", internal.ErrStringOrEmpty(err)) return err } @@ -642,7 +643,7 @@ func (s *SupermicroX) statusSSL() error { "model", s.HardwareType(), "endpoint", endpoint, "statusCode", status, - "error", err.Error()) + "error", internal.ErrStringOrEmpty(err)) return err } diff --git a/vendor/github.com/bmc-toolbox/bmclib/providers/supermicro/supermicrox/supermicrox.go b/vendor/github.com/bmc-toolbox/bmclib/providers/supermicro/supermicrox/supermicrox.go index 753eb01a..6321322c 100644 --- a/vendor/github.com/bmc-toolbox/bmclib/providers/supermicro/supermicrox/supermicrox.go +++ b/vendor/github.com/bmc-toolbox/bmclib/providers/supermicro/supermicrox/supermicrox.go @@ -14,6 +14,7 @@ import ( "github.com/bmc-toolbox/bmclib/devices" "github.com/bmc-toolbox/bmclib/errors" + "github.com/bmc-toolbox/bmclib/internal" "github.com/bmc-toolbox/bmclib/internal/httpclient" "github.com/go-logr/logr" @@ -247,7 +248,7 @@ func (s *SupermicroX) HardwareType() (model string) { m, err := s.Model() if err != nil { // Here is your sin - s.log.V(1).Info("error getting hardwaretype", "err", err.Error()) + s.log.V(1).Info("error getting hardwaretype", "err", internal.ErrStringOrEmpty(err)) return model } if strings.Contains(strings.ToLower(m), X10) { diff --git a/vendor/modules.txt b/vendor/modules.txt index 24d1246b..13dfefeb 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1,4 +1,4 @@ -# github.com/bmc-toolbox/bmclib v0.4.4 +# github.com/bmc-toolbox/bmclib v0.4.5 ## explicit github.com/bmc-toolbox/bmclib/cfgresources github.com/bmc-toolbox/bmclib/devices