From 5da4820298c77fa8fae7e98dbc4b8013d48af204 Mon Sep 17 00:00:00 2001
From: oothman <omar.othman@booking.com>
Date: Tue, 3 Aug 2021 13:59:21 +0200
Subject: [PATCH] Extra LDAP groups for chassis as well.

---
 pkg/butler/configure/chassis.go | 12 ++++++++++++
 pkg/butler/execute.go           | 10 ++++++----
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/pkg/butler/configure/chassis.go b/pkg/butler/configure/chassis.go
index 774b8377..439d67fe 100644
--- a/pkg/butler/configure/chassis.go
+++ b/pkg/butler/configure/chassis.go
@@ -114,6 +114,18 @@ func (b *Cmc) Apply() { //nolint: gocyclo
 			}
 		case "ldap_group":
 			if b.config.LdapGroups != nil && b.config.Ldap != nil {
+				k, err := b.config.LdapGroups.GetExtraGroups(b.asset.Serial, b.asset.Vendor)
+				if err != nil {
+					b.logger.WithFields(logrus.Fields{
+						"Vendor":    b.vendor,
+						"Model":     b.model,
+						"Serial":    b.serial,
+						"IPAddress": b.ip,
+						"Error":     err,
+						"K":         k,
+						"Groups":    b.config.LdapGroups.Groups,
+					}).Warn("Trying to fetch more LDAP groups has failed.")
+				}
 				err = b.configure.LdapGroups(b.config.LdapGroups.Groups, b.config.Ldap)
 			}
 		case "license":
diff --git a/pkg/butler/execute.go b/pkg/butler/execute.go
index 4fc36f6c..2c84b0d4 100644
--- a/pkg/butler/execute.go
+++ b/pkg/butler/execute.go
@@ -52,11 +52,12 @@ func (b *Butler) executeCommand(command string, asset *asset.Asset) (err error)
 			log.WithFields(logrus.Fields{
 				"component":          component,
 				"Serial":             asset.Serial,
-				"AssetType":          asset.Type,
+				"Asset Type":         asset.Type,
 				"Vendor":             asset.Vendor, //at this point the vendor may or may not be known.
 				"Location":           asset.Location,
+				"IP Address":         asset.IPAddress,
 				"Command":            command,
-				"Command successful": success,
+				"Command Successful": success,
 				"Error":              err,
 				"Output":             output,
 			}).Warn("Command execute returned error.")
@@ -64,11 +65,12 @@ func (b *Butler) executeCommand(command string, asset *asset.Asset) (err error)
 			log.WithFields(logrus.Fields{
 				"component":          component,
 				"Serial":             asset.Serial,
-				"AssetType":          asset.Type,
+				"Asset Type":         asset.Type,
 				"Vendor":             asset.Vendor,
 				"Location":           asset.Location,
+				"IP Address":         asset.IPAddress,
 				"Command":            command,
-				"Command successful": success,
+				"Command Successful": success,
 				"Output":             output,
 			}).Debug("Command successfully executed.")
 		}