Merge pull request #249 from jwessel/fix_host_inspect

fix: host inspect causes db errors with later operations
moul · Mar 26, 2021 · a5bade8 · a5bade8
2 parents 7404704 + 3c32177
commit a5bade8
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/pkg/bastion/shell.go b/pkg/bastion/shell.go
@@ -829,12 +829,14 @@ GLOBAL OPTIONS:
 						}
 
 						var hosts []*dbmodels.Host
-						db = db.Preload("Groups")
 						if myself.HasRole("admin") {
-							db = db.Preload("SSHKey")
-						}
-						if err := dbmodels.HostsByIdentifiers(db, c.Args()).Find(&hosts).Error; err != nil {
-							return err
+							if err := dbmodels.HostsByIdentifiers(db.Preload("Groups").Preload("SSHKey"), c.Args()).Find(&hosts).Error; err != nil {
+								return err
+							}
+						} else {
+							if err := dbmodels.HostsByIdentifiers(db.Preload("Groups"), c.Args()).Find(&hosts).Error; err != nil {
+								return err
+							}
 						}
 
 						if c.Bool("decrypt") {