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

…#369)
openziti · Jul 17, 2023 · 141c9ae · 141c9ae
1 parent 6629171
commit 141c9ae
Show file tree

Hide file tree

Showing 13 changed files with 26 additions and 26 deletions.
diff --git a/cmd/zrok/accessPrivate.go b/cmd/zrok/accessPrivate.go
@@ -101,7 +101,7 @@ func (cmd *accessPrivateCommand) run(_ *cobra.Command, args []string) {
 	case "tcpTunnel":
 		fe, err := tcpTunnel.NewFrontend(&tcpTunnel.FrontendConfig{
 			BindAddress:  cmd.bindAddress,
-			IdentityName: env.ShareIdentityName(),
+			IdentityName: env.EnvironmentIdentityName(),
 			ShrToken:     args[0],
 			RequestsChan: requests,
 		})
@@ -123,7 +123,7 @@ func (cmd *accessPrivateCommand) run(_ *cobra.Command, args []string) {
 	case "udpTunnel":
 		fe, err := udpTunnel.NewFrontend(&udpTunnel.FrontendConfig{
 			BindAddress:  cmd.bindAddress,
-			IdentityName: env.ShareIdentityName(),
+			IdentityName: env.EnvironmentIdentityName(),
 			ShrToken:     args[0],
 			RequestsChan: requests,
 			IdleTime:     time.Minute,
@@ -144,7 +144,7 @@ func (cmd *accessPrivateCommand) run(_ *cobra.Command, args []string) {
 		}()
 
 	default:
-		cfg := proxy.DefaultFrontendConfig(env.ShareIdentityName())
+		cfg := proxy.DefaultFrontendConfig(env.EnvironmentIdentityName())
 		cfg.ShrToken = shrToken
 		cfg.Address = cmd.bindAddress
 		cfg.RequestsChan = requests

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

diff --git a/cmd/zrok/enable.go b/cmd/zrok/enable.go
@@ -130,7 +130,7 @@ func (cmd *enableCommand) run(_ *cobra.Command, args []string) {
 		}
 		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 {
 			prg.Send(fmt.Sprintf("there was an error writing the environment: %v", err))
 			prg.Quit()

diff --git a/cmd/zrok/sharePrivate.go b/cmd/zrok/sharePrivate.go
@@ -90,7 +90,7 @@ func (cmd *sharePrivateCommand) run(_ *cobra.Command, args []string) {
 		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 !panicInstead {
 			tui.Error("unable to load ziti identity configuration", err)

diff --git a/cmd/zrok/sharePublic.go b/cmd/zrok/sharePublic.go
@@ -84,7 +84,7 @@ func (cmd *sharePublicCommand) run(_ *cobra.Command, args []string) {
 		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 !panicInstead {
 			tui.Error("unable to load ziti identity configuration", err)

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

diff --git a/cmd/zrok/testLoopPublic.go b/cmd/zrok/testLoopPublic.go
@@ -186,7 +186,7 @@ func (l *looper) startup() {
 	}
 	l.env = env.Environment()
 
-	l.zif, err = env.ZitiIdentityNamed(env.ShareIdentityName())
+	l.zif, err = env.ZitiIdentityNamed(env.EnvironmentIdentityName())
 	if err != nil {
 		panic(err)
 	}

diff --git a/controller/bootstrap.go b/controller/bootstrap.go
@@ -43,20 +43,20 @@ func Bootstrap(skipFrontend bool, inCfg *config.Config) error {
 
 	var frontendZId string
 	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)
 		} else {
-			frontendZId, err = bootstrapIdentity(env.AccessIdentityName(), edge)
+			frontendZId, err = bootstrapIdentity(env.PublicIdentityName(), edge)
 			if err != nil {
 				panic(err)
 			}
 		}
 		if err := assertIdentity(frontendZId, edge); err != nil {
 			panic(err)
 		}
-		if err := assertErpForIdentity(env.AccessIdentityName(), frontendZId, edge); err != nil {
+		if err := assertErpForIdentity(env.PublicIdentityName(), frontendZId, edge); err != nil {
 			panic(err)
 		}
 

diff --git a/endpoints/publicProxy/config.go b/endpoints/publicProxy/config.go
@@ -13,7 +13,7 @@ type Config struct {
 
 func DefaultConfig() *Config {
 	return &Config{
-		Identity: "frontend",
+		Identity: "public",
 		Address:  "0.0.0.0:8080",
 	}
 }

diff --git a/environment/env_core/model.go b/environment/env_core/model.go
@@ -19,8 +19,8 @@ type Root interface {
 	SetEnvironment(env *Environment) error
 	DeleteEnvironment() error
 
-	AccessIdentityName() string
-	ShareIdentityName() string
+	PublicIdentityName() string
+	EnvironmentIdentityName() string
 
 	ZitiIdentityNamed(name string) (string, error)
 	SaveZitiIdentityNamed(name, data string) error

diff --git a/environment/env_v0_3/api.go b/environment/env_v0_3/api.go
@@ -116,11 +116,11 @@ func (r *Root) IsEnabled() bool {
 	return r.env != nil
 }
 
-func (r *Root) AccessIdentityName() string {
+func (r *Root) PublicIdentityName() string {
 	return "frontend"
 }
 
-func (r *Root) ShareIdentityName() string {
+func (r *Root) EnvironmentIdentityName() string {
 	return "backend"
 }
 

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

diff --git a/environment/env_v0_4/root.go b/environment/env_v0_4/root.go
@@ -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()}
 
-	oldAccessF, err := r.ZitiIdentityNamed(r.AccessIdentityName())
+	oldAccessF, err := r.ZitiIdentityNamed(r.PublicIdentityName())
 	if err != nil {
 		return nil, err
 	}
 	_, err = os.Stat(oldAccessF)
 	if err == nil {
-		newAccessF, err := newR.ZitiIdentityNamed(newR.AccessIdentityName())
+		newAccessF, err := newR.ZitiIdentityNamed(newR.PublicIdentityName())
 		if err != nil {
 			return nil, err
 		}
@@ -95,13 +95,13 @@ func Update(r env_core.Root) (env_core.Root, error) {
 		return nil, err
 	}
 
-	oldShareF, err := r.ZitiIdentityNamed(r.ShareIdentityName())
+	oldShareF, err := r.ZitiIdentityNamed(r.EnvironmentIdentityName())
 	if err != nil {
 		return nil, err
 	}
 	_, err = os.Stat(oldShareF)
 	if err == nil {
-		newShareF, err := newR.ZitiIdentityNamed(newR.ShareIdentityName())
+		newShareF, err := newR.ZitiIdentityNamed(newR.EnvironmentIdentityName())
 		if err != nil {
 			return nil, err
 		}