Skip to content

nats server check credential --context-credential #1313

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
philpennock wants to merge 1 commit into
base: main
Choose a base branch
from
Open

nats server check credential --context-credential #1313

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 22 additions & 1 deletion cli/server_check_command.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ type SrvCheckCmd struct {
credentialValidityCrit time.Duration
credentialValidityWarn time.Duration
credentialRequiresExpire bool
credentialFromContext bool
credential string

exporterConfigFile string
Expand Down Expand Up @@ -237,10 +238,11 @@ When set these settings will be used, but can be overridden using --waiting-crit
kv.Flag("key", "Requires a key to have any non-delete value set").StringVar(&c.kvKey)

cred := check.Command("credential", "Checks the validity of a NATS credential file").Action(c.checkCredentialAction)
cred.Flag("credential", "The file holding the NATS credential").Required().StringVar(&c.credential)
cred.Flag("credential", "The file holding the NATS credential").StringVar(&c.credential)
cred.Flag("validity-warn", "Warning threshold for time before expiry").DurationVar(&c.credentialValidityWarn)
cred.Flag("validity-critical", "Critical threshold for time before expiry").DurationVar(&c.credentialValidityCrit)
cred.Flag("require-expiry", "Requires the credential to have expiry set").Default("true").BoolVar(&c.credentialRequiresExpire)
cred.Flag("context-credential", "Use the credential file from the context").BoolVar(&c.credentialFromContext)

exporter := check.Command("exporter", "Prometheus exporter for server checks").Hidden().Action(c.exporterAction)
exporter.Flag("config", "Exporter configuration").Required().ExistingFileVar(&c.exporterConfigFile)
Expand Down Expand Up @@ -489,6 +491,25 @@ func (c *SrvCheckCmd) checkCredentialAction(_ *fisk.ParseContext) error {
check := &monitor.Result{Name: "Credential", Check: "credential", OutFile: checkRenderOutFile, NameSpace: opts().PrometheusNamespace, RenderFormat: checkRenderFormat, Trace: opts().Trace}
defer check.GenericExit()

if c.credentialFromContext {
if c.credential == "" {
err := loadContext(false)
if check.CriticalIfErr(err, "loading context failed: %v", err) {
return nil
}
c.credential = opts().Config.Creds()
if c.credential == "" {
check.CriticalExit("--context-credential failed to load a credential")
return nil
}
}
} else {
if c.credential == "" {
check.CriticalExit("neither --credential nor --context-credential given")
return nil
}
}

return monitor.CheckCredential(check, monitor.CheckCredentialOptions{
File: c.credential,
ValidityWarning: c.credentialValidityWarn.Seconds(),
Expand Down