remove duplicate license info (#8496)

This commit is contained in:
Drew Bailey
2020-07-22 10:21:56 -04:00
committed by GitHub
parent e8c0deb2e1
commit 94f09bfb6e
2 changed files with 29 additions and 2 deletions

View File

@@ -74,8 +74,6 @@ func outputLicenseInfo(ui cli.Ui, lic *api.License, expired bool, validity strin
fmt.Sprintf("License ID|%s", lic.LicenseID),
fmt.Sprintf("Customer ID|%s", lic.CustomerID),
expStr,
fmt.Sprintf("License ID|%s", lic.LicenseID),
fmt.Sprintf("Customer ID|%s", lic.CustomerID),
fmt.Sprintf("Terminates At|%s", lic.TerminationTime.String()),
fmt.Sprintf("Datacenter|%s", lic.InstallationID),
}

View File

@@ -2,7 +2,9 @@ package command
import (
"testing"
"time"
"github.com/hashicorp/nomad/api"
"github.com/mitchellh/cli"
"github.com/stretchr/testify/require"
)
@@ -26,3 +28,30 @@ func TestCommand_LicenseGet_OSSErr(t *testing.T) {
require.Contains(t, ui.ErrorWriter.String(), "Nomad Enterprise only endpoint")
}
}
func TestOutputLicenseReply(t *testing.T) {
now := time.Now()
lic := &api.LicenseReply{
License: &api.License{
LicenseID: "licenseID",
CustomerID: "customerID",
InstallationID: "*",
IssueTime: now,
StartTime: now,
ExpirationTime: now.Add(1 * time.Hour),
TerminationTime: now,
Product: "nomad",
Flags: map[string]interface{}{
"": nil,
},
},
}
ui := new(cli.MockUi)
require.Equal(t, 0, OutputLicenseReply(ui, lic))
out := ui.OutputWriter.String()
require.Contains(t, out, "Customer ID")
require.Contains(t, out, "License ID")
}