Fix 'unsupported relationship HopId'

Fixes moul#329 (cherry picked from commit 1f3e507)
husqvarnagroup · Oct 7, 2023 · 8bd4f7c · 8bd4f7c
1 parent d3e885c
commit 8bd4f7c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/pkg/bastion/shell.go b/pkg/bastion/shell.go
@@ -901,7 +901,7 @@ GLOBAL OPTIONS:
  var hop string
  if host.HopID != 0 {
  var hopHost dbmodels.Host
- if err := db.Model(host).Association("HopID").Find(&hopHost); err != nil {
+ if err := db.Model(host).Association("Hop").Find(&hopHost); err != nil {
  return err
  }
  hop = hopHost.Name
@@ -1028,7 +1028,7 @@ GLOBAL OPTIONS:
  if c.Bool("unset-hop") {
  var hopHost dbmodels.Host
 
- if err := db.Model(&host).Association("HopID").Find(&hopHost); err != nil {
+ if err := db.Model(&host).Association("Hop").Find(&hopHost); err != nil {
  return err
  }
  if err := model.Association("Hop").Clear(); err != nil {

diff --git a/pkg/bastion/ssh.go b/pkg/bastion/ssh.go
@@ -144,7 +144,7 @@ func ChannelHandler(srv *ssh.Server, conn *gossh.ServerConn, newChan gossh.NewCh
  }}, sessionConfigs...)
  if currentHost.HopID != 0 {
  var newHost dbmodels.Host
- if err := actx.db.Model(currentHost).Association("HopID").Find(&newHost); err != nil {
+ if err := actx.db.Model(currentHost).Association("Hop").Find(&newHost); err != nil {
  log.Printf("Error: %v", err)
  return
  }