Remove sanitize option from license formatter

kacpersaw · kacpersaw · commit 6bfa3ffde690 · 2025-06-24T07:37:36.000Z
diff --git a/cli/cliutil/license.go b/cli/cliutil/license.go
@@ -12,14 +12,9 @@ import (
 	"github.com/coder/coder/v2/codersdk"
 )
 
-// LicenseFormatterOpts are options for the license formatter.
-type LicenseFormatterOpts struct {
-	Sanitize bool // If true, the UUID of the license will be redacted.
-}
-
 // NewLicenseFormatter returns a new license formatter.
 // The formatter will return a table and JSON output.
-func NewLicenseFormatter(opts LicenseFormatterOpts) *cliui.OutputFormatter {
+func NewLicenseFormatter() *cliui.OutputFormatter {
 	type tableLicense struct {
 		ID         int32     `table:"id,default_sort"`
 		UUID       uuid.UUID `table:"uuid" format:"uuid"`
@@ -63,11 +58,6 @@ func NewLicenseFormatter(opts LicenseFormatterOpts) *cliui.OutputFormatter {
 					// If this returns an error, a zero time is returned.
 					exp, _ := lic.ExpiresAt()
 
-					// If sanitize is true, we redact the UUID.
-					if opts.Sanitize {
-						lic.UUID = uuid.Nil
-					}
-
 					out = append(out, tableLicense{
 						ID:         lic.ID,
 						UUID:       lic.UUID,
diff --git a/cli/support.go b/cli/support.go
@@ -51,7 +51,7 @@ var supportBundleBlurb = cliui.Bold("This will collect the following information
   - Agent details (with environment variable sanitized)
   - Agent network diagnostics
   - Agent logs
-  - License status (sanitized)
+  - License status
 ` + cliui.Bold("Note: ") +
 	cliui.Wrap("While we try to sanitize sensitive data from support bundles, we cannot guarantee that they do not contain information that you or your organization may consider sensitive.\n") +
 	cliui.Bold("Please confirm that you will:\n") +
@@ -371,9 +371,7 @@ func humanizeBuildLogs(ls []codersdk.ProvisionerJobLog) string {
 }
 
 func humanizeLicenses(licenses []codersdk.License) (string, error) {
-	formatter := cliutil.NewLicenseFormatter(cliutil.LicenseFormatterOpts{
-		Sanitize: true,
-	})
+	formatter := cliutil.NewLicenseFormatter()
 
 	if len(licenses) == 0 {
 		return "No licenses found", nil
diff --git a/enterprise/cli/licenses.go b/enterprise/cli/licenses.go
@@ -136,7 +136,7 @@ func validJWT(s string) error {
 }
 
 func (r *RootCmd) licensesList() *serpent.Command {
-	formatter := cliutil.NewLicenseFormatter(cliutil.LicenseFormatterOpts{})
+	formatter := cliutil.NewLicenseFormatter()
 	client := new(codersdk.Client)
 	cmd := &serpent.Command{
 		Use:     "list",

Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,7 @@ func validJWT(s string) error {`
`136`	`136`	`}`
`137`	`137`
`138`	`138`	`func (r RootCmd) licensesList() serpent.Command {`
`139`		`- formatter := cliutil.NewLicenseFormatter(cliutil.LicenseFormatterOpts{})`
	`139`	`+ formatter := cliutil.NewLicenseFormatter()`
`140`	`140`	`client := new(codersdk.Client)`
`141`	`141`	`cmd := &serpent.Command{`
`142`	`142`	`Use: "list",`