From 1f3e5077fafddd06deb46777ca3de7a823d5e5ac Mon Sep 17 00:00:00 2001 From: Vladimir DOMBROVSKI Date: Thu, 13 Jul 2023 11:25:54 +0200 Subject: [PATCH] Fix 'unsupported relationship HopId' Fixes #329 --- pkg/bastion/shell.go | 4 ++-- pkg/bastion/ssh.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/bastion/shell.go b/pkg/bastion/shell.go index d81b9449..a474774a 100644 --- 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 index 2c7d079d..4f37dc97 100644 --- 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 }