Merge branch 'main' into startuplogs

coder · kylecarbs · Mar 23, 2023 · Feb 23, 2023 · Feb 23, 2023 · Feb 23, 2023
commit 7fed360104fdb28e5d8c6885b0ee40b1b59b7e44
diff --git a/agent/agent.go b/agent/agent.go
@@ -640,9 +640,8 @@ func (a *agent) runScript(ctx context.Context, lifecycle, script string) error {
 		return nil
 	}
 
-	a.logger.Info(ctx, "running startup script", slog.F("script", script))
-
-	fileWriter, err := a.filesystem.OpenFile(filepath.Join(a.logDir, "coder-startup-script.log"), os.O_CREATE|os.O_RDWR, 0o600)
+	a.logger.Info(ctx, "running script", slog.F("lifecycle", lifecycle), slog.F("script", script))
+	fileWriter, err := a.filesystem.OpenFile(filepath.Join(a.logDir, fmt.Sprintf("coder-%s-script.log", lifecycle)), os.O_CREATE|os.O_RDWR, 0o600)
 	if err != nil {
 		return xerrors.Errorf("open %s script log file: %w", lifecycle, err)
 	}

diff --git a/agent/agent_test.go b/agent/agent_test.go
@@ -744,7 +744,7 @@ func TestAgent_StartupScript(t *testing.T) {
 	}
 	content := "output\n"
 	//nolint:dogsled
-	_, client, _, fs := setupAgent(t, agentsdk.Metadata{
+	_, client, _, fs, _ := setupAgent(t, agentsdk.Metadata{
 		StartupScript: "echo " + content,
 	}, 0)
 	var gotContent string

diff --git a/coderd/apidoc/docs.go b/coderd/apidoc/docs.go
diff --git a/coderd/apidoc/swagger.json b/coderd/apidoc/swagger.json
diff --git a/docs/api/agents.md b/docs/api/agents.md
@@ -718,7 +718,8 @@ curl -X GET http://coder-server:8080/api/v2/workspaceagents/{workspaceagent}/log
 ```json
 [
   {
-    "name": "string",
+    "agent_id": "string",
+    "job_id": "string",
     "output": "string"
   }
 ]
@@ -737,7 +738,8 @@ Status Code **200**
 | Name           | Type   | Required | Restrictions | Description |
 | -------------- | ------ | -------- | ------------ | ----------- |
 | `[array item]` | array  | false    |              |             |
-| `» name`       | string | false    |              |             |
+| `» agent_id`   | string | false    |              |             |
+| `» job_id`     | string | false    |              |             |
 | `» output`     | string | false    |              |             |
 
 To perform this operation, you must be authenticated. [Learn more](authentication.md).

diff --git a/docs/api/schemas.md b/docs/api/schemas.md
@@ -3350,23 +3350,7 @@ Parameter represents a set value for the scope.
 | `enabled`          | boolean | false    |              |             |
 | `message`          | string  | false    |              |             |
 
-## codersdk.StartupScriptLog
-
-```json
-{
-  "name": "string",
-  "output": "string"
-}
-```
-
-### Properties
-
-| Name     | Type   | Required | Restrictions | Description |
-| -------- | ------ | -------- | ------------ | ----------- |
-| `name`   | string | false    |              |             |
-| `output` | string | false    |              |             |
-
-## codersdk.SwaggerConfig
+## codersdk.SessionCountDeploymentStats
 
 ```json
 {
@@ -3386,6 +3370,24 @@ Parameter represents a set value for the scope.
 | `ssh`              | integer | false    |              |             |
 | `vscode`           | integer | false    |              |             |
 
+## codersdk.StartupScriptLog
+
+```json
+{
+  "agent_id": "string",
+  "job_id": "string",
+  "output": "string"
+}
+```
+
+### Properties
+
+| Name       | Type   | Required | Restrictions | Description |
+| ---------- | ------ | -------- | ------------ | ----------- |
+| `agent_id` | string | false    |              |             |
+| `job_id`   | string | false    |              |             |
+| `output`   | string | false    |              |             |
+
 ## codersdk.SupportConfig
 
 ```json

diff --git a/site/src/api/api.ts b/site/src/api/api.ts
@@ -815,9 +815,14 @@ export const getStartupScriptLogs = async (
   return response.data
 }
 
-export const getDeploymentConfig =
-  async (): Promise<TypesGen.DeploymentConfig> => {
-    const response = await axios.get(`/api/v2/config/deployment`)
+export const getDeploymentValues = async (): Promise<DeploymentConfig> => {
+  const response = await axios.get(`/api/v2/deployment/config`)
+  return response.data
+}
+
+export const getDeploymentStats =
+  async (): Promise<TypesGen.DeploymentStats> => {
+    const response = await axios.get(`/api/v2/deployment/stats`)
     return response.data
   }