extern/zrok
1
1
Fork 0
mirror of https://github.com/openziti/zrok.git synced 2024-11-26 01:54:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of github.com:openziti/zrok

Browse Source
This commit is contained in:
Michael Quigley 2023-02-16 13:39:25 -05:00
commit 14e0e39b85
No known key found for this signature in database
GPG Key ID: 9B60314A9DD20A62
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -1,3 +1,7 @@
# v0.3.2
CHANGE: `zrok status` no longer shows secrets (secret token, ziti identity) unless the `--secrets` flag is passed (https://github.com/openziti/zrok/issues/243)
# v0.3.1 # v0.3.1
CHANGE: Incorporate initial docker image build (https://github.com/openziti/zrok/issues/217) CHANGE: Incorporate initial docker image build (https://github.com/openziti/zrok/issues/217)

22
cmd/zrok/status.go
View File

@ -14,7 +14,8 @@ func init() {
} }
type statusCommand struct { type statusCommand struct {
cmd *cobra.Command secrets bool
cmd *cobra.Command
} }
func newStatusCommand() *statusCommand { func newStatusCommand() *statusCommand {
@ -25,6 +26,7 @@ func newStatusCommand() *statusCommand {
Args: cobra.ExactArgs(0), Args: cobra.ExactArgs(0),
} }
command := &statusCommand{cmd: cmd} command := &statusCommand{cmd: cmd}
cmd.Flags().BoolVar(&command.secrets, "secrets", false, "Show secrets in status output")
cmd.Run = command.run cmd.Run = command.run
return command return command
} }
@ -57,8 +59,22 @@ func (cmd *statusCommand) run(_ *cobra.Command, _ []string) {
t.SetOutputMirror(os.Stdout) t.SetOutputMirror(os.Stdout)
t.SetStyle(table.StyleColoredDark) t.SetStyle(table.StyleColoredDark)
t.AppendHeader(table.Row{"Property", "Value"}) t.AppendHeader(table.Row{"Property", "Value"})
t.AppendRow(table.Row{"Secret Token", zrd.Env.Token}) if cmd.secrets {
t.AppendRow(table.Row{"Ziti Identity", zrd.Env.ZId}) t.AppendRow(table.Row{"Secret Token", zrd.Env.Token})
t.AppendRow(table.Row{"Ziti Identity", zrd.Env.ZId})
} else {
secretToken := "<<SET>>"
if zrd.Env.Token == "" {
secretToken = "<<UNSET>>"
}
t.AppendRow(table.Row{"Secret Token", secretToken})
zId := "<<SET>>"
if zrd.Env.ZId == "" {
zId = "<<UNSET>>"
}
t.AppendRow(table.Row{"Ziti Identity", zId})
}
t.Render() t.Render()
} }
_, _ = fmt.Fprintf(os.Stdout, "\n") _, _ = fmt.Fprintf(os.Stdout, "\n")