Add provisioner daemons

kylecarbs · kylecarbs · commit 5255b133356a · 2022-11-15T01:40:06.000Z
diff --git a/enterprise/cli/provisionerdaemons.go b/enterprise/cli/provisionerdaemons.go
@@ -0,0 +1 @@
+package cli
diff --git a/enterprise/coderd/provisionerdaemons.go b/enterprise/coderd/provisionerdaemons.go
@@ -107,7 +107,7 @@ func (api *API) provisionerDaemonServe(rw http.ResponseWriter, r *http.Request)
 
 	if tags[provisionerdserver.TagScope] == provisionerdserver.ScopeOrganization {
 		if !api.AGPL.Authorize(r, rbac.ActionCreate, rbac.ResourceProvisionerDaemon) {
-			httpapi.Write(r.Context(), rw, http.StatusUnauthorized, codersdk.Response{
+			httpapi.Write(r.Context(), rw, http.StatusForbidden, codersdk.Response{
 				Message: "You aren't allowed to create provisioner daemons for the organization.",
 			})
 			return
@@ -130,6 +130,8 @@ func (api *API) provisionerDaemonServe(rw http.ResponseWriter, r *http.Request)
 		return
 	}
 
+	fmt.Printf("TAGS %+v\n", daemon.Tags)
+
 	rawTags, err := json.Marshal(daemon.Tags)
 	if err != nil {
 		httpapi.Write(r.Context(), rw, http.StatusInternalServerError, codersdk.Response{
diff --git a/enterprise/coderd/provisionerdaemons_test.go b/enterprise/coderd/provisionerdaemons_test.go
@@ -2,18 +2,26 @@ package coderd_test
 
 import (
 	"context"
+	"net/http"
 	"testing"
+	"time"
 
+	"github.com/google/uuid"
 	"github.com/stretchr/testify/require"
 
 	"github.com/coder/coder/coderd/coderdtest"
+	"github.com/coder/coder/coderd/provisionerdserver"
 	"github.com/coder/coder/codersdk"
 	"github.com/coder/coder/enterprise/coderd/coderdenttest"
+	"github.com/coder/coder/provisioner/echo"
+	"github.com/coder/coder/provisionerd"
+	provisionerdproto "github.com/coder/coder/provisionerd/proto"
+	"github.com/coder/coder/provisionersdk/proto"
 )
 
 func TestProvisionerDaemonServe(t *testing.T) {
 	t.Parallel()
-	t.Run("Serve", func(t *testing.T) {
+	t.Run("Organization", func(t *testing.T) {
 		t.Parallel()
 		client := coderdenttest.New(t, nil)
 		user := coderdtest.CreateFirstUser(t, client)
@@ -23,6 +31,89 @@ func TestProvisionerDaemonServe(t *testing.T) {
 		require.NoError(t, err)
 		srv.DRPCConn().Close()
 	})
+
+	t.Run("OrganizationNoPerms", func(t *testing.T) {
+		t.Parallel()
+		client := coderdenttest.New(t, nil)
+		user := coderdtest.CreateFirstUser(t, client)
+		another := coderdtest.CreateAnotherUser(t, client, user.OrganizationID)
+		_, err := another.ServeProvisionerDaemon(context.Background(), user.OrganizationID, []codersdk.ProvisionerType{
+			codersdk.ProvisionerTypeEcho,
+		}, map[string]string{
+			provisionerdserver.TagScope: provisionerdserver.ScopeOrganization,
+		})
+		require.Error(t, err)
+		var apiError *codersdk.Error
+		require.ErrorAs(t, err, &apiError)
+		require.Equal(t, http.StatusForbidden, apiError.StatusCode())
+	})
+
+	t.Run("UserLocal", func(t *testing.T) {
+		t.Parallel()
+		client := coderdenttest.New(t, nil)
+		user := coderdtest.CreateFirstUser(t, client)
+		srv := provisionerd.New(func(ctx context.Context) (provisionerdproto.DRPCProvisionerDaemonClient, error) {
+			return client.ServeProvisionerDaemon(context.Background(), user.OrganizationID, []codersdk.ProvisionerType{
+				codersdk.ProvisionerTypeEcho,
+			}, map[string]string{
+				provisionerdserver.TagScope: provisionerdserver.ScopeUser,
+			})
+		}, nil)
+		defer srv.Close()
+
+		authToken := uuid.NewString()
+		data, err := echo.Tar(&echo.Responses{
+			Parse: echo.ParseComplete,
+			ProvisionDryRun: []*proto.Provision_Response{{
+				Type: &proto.Provision_Response_Complete{
+					Complete: &proto.Provision_Complete{
+						Resources: []*proto.Resource{{
+							Name: "example",
+							Type: "aws_instance",
+							Agents: []*proto.Agent{{
+								Id:   uuid.NewString(),
+								Name: "example",
+							}},
+						}},
+					},
+				},
+			}},
+			Provision: []*proto.Provision_Response{{
+				Type: &proto.Provision_Response_Complete{
+					Complete: &proto.Provision_Complete{
+						Resources: []*proto.Resource{{
+							Name: "example",
+							Type: "aws_instance",
+							Agents: []*proto.Agent{{
+								Id:   uuid.NewString(),
+								Name: "example",
+								Auth: &proto.Agent_Token{
+									Token: authToken,
+								},
+							}},
+						}},
+					},
+				},
+			}},
+		})
+		require.NoError(t, err)
+		file, err := client.Upload(context.Background(), codersdk.ContentTypeTar, data)
+		require.NoError(t, err)
+
+		_, err = client.CreateTemplateVersion(context.Background(), user.OrganizationID, codersdk.CreateTemplateVersionRequest{
+			Name:          "example",
+			StorageMethod: codersdk.ProvisionerStorageMethodFile,
+			FileID:        file.ID,
+			Provisioner:   codersdk.ProvisionerTypeEcho,
+			ProvisionerTags: map[string]string{
+				provisionerdserver.TagScope: provisionerdserver.ScopeUser,
+			},
+		})
+		require.NoError(t, err)
+		// coderdtest.AwaitTemplateVersionJob(t, client, version.ID)
+
+		time.Sleep(time.Second)
+	})
 }
 
 func TestPostProvisionerDaemon(t *testing.T) {
diff --git a/provisionerd/provisionerd.go b/provisionerd/provisionerd.go
@@ -58,6 +58,9 @@ type Options struct {
 
 // New creates and starts a provisioner daemon.
 func New(clientDialer Dialer, opts *Options) *Server {
+	if opts == nil {
+		opts = &Options{}
+	}
 	if opts.PollInterval == 0 {
 		opts.PollInterval = 5 * time.Second
 	}

Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,9 @@ type Options struct {`
`58`	`58`
`59`	`59`	`// New creates and starts a provisioner daemon.`
`60`	`60`	`func New(clientDialer Dialer, opts Options) Server {`
	`61`	`+ if opts == nil {`
	`62`	`+ opts = &Options{}`
	`63`	`+ }`
`61`	`64`	`if opts.PollInterval == 0 {`
`62`	`65`	`opts.PollInterval = 5 * time.Second`
`63`	`66`	`}`