Merge pull request #8051 from hashicorp/revert-7922-disable-future-commands

Revert "disable license cli commands"
This commit is contained in:
Drew Bailey
2020-05-26 13:00:58 -04:00
committed by GitHub
2 changed files with 15 additions and 2 deletions

View File

@@ -236,7 +236,6 @@ type LicenseReply struct {
QueryMeta
}
// Note: These api actions are not yet supported
func (op *Operator) LicensePut(license string, q *WriteOptions) (*WriteMeta, error) {
wm, err := op.c.write("/v1/operator/license", license, nil, q)
if err != nil {
@@ -245,7 +244,6 @@ func (op *Operator) LicensePut(license string, q *WriteOptions) (*WriteMeta, err
return wm, nil
}
// Note: These api actions are not yet supported
func (op *Operator) LicenseGet(q *QueryOptions) (*LicenseReply, *QueryMeta, error) {
var reply LicenseReply
qm, err := op.c.query("/v1/operator/license", &reply, q)

View File

@@ -361,6 +361,21 @@ func Commands(metaPtr *Meta, agentUi cli.Ui) map[string]cli.CommandFactory {
Meta: meta,
}, nil
},
"license": func() (cli.Command, error) {
return &LicenseCommand{
Meta: meta,
}, nil
},
"license get": func() (cli.Command, error) {
return &LicenseGetCommand{
Meta: meta,
}, nil
},
"license put": func() (cli.Command, error) {
return &LicensePutCommand{
Meta: meta,
}, nil
},
"logs": func() (cli.Command, error) {
return &AllocLogsCommand{
Meta: meta,