add endsWith expiration to date conditions

oxidecomputer · Feb 7, 2025 · 631261a · 631261a
1 parent b843d30
commit 631261a
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 13 deletions.
diff --git a/oxide-api/src/util.ts b/oxide-api/src/util.ts
@@ -45,8 +45,17 @@ export const mapObj =
     return newObj;
   };
 
+const isoDateRegex = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(\.\d{1,6})?Z$/;
+
 export const parseIfDate = (k: string | undefined, v: unknown) => {
-  if (typeof v === "string" && (k?.startsWith("time_") || k === "timestamp")) {
+  if (
+    typeof v === "string" &&
+    isoDateRegex.test(v) &&
+    (k?.startsWith("time_") ||
+      k?.endsWith("_time") ||
+      k?.endsWith("_expiration") ||
+      k === "timestamp")
+  ) {
     const d = new Date(v);
     if (isNaN(d.getTime())) return v;
     return d;

diff --git a/oxide-openapi-gen-ts/src/client/static/util.test.ts b/oxide-openapi-gen-ts/src/client/static/util.test.ts
@@ -90,17 +90,14 @@ describe("parseIfDate", () => {
     expect(parseIfDate("abc", dateStr)).toEqual(dateStr);
   });
 
-  it("parses dates if key starts with time_", () => {
-    const value = parseIfDate("time_whatever", dateStr);
-    expect(value).toBeInstanceOf(Date);
-    expect((value as Date).getTime()).toEqual(timestamp);
-  });
-
-  it("parses dates if key = 'timestamp'", () => {
-    const value = parseIfDate("timestamp", dateStr);
-    expect(value).toBeInstanceOf(Date);
-    expect((value as Date).getTime()).toEqual(timestamp);
-  });
+  it.each(["time_whatever", "auto_thing_expiration", "timestamp"])(
+    "parses dates if key is '%s'",
+    (key) => {
+      const value = parseIfDate(key, dateStr);
+      expect(value).toBeInstanceOf(Date);
+      expect((value as Date).getTime()).toEqual(timestamp);
+    }
+  );
 
   it("passes through values that fail to parse as dates", () => {
     const value = parseIfDate("time_whatever", "blah");

diff --git a/oxide-openapi-gen-ts/src/client/static/util.ts b/oxide-openapi-gen-ts/src/client/static/util.ts
@@ -45,8 +45,17 @@ export const mapObj =
     return newObj;
   };
 
+const isoDateRegex = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(\.\d{1,6})?Z$/;
+
 export const parseIfDate = (k: string | undefined, v: unknown) => {
-  if (typeof v === "string" && (k?.startsWith("time_") || k === "timestamp")) {
+  if (
+    typeof v === "string" &&
+    isoDateRegex.test(v) &&
+    (k?.startsWith("time_") ||
+      k?.endsWith("_time") ||
+      k?.endsWith("_expiration") ||
+      k === "timestamp")
+  ) {
     const d = new Date(v);
     if (isNaN(d.getTime())) return v;
     return d;