From 3a1a92bb0ecfe79bc2a8620e05b38acd9125dfed Mon Sep 17 00:00:00 2001 From: Yoan Blanc Date: Mon, 8 Jun 2020 20:35:39 +0200 Subject: [PATCH] operator: init -status to return JSON (#8773) --- command/operator_init.go | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/command/operator_init.go b/command/operator_init.go index fe03e10a0e..5a2c64a8ed 100644 --- a/command/operator_init.go +++ b/command/operator_init.go @@ -489,13 +489,25 @@ func (c *OperatorInitCommand) status(client *api.Client) int { return 1 // Normally we'd return 2, but 2 means something special here } - if inited { - c.UI.Output("Vault is initialized") - return 0 + errorCode := 0 + + if !inited { + errorCode = 2 } - c.UI.Output("Vault is not initialized") - return 2 + switch Format(c.UI) { + case "table": + if inited { + c.UI.Output("Vault is initialized") + } else { + c.UI.Output("Vault is not initialized") + } + default: + data := api.InitStatusResponse{Initialized: inited} + OutputData(c.UI, data) + } + + return errorCode } // machineInit is used to output information about the init command.