diff options
author | Leandro Alves <ldalves@gmail.com> | 2021-11-25 16:49:05 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-11-25 16:49:05 +0100 |
commit | abf9a0e7e83016d8cd0046d4da03b1df5d5aab93 (patch) | |
tree | d862b052f999c9b82c283fdc466e69c7a1855ca2 /client/go/cmd/cert.go | |
parent | 424d01764454c3385792c92b67d68914e59b5a70 (diff) | |
parent | 914a47fbb80bc09132173b1618923fc73076c4d1 (diff) |
Merge pull request #20219 from vespa-engine/bjorncs/vespa-cli
Bjorncs/vespa cli
Diffstat (limited to 'client/go/cmd/cert.go')
-rw-r--r-- | client/go/cmd/cert.go | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/client/go/cmd/cert.go b/client/go/cmd/cert.go index eaf3fc564dd..6fbe19b524d 100644 --- a/client/go/cmd/cert.go +++ b/client/go/cmd/cert.go @@ -16,15 +16,22 @@ import ( var overwriteCertificate bool func init() { - rootCmd.AddCommand(certCmd) certCmd.Flags().BoolVarP(&overwriteCertificate, "force", "f", false, "Force overwrite of existing certificate and private key") certCmd.MarkPersistentFlagRequired(applicationFlag) } +func certExample() string { + if vespa.Auth0AccessTokenEnabled() { + return "$ vespa auth cert -a my-tenant.my-app.my-instance" + } else { + return "$ vespa cert -a my-tenant.my-app.my-instance" + } +} + var certCmd = &cobra.Command{ Use: "cert", Short: "Create a new private key and self-signed certificate for Vespa Cloud deployment", - Example: "$ vespa cert -a my-tenant.my-app.my-instance", + Example: certExample(), DisableAutoGenTag: true, Args: cobra.MaximumNArgs(1), Run: func(cmd *cobra.Command, args []string) { @@ -66,8 +73,14 @@ var certCmd = &cobra.Command{ } } if pkg.IsZip() { + var msg string + if vespa.Auth0AccessTokenEnabled() { + msg = "Try running 'mvn clean' before 'vespa auth cert', and then 'mvn package'" + } else { + msg = "Try running 'mvn clean' before 'vespa cert', and then 'mvn package'" + } fatalErrHint(fmt.Errorf("Cannot add certificate to compressed application package %s", pkg.Path), - "Try running 'mvn clean' before 'vespa cert', and then 'mvn package'") + msg) return } |