From 74c375d8de7b9c6ed14e8610ef6e5b60e5211a93 Mon Sep 17 00:00:00 2001
From: Mathias Fredriksson <mafredri@gmail.com>
Date: Fri, 8 Dec 2023 15:57:02 +0000
Subject: [PATCH 1/5] test(site/e2e): catch missing agent defaults in
 `fillResource`

---
 site/e2e/helpers.ts | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/site/e2e/helpers.ts b/site/e2e/helpers.ts
index 69384e7d8f28c..5a1c0b65db493 100644
--- a/site/e2e/helpers.ts
+++ b/site/e2e/helpers.ts
@@ -469,7 +469,7 @@ const createTemplateVersionTar = async (
               } as App;
             });
           }
-          return {
+          const agentResource = {
             apps: [],
             architecture: "amd64",
             connectionTimeoutSeconds: 300,
@@ -490,6 +490,16 @@ const createTemplateVersionTar = async (
             token: randomUUID(),
             ...agent,
           } as Agent;
+
+          try {
+            Agent.encode(agentResource);
+          } catch (e) {
+            throw new Error(
+              "agentResource encode failed, missing defaults? " + e,
+            );
+          }
+
+          return agentResource;
         },
       );
     }

From 67a6c1551a319a6e30d3f6ddce5422909cb38ec1 Mon Sep 17 00:00:00 2001
From: Mathias Fredriksson <mafredri@gmail.com>
Date: Mon, 11 Dec 2023 10:49:15 +0000
Subject: [PATCH 2/5] include the original stack

---
 site/e2e/helpers.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/e2e/helpers.ts b/site/e2e/helpers.ts
index 5a1c0b65db493..368991b701185 100644
--- a/site/e2e/helpers.ts
+++ b/site/e2e/helpers.ts
@@ -495,7 +495,7 @@ const createTemplateVersionTar = async (
             Agent.encode(agentResource);
           } catch (e) {
             throw new Error(
-              "agentResource encode failed, missing defaults? " + e,
+              `agentResource encode failed, missing defaults?\n${e}\n${e.stack}`,
             );
           }
 

From 99cb8963012cd98903a60d625acc3d8713d96663 Mon Sep 17 00:00:00 2001
From: Mathias Fredriksson <mafredri@gmail.com>
Date: Mon, 11 Dec 2023 10:49:54 +0000
Subject: [PATCH 3/5] throw error in ci

---
 site/e2e/helpers.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/site/e2e/helpers.ts b/site/e2e/helpers.ts
index 368991b701185..d402c1fbb24d7 100644
--- a/site/e2e/helpers.ts
+++ b/site/e2e/helpers.ts
@@ -477,7 +477,6 @@ const createTemplateVersionTar = async (
             env: {},
             id: randomUUID(),
             metadata: [],
-            scripts: [],
             motdFile: "",
             name: "dev",
             operatingSystem: "linux",

From 54607626e0c004bde5dcd4b7c3e0f818b9d9808f Mon Sep 17 00:00:00 2001
From: Mathias Fredriksson <mafredri@gmail.com>
Date: Mon, 11 Dec 2023 13:58:14 +0000
Subject: [PATCH 4/5] check instanceof

---
 site/e2e/helpers.ts | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/site/e2e/helpers.ts b/site/e2e/helpers.ts
index d402c1fbb24d7..11abb5627d200 100644
--- a/site/e2e/helpers.ts
+++ b/site/e2e/helpers.ts
@@ -493,9 +493,11 @@ const createTemplateVersionTar = async (
           try {
             Agent.encode(agentResource);
           } catch (e) {
-            throw new Error(
-              `agentResource encode failed, missing defaults?\n${e}\n${e.stack}`,
-            );
+            let m = `agentResource encode failed, missing defaults?\n${e}`;
+            if (e instanceof Error) {
+              m += `\n${e.stack}`;
+            }
+            throw new Error(m);
           }
 
           return agentResource;

From 7ca47514613084a22e23ffa501cac1f9018d921f Mon Sep 17 00:00:00 2001
From: Mathias Fredriksson <mafredri@gmail.com>
Date: Mon, 11 Dec 2023 16:42:14 +0000
Subject: [PATCH 5/5] remove double name/message from output

---
 site/e2e/helpers.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/site/e2e/helpers.ts b/site/e2e/helpers.ts
index 11abb5627d200..175733458ebce 100644
--- a/site/e2e/helpers.ts
+++ b/site/e2e/helpers.ts
@@ -493,9 +493,14 @@ const createTemplateVersionTar = async (
           try {
             Agent.encode(agentResource);
           } catch (e) {
-            let m = `agentResource encode failed, missing defaults?\n${e}`;
+            let m = `Error: agentResource encode failed, missing defaults?`;
             if (e instanceof Error) {
+              if (!e.stack?.includes(e.message)) {
+                m += `\n${e.name}: ${e.message}`;
+              }
               m += `\n${e.stack}`;
+            } else {
+              m += `\n${e}`;
             }
             throw new Error(m);
           }