extern/zrok
1
1
Fork 0
mirror of https://github.com/openziti/zrok.git synced 2025-02-08 14:29:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

lint (#131)

Browse Source
This commit is contained in:
Michael Quigley 2022-12-05 14:06:53 -05:00
parent d238809481
commit 2fda4351ed
No known key found for this signature in database
GPG Key ID: 9B60314A9DD20A62
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
controller/bootstrap.go
View File

@ -78,16 +78,16 @@ func assertZrokProxyConfigType(edge *rest_management_api_client.ZitiEdgeManageme
func getIdentityId(identityName string) (string, error) { func getIdentityId(identityName string) (string, error) {
zif, err := zrokdir.ZitiIdentityFile(identityName) zif, err := zrokdir.ZitiIdentityFile(identityName)
if err != nil { if err != nil {
return "", errors.Wrapf(err, "error opening identity '%v' from zrokdir: %v", identityName) return "", errors.Wrapf(err, "error opening identity '%v' from zrokdir", identityName)
} }
zcfg, err := config2.NewFromFile(zif) zcfg, err := config2.NewFromFile(zif)
if err != nil { if err != nil {
return "", errors.Wrapf(err, "error loading ziti config from file '%v': %v", zif) return "", errors.Wrapf(err, "error loading ziti config from file '%v'", zif)
} }
zctx := ziti.NewContextWithConfig(zcfg) zctx := ziti.NewContextWithConfig(zcfg)
id, err := zctx.GetCurrentIdentity() id, err := zctx.GetCurrentIdentity()
if err != nil { if err != nil {
return "", errors.Wrapf(err, "error getting current identity from '%v': %v", zif) return "", errors.Wrapf(err, "error getting current identity from '%v'", zif)
} }
return id.Id, nil return id.Id, nil
} }