Refactor init-script endpoint, apply review suggestions for db

kacpersaw · kacpersaw · commit 2d2dfec8e9b4 · 2025-08-06T13:45:30.000Z
diff --git a/coderd/database/dbauthz/dbauthz.go b/coderd/database/dbauthz/dbauthz.go
@@ -4707,7 +4707,7 @@ func (q *querier) UpdateTemplateVersionDescriptionByJobID(ctx context.Context, a
 }
 
 func (q *querier) UpdateTemplateVersionExternalAgentByJobID(ctx context.Context, arg database.UpdateTemplateVersionExternalAgentByJobIDParams) error {
-	// An actor is allowed to update the template version AI task flag if they are authorized to update the template.
+	// An actor is allowed to update the template version external agent flag if they are authorized to update the template.
 	tv, err := q.db.GetTemplateVersionByJobID(ctx, arg.JobID)
 	if err != nil {
 		return err
diff --git a/coderd/database/migrations/000356_external_agents.down.sql b/coderd/database/migrations/000356_external_agents.down.sql
@@ -36,7 +36,6 @@ ALTER TABLE workspace_builds DROP COLUMN has_external_agent;
 
 DROP VIEW workspace_build_with_user;
 
--- We're adding the has_external_agent column.
 CREATE VIEW workspace_build_with_user AS
 SELECT
     workspace_builds.id,
diff --git a/coderd/database/migrations/000356_external_agents.up.sql b/coderd/database/migrations/000356_external_agents.up.sql
@@ -23,7 +23,7 @@ SELECT
     template_versions.archived,
     template_versions.source_example_id,
     template_versions.has_ai_task,
-	template_versions.has_external_agent,
+    template_versions.has_external_agent,
     COALESCE(visible_users.avatar_url, '' :: text) AS created_by_avatar_url,
     COALESCE(visible_users.username, '' :: text) AS created_by_username,
     COALESCE(visible_users.name, '' :: text) AS created_by_name
@@ -66,7 +66,7 @@ SELECT
     workspace_builds.template_version_preset_id,
     workspace_builds.has_ai_task,
     workspace_builds.ai_task_sidebar_app_id,
-	workspace_builds.has_external_agent,
+    workspace_builds.has_external_agent,
     COALESCE(
         visible_users.avatar_url,
         '' :: text
diff --git a/coderd/init_script.go b/coderd/init_script.go
@@ -22,18 +22,9 @@ func (api *API) initScript(rw http.ResponseWriter, r *http.Request) {
 	os := strings.ToLower(chi.URLParam(r, "os"))
 	arch := strings.ToLower(chi.URLParam(r, "arch"))
 
-	if os != "linux" && os != "darwin" && os != "windows" {
-		rw.WriteHeader(http.StatusBadRequest)
-		return
-	}
-	if arch != "amd64" && arch != "arm64" && arch != "armv7" {
-		rw.WriteHeader(http.StatusBadRequest)
-		return
-	}
-
 	script, exists := provisionersdk.AgentScriptEnv()[fmt.Sprintf("CODER_AGENT_SCRIPT_%s_%s", os, arch)]
 	if !exists {
-		rw.WriteHeader(http.StatusNotFound)
+		rw.WriteHeader(http.StatusBadRequest)
 		return
 	}
 	script = strings.ReplaceAll(script, "${ACCESS_URL}", api.AccessURL.String()+"/")
diff --git a/coderd/init_script_test.go b/coderd/init_script_test.go
@@ -0,0 +1,31 @@
+package coderd_test
+
+import (
+	"context"
+	"fmt"
+	"testing"
+
+	"github.com/stretchr/testify/require"
+
+	"github.com/coder/coder/v2/coderd/coderdtest"
+)
+
+func TestInitScript(t *testing.T) {
+	t.Parallel()
+
+	t.Run("OK", func(t *testing.T) {
+		t.Parallel()
+		client := coderdtest.New(t, nil)
+		script, err := client.InitScript(context.Background(), "windows", "amd64")
+		require.NoError(t, err)
+		require.NotEmpty(t, script)
+	})
+
+	t.Run("BadRequest", func(t *testing.T) {
+		t.Parallel()
+		client := coderdtest.New(t, nil)
+		_, err := client.InitScript(context.Background(), "darwin", "armv7")
+		require.Error(t, err)
+		fmt.Printf("err: %+v\n", err)
+	})
+}
diff --git a/codersdk/init_script.go b/codersdk/init_script.go
@@ -0,0 +1,28 @@
+package codersdk
+
+import (
+	"context"
+	"fmt"
+	"io"
+	"net/http"
+)
+
+func (c *Client) InitScript(ctx context.Context, os, arch string) (string, error) {
+	url := fmt.Sprintf("/api/v2/init-script/%s/%s", os, arch)
+	res, err := c.Request(ctx, http.MethodGet, url, nil)
+	if err != nil {
+		return "", err
+	}
+	defer res.Body.Close()
+
+	if res.StatusCode != http.StatusOK {
+		return "", ReadBodyAsError(res)
+	}
+
+	script, err := io.ReadAll(res.Body)
+	if err != nil {
+		return "", err
+	}
+
+	return string(script), nil
+}

Original file line number	Diff line number	Diff line change
`@@ -4707,7 +4707,7 @@ func (q *querier) UpdateTemplateVersionDescriptionByJobID(ctx context.Context, a`
`4707`	`4707`	`}`
`4708`	`4708`
`4709`	`4709`	`func (q *querier) UpdateTemplateVersionExternalAgentByJobID(ctx context.Context, arg database.UpdateTemplateVersionExternalAgentByJobIDParams) error {`
`4710`		`- // An actor is allowed to update the template version AI task flag if they are authorized to update the template.`
	`4710`	`+ // An actor is allowed to update the template version external agent flag if they are authorized to update the template.`
`4711`	`4711`	`tv, err := q.db.GetTemplateVersionByJobID(ctx, arg.JobID)`
`4712`	`4712`	`if err != nil {`
`4713`	`4713`	`return err`