feat(licenses): show license_expires time as rfc3339 date

rodrimaia · rodrimaia · commit ac2083bdf1cd · 2023-05-25T20:52:38.000Z
diff --git a/enterprise/cli/licenses.go b/enterprise/cli/licenses.go
@@ -8,6 +8,7 @@ import (
 	"regexp"
 	"strconv"
 	"strings"
+	"time"
 
 	"golang.org/x/xerrors"
 
@@ -154,6 +155,10 @@ func (r *RootCmd) licensesList() *clibase.Cmd {
 				licenses = make([]codersdk.License, 0)
 			}
 
+			for _, license := range licenses {
+				convertLicenseExpireTime(license)
+			}
+
 			enc := json.NewEncoder(inv.Stdout)
 			enc.SetIndent("", "  ")
 			return enc.Encode(licenses)
@@ -187,3 +192,20 @@ func (r *RootCmd) licenseDelete() *clibase.Cmd {
 	}
 	return cmd
 }
+
+func convertLicenseExpireTime(license codersdk.License) codersdk.License {
+	if license.Claims["license_expires"] != nil {
+		value, ok := license.Claims["license_expires"].(json.Number)
+		if !ok {
+			return license
+		}
+		int64Value, err := value.Int64()
+		if err != nil {
+			return license
+		}
+		t := time.Unix(int64Value, 0)
+		rfc3339Format := t.Format(time.RFC3339)
+		license.Claims["license_expires"] = rfc3339Format
+	}
+	return license
+}
diff --git a/enterprise/cli/licenses_test.go b/enterprise/cli/licenses_test.go
@@ -158,6 +158,8 @@ func TestLicensesListFake(t *testing.T) {
 		assert.Equal(t, "claim1", licenses[0].Claims["h1"])
 		assert.Equal(t, int32(5), licenses[1].ID)
 		assert.Equal(t, "claim2", licenses[1].Claims["h2"])
+		assert.Equal(t, "2024-04-06T16:53:35Z", licenses[0].Claims["license_expires"])
+		assert.Equal(t, "anyvalue", licenses[1].Claims["license_expires"]) // keep value if not a time
 	})
 }
 
@@ -294,7 +296,8 @@ func (s *fakeLicenseAPI) licenses(rw http.ResponseWriter, _ *http.Request) {
 			ID:         1,
 			UploadedAt: time.Now(),
 			Claims: map[string]interface{}{
-				"h1": "claim1",
+				"license_expires": 1712422415,
+				"h1":              "claim1",
 				"features": map[string]int64{
 					"f1": 1,
 					"f2": 2,
@@ -305,7 +308,8 @@ func (s *fakeLicenseAPI) licenses(rw http.ResponseWriter, _ *http.Request) {
 			ID:         5,
 			UploadedAt: time.Now(),
 			Claims: map[string]interface{}{
-				"h2": "claim2",
+				"license_expires": "anyvalue",
+				"h2":              "claim2",
 				"features": map[string]int64{
 					"f3": 3,
 					"f4": 4,
