wip

leg100 · Nov 5, 2024 · a744870 · a744870
1 parent 4f43358
commit a744870
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 30 deletions.
diff --git a/internal/http/html/static/templates/content/workspace_edit.tmpl b/internal/http/html/static/templates/content/workspace_edit.tmpl
@@ -58,7 +58,7 @@
         <div class="col-start-2 hidden peer-checked:flex flex-col mt-2 bg-gray-100 p-2 gap-2">
           <div class="flex items-center gap-2">
             <label class="text-md" for="agent-pool-id">Agent pool</label>
-            <div hx-get="{{ poolsWorkspacePath .Workspace.ID }}?agent_pool_id={{ default "" .Workspace.AgentPoolID.String }}" hx-trigger="load" hx-swap="innerHTML"></div>
+            <div hx-get="{{ poolsWorkspacePath .Workspace.ID }}?agent_pool_id={{ default "" .Workspace.AgentPoolID }}" hx-trigger="load" hx-swap="innerHTML"></div>
           </div>
           <span class="description">Select an agent pool. If no pools are listed then you either need to create a pool or you need to configure at least one pool to grant access to your workspace. Manage agent pools <a id="agent-pools-link" class="underline" href="{{ agentPoolsPath .Workspace.Organization }}">here</a>.</span>
         </div>

diff --git a/internal/runner/job_test.go b/internal/runner/job_test.go
@@ -6,34 +6,6 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
-func Test_jobSpecFromString(t *testing.T) {
-	tests := []struct {
-		spec    string
-		want    JobSpec
-		wantErr error
-	}{
-		{
-			spec: "run-grDQCjrQne1EUIGW/plan",
-			want: JobSpec{RunID: resource.ParseID("run-grDQCjrQne1EUIGW", Phase: "plan")},
-		},
-		{
-			spec:    "grDQCjrQne1EUIGW/plan",
-			wantErr: ErrMalformedJobSpecString,
-		},
-		{
-			spec:    "run-grDQCjrQne1EUIGW",
-			wantErr: ErrMalformedJobSpecString,
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.spec, func(t *testing.T) {
-			got, err := jobSpecFromString(tt.spec)
-			assert.Equal(t, tt.wantErr, err)
-			assert.Equal(t, tt.want, got)
-		})
-	}
-}
-
 func TestJob_updateStatus(t *testing.T) {
 	tests := []struct {
 		name string

diff --git a/internal/runner/web.go b/internal/runner/web.go
@@ -324,7 +324,7 @@ func (h *webHandlers) deleteAgentPool(w http.ResponseWriter, r *http.Request) {
 func (h *webHandlers) listAllowedPools(w http.ResponseWriter, r *http.Request) {
 	var opts struct {
 		WorkspaceID resource.ID `schema:"workspace_id,required"`
-		AgentPoolID resource.ID `schema:"agent_pool_id,required"`
+		AgentPoolID resource.ID `schema:"agent_pool_id"`
 	}
 	if err := decode.All(&opts, r); err != nil {
 		h.Error(w, err.Error(), http.StatusUnprocessableEntity)