extern/zrok
1
1
Fork 0
mirror of https://github.com/openziti/zrok.git synced 2025-08-19 04:06:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

further ziti identity naming cleanup (#369)

Browse Source
This commit is contained in:
Michael Quigley
2023-07-14 10:14:32 -04:00
parent 48cfaada20
commit 4713243e2c
15 changed files with 46 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
controller/bootstrap.go
View File

@@ -36,14 +36,19 @@ func Bootstrap(skipFrontend bool, inCfg *config.Config) error {
return errors.Wrap(err, "error connecting to the ziti edge management api")
}
env, err := environment.LoadRoot()
if err != nil {
return err
}
var frontendZId string
if !skipFrontend {
logrus.Info("creating identity for frontend ziti access")
if frontendZId, err = getIdentityId("frontend"); err == nil {
if frontendZId, err = getIdentityId(env.AccessIdentityName()); err == nil {
logrus.Infof("frontend identity: %v", frontendZId)
} else {
frontendZId, err = bootstrapIdentity("frontend", edge)
frontendZId, err = bootstrapIdentity(env.AccessIdentityName(), edge)
if err != nil {
panic(err)
}
@@ -51,7 +56,7 @@ func Bootstrap(skipFrontend bool, inCfg *config.Config) error {
if err := assertIdentity(frontendZId, edge); err != nil {
panic(err)
}
if err := assertErpForIdentity("frontend", frontendZId, edge); err != nil {
if err := assertErpForIdentity(env.AccessIdentityName(), frontendZId, edge); err != nil {
panic(err)
}
@@ -117,7 +122,7 @@ func getIdentityId(identityName string) (string, error) {
if err != nil {
return "", errors.Wrap(err, "error opening environment root")
}
zif, err := env.ZitiIdentityFile(identityName)
zif, err := env.ZitiIdentityNamed(identityName)
if err != nil {
return "", errors.Wrapf(err, "error opening identity '%v' from environment", identityName)
}
@@ -184,7 +189,7 @@ func bootstrapIdentity(name string, edge *rest_management_api_client.ZitiEdgeMan
if err != nil {
return "", errors.Wrapf(err, "error encoding identity config '%v'", name)
}
if err := env.SaveZitiIdentity(name, out.String()); err != nil {
if err := env.SaveZitiIdentityNamed(name, out.String()); err != nil {
return "", errors.Wrapf(err, "error saving identity config '%v'", name)
}
return zId, nil