even better names for the common identities in the 'environment' (#34, #369)

This commit is contained in:
Michael Quigley 2023-07-17 13:51:51 -04:00
parent 6629171bac
commit 141c9ae685
No known key found for this signature in database
GPG Key ID: 9B60314A9DD20A62
13 changed files with 26 additions and 26 deletions

View File

@ -101,7 +101,7 @@ func (cmd *accessPrivateCommand) run(_ *cobra.Command, args []string) {
case "tcpTunnel": case "tcpTunnel":
fe, err := tcpTunnel.NewFrontend(&tcpTunnel.FrontendConfig{ fe, err := tcpTunnel.NewFrontend(&tcpTunnel.FrontendConfig{
BindAddress: cmd.bindAddress, BindAddress: cmd.bindAddress,
IdentityName: env.ShareIdentityName(), IdentityName: env.EnvironmentIdentityName(),
ShrToken: args[0], ShrToken: args[0],
RequestsChan: requests, RequestsChan: requests,
}) })
@ -123,7 +123,7 @@ func (cmd *accessPrivateCommand) run(_ *cobra.Command, args []string) {
case "udpTunnel": case "udpTunnel":
fe, err := udpTunnel.NewFrontend(&udpTunnel.FrontendConfig{ fe, err := udpTunnel.NewFrontend(&udpTunnel.FrontendConfig{
BindAddress: cmd.bindAddress, BindAddress: cmd.bindAddress,
IdentityName: env.ShareIdentityName(), IdentityName: env.EnvironmentIdentityName(),
ShrToken: args[0], ShrToken: args[0],
RequestsChan: requests, RequestsChan: requests,
IdleTime: time.Minute, IdleTime: time.Minute,
@ -144,7 +144,7 @@ func (cmd *accessPrivateCommand) run(_ *cobra.Command, args []string) {
}() }()
default: default:
cfg := proxy.DefaultFrontendConfig(env.ShareIdentityName()) cfg := proxy.DefaultFrontendConfig(env.EnvironmentIdentityName())
cfg.ShrToken = shrToken cfg.ShrToken = shrToken
cfg.Address = cmd.bindAddress cfg.Address = cmd.bindAddress
cfg.RequestsChan = requests cfg.RequestsChan = requests

View File

@ -65,7 +65,7 @@ func (cmd *disableCommand) run(_ *cobra.Command, _ []string) {
} }
panic(err) panic(err)
} }
if err := env.DeleteZitiIdentityNamed(env.ShareIdentityName()); err != nil { if err := env.DeleteZitiIdentityNamed(env.EnvironmentIdentityName()); err != nil {
if !panicInstead { if !panicInstead {
tui.Error("error removing zrok backend identity", err) tui.Error("error removing zrok backend identity", err)
} }

View File

@ -130,7 +130,7 @@ func (cmd *enableCommand) run(_ *cobra.Command, args []string) {
} }
os.Exit(1) os.Exit(1)
} }
if err := env.SaveZitiIdentityNamed(env.ShareIdentityName(), resp.Payload.Cfg); err != nil { if err := env.SaveZitiIdentityNamed(env.EnvironmentIdentityName(), resp.Payload.Cfg); err != nil {
if !cmd.headless && prg != nil { if !cmd.headless && prg != nil {
prg.Send(fmt.Sprintf("there was an error writing the environment: %v", err)) prg.Send(fmt.Sprintf("there was an error writing the environment: %v", err))
prg.Quit() prg.Quit()

View File

@ -90,7 +90,7 @@ func (cmd *sharePrivateCommand) run(_ *cobra.Command, args []string) {
tui.Error("unable to load environment; did you 'zrok enable'?", nil) tui.Error("unable to load environment; did you 'zrok enable'?", nil)
} }
zif, err := env.ZitiIdentityNamed(env.ShareIdentityName()) zif, err := env.ZitiIdentityNamed(env.EnvironmentIdentityName())
if err != nil { if err != nil {
if !panicInstead { if !panicInstead {
tui.Error("unable to load ziti identity configuration", err) tui.Error("unable to load ziti identity configuration", err)

View File

@ -84,7 +84,7 @@ func (cmd *sharePublicCommand) run(_ *cobra.Command, args []string) {
tui.Error("unable to load environment; did you 'zrok enable'?", nil) tui.Error("unable to load environment; did you 'zrok enable'?", nil)
} }
zif, err := env.ZitiIdentityNamed(env.ShareIdentityName()) zif, err := env.ZitiIdentityNamed(env.EnvironmentIdentityName())
if err != nil { if err != nil {
if !panicInstead { if !panicInstead {
tui.Error("unable to load ziti identity configuration", err) tui.Error("unable to load ziti identity configuration", err)

View File

@ -78,7 +78,7 @@ func (cmd *shareReservedCommand) run(_ *cobra.Command, args []string) {
target = resp.Payload.BackendProxyEndpoint target = resp.Payload.BackendProxyEndpoint
} }
zif, err := env.ZitiIdentityNamed(env.ShareIdentityName()) zif, err := env.ZitiIdentityNamed(env.EnvironmentIdentityName())
if err != nil { if err != nil {
if !panicInstead { if !panicInstead {
tui.Error("unable to load ziti identity configuration", err) tui.Error("unable to load ziti identity configuration", err)

View File

@ -186,7 +186,7 @@ func (l *looper) startup() {
} }
l.env = env.Environment() l.env = env.Environment()
l.zif, err = env.ZitiIdentityNamed(env.ShareIdentityName()) l.zif, err = env.ZitiIdentityNamed(env.EnvironmentIdentityName())
if err != nil { if err != nil {
panic(err) panic(err)
} }

View File

@ -43,12 +43,12 @@ func Bootstrap(skipFrontend bool, inCfg *config.Config) error {
var frontendZId string var frontendZId string
if !skipFrontend { if !skipFrontend {
logrus.Info("creating identity for frontend ziti access") logrus.Info("creating identity for public frontend access")
if frontendZId, err = getIdentityId(env.AccessIdentityName()); err == nil { if frontendZId, err = getIdentityId(env.PublicIdentityName()); err == nil {
logrus.Infof("frontend identity: %v", frontendZId) logrus.Infof("frontend identity: %v", frontendZId)
} else { } else {
frontendZId, err = bootstrapIdentity(env.AccessIdentityName(), edge) frontendZId, err = bootstrapIdentity(env.PublicIdentityName(), edge)
if err != nil { if err != nil {
panic(err) panic(err)
} }
@ -56,7 +56,7 @@ func Bootstrap(skipFrontend bool, inCfg *config.Config) error {
if err := assertIdentity(frontendZId, edge); err != nil { if err := assertIdentity(frontendZId, edge); err != nil {
panic(err) panic(err)
} }
if err := assertErpForIdentity(env.AccessIdentityName(), frontendZId, edge); err != nil { if err := assertErpForIdentity(env.PublicIdentityName(), frontendZId, edge); err != nil {
panic(err) panic(err)
} }

View File

@ -13,7 +13,7 @@ type Config struct {
func DefaultConfig() *Config { func DefaultConfig() *Config {
return &Config{ return &Config{
Identity: "frontend", Identity: "public",
Address: "0.0.0.0:8080", Address: "0.0.0.0:8080",
} }
} }

View File

@ -19,8 +19,8 @@ type Root interface {
SetEnvironment(env *Environment) error SetEnvironment(env *Environment) error
DeleteEnvironment() error DeleteEnvironment() error
AccessIdentityName() string PublicIdentityName() string
ShareIdentityName() string EnvironmentIdentityName() string
ZitiIdentityNamed(name string) (string, error) ZitiIdentityNamed(name string) (string, error)
SaveZitiIdentityNamed(name, data string) error SaveZitiIdentityNamed(name, data string) error

View File

@ -116,11 +116,11 @@ func (r *Root) IsEnabled() bool {
return r.env != nil return r.env != nil
} }
func (r *Root) AccessIdentityName() string { func (r *Root) PublicIdentityName() string {
return "frontend" return "frontend"
} }
func (r *Root) ShareIdentityName() string { func (r *Root) EnvironmentIdentityName() string {
return "backend" return "backend"
} }

View File

@ -116,12 +116,12 @@ func (r *Root) IsEnabled() bool {
return r.env != nil return r.env != nil
} }
func (r *Root) AccessIdentityName() string { func (r *Root) PublicIdentityName() string {
return "access" return "public"
} }
func (r *Root) ShareIdentityName() string { func (r *Root) EnvironmentIdentityName() string {
return "share" return "environment"
} }
func (r *Root) ZitiIdentityNamed(name string) (string, error) { func (r *Root) ZitiIdentityNamed(name string) (string, error) {

View File

@ -77,13 +77,13 @@ func Update(r env_core.Root) (env_core.Root, error) {
newR := &Root{meta: r.Metadata(), cfg: r.Config(), env: r.Environment()} newR := &Root{meta: r.Metadata(), cfg: r.Config(), env: r.Environment()}
oldAccessF, err := r.ZitiIdentityNamed(r.AccessIdentityName()) oldAccessF, err := r.ZitiIdentityNamed(r.PublicIdentityName())
if err != nil { if err != nil {
return nil, err return nil, err
} }
_, err = os.Stat(oldAccessF) _, err = os.Stat(oldAccessF)
if err == nil { if err == nil {
newAccessF, err := newR.ZitiIdentityNamed(newR.AccessIdentityName()) newAccessF, err := newR.ZitiIdentityNamed(newR.PublicIdentityName())
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -95,13 +95,13 @@ func Update(r env_core.Root) (env_core.Root, error) {
return nil, err return nil, err
} }
oldShareF, err := r.ZitiIdentityNamed(r.ShareIdentityName()) oldShareF, err := r.ZitiIdentityNamed(r.EnvironmentIdentityName())
if err != nil { if err != nil {
return nil, err return nil, err
} }
_, err = os.Stat(oldShareF) _, err = os.Stat(oldShareF)
if err == nil { if err == nil {
newShareF, err := newR.ZitiIdentityNamed(newR.ShareIdentityName()) newShareF, err := newR.ZitiIdentityNamed(newR.EnvironmentIdentityName())
if err != nil { if err != nil {
return nil, err return nil, err
} }