migrated all usages to the new package (#369)

This commit is contained in:
Michael Quigley
2023-07-13 14:26:35 -04:00
parent 7bfafd494f
commit 04b0b64ebf
38 changed files with 545 additions and 893 deletions

View File

@ -6,7 +6,7 @@ import (
"github.com/openziti/sdk-golang/ziti"
"github.com/openziti/zrok/endpoints"
"github.com/openziti/zrok/endpoints/publicProxy/notFoundUi"
"github.com/openziti/zrok/environment/env_v0_3"
"github.com/openziti/zrok/environment"
"github.com/openziti/zrok/model"
"github.com/openziti/zrok/util"
"github.com/pkg/errors"
@ -40,7 +40,11 @@ type Frontend struct {
}
func NewFrontend(cfg *FrontendConfig) (*Frontend, error) {
zCfgPath, err := env_v0_3.ZitiIdentityFile(cfg.IdentityName)
env, err := environment.LoadRoot()
if err != nil {
return nil, errors.Wrap(err, "error loading environment root")
}
zCfgPath, err := env.ZitiIdentityFile(cfg.IdentityName)
if err != nil {
return nil, errors.Wrapf(err, "error getting ziti identity '%v' from environment", cfg.IdentityName)
}