gsadmin/ziti
1
0
Fork 0
mirror of https://github.com/openziti/ziti.git synced 2026-10-12 07:18:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleaned up commented code

Browse Source 
Fixed env variable printout and template file
This commit is contained in:
gberl002
2022-02-11 14:55:18 -05:00
parent c8b5013afd
commit 2d764118de
8 changed files with 233 additions and 451 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstart/docker/image/ziti-cli-functions.sh
+1 -1
View File
@@ -320,7 +320,7 @@ function generateEnvFile {
if [[ "${ZITI_EDGE_ROUTER_RAWNAME-}" == "" ]]; then export export ZITI_EDGE_ROUTER_RAWNAME="${ZITI_NETWORK-}-edge-router"; fi
if [[ "${ZITI_EDGE_ROUTER_HOSTNAME-}" == "" ]]; then export export ZITI_EDGE_ROUTER_HOSTNAME="${ZITI_NETWORK-}"; fi
if [[ "${ZITI_EDGE_ROUTER_PORT-}" == "" ]]; then export ZITI_EDGE_ROUTER_PORT="3022"; fi
if [[ "${ZITI_CTRL_ADVERTISED_ADDRESS-}" == "" ]]; then export ZITI_CTRL_ADVERTISED_ADDRESS="${ZITI_NETWORK-}-controller"; fi
if [[ "${ZITI_CTRL_ADVERTISED_ADDRESS-}" == "" ]]; then export ZITI_CTRL_ADVERTISED_ADDRESS="${ZITI_NETWORK-}"; fi
if [[ "${ZITI_BIN_ROOT-}" == "" ]]; then
export ZITI_BIN_ROOT="${ZITI_HOME-}/ziti-bin"
ziti/cmd/ziti/cmd/config_templates/environment.yml
+4 -4
View File
@@ -4,12 +4,12 @@
{{ if eq .OS "windows" }}SET{{ else }}export{{ end }} {{ .ZitiCtrlNameVarName }}={{ .Controller.Name }}
{{ if eq .OS "windows" }}Rem {{ else }}# {{ end }}{{ .ZitiCtrlPortVarDescription }}
{{ if eq .OS "windows" }}SET{{ else }}export{{ end }} {{ .ZitiCtrlPortVarName }}={{ .Controller.Port }}
{{ if eq .OS "windows" }}Rem {{ else }}# {{ end }}{{ .ZitiEdgeRouterHostnameVarDescription }}
{{ if eq .OS "windows" }}Rem {{ else }}# {{ end }}{{ .ZitiEdgeRouterRawNameVarDescription }}
{{ if eq .OS "windows" }}SET{{ else }}export{{ end }} {{ .ZitiEdgeRouterRawNameVarName }}={{ .Router.Edge.Hostname }}
{{ if eq .OS "windows" }}Rem {{ else }}# {{ end }}{{ .ZitiCtrlListenerAddressVarDescription }}
{{ if eq .OS "windows" }}SET{{ else }}export{{ end }} {{ .ZitiCtrlListenerAddressVarName }}={{ .Controller.ListenerAddress }}
{{ if eq .OS "windows" }}Rem {{ else }}# {{ end }}{{ .ZitiCtrlAdvertisedAddressVarDescription }}
{{ if eq .OS "windows" }}SET{{ else }}export{{ end }} {{ .ZitiCtrlAdvertisedAddressVarName }}={{ .Controller.AdvertisedAddress }}
{{ if eq .OS "windows" }}SET{{ else }}export{{ end }} {{ .ZitiEdgeRouterHostnameVarName }}={{ .Router.Edge.Hostname }}
{{ if eq .OS "windows" }}Rem {{ else }}# {{ end }}{{ .ZitiEdgeCtrlIdentityCertVarDescription }}
{{ if eq .OS "windows" }}SET{{ else }}export{{ end }} {{ .ZitiEdgeCtrlIdentityCertVarName }}={{ .Controller.Edge.IdentityCert }}
{{ if eq .OS "windows" }}Rem {{ else }}# {{ end }}{{ .ZitiEdgeCtrlIdentityServerCertVarDescription }}
@@ -35,9 +35,9 @@
{{ if eq .OS "windows" }}Rem {{ else }}# {{ end }}{{ .ZitiRouterIdentityCAVarDescription }}
{{ if eq .OS "windows" }}SET{{ else }}export{{ end }} {{ .ZitiRouterIdentityCAVarName }}={{ .Router.IdentityCA }}
{{ if eq .OS "windows" }}Rem {{ else }}# {{ end }}{{ .ZitiSigningCertVarDescription }}
{{ if eq .OS "windows" }}SET{{ else }}export{{ end }} {{ .ZitiSigningCertVarName }}={{ .ZitiSigningCert }}
{{ if eq .OS "windows" }}SET{{ else }}export{{ end }} {{ .ZitiSigningCertVarName }}={{ .Controller.Edge.ZitiSigningCert }}
{{ if eq .OS "windows" }}Rem {{ else }}# {{ end }}{{ .ZitiSigningKeyVarDescription }}
{{ if eq .OS "windows" }}SET{{ else }}export{{ end }} {{ .ZitiSigningKeyVarName }}={{ .ZitiSigningKey }}
{{ if eq .OS "windows" }}SET{{ else }}export{{ end }} {{ .ZitiSigningKeyVarName }}={{ .Controller.Edge.ZitiSigningKey }}
{{ if eq .OS "windows" }}Rem {{ else }}# {{ end }}{{ .ZitiCtrlMgmtListenerHostPortVarDescription }}
{{ if eq .OS "windows" }}SET{{ else }}export{{ end }} {{ .ZitiCtrlMgmtListenerHostPortVarName }}={{ .Controller.MgmtListenerHostPort }}
{{ if eq .OS "windows" }}Rem {{ else }}# {{ end }}{{ .ZitiEdgeCtrlListenerHostPortVarDescription }}
ziti/cmd/ziti/cmd/create_config.go
+9 -84
View File
@@ -190,99 +190,39 @@ func (data *ConfigTemplateValues) populateEnvVars() {
// Get and add ziti home to the params
zitiHome, err := cmdhelper.GetZitiHome()
handleVariableError(err, cmdhelper.EnvVariableDetails.ZitiHomeVarName)
handleVariableError(err, constants.ZitiHomeVarName)
// Get Ziti Controller Name
zitiCtrlHostname, err := cmdhelper.GetZitiCtrlName()
handleVariableError(err, cmdhelper.EnvVariableDetails.ZitiCtrlNameVarName)
// Get Ziti Edge Router Hostname
zitiEdgeRouterHostName, err := cmdhelper.GetZitiEdgeRouterHostname()
handleVariableError(err, cmdhelper.EnvVariableDetails.ZitiEdgeRouterHostnameVarName)
handleVariableError(err, constants.ZitiCtrlNameVarName)
// Get Ziti Edge Router Port
zitiEdgeRouterPort, err := cmdhelper.GetZitiEdgeRouterPort()
handleVariableError(err, cmdhelper.EnvVariableDetails.ZitiEdgeRouterPortVarName)
// Get Ziti Controller Identity Cert
//zitiCtrlIdentityCert, err := cmdhelper.GetZitiCtrlIdentityCert()
//handleVariableError(err, cmdhelper.EnvVariableDetails.ZitiCtrlIdentityCertVarName)
// Get Ziti Controller Identity Server Cert
//zitiCtrlIdentityServerCert, err := cmdhelper.GetZitiCtrlIdentityServerCert()
//handleVariableError(err, cmdhelper.EnvVariableDetails.ZitiCtrlIdentityServerCertVarName)
// Get Ziti Controller Identity Key
//zitiCtrlIdentityKey, err := cmdhelper.GetZitiCtrlIdentityKey()
//handleVariableError(err, cmdhelper.EnvVariableDetails.ZitiCtrlIdentityKeyVarName)
// Get Ziti Controller Identity CA
//zitiCtrlIdentityCA, err := cmdhelper.GetZitiCtrlIdentityCA()
//handleVariableError(err, cmdhelper.EnvVariableDetails.ZitiCtrlIdentityCAVarName)
// Get Ziti Controller Identity Cert
//zitiRouterIdentityCert, err := cmdhelper.GetZitiRouterIdentityCert(zitiEdgeRouterHostName, true)
//handleVariableError(err, cmdhelper.EnvVariableDetails.ZitiCtrlIdentityCertVarName)
// Get Ziti Controller Identity Server Cert
//zitiRouterIdentityServerCert, err := cmdhelper.GetZitiRouterIdentityServerCert(zitiEdgeRouterHostName, true)
//handleVariableError(err, cmdhelper.EnvVariableDetails.ZitiCtrlIdentityServerCertVarName)
// Get Ziti Controller Identity Key
//zitiRouterIdentityKey, err := cmdhelper.GetZitiRouterIdentityKey(zitiEdgeRouterHostName, true)
//handleVariableError(err, cmdhelper.EnvVariableDetails.ZitiCtrlIdentityKeyVarName)
// Get Ziti Controller Identity CA
//zitiRouterIdentityCA, err := cmdhelper.GetZitiRouterIdentityCA(zitiEdgeRouterHostName, true)
//handleVariableError(err, cmdhelper.EnvVariableDetails.ZitiCtrlIdentityCAVarName)
// Get Ziti Edge Controller Identity Cert
//zitiEdgeCtrlIdentityCert, err := cmdhelper.GetZitiEdgeIdentityCert()
//handleVariableError(err, cmdhelper.EnvVariableDetails.ZitiCtrlIdentityCertVarName)
// Get Ziti Edge Controller Identity Server Cert
//zitiEdgeCtrlIdentityServerCert, err := cmdhelper.GetZitiEdgeIdentityServerCert()
//handleVariableError(err, cmdhelper.EnvVariableDetails.ZitiCtrlIdentityServerCertVarName)
// Get Ziti Edge Controller Identity Key
//zitiEdgeCtrlIdentityKey, err := cmdhelper.GetZitiEdgeIdentityKey()
//handleVariableError(err, cmdhelper.EnvVariableDetails.ZitiCtrlIdentityKeyVarName)
// Get Ziti Edge Controller Identity CA
//zitiEdgeCtrlIdentityCA, err := cmdhelper.GetZitiEdgeIdentityCA()
//handleVariableError(err, cmdhelper.EnvVariableDetails.ZitiCtrlIdentityCAVarName)
handleVariableError(err, constants.ZitiEdgeRouterPortVarName)
// Get Ziti Controller Listener Address
zitiCtrlListenerAddress, err := cmdhelper.GetZitiCtrlListenerAddress()
handleVariableError(err, cmdhelper.EnvVariableDetails.ZitiCtrlListenerAddressVarName)
handleVariableError(err, constants.ZitiCtrlListenerAddressVarName)
// Get Ziti Controller Advertised Address
zitiCtrlAdvertisedAddress, err := cmdhelper.GetZitiCtrlAdvertisedAddress()
handleVariableError(err, cmdhelper.EnvVariableDetails.ZitiCtrlAdvertisedAddressVarName)
handleVariableError(err, constants.ZitiCtrlAdvertisedAddressVarName)
// Get Ziti Controller Port
zitiCtrlPort, err := cmdhelper.GetZitiCtrlPort()
handleVariableError(err, cmdhelper.EnvVariableDetails.ZitiCtrlPortVarName)
handleVariableError(err, constants.ZitiCtrlPortVarName)
// Get Ziti Controller Management Host and Port
zitiCtrlMgmtListenerHostPort, err := cmdhelper.GetZitiCtrlMgmtListenerHostPort()
handleVariableError(err, cmdhelper.EnvVariableDetails.ZitiCtrlMgmtListenerHostPortVarName)
// Get Ziti Signing Cert
//zitiSigningCert, err := cmdhelper.GetZitiSigningCert()
//handleVariableError(err, cmdhelper.EnvVariableDetails.ZitiSigningCertVarName)
// Get Ziti Signing Key
//zitiSigningKey, err := cmdhelper.GetZitiSigningKey()
//handleVariableError(err, cmdhelper.EnvVariableDetails.ZitiSigningKeyVarName)
handleVariableError(err, constants.ZitiCtrlMgmtListenerHostPortVarName)
// Get Ziti Edge Controller Listener Host and Port
zitiEdgeCtrlListenerHostPort, err := cmdhelper.GetZitiEdgeCtrlListenerHostPort()
handleVariableError(err, cmdhelper.EnvVariableDetails.ZitiEdgeCtrlListenerHostPortVarName)
handleVariableError(err, constants.ZitiEdgeCtrlListenerHostPortVarName)
// Get Ziti Edge Controller Advertised Host and Port
zitiEdgeCtrlAdvertisedHostPort, err := cmdhelper.GetZitiEdgeCtrlAdvertisedHostPort()
handleVariableError(err, cmdhelper.EnvVariableDetails.ZitiEdgeCtrlAdvertisedHostPortVarName)
handleVariableError(err, constants.ZitiEdgeCtrlAdvertisedHostPortVarName)
data.ZitiHome = zitiHome
data.Hostname = hostname
@@ -293,21 +233,6 @@ func (data *ConfigTemplateValues) populateEnvVars() {
data.Controller.MgmtListenerHostPort = zitiCtrlMgmtListenerHostPort
data.Controller.Edge.ListenerHostPort = zitiEdgeCtrlListenerHostPort
data.Controller.Edge.AdvertisedHostPort = zitiEdgeCtrlAdvertisedHostPort
//data.Controller.IdentityCert = zitiCtrlIdentityCert
//data.Controller.IdentityServerCert = zitiCtrlIdentityServerCert
//data.Controller.IdentityKey = zitiCtrlIdentityKey
//data.Controller.IdentityCA = zitiCtrlIdentityCA
//data.Controller.Edge.IdentityCert = zitiEdgeCtrlIdentityCert
//data.Controller.Edge.IdentityServerCert = zitiEdgeCtrlIdentityServerCert
//data.Controller.Edge.IdentityKey = zitiEdgeCtrlIdentityKey
//data.Controller.Edge.IdentityCA = zitiEdgeCtrlIdentityCA
//data.Controller.Edge.ZitiSigningCert = zitiSigningCert
//data.Controller.Edge.ZitiSigningKey = zitiSigningKey
//data.Router.IdentityCert = zitiRouterIdentityCert
//data.Router.IdentityServerCert = zitiRouterIdentityServerCert
//data.Router.IdentityKey = zitiRouterIdentityKey
//data.Router.IdentityCA = zitiRouterIdentityCA
data.Router.Edge.Hostname = zitiEdgeRouterHostName
data.Router.Edge.Port = zitiEdgeRouterPort
}
ziti/cmd/ziti/cmd/create_config_controller.go
+16 -16
View File
@@ -183,30 +183,30 @@ func SetControllerIdentity(data *ControllerTemplateValues) {
SetControllerIdentityCA(data)
}
func SetControllerIdentityCert(c *ControllerTemplateValues) {
val := os.Getenv("ZITI_CTRL_IDENTITY_CERT")
val := os.Getenv(constants.ZitiCtrlIdentityCertVarName)
if val == "" {
val = workingDir + "/" + hostnameOrNetworkName() + ".cert" //default
val = workingDir + "/" + hostnameOrNetworkName() + ".cert" // default
}
c.IdentityCert = cmdhelper.NormalizePath(val)
}
func SetControllerIdentityServerCert(c *ControllerTemplateValues) {
val := os.Getenv("ZITI_CTRL_IDENTITY_SERVER_CERT")
val := os.Getenv(constants.ZitiCtrlIdentityServerCertVarName)
if val == "" {
val = workingDir + "/" + hostnameOrNetworkName() + ".server.chain.cert" //default
val = workingDir + "/" + hostnameOrNetworkName() + ".server.chain.cert" // default
}
c.IdentityServerCert = cmdhelper.NormalizePath(val)
}
func SetControllerIdentityKey(c *ControllerTemplateValues) {
val := os.Getenv("ZITI_CTRL_IDENTITY_KEY")
val := os.Getenv(constants.ZitiCtrlIdentityKeyVarName)
if val == "" {
val = workingDir + "/" + hostnameOrNetworkName() + ".key" //default
val = workingDir + "/" + hostnameOrNetworkName() + ".key" // default
}
c.IdentityKey = cmdhelper.NormalizePath(val)
}
func SetControllerIdentityCA(c *ControllerTemplateValues) {
val := os.Getenv("ZITI_CTRL_IDENTITY_CA")
val := os.Getenv(constants.ZitiCtrlIdentityCAVarName)
if val == "" {
val = workingDir + "/" + hostnameOrNetworkName() + ".ca" //default
val = workingDir + "/" + hostnameOrNetworkName() + ".ca" // default
}
c.IdentityCA = cmdhelper.NormalizePath(val)
}
@@ -216,16 +216,16 @@ func SetEdgeConfig(data *ControllerTemplateValues) {
SetEdgeSigningKey(data)
}
func SetEdgeSigningCert(c *ControllerTemplateValues) {
val := os.Getenv("ZITI_SIGNING_CERT")
val := os.Getenv(constants.ZitiSigningCertVarName)
if val == "" {
val = workingDir + "/" + hostnameOrNetworkName() + ".signing.cert" //default
val = workingDir + "/" + hostnameOrNetworkName() + ".signing.cert" // default
}
c.Edge.ZitiSigningCert = cmdhelper.NormalizePath(val)
}
func SetEdgeSigningKey(c *ControllerTemplateValues) {
val := os.Getenv("ZITI_SIGNING_KEY")
val := os.Getenv(constants.ZitiSigningKeyVarName)
if val == "" {
val = workingDir + "/" + hostnameOrNetworkName() + ".signing.key" //default
val = workingDir + "/" + hostnameOrNetworkName() + ".signing.key" // default
}
c.Edge.ZitiSigningKey = cmdhelper.NormalizePath(val)
}
@@ -237,28 +237,28 @@ func SetWebConfig(data *ControllerTemplateValues) {
SetWebIdentityCA(data)
}
func SetWebIdentityCert(c *ControllerTemplateValues) {
val := os.Getenv("ZITI_EDGE_CTRL_IDENTITY_CERT")
val := os.Getenv(constants.ZitiEdgeCtrlIdentityCertVarName)
if val == "" {
val = c.IdentityCert //default
}
c.Edge.IdentityCert = cmdhelper.NormalizePath(val)
}
func SetWebIdentityServerCert(c *ControllerTemplateValues) {
val := os.Getenv("ZITI_EDGE_CTRL_IDENTITY_SERVER_CERT")
val := os.Getenv(constants.ZitiEdgeCtrlIdentityServerCertVarName)
if val == "" {
val = c.IdentityServerCert //default
}
c.Edge.IdentityServerCert = cmdhelper.NormalizePath(val)
}
func SetWebIdentityKey(c *ControllerTemplateValues) {
val := os.Getenv("ZITI_EDGE_CTRL_IDENTITY_KEY")
val := os.Getenv(constants.ZitiEdgeCtrlIdentityKeyVarName)
if val == "" {
val = c.IdentityKey //default
}
c.Edge.IdentityKey = cmdhelper.NormalizePath(val)
}
func SetWebIdentityCA(c *ControllerTemplateValues) {
val := os.Getenv("ZITI_EDGE_CTRL_IDENTITY_CA")
val := os.Getenv(constants.ZitiEdgeCtrlIdentityCAVarName)
if val == "" {
val = c.IdentityCA //default
}
ziti/cmd/ziti/cmd/create_config_environment.go
+129 -26
View File
@@ -21,6 +21,7 @@ import (
"fmt"
cmdhelper "github.com/openziti/ziti/ziti/cmd/ziti/cmd/helpers"
"github.com/openziti/ziti/ziti/cmd/ziti/cmd/templates"
"github.com/openziti/ziti/ziti/cmd/ziti/constants"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
"github.com/spf13/cobra"
@@ -31,6 +32,58 @@ import (
"text/template"
)
type EnvVariableMetaData struct {
OS string
ZitiHomeVarName string
ZitiCtrlNameVarName string
ZitiCtrlPortVarName string
ZitiEdgeRouterRawNameVarName string
ZitiEdgeRouterPortVarName string
ZitiEdgeCtrlIdentityCertVarName string
ZitiEdgeCtrlIdentityServerCertVarName string
ZitiEdgeCtrlIdentityKeyVarName string
ZitiEdgeCtrlIdentityCAVarName string
ZitiCtrlIdentityCertVarName string
ZitiCtrlIdentityServerCertVarName string
ZitiCtrlIdentityKeyVarName string
ZitiCtrlIdentityCAVarName string
ZitiSigningCertVarName string
ZitiSigningKeyVarName string
ZitiCtrlMgmtListenerHostPortVarName string
ZitiEdgeCtrlListenerHostPortVarName string
ZitiEdgeCtrlAdvertisedHostPortVarName string
ZitiRouterIdentityCertVarName string
ZitiRouterIdentityServerCertVarName string
ZitiRouterIdentityKeyVarName string
ZitiRouterIdentityCAVarName string
ZitiCtrlListenerAddressVarName string
ZitiCtrlAdvertisedAddressVarName string
ZitiHomeVarDescription string
ZitiCtrlNameVarDescription string
ZitiEdgeRouterRawNameVarDescription string
ZitiEdgeRouterPortVarDescription string
ZitiEdgeCtrlIdentityCertVarDescription string
ZitiEdgeCtrlIdentityServerCertVarDescription string
ZitiEdgeCtrlIdentityKeyVarDescription string
ZitiEdgeCtrlIdentityCAVarDescription string
ZitiCtrlIdentityCertVarDescription string
ZitiCtrlIdentityServerCertVarDescription string
ZitiCtrlIdentityKeyVarDescription string
ZitiCtrlIdentityCAVarDescription string
ZitiSigningCertVarDescription string
ZitiSigningKeyVarDescription string
ZitiCtrlPortVarDescription string
ZitiCtrlListenerAddressVarDescription string
ZitiCtrlAdvertisedAddressVarDescription string
ZitiCtrlMgmtListenerHostPortVarDescription string
ZitiEdgeCtrlListenerHostPortVarDescription string
ZitiEdgeCtrlAdvertisedHostPortVarDescription string
ZitiRouterIdentityCertVarDescription string
ZitiRouterIdentityServerCertVarDescription string
ZitiRouterIdentityKeyVarDescription string
ZitiRouterIdentityCAVarDescription string
}
var (
createConfigEnvironmentLong = templates.LongDesc(`
Displays available environment variable manual overrides
@@ -52,7 +105,7 @@ var environmentConfigTemplate string
type CreateConfigEnvironmentOptions struct {
CreateConfigOptions
ConfigTemplateValues
cmdhelper.EnvVariableMetaData
EnvVariableMetaData
output string
}
@@ -60,7 +113,57 @@ type CreateConfigEnvironmentOptions struct {
func NewCmdCreateConfigEnvironment(data *ConfigTemplateValues) *cobra.Command {
environmentOptions := &CreateConfigEnvironmentOptions{
ConfigTemplateValues: *data,
EnvVariableMetaData: cmdhelper.EnvVariableDetails,
EnvVariableMetaData: EnvVariableMetaData{
OS: "Stuff",
ZitiHomeVarName: constants.ZitiHomeVarName,
ZitiHomeVarDescription: constants.ZitiHomeVarDescription,
ZitiCtrlNameVarName: constants.ZitiCtrlNameVarName,
ZitiCtrlNameVarDescription: constants.ZitiCtrlNameVarDescription,
ZitiCtrlPortVarName: constants.ZitiCtrlPortVarName,
ZitiCtrlPortVarDescription: constants.ZitiCtrlPortVarDescription,
ZitiEdgeRouterRawNameVarName: constants.ZitiEdgeRouterRawNameVarName,
ZitiEdgeRouterRawNameVarDescription: constants.ZitiEdgeRouterRawNameVarDescription,
ZitiEdgeRouterPortVarName: constants.ZitiEdgeRouterPortVarName,
ZitiEdgeRouterPortVarDescription: constants.ZitiEdgeRouterPortVarDescription,
ZitiEdgeCtrlIdentityCertVarName: constants.ZitiEdgeCtrlIdentityCertVarName,
ZitiEdgeCtrlIdentityCertVarDescription: constants.ZitiEdgeCtrlIdentityCertVarDescription,
ZitiEdgeCtrlIdentityServerCertVarName: constants.ZitiEdgeCtrlIdentityServerCertVarName,
ZitiEdgeCtrlIdentityServerCertVarDescription: constants.ZitiEdgeCtrlIdentityServerCertVarDescription,
ZitiEdgeCtrlIdentityKeyVarName: constants.ZitiEdgeCtrlIdentityKeyVarName,
ZitiEdgeCtrlIdentityKeyVarDescription: constants.ZitiEdgeCtrlIdentityKeyVarDescription,
ZitiEdgeCtrlIdentityCAVarName: constants.ZitiEdgeCtrlIdentityCAVarName,
ZitiEdgeCtrlIdentityCAVarDescription: constants.ZitiEdgeCtrlIdentityCAVarDescription,
ZitiCtrlIdentityCertVarName: constants.ZitiCtrlIdentityCertVarName,
ZitiCtrlIdentityCertVarDescription: constants.ZitiCtrlIdentityCertVarDescription,
ZitiCtrlIdentityServerCertVarName: constants.ZitiCtrlIdentityServerCertVarName,
ZitiCtrlIdentityServerCertVarDescription: constants.ZitiCtrlIdentityServerCertVarDescription,
ZitiCtrlIdentityKeyVarName: constants.ZitiCtrlIdentityKeyVarName,
ZitiCtrlIdentityKeyVarDescription: constants.ZitiCtrlIdentityKeyVarDescription,
ZitiCtrlIdentityCAVarName: constants.ZitiCtrlIdentityCAVarName,
ZitiCtrlIdentityCAVarDescription: constants.ZitiCtrlIdentityCAVarDescription,
ZitiSigningCertVarName: constants.ZitiSigningCertVarName,
ZitiSigningCertVarDescription: constants.ZitiSigningCertVarDescription,
ZitiSigningKeyVarName: constants.ZitiSigningKeyVarName,
ZitiSigningKeyVarDescription: constants.ZitiSigningKeyVarDescription,
ZitiRouterIdentityCertVarName: constants.ZitiRouterIdentityCertVarName,
ZitiRouterIdentityCertVarDescription: constants.ZitiRouterIdentityCertVarDescription,
ZitiRouterIdentityServerCertVarName: constants.ZitiRouterIdentityServerCertVarName,
ZitiRouterIdentityServerCertVarDescription: constants.ZitiRouterIdentityServerCertVarDescription,
ZitiRouterIdentityKeyVarName: constants.ZitiRouterIdentityKeyVarName,
ZitiRouterIdentityKeyVarDescription: constants.ZitiRouterIdentityKeyVarDescription,
ZitiRouterIdentityCAVarName: constants.ZitiRouterIdentityCAVarName,
ZitiRouterIdentityCAVarDescription: constants.ZitiRouterIdentityCAVarDescription,
ZitiCtrlListenerAddressVarName: constants.ZitiCtrlListenerAddressVarName,
ZitiCtrlListenerAddressVarDescription: constants.ZitiCtrlListenerAddressVarDescription,
ZitiCtrlAdvertisedAddressVarName: constants.ZitiCtrlAdvertisedAddressVarName,
ZitiCtrlAdvertisedAddressVarDescription: constants.ZitiCtrlAdvertisedAddressVarDescription,
ZitiCtrlMgmtListenerHostPortVarName: constants.ZitiCtrlMgmtListenerHostPortVarName,
ZitiCtrlMgmtListenerHostPortVarDescription: constants.ZitiCtrlMgmtListenerHostPortVarDescription,
ZitiEdgeCtrlListenerHostPortVarName: constants.ZitiEdgeCtrlListenerHostPortVarName,
ZitiEdgeCtrlListenerHostPortVarDescription: constants.ZitiEdgeCtrlListenerHostPortVarDescription,
ZitiEdgeCtrlAdvertisedHostPortVarName: constants.ZitiEdgeCtrlAdvertisedHostPortVarName,
ZitiEdgeCtrlAdvertisedHostPortVarDescription: constants.ZitiEdgeCtrlAdvertisedHostPortVarDescription,
},
}
cmd := &cobra.Command{
@@ -122,30 +225,30 @@ func NewCmdCreateConfigEnvironment(data *ConfigTemplateValues) *cobra.Command {
"%-36s %-50s %s\n"+
"%-36s %-50s %s\n"+
"%-36s %-50s %s",
cmdhelper.EnvVariableDetails.ZitiHomeVarName, cmdhelper.EnvVariableDetails.ZitiHomeVarDescription, data.ZitiHome,
cmdhelper.EnvVariableDetails.ZitiCtrlPortVarName, cmdhelper.EnvVariableDetails.ZitiCtrlPortVarDescription, data.Controller.Port,
cmdhelper.EnvVariableDetails.ZitiCtrlMgmtListenerHostPortVarName, cmdhelper.EnvVariableDetails.ZitiCtrlMgmtListenerHostPortVarDescription, data.Controller.MgmtListenerHostPort,
cmdhelper.EnvVariableDetails.ZitiCtrlNameVarName, cmdhelper.EnvVariableDetails.ZitiCtrlNameVarDescription, data.Controller.Name,
cmdhelper.EnvVariableDetails.ZitiCtrlAdvertisedAddressVarName, cmdhelper.EnvVariableDetails.ZitiCtrlAdvertisedAddressVarDescription, data.Controller.AdvertisedAddress,
cmdhelper.EnvVariableDetails.ZitiCtrlListenerAddressVarName, cmdhelper.EnvVariableDetails.ZitiCtrlListenerAddressVarDescription, data.Controller.ListenerAddress,
cmdhelper.EnvVariableDetails.ZitiEdgeCtrlListenerHostPortVarName, cmdhelper.EnvVariableDetails.ZitiEdgeCtrlListenerHostPortVarDescription, data.Controller.Edge.ListenerHostPort,
cmdhelper.EnvVariableDetails.ZitiEdgeCtrlAdvertisedHostPortVarName, cmdhelper.EnvVariableDetails.ZitiEdgeCtrlAdvertisedHostPortVarDescription, data.Controller.Edge.AdvertisedHostPort,
cmdhelper.EnvVariableDetails.ZitiEdgeRouterHostnameVarName, cmdhelper.EnvVariableDetails.ZitiEdgeRouterHostnameVarDescription, data.Router.Edge.Hostname,
cmdhelper.EnvVariableDetails.ZitiEdgeRouterPortVarName, cmdhelper.EnvVariableDetails.ZitiEdgeRouterPortVarDescription, data.Router.Edge.Port,
cmdhelper.EnvVariableDetails.ZitiRouterIdentityCertVarName, cmdhelper.EnvVariableDetails.ZitiRouterIdentityCertVarName, data.Router.IdentityCert,
cmdhelper.EnvVariableDetails.ZitiRouterIdentityServerCertVarName, cmdhelper.EnvVariableDetails.ZitiRouterIdentityServerCertVarName, data.Router.IdentityServerCert,
cmdhelper.EnvVariableDetails.ZitiRouterIdentityKeyVarName, cmdhelper.EnvVariableDetails.ZitiRouterIdentityKeyVarName, data.Router.IdentityKey,
cmdhelper.EnvVariableDetails.ZitiRouterIdentityCAVarName, cmdhelper.EnvVariableDetails.ZitiRouterIdentityCAVarName, data.Router.IdentityCA,
cmdhelper.EnvVariableDetails.ZitiCtrlIdentityCertVarName, cmdhelper.EnvVariableDetails.ZitiCtrlIdentityCertVarDescription, data.Controller.IdentityCert,
cmdhelper.EnvVariableDetails.ZitiCtrlIdentityServerCertVarName, cmdhelper.EnvVariableDetails.ZitiCtrlIdentityServerCertVarDescription, data.Controller.IdentityServerCert,
cmdhelper.EnvVariableDetails.ZitiCtrlIdentityKeyVarName, cmdhelper.EnvVariableDetails.ZitiCtrlIdentityKeyVarDescription, data.Controller.IdentityKey,
cmdhelper.EnvVariableDetails.ZitiCtrlIdentityCAVarName, cmdhelper.EnvVariableDetails.ZitiCtrlIdentityCAVarDescription, data.Controller.IdentityCA,
cmdhelper.EnvVariableDetails.ZitiEdgeCtrlIdentityCertVarName, cmdhelper.EnvVariableDetails.ZitiEdgeCtrlIdentityCertVarDescription, data.Controller.Edge.IdentityCert,
cmdhelper.EnvVariableDetails.ZitiEdgeCtrlIdentityServerCertVarName, cmdhelper.EnvVariableDetails.ZitiEdgeCtrlIdentityServerCertVarDescription, data.Controller.Edge.IdentityServerCert,
cmdhelper.EnvVariableDetails.ZitiEdgeCtrlIdentityKeyVarName, cmdhelper.EnvVariableDetails.ZitiEdgeCtrlIdentityKeyVarDescription, data.Controller.Edge.IdentityKey,
cmdhelper.EnvVariableDetails.ZitiEdgeCtrlIdentityCAVarName, cmdhelper.EnvVariableDetails.ZitiEdgeCtrlIdentityCAVarDescription, data.Controller.Edge.IdentityCA,
cmdhelper.EnvVariableDetails.ZitiSigningCertVarName, cmdhelper.EnvVariableDetails.ZitiSigningCertVarDescription, data.Controller.Edge.ZitiSigningCert,
cmdhelper.EnvVariableDetails.ZitiSigningKeyVarName, cmdhelper.EnvVariableDetails.ZitiSigningKeyVarDescription, data.Controller.Edge.ZitiSigningKey)
constants.ZitiHomeVarName, constants.ZitiHomeVarDescription, data.ZitiHome,
constants.ZitiCtrlPortVarName, constants.ZitiCtrlPortVarDescription, data.Controller.Port,
constants.ZitiCtrlMgmtListenerHostPortVarName, constants.ZitiCtrlMgmtListenerHostPortVarDescription, data.Controller.MgmtListenerHostPort,
constants.ZitiCtrlNameVarName, constants.ZitiCtrlNameVarDescription, data.Controller.Name,
constants.ZitiCtrlAdvertisedAddressVarName, constants.ZitiCtrlAdvertisedAddressVarDescription, data.Controller.AdvertisedAddress,
constants.ZitiCtrlListenerAddressVarName, constants.ZitiCtrlListenerAddressVarDescription, data.Controller.ListenerAddress,
constants.ZitiEdgeCtrlListenerHostPortVarName, constants.ZitiEdgeCtrlListenerHostPortVarDescription, data.Controller.Edge.ListenerHostPort,
constants.ZitiEdgeCtrlAdvertisedHostPortVarName, constants.ZitiEdgeCtrlAdvertisedHostPortVarDescription, data.Controller.Edge.AdvertisedHostPort,
constants.ZitiEdgeRouterRawNameVarName, constants.ZitiEdgeRouterRawNameVarDescription, data.Router.Edge.Hostname,
constants.ZitiEdgeRouterPortVarName, constants.ZitiEdgeRouterPortVarDescription, data.Router.Edge.Port,
constants.ZitiRouterIdentityCertVarName, constants.ZitiRouterIdentityCertVarDescription, data.Router.IdentityCert,
constants.ZitiRouterIdentityServerCertVarName, constants.ZitiRouterIdentityServerCertVarDescription, data.Router.IdentityServerCert,
constants.ZitiRouterIdentityKeyVarName, constants.ZitiRouterIdentityKeyVarDescription, data.Router.IdentityKey,
constants.ZitiRouterIdentityCAVarName, constants.ZitiRouterIdentityCAVarDescription, data.Router.IdentityCA,
constants.ZitiCtrlIdentityCertVarName, constants.ZitiCtrlIdentityCertVarDescription, data.Controller.IdentityCert,
constants.ZitiCtrlIdentityServerCertVarName, constants.ZitiCtrlIdentityServerCertVarDescription, data.Controller.IdentityServerCert,
constants.ZitiCtrlIdentityKeyVarName, constants.ZitiCtrlIdentityKeyVarDescription, data.Controller.IdentityKey,
constants.ZitiCtrlIdentityCAVarName, constants.ZitiCtrlIdentityCAVarDescription, data.Controller.IdentityCA,
constants.ZitiEdgeCtrlIdentityCertVarName, constants.ZitiEdgeCtrlIdentityCertVarDescription, data.Controller.Edge.IdentityCert,
constants.ZitiEdgeCtrlIdentityServerCertVarName, constants.ZitiEdgeCtrlIdentityServerCertVarDescription, data.Controller.Edge.IdentityServerCert,
constants.ZitiEdgeCtrlIdentityKeyVarName, constants.ZitiEdgeCtrlIdentityKeyVarDescription, data.Controller.Edge.IdentityKey,
constants.ZitiEdgeCtrlIdentityCAVarName, constants.ZitiEdgeCtrlIdentityCAVarDescription, data.Controller.Edge.IdentityCA,
constants.ZitiSigningCertVarName, constants.ZitiSigningCertVarDescription, data.Controller.Edge.ZitiSigningCert,
constants.ZitiSigningKeyVarName, constants.ZitiSigningKeyVarDescription, data.Controller.Edge.ZitiSigningKey)
cmd.Long = createConfigLong
ziti/cmd/ziti/cmd/create_config_router_common.go
+10 -9
View File
@@ -19,6 +19,7 @@ package cmd
import (
_ "embed"
cmdhelper "github.com/openziti/ziti/ziti/cmd/ziti/cmd/helpers"
"github.com/openziti/ziti/ziti/cmd/ziti/constants"
"os"
)
@@ -28,36 +29,36 @@ func SetZitiRouterIdentity(r *RouterTemplateValues, routerName string) {
SetZitiRouterIdentityKey(r, routerName)
SetZitiRouterIdentityCA(r, routerName)
val := os.Getenv("ZITI_EDGE_ROUTER_RAWNAME")
val := os.Getenv(constants.ZitiEdgeRouterRawNameVarName)
if val != "" {
r.Edge.Hostname = val
}
}
func SetZitiRouterIdentityCert(r *RouterTemplateValues, routerName string) {
val := os.Getenv("ZITI_ROUTER_IDENTITY_CERT")
val := os.Getenv(constants.ZitiRouterIdentityCertVarName)
if val == "" {
val = workingDir + "/" + routerName + ".cert" //default
val = workingDir + "/" + routerName + ".cert" // default
}
r.IdentityCert = cmdhelper.NormalizePath(val)
}
func SetZitiRouterIdentityServerCert(r *RouterTemplateValues, routerName string) {
val := os.Getenv("ZITI_ROUTER_IDENTITY_SERVER_CERT")
val := os.Getenv(constants.ZitiRouterIdentityServerCertVarName)
if val == "" {
val = workingDir + "/" + routerName + ".server.chain.cert" //default
val = workingDir + "/" + routerName + ".server.chain.cert" // default
}
r.IdentityServerCert = cmdhelper.NormalizePath(val)
}
func SetZitiRouterIdentityKey(r *RouterTemplateValues, routerName string) {
val := os.Getenv("ZITI_ROUTER_IDENTITY_KEY")
val := os.Getenv(constants.ZitiRouterIdentityKeyVarName)
if val == "" {
val = workingDir + "/" + routerName + ".key" //default
val = workingDir + "/" + routerName + ".key" // default
}
r.IdentityKey = cmdhelper.NormalizePath(val)
}
func SetZitiRouterIdentityCA(r *RouterTemplateValues, routerName string) {
val := os.Getenv("ZITI_ROUTER_IDENTITY_CA")
val := os.Getenv(constants.ZitiRouterIdentityCAVarName)
if val == "" {
val = workingDir + "/" + routerName + ".cas" //default
val = workingDir + "/" + routerName + ".cas" // default
}
r.IdentityCA = cmdhelper.NormalizePath(val)
}
ziti/cmd/ziti/cmd/helpers/env_helpers.go
+12 -310
View File
@@ -17,118 +17,12 @@
package helpers
import (
"fmt"
"github.com/openziti/ziti/ziti/cmd/ziti/constants"
"github.com/pkg/errors"
"os"
"strings"
)
type EnvVariableMetaData struct {
OS string
PathSeparator string
ZitiHomeVarName string
ZitiCtrlNameVarName string
ZitiCtrlPortVarName string
ZitiEdgeRouterHostnameVarName string
ZitiEdgeRouterPortVarName string
ZitiEdgeCtrlIdentityCertVarName string
ZitiEdgeCtrlIdentityServerCertVarName string
ZitiEdgeCtrlIdentityKeyVarName string
ZitiEdgeCtrlIdentityCAVarName string
ZitiCtrlIdentityCertVarName string
ZitiCtrlIdentityServerCertVarName string
ZitiCtrlIdentityKeyVarName string
ZitiCtrlIdentityCAVarName string
ZitiSigningCertVarName string
ZitiSigningKeyVarName string
ZitiCtrlMgmtListenerHostPortVarName string
ZitiEdgeCtrlListenerHostPortVarName string
ZitiEdgeCtrlAdvertisedHostPortVarName string
ZitiRouterIdentityCertVarName string
ZitiRouterIdentityServerCertVarName string
ZitiRouterIdentityKeyVarName string
ZitiRouterIdentityCAVarName string
ZitiCtrlListenerAddressVarName string
ZitiCtrlAdvertisedAddressVarName string
ZitiHomeVarDescription string
ZitiCtrlNameVarDescription string
ZitiEdgeRouterHostnameVarDescription string
ZitiEdgeRouterPortVarDescription string
ZitiEdgeCtrlIdentityCertVarDescription string
ZitiEdgeCtrlIdentityServerCertVarDescription string
ZitiEdgeCtrlIdentityKeyVarDescription string
ZitiEdgeCtrlIdentityCAVarDescription string
ZitiCtrlIdentityCertVarDescription string
ZitiCtrlIdentityServerCertVarDescription string
ZitiCtrlIdentityKeyVarDescription string
ZitiCtrlIdentityCAVarDescription string
ZitiSigningCertVarDescription string
ZitiSigningKeyVarDescription string
ZitiCtrlPortVarDescription string
ZitiCtrlListenerAddressVarDescription string
ZitiCtrlAdvertisedAddressVarDescription string
ZitiCtrlMgmtListenerHostPortVarDescription string
ZitiEdgeCtrlListenerHostPortVarDescription string
ZitiEdgeCtrlAdvertisedHostPortVarDescription string
ZitiRouterIdentityCertVarDescription string
ZitiRouterIdentityServerCertVarDescription string
ZitiRouterIdentityKeyVarDescription string
ZitiRouterIdentityCAVarDescription string
}
var EnvVariableDetails = EnvVariableMetaData{
PathSeparator: "/",
ZitiHomeVarName: "ZITI_HOME",
ZitiHomeVarDescription: "Root home directory for Ziti related files",
ZitiCtrlNameVarName: "ZITI_CONTROLLER_NAME",
ZitiCtrlNameVarDescription: "The name of the Ziti Controller",
ZitiCtrlPortVarName: "ZITI_CTRL_PORT",
ZitiCtrlPortVarDescription: "The port of the Ziti Controller",
ZitiEdgeRouterHostnameVarName: "ZITI_EDGE_ROUTER_HOSTNAME",
ZitiEdgeRouterHostnameVarDescription: "Hostname of the Ziti Edge Router",
ZitiEdgeRouterPortVarName: "ZITI_EDGE_ROUTER_PORT",
ZitiEdgeRouterPortVarDescription: "Port of the Ziti Edge Router",
ZitiEdgeCtrlIdentityCertVarName: "ZITI_EDGE_CTRL_IDENTITY_CERT",
ZitiEdgeCtrlIdentityCertVarDescription: "Path to Identity Cert for Ziti Edge Controller",
ZitiEdgeCtrlIdentityServerCertVarName: "ZITI_EDGE_CTRL_IDENTITY_SERVER_CERT",
ZitiEdgeCtrlIdentityServerCertVarDescription: "Path to Identity Server Cert for Ziti Edge Controller",
ZitiEdgeCtrlIdentityKeyVarName: "ZITI_EDGE_CTRL_IDENTITY_KEY",
ZitiEdgeCtrlIdentityKeyVarDescription: "Path to Identity Key for Ziti Edge Controller",
ZitiEdgeCtrlIdentityCAVarName: "ZITI_EDGE_CTRL_IDENTITY_CA",
ZitiEdgeCtrlIdentityCAVarDescription: "Path to Identity CA for Ziti Edge Controller",
ZitiCtrlIdentityCertVarName: "ZITI_CTRL_IDENTITY_CERT",
ZitiCtrlIdentityCertVarDescription: "Path to Identity Cert for Ziti Controller",
ZitiCtrlIdentityServerCertVarName: "ZITI_CTRL_IDENTITY_SERVER_CERT",
ZitiCtrlIdentityServerCertVarDescription: "Path to Identity Server Cert for Ziti Controller",
ZitiCtrlIdentityKeyVarName: "ZITI_CTRL_IDENTITY_KEY",
ZitiCtrlIdentityKeyVarDescription: "Path to Identity Key for Ziti Controller",
ZitiCtrlIdentityCAVarName: "ZITI_CTRL_IDENTITY_CA",
ZitiCtrlIdentityCAVarDescription: "Path to Identity CA for Ziti Controller",
ZitiSigningCertVarName: "ZITI_SIGNING_CERT",
ZitiSigningCertVarDescription: "Path to the Ziti Signing Cert",
ZitiSigningKeyVarName: "ZITI_SIGNING_KEY",
ZitiSigningKeyVarDescription: "Path to the Ziti Signing Key",
ZitiRouterIdentityCertVarName: "ZITI_ROUTER_IDENTITY_CERT",
ZitiRouterIdentityCertVarDescription: "Path to Identity Cert for Ziti Router",
ZitiRouterIdentityServerCertVarName: "ZITI_ROUTER_IDENTITY_SERVER_CERT",
ZitiRouterIdentityServerCertVarDescription: "Path to Identity Server Cert for Ziti Router",
ZitiRouterIdentityKeyVarName: "ZITI_ROUTER_IDENTITY_KEY",
ZitiRouterIdentityKeyVarDescription: "Path to Identity Key for Ziti Router",
ZitiRouterIdentityCAVarName: "ZITI_ROUTER_IDENTITY_CA",
ZitiRouterIdentityCAVarDescription: "Path to Identity CA for Ziti Router",
ZitiCtrlListenerAddressVarName: "ZITI_CTRL_LISTENER_ADDRESS",
ZitiCtrlListenerAddressVarDescription: "The Ziti Controller Listener Address",
ZitiCtrlAdvertisedAddressVarName: "ZITI_CTRL_ADVERTISED_ADDRESS",
ZitiCtrlAdvertisedAddressVarDescription: "The Ziti Controller Advertised Address",
ZitiCtrlMgmtListenerHostPortVarName: "ZITI_CTRL_MGMT_HOST_PORT",
ZitiCtrlMgmtListenerHostPortVarDescription: "Host and port of the Ziti Controller Management Listener",
ZitiEdgeCtrlListenerHostPortVarName: "ZITI_CTRL_EDGE_LISTENER_HOST_PORT",
ZitiEdgeCtrlListenerHostPortVarDescription: "Host and port of the Ziti Edge Controller Listener",
ZitiEdgeCtrlAdvertisedHostPortVarName: "ZITI_EDGE_CTRL_ADVERTISED_HOST_PORT",
ZitiEdgeCtrlAdvertisedHostPortVarDescription: "Host and port of the Ziti Edge Controller API",
}
func HomeDir() string {
if h := os.Getenv("HOME"); h != "" {
return h
@@ -152,7 +46,7 @@ func WorkingDir() (string, error) {
func GetZitiHome() (string, error) {
// Get path from env variable
retVal := os.Getenv(EnvVariableDetails.ZitiHomeVarName)
retVal := os.Getenv(constants.ZitiHomeVarName)
if retVal == "" {
// If not set, create a default path of the current working directory
@@ -161,180 +55,17 @@ func GetZitiHome() (string, error) {
return "", err
}
err = os.Setenv(EnvVariableDetails.ZitiHomeVarName, workingDir)
err = os.Setenv(constants.ZitiHomeVarName, workingDir)
if err != nil {
return "", err
}
retVal = os.Getenv(EnvVariableDetails.ZitiHomeVarName)
retVal = os.Getenv(constants.ZitiHomeVarName)
}
return NormalizePath(retVal), nil
}
func GetZitiCtrlIdentityCert() (string, error) {
workingDir, err := WorkingDir()
if err != nil {
return "", err
}
controllerName, err := GetZitiCtrlName()
if err != nil {
err := errors.Wrap(err, "Unable to get "+EnvVariableDetails.ZitiCtrlNameVarName)
if err != nil {
return "", err
}
}
return getValueOrSetAndGetDefault(EnvVariableDetails.ZitiCtrlIdentityCertVarName, fmt.Sprintf("%s/%s-client.cert", workingDir, controllerName), false)
}
func GetZitiCtrlIdentityServerCert() (string, error) {
workingDir, err := WorkingDir()
if err != nil {
return "", err
}
controllerName, err := GetZitiCtrlName()
if err != nil {
err := errors.Wrap(err, "Unable to get "+EnvVariableDetails.ZitiCtrlNameVarName)
if err != nil {
return "", err
}
}
return getValueOrSetAndGetDefault(EnvVariableDetails.ZitiCtrlIdentityServerCertVarName, fmt.Sprintf("%s/%s-server.pem", workingDir, controllerName), false)
}
func GetZitiCtrlIdentityKey() (string, error) {
workingDir, err := WorkingDir()
if err != nil {
return "", err
}
controllerName, err := GetZitiCtrlName()
if err != nil {
err := errors.Wrap(err, "Unable to get "+EnvVariableDetails.ZitiCtrlNameVarName)
if err != nil {
return "", err
}
}
return getValueOrSetAndGetDefault(EnvVariableDetails.ZitiCtrlIdentityKeyVarName, fmt.Sprintf("%s/%s-server.key", workingDir, controllerName), false)
}
func GetZitiCtrlIdentityCA() (string, error) {
workingDir, err := WorkingDir()
if err != nil {
return "", err
}
controllerName, err := GetZitiCtrlName()
if err != nil {
err := errors.Wrap(err, "Unable to get "+EnvVariableDetails.ZitiCtrlNameVarName)
if err != nil {
return "", err
}
}
return getValueOrSetAndGetDefault(EnvVariableDetails.ZitiCtrlIdentityCAVarName, fmt.Sprintf("%s/%s-cas.pem", workingDir, controllerName), false)
}
func GetZitiRouterIdentityServerCert(routerName string, forceSet bool) (string, error) {
workingDir, err := WorkingDir()
if err != nil {
return "", err
}
return getValueOrSetAndGetDefault(EnvVariableDetails.ZitiRouterIdentityServerCertVarName, fmt.Sprintf("%s/%s-server.pem", workingDir, routerName), forceSet)
}
func GetZitiRouterIdentityKey(routerName string, forceSet bool) (string, error) {
workingDir, err := WorkingDir()
if err != nil {
return "", err
}
return getValueOrSetAndGetDefault(EnvVariableDetails.ZitiRouterIdentityKeyVarName, fmt.Sprintf("%s/%s-server.key", workingDir, routerName), forceSet)
}
func GetZitiRouterIdentityCA(routerName string, forceSet bool) (string, error) {
workingDir, err := WorkingDir()
if err != nil {
return "", err
}
return getValueOrSetAndGetDefault(EnvVariableDetails.ZitiRouterIdentityCAVarName, fmt.Sprintf("%s/%s-cas.pem", workingDir, routerName), forceSet)
}
func GetZitiEdgeIdentityCert() (string, error) {
workingDir, err := WorkingDir()
if err != nil {
return "", err
}
controllerName, err := GetZitiCtrlName()
if err != nil {
err := errors.Wrap(err, "Unable to get "+EnvVariableDetails.ZitiCtrlNameVarName)
if err != nil {
return "", err
}
}
return getValueOrSetAndGetDefault(EnvVariableDetails.ZitiEdgeCtrlIdentityCertVarName, fmt.Sprintf("%s/%s-client.cert", workingDir, controllerName), false)
}
func GetZitiEdgeIdentityServerCert() (string, error) {
workingDir, err := WorkingDir()
if err != nil {
return "", err
}
controllerName, err := GetZitiCtrlName()
if err != nil {
err := errors.Wrap(err, "Unable to get "+EnvVariableDetails.ZitiCtrlNameVarName)
if err != nil {
return "", err
}
}
return getValueOrSetAndGetDefault(EnvVariableDetails.ZitiEdgeCtrlIdentityServerCertVarName, fmt.Sprintf("%s/%s-server.pem", workingDir, controllerName), false)
}
func GetZitiEdgeIdentityKey() (string, error) {
workingDir, err := WorkingDir()
if err != nil {
return "", err
}
controllerName, err := GetZitiCtrlName()
if err != nil {
err := errors.Wrap(err, "Unable to get "+EnvVariableDetails.ZitiCtrlNameVarName)
if err != nil {
return "", err
}
}
return getValueOrSetAndGetDefault(EnvVariableDetails.ZitiEdgeCtrlIdentityKeyVarName, fmt.Sprintf("%s/%s-server.key", workingDir, controllerName), false)
}
func GetZitiEdgeIdentityCA() (string, error) {
workingDir, err := WorkingDir()
if err != nil {
return "", err
}
controllerName, err := GetZitiCtrlName()
if err != nil {
err := errors.Wrap(err, "Unable to get "+EnvVariableDetails.ZitiCtrlNameVarName)
if err != nil {
return "", err
}
}
return getValueOrSetAndGetDefault(EnvVariableDetails.ZitiEdgeCtrlIdentityCAVarName, fmt.Sprintf("%s/%s-cas.pem", workingDir, controllerName), false)
}
func GetZitiCtrlAdvertisedAddress() (string, error) {
hostname, err := os.Hostname()
if err != nil {
@@ -344,60 +75,31 @@ func GetZitiCtrlAdvertisedAddress() (string, error) {
}
}
return getValueOrSetAndGetDefault(EnvVariableDetails.ZitiCtrlAdvertisedAddressVarName, hostname, false)
return getValueOrSetAndGetDefault(constants.ZitiCtrlAdvertisedAddressVarName, hostname, false)
}
func GetZitiCtrlPort() (string, error) {
return getValueOrSetAndGetDefault(EnvVariableDetails.ZitiCtrlPortVarName, constants.DefaultZitiControllerPort, false)
return getValueOrSetAndGetDefault(constants.ZitiCtrlPortVarName, constants.DefaultZitiControllerPort, false)
}
func GetZitiCtrlListenerAddress() (string, error) {
return getValueOrSetAndGetDefault(EnvVariableDetails.ZitiCtrlListenerAddressVarName, constants.DefaultZitiControllerListenerAddress, false)
return getValueOrSetAndGetDefault(constants.ZitiCtrlListenerAddressVarName, constants.DefaultZitiControllerListenerAddress, false)
}
func GetZitiCtrlMgmtListenerHostPort() (string, error) {
return getValueOrSetAndGetDefault(EnvVariableDetails.ZitiCtrlMgmtListenerHostPortVarName, constants.DefaultZitiMgmtControllerListenerHostPort, false)
return getValueOrSetAndGetDefault(constants.ZitiCtrlMgmtListenerHostPortVarName, constants.DefaultZitiMgmtControllerListenerHostPort, false)
}
func GetZitiCtrlName() (string, error) {
return getValueOrSetAndGetDefault(EnvVariableDetails.ZitiCtrlNameVarName, constants.DefaultZitiControllerName, false)
}
func GetZitiEdgeRouterHostname() (string, error) {
hostname, err := os.Hostname()
if err != nil {
err := errors.Wrap(err, "Unable to get hostname")
if err != nil {
return "", err
}
}
return getValueOrSetAndGetDefault(EnvVariableDetails.ZitiEdgeRouterHostnameVarName, hostname, false)
return getValueOrSetAndGetDefault(constants.ZitiCtrlNameVarName, constants.DefaultZitiControllerName, false)
}
func GetZitiEdgeRouterPort() (string, error) {
return getValueOrSetAndGetDefault(EnvVariableDetails.ZitiEdgeRouterPortVarName, constants.DefaultZitiEdgeRouterPort, false)
}
func GetZitiSigningCert() (string, error) {
workingDir, err := WorkingDir()
if err != nil {
return "", err
}
return getValueOrSetAndGetDefault(EnvVariableDetails.ZitiSigningCertVarName, fmt.Sprintf("%s/signingCert.cert", workingDir), false)
}
func GetZitiSigningKey() (string, error) {
workingDir, err := WorkingDir()
if err != nil {
return "", err
}
return getValueOrSetAndGetDefault(EnvVariableDetails.ZitiSigningKeyVarName, fmt.Sprintf("%s/signingKey.key", workingDir), false)
return getValueOrSetAndGetDefault(constants.ZitiEdgeRouterPortVarName, constants.DefaultZitiEdgeRouterPort, false)
}
func GetZitiEdgeCtrlListenerHostPort() (string, error) {
return getValueOrSetAndGetDefault(EnvVariableDetails.ZitiEdgeCtrlListenerHostPortVarName, constants.DefaultZitiEdgeListenerHostPort, false)
return getValueOrSetAndGetDefault(constants.ZitiEdgeCtrlListenerHostPortVarName, constants.DefaultZitiEdgeListenerHostPort, false)
}
func GetZitiEdgeCtrlAdvertisedHostPort() (string, error) {
@@ -409,7 +111,7 @@ func GetZitiEdgeCtrlAdvertisedHostPort() (string, error) {
}
}
return getValueOrSetAndGetDefault(EnvVariableDetails.ZitiEdgeCtrlAdvertisedHostPortVarName, hostname+":"+constants.DefaultZitiEdgeAPIPort, false)
return getValueOrSetAndGetDefault(constants.ZitiEdgeCtrlAdvertisedHostPortVarName, hostname+":"+constants.DefaultZitiEdgeAPIPort, false)
}
func getValueOrSetAndGetDefault(envVarName string, defaultValue string, forceDefault bool) (string, error) {
@@ -432,7 +134,7 @@ func getValueOrSetAndGetDefault(envVarName string, defaultValue string, forceDef
return retVal, nil
}
// replaces windows \ with / which windows allows for
// NormalizePath replaces windows \ with / which windows allows for
func NormalizePath(input string) string {
return strings.ReplaceAll(input, "\\", "/")
}
ziti/cmd/ziti/constants/constants.go
+52 -1
View File
@@ -39,7 +39,6 @@ const (
DefaultOutQueueSize = 16
DefaultConnectTimeoutMs = 5000
DefaultGetSessionTimeoutS = 60
DefaultZitiPKI = ""
// Router defaults
DefaultZitiEdgeRouterPort = "3022"
@@ -78,3 +77,55 @@ const (
DefaultLinkDialQueueLength = 1000
DefaultLinkDialWorkerCount = 10
)
// Env Var Constants
const (
ZitiHomeVarName = "ZITI_HOME"
ZitiHomeVarDescription = "Root home directory for Ziti related files"
ZitiCtrlNameVarName = "ZITI_CONTROLLER_NAME"
ZitiCtrlNameVarDescription = "The name of the Ziti Controller"
ZitiCtrlPortVarName = "ZITI_CTRL_PORT"
ZitiCtrlPortVarDescription = "The port of the Ziti Controller"
ZitiEdgeRouterRawNameVarName = "ZITI_EDGE_ROUTER_RAWNAME"
ZitiEdgeRouterRawNameVarDescription = "The Edge Router Raw Name"
ZitiEdgeRouterPortVarName = "ZITI_EDGE_ROUTER_PORT"
ZitiEdgeRouterPortVarDescription = "Port of the Ziti Edge Router"
ZitiEdgeCtrlIdentityCertVarName = "ZITI_EDGE_CTRL_IDENTITY_CERT"
ZitiEdgeCtrlIdentityCertVarDescription = "Path to Identity Cert for Ziti Edge Controller"
ZitiEdgeCtrlIdentityServerCertVarName = "ZITI_EDGE_CTRL_IDENTITY_SERVER_CERT"
ZitiEdgeCtrlIdentityServerCertVarDescription = "Path to Identity Server Cert for Ziti Edge Controller"
ZitiEdgeCtrlIdentityKeyVarName = "ZITI_EDGE_CTRL_IDENTITY_KEY"
ZitiEdgeCtrlIdentityKeyVarDescription = "Path to Identity Key for Ziti Edge Controller"
ZitiEdgeCtrlIdentityCAVarName = "ZITI_EDGE_CTRL_IDENTITY_CA"
ZitiEdgeCtrlIdentityCAVarDescription = "Path to Identity CA for Ziti Edge Controller"
ZitiCtrlIdentityCertVarName = "ZITI_CTRL_IDENTITY_CERT"
ZitiCtrlIdentityCertVarDescription = "Path to Identity Cert for Ziti Controller"
ZitiCtrlIdentityServerCertVarName = "ZITI_CTRL_IDENTITY_SERVER_CERT"
ZitiCtrlIdentityServerCertVarDescription = "Path to Identity Server Cert for Ziti Controller"
ZitiCtrlIdentityKeyVarName = "ZITI_CTRL_IDENTITY_KEY"
ZitiCtrlIdentityKeyVarDescription = "Path to Identity Key for Ziti Controller"
ZitiCtrlIdentityCAVarName = "ZITI_CTRL_IDENTITY_CA"
ZitiCtrlIdentityCAVarDescription = "Path to Identity CA for Ziti Controller"
ZitiSigningCertVarName = "ZITI_SIGNING_CERT"
ZitiSigningCertVarDescription = "Path to the Ziti Signing Cert"
ZitiSigningKeyVarName = "ZITI_SIGNING_KEY"
ZitiSigningKeyVarDescription = "Path to the Ziti Signing Key"
ZitiRouterIdentityCertVarName = "ZITI_ROUTER_IDENTITY_CERT"
ZitiRouterIdentityCertVarDescription = "Path to Identity Cert for Ziti Router"
ZitiRouterIdentityServerCertVarName = "ZITI_ROUTER_IDENTITY_SERVER_CERT"
ZitiRouterIdentityServerCertVarDescription = "Path to Identity Server Cert for Ziti Router"
ZitiRouterIdentityKeyVarName = "ZITI_ROUTER_IDENTITY_KEY"
ZitiRouterIdentityKeyVarDescription = "Path to Identity Key for Ziti Router"
ZitiRouterIdentityCAVarName = "ZITI_ROUTER_IDENTITY_CA"
ZitiRouterIdentityCAVarDescription = "Path to Identity CA for Ziti Router"
ZitiCtrlListenerAddressVarName = "ZITI_CTRL_LISTENER_ADDRESS"
ZitiCtrlListenerAddressVarDescription = "The Ziti Controller Listener Address"
ZitiCtrlAdvertisedAddressVarName = "ZITI_CTRL_ADVERTISED_ADDRESS"
ZitiCtrlAdvertisedAddressVarDescription = "The Ziti Controller Advertised Address"
ZitiCtrlMgmtListenerHostPortVarName = "ZITI_CTRL_MGMT_HOST_PORT"
ZitiCtrlMgmtListenerHostPortVarDescription = "Host and port of the Ziti Controller Management Listener"
ZitiEdgeCtrlListenerHostPortVarName = "ZITI_CTRL_EDGE_LISTENER_HOST_PORT"
ZitiEdgeCtrlListenerHostPortVarDescription = "Host and port of the Ziti Edge Controller Listener"
ZitiEdgeCtrlAdvertisedHostPortVarName = "ZITI_EDGE_CTRL_ADVERTISED_HOST_PORT"
ZitiEdgeCtrlAdvertisedHostPortVarDescription = "Host and port of the Ziti Edge Controller API"
)