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

bootstrap cleanups/lint (#968)

Browse Source
This commit is contained in:
Michael Quigley
2025-06-16 13:32:23 -04:00
parent 49d852ee02
commit 3d69987970
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
controller/bootstrap.go
View File

@@ -60,11 +60,12 @@ func Bootstrap(bootCfg *BootstrapConfig, ctrlCfg *config.Config) error {
func assertFrontendIdentity(cfg *BootstrapConfig, env env_core.Root, edge *rest_management_api_client.ZitiEdgeManagement) error { func assertFrontendIdentity(cfg *BootstrapConfig, env env_core.Root, edge *rest_management_api_client.ZitiEdgeManagement) error {
var frontendZId string var frontendZId string
var err error
if !cfg.SkipFrontend { if !cfg.SkipFrontend {
logrus.Info("creating identity for public frontend access") logrus.Info("bootstrapping identity for public frontend access")
if frontendZId, err := getIdentityId(env.PublicIdentityName()); err == nil { if frontendZId, err = getIdentityId(env.PublicIdentityName()); err == nil {
logrus.Infof("frontend identity: %v", frontendZId) logrus.Infof("existing frontend identity: %v", frontendZId)
} else { } else {
frontendZId, err = bootstrapIdentity(env.PublicIdentityName(), edge) frontendZId, err = bootstrapIdentity(env.PublicIdentityName(), edge)
if err != nil { if err != nil {
@@ -79,13 +80,14 @@ func assertFrontendIdentity(cfg *BootstrapConfig, env env_core.Root, edge *rest_
panic(err) panic(err)
} }
tx, err := str.Begin() trx, err := str.Begin()
if err != nil { if err != nil {
panic(err) panic(err)
} }
defer func() { _ = tx.Rollback() }() defer trx.Rollback()
publicFe, err := str.FindFrontendWithZId(frontendZId, tx) publicFe, err := str.FindFrontendWithZId(frontendZId, trx)
if err != nil { if err != nil {
logrus.Error(err)
logrus.Warnf("missing public frontend for ziti id '%v'; please use 'zrok admin create frontend %v public https://{token}.your.dns.name' to create a frontend instance", frontendZId, frontendZId) logrus.Warnf("missing public frontend for ziti id '%v'; please use 'zrok admin create frontend %v public https://{token}.your.dns.name' to create a frontend instance", frontendZId, frontendZId)
} else { } else {
if publicFe.PublicName != nil && publicFe.UrlTemplate != nil { if publicFe.PublicName != nil && publicFe.UrlTemplate != nil {