opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(mcclient): add FetchKeypairBySession method

Browse Source
This commit is contained in:
Zexi Li
2023-03-06 16:24:46 +08:00
parent a5c9f2b278
commit 3d5ac90934
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/mcclient/modules/compute/mod_sshkeypairs.go
+12 -7
View File
@@ -54,6 +54,14 @@ func (this *SSshkeypairManager) FetchPrivateKey(ctx context.Context, userCred mc
}
func (this *SSshkeypairManager) FetchPrivateKeyBySession(ctx context.Context, s *mcclient.ClientSession) (string, error) {
kp, err := this.FetchKeypairBySession(ctx, s)
if err != nil {
return "", errors.Wrap(err, "FetchKeypairBySession")
}
return kp.PrivateKey, nil
}
func (this *SSshkeypairManager) FetchKeypairBySession(ctx context.Context, s *mcclient.ClientSession) (*models.SshKeypair, error) {
userCred := s.GetToken()
jd := jsonutils.NewDict()
var jr jsonutils.JSONObject
@@ -61,24 +69,21 @@ func (this *SSshkeypairManager) FetchPrivateKeyBySession(ctx context.Context, s
jd.Set("admin", jsonutils.JSONTrue)
r, err := Sshkeypairs.List(s, jd)
if err != nil {
return "", errors.Wrap(err, "get admin ssh key")
return nil, errors.Wrap(err, "get admin ssh key")
}
jr = r.Data[0]
} else {
r, err := Sshkeypairs.GetById(s, userCred.GetProjectId(), jd)
if err != nil {
return "", errors.Wrap(err, "get project ssh key")
return nil, errors.Wrap(err, "get project ssh key")
}
jr = r
}
kp := &models.SshKeypair{}
if err := jr.Unmarshal(kp); err != nil {
return "", errors.Wrap(err, "unmarshal ssh key")
return nil, errors.Wrap(err, "unmarshal ssh key")
}
if kp.PrivateKey == "" {
return "", errors.Error("empty ssh key")
}
return kp.PrivateKey, nil
return kp, nil
}
var (