Fix SQL tests

kylecarbs · kylecarbs · commit 4c17a8bbfe93 · 2023-09-21T14:35:52.000Z
diff --git a/coderd/database/querier_test.go b/coderd/database/querier_test.go
@@ -112,8 +112,9 @@ func TestInsertWorkspaceAgentLogs(t *testing.T) {
 	agent := dbgen.WorkspaceAgent(t, db, database.WorkspaceAgent{
 		ResourceID: resource.ID,
 	})
-	source := dbgen.WorkspaceAgentLogSource(t, db, database.WorkspaceAgentLogSource{})
-
+	source := dbgen.WorkspaceAgentLogSource(t, db, database.WorkspaceAgentLogSource{
+		WorkspaceAgentID: agent.ID,
+	})
 	logs, err := db.InsertWorkspaceAgentLogs(ctx, database.InsertWorkspaceAgentLogsParams{
 		AgentID:     agent.ID,
 		CreatedAt:   dbtime.Now(),
diff --git a/site/e2e/provisionerGenerated.ts b/site/e2e/provisionerGenerated.ts
@@ -104,7 +104,7 @@ export interface Agent {
   id: string;
   name: string;
   env: { [key: string]: string };
-  startupScript: string;
+  /** Field 4 was startup_script, now removed. */
   operatingSystem: string;
   architecture: string;
   directory: string;
@@ -114,13 +114,14 @@ export interface Agent {
   connectionTimeoutSeconds: number;
   troubleshootingUrl: string;
   motdFile: string;
-  /** Field 14 was bool login_before_ready = 14, now removed. */
-  startupScriptTimeoutSeconds: number;
-  shutdownScript: string;
-  shutdownScriptTimeoutSeconds: number;
+  /**
+   * Field 14 was bool login_before_ready = 14, now removed.
+   * Field 15, 16, 17 were related to scripts, which are now removed.
+   */
   metadata: Agent_Metadata[];
-  startupScriptBehavior: string;
+  /** Field 19 was startup_script_behavior, now removed. */
   displayApps: DisplayApps | undefined;
+  scripts: Script[];
 }
 
 export interface Agent_Metadata {
@@ -144,6 +145,19 @@ export interface DisplayApps {
   portForwardingHelper: boolean;
 }
 
+/** Script represents a script to be run on the workspace. */
+export interface Script {
+  displayName: string;
+  icon: string;
+  script: string;
+  cron: string;
+  startBlocksLogin: boolean;
+  runOnStart: boolean;
+  runOnStop: boolean;
+  timeoutSeconds: number;
+  logPath: string;
+}
+
 /** App represents a dev-accessible application on the workspace. */
 export interface App {
   /**
@@ -470,9 +484,6 @@ export const Agent = {
         writer.uint32(26).fork(),
       ).ldelim();
     });
-    if (message.startupScript !== "") {
-      writer.uint32(34).string(message.startupScript);
-    }
     if (message.operatingSystem !== "") {
       writer.uint32(42).string(message.operatingSystem);
     }
@@ -500,27 +511,18 @@ export const Agent = {
     if (message.motdFile !== "") {
       writer.uint32(106).string(message.motdFile);
     }
-    if (message.startupScriptTimeoutSeconds !== 0) {
-      writer.uint32(120).int32(message.startupScriptTimeoutSeconds);
-    }
-    if (message.shutdownScript !== "") {
-      writer.uint32(130).string(message.shutdownScript);
-    }
-    if (message.shutdownScriptTimeoutSeconds !== 0) {
-      writer.uint32(136).int32(message.shutdownScriptTimeoutSeconds);
-    }
     for (const v of message.metadata) {
       Agent_Metadata.encode(v!, writer.uint32(146).fork()).ldelim();
     }
-    if (message.startupScriptBehavior !== "") {
-      writer.uint32(154).string(message.startupScriptBehavior);
-    }
     if (message.displayApps !== undefined) {
       DisplayApps.encode(
         message.displayApps,
         writer.uint32(162).fork(),
       ).ldelim();
     }
+    for (const v of message.scripts) {
+      Script.encode(v!, writer.uint32(170).fork()).ldelim();
+    }
     return writer;
   },
 };
@@ -588,6 +590,42 @@ export const DisplayApps = {
   },
 };
 
+export const Script = {
+  encode(
+    message: Script,
+    writer: _m0.Writer = _m0.Writer.create(),
+  ): _m0.Writer {
+    if (message.displayName !== "") {
+      writer.uint32(10).string(message.displayName);
+    }
+    if (message.icon !== "") {
+      writer.uint32(18).string(message.icon);
+    }
+    if (message.script !== "") {
+      writer.uint32(26).string(message.script);
+    }
+    if (message.cron !== "") {
+      writer.uint32(34).string(message.cron);
+    }
+    if (message.startBlocksLogin === true) {
+      writer.uint32(40).bool(message.startBlocksLogin);
+    }
+    if (message.runOnStart === true) {
+      writer.uint32(48).bool(message.runOnStart);
+    }
+    if (message.runOnStop === true) {
+      writer.uint32(56).bool(message.runOnStop);
+    }
+    if (message.timeoutSeconds !== 0) {
+      writer.uint32(64).int32(message.timeoutSeconds);
+    }
+    if (message.logPath !== "") {
+      writer.uint32(74).string(message.logPath);
+    }
+    return writer;
+  },
+};
+
 export const App = {
   encode(message: App, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.slug !== "") {
