Skip to content

CLI: coder licensese delete #3699

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

Merged
merged 1 commit into from
Aug 26, 2022
Merged

CLI: coder licensese delete #3699

Show file tree
Hide file tree
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
30 changes: 29 additions & 1 deletion enterprise/cli/licenses.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
"io"
"os"
"regexp"
"strconv"
"strings"

"github.com/spf13/cobra"
Expand All @@ -20,13 +21,14 @@ var jwtRegexp = regexp.MustCompile(`^[A-Za-z0-9_-]+\.[A-Za-z0-9_-]+\.[A-Za-z0-9_

func licenses() *cobra.Command {
cmd := &cobra.Command{
Short: "Add, remove, and list licenses",
Short: "Add, delete, and list licenses",
Use: "licenses",
Aliases: []string{"license"},
}
cmd.AddCommand(
licenseAdd(),
licensesList(),
licenseDelete(),
)
return cmd
}
Expand Down Expand Up @@ -142,3 +144,29 @@ func licensesList() *cobra.Command {
}
return cmd
}

func licenseDelete() *cobra.Command {
cmd := &cobra.Command{
Use: "delete <id>",
Short: "Delete license by ID",
Aliases: []string{"del", "rm"},
Args: cobra.ExactArgs(1),
RunE: func(cmd *cobra.Command, args []string) error {
client, err := agpl.CreateClient(cmd)
if err != nil {
return err
}
id, err := strconv.ParseInt(args[0], 10, 32)
if err != nil {
return xerrors.Errorf("license ID must be an integer: %s", args[0])
}
err = client.DeleteLicense(cmd.Context(), int32(id))
if err != nil {
return err
}
_, _ = fmt.Fprintf(cmd.OutOrStdout(), "License with ID %d deleted\n", id)
return nil
},
}
return cmd
}
48 changes: 48 additions & 0 deletions enterprise/cli/licenses_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,48 @@ func TestLicensesListReal(t *testing.T) {
})
}

func TestLicensesDeleteFake(t *testing.T) {
t.Parallel()
// We can't check a real license into the git repo, and can't patch out the keys from here,
// so instead we have to fake the HTTP interaction.
t.Run("Mainline", func(t *testing.T) {
t.Parallel()
ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
defer cancel()
cmd := setupFakeLicenseServerTest(t, "licenses", "delete", "55")
pty := attachPty(t, cmd)
errC := make(chan error)
go func() {
errC <- cmd.ExecuteContext(ctx)
}()
require.NoError(t, <-errC)
pty.ExpectMatch("License with ID 55 deleted")
})
}

func TestLicensesDeleteReal(t *testing.T) {
t.Parallel()
t.Run("Empty", func(t *testing.T) {
t.Parallel()
client := coderdtest.New(t, &coderdtest.Options{APIBuilder: coderd.NewEnterprise})
coderdtest.CreateFirstUser(t, client)
cmd, root := clitest.NewWithSubcommands(t, cli.EnterpriseSubcommands(),
"licenses", "delete", "1")
clitest.SetupConfig(t, client, root)
ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
defer cancel()
errC := make(chan error)
go func() {
errC <- cmd.ExecuteContext(ctx)
}()
err := <-errC
var coderError *codersdk.Error
require.True(t, xerrors.As(err, &coderError))
assert.Equal(t, 404, coderError.StatusCode())
assert.Contains(t, "Unknown license ID", coderError.Message)
})
}

func setupFakeLicenseServerTest(t *testing.T, args ...string) *cobra.Command {
t.Helper()
s := httptest.NewServer(newFakeLicenseAPI(t))
Expand All @@ -217,6 +259,7 @@ func newFakeLicenseAPI(t *testing.T) http.Handler {
r.Post("/api/v2/licenses", a.postLicense)
r.Get("/api/v2/licenses", a.licenses)
r.Get("/api/v2/buildinfo", a.noop)
r.Delete("/api/v2/licenses/{id}", a.deleteLicense)
return r
}

Expand Down Expand Up @@ -282,3 +325,8 @@ func (s *fakeLicenseAPI) licenses(rw http.ResponseWriter, _ *http.Request) {
err := json.NewEncoder(rw).Encode(resp)
assert.NoError(s.t, err)
}

func (s *fakeLicenseAPI) deleteLicense(rw http.ResponseWriter, r *http.Request) {
assert.Equal(s.t, "55", chi.URLParam(r, "id"))
rw.WriteHeader(200)
}