Add provisioner tags to template push and create

coder · kylecarbs · Nov 16, 2022 · Oct 25, 2022 · Nov 7, 2022 · Nov 7, 2022
commit 200e6528ea24ff135a0807ef8efefa9b78c8287e
diff --git a/cli/templatecreate.go b/cli/templatecreate.go
@@ -27,6 +27,7 @@ func templateCreate() *cobra.Command {
 		directory            string
 		provisioner          string
 		parameterFile        string
+		provisionerTags      []string
 		maxTTL               time.Duration
 		minAutostartInterval time.Duration
 	)
@@ -88,12 +89,18 @@ func templateCreate() *cobra.Command {
 			}
 			spin.Stop()
 
+			tags, err := ParseProvisionerTags(provisionerTags)
+			if err != nil {
+				return err
+			}
+
 			job, _, err := createValidTemplateVersion(cmd, createValidTemplateVersionArgs{
-				Client:        client,
-				Organization:  organization,
-				Provisioner:   database.ProvisionerType(provisioner),
-				FileID:        resp.ID,
-				ParameterFile: parameterFile,
+				Client:          client,
+				Organization:    organization,
+				Provisioner:     database.ProvisionerType(provisioner),
+				FileID:          resp.ID,
+				ParameterFile:   parameterFile,
+				ProvisionerTags: tags,
 			})
 			if err != nil {
 				return err
@@ -135,6 +142,7 @@ func templateCreate() *cobra.Command {
 	cmd.Flags().StringVarP(&parameterFile, "parameter-file", "", "", "Specify a file path with parameter values.")
 	cmd.Flags().DurationVarP(&maxTTL, "max-ttl", "", 24*time.Hour, "Specify a maximum TTL for workspaces created from this template.")
 	cmd.Flags().DurationVarP(&minAutostartInterval, "min-autostart-interval", "", time.Hour, "Specify a minimum autostart interval for workspaces created from this template.")
+	cmd.Flags().StringArrayVarP(&provisionerTags, "provisioner-tag", "", []string{}, "Specify a set of tags to target provisioner daemons.")
 	// This is for testing!
 	err := cmd.Flags().MarkHidden("test.provisioner")
 	if err != nil {
@@ -157,6 +165,7 @@ type createValidTemplateVersionArgs struct {
 	// before prompting the user. Set to false to always prompt for param
 	// values.
 	ReuseParameters bool
+	ProvisionerTags map[string]string
 }
 
 func createValidTemplateVersion(cmd *cobra.Command, args createValidTemplateVersionArgs, parameters ...codersdk.CreateParameterRequest) (*codersdk.TemplateVersion, []codersdk.CreateParameterRequest, error) {
@@ -168,6 +177,7 @@ func createValidTemplateVersion(cmd *cobra.Command, args createValidTemplateVers
 		FileID:          args.FileID,
 		Provisioner:     codersdk.ProvisionerType(args.Provisioner),
 		ParameterValues: parameters,
+		ProvisionerTags: args.ProvisionerTags,
 	}
 	if args.Template != nil {
 		req.TemplateID = args.Template.ID
@@ -337,3 +347,15 @@ func prettyDirectoryPath(dir string) string {
 	}
 	return pretty
 }
+
+func ParseProvisionerTags(rawTags []string) (map[string]string, error) {
+	tags := map[string]string{}
+	for _, rawTag := range rawTags {
+		parts := strings.SplitN(rawTag, "=", 2)
+		if len(parts) < 2 {
+			return nil, xerrors.Errorf("invalid tag format for %q. must be key=value", rawTag)
+		}
+		tags[parts[0]] = parts[1]
+	}
+	return tags, nil
+}
diff --git a/cli/templatepush.go b/cli/templatepush.go
@@ -18,11 +18,12 @@ import (
 
 func templatePush() *cobra.Command {
 	var (
-		directory     string
-		versionName   string
-		provisioner   string
-		parameterFile string
-		alwaysPrompt  bool
+		directory       string
+		versionName     string
+		provisioner     string
+		parameterFile   string
+		alwaysPrompt    bool
+		provisionerTags []string
 	)
 
 	cmd := &cobra.Command{
@@ -75,6 +76,11 @@ func templatePush() *cobra.Command {
 			}
 			spin.Stop()
 
+			tags, err := ParseProvisionerTags(provisionerTags)
+			if err != nil {
+				return err
+			}
+
 			job, _, err := createValidTemplateVersion(cmd, createValidTemplateVersionArgs{
 				Name:            versionName,
 				Client:          client,
@@ -84,6 +90,7 @@ func templatePush() *cobra.Command {
 				ParameterFile:   parameterFile,
 				Template:        &template,
 				ReuseParameters: !alwaysPrompt,
+				ProvisionerTags: tags,
 			})
 			if err != nil {
 				return err

diff --git a/coderd/database/dbtype/dbtype.go b/coderd/database/dbtype/dbtype.go
@@ -9,13 +9,13 @@ import (
 
 type Map map[string]string
 
-func (m Map) Scan(src interface{}) error {
+func (m *Map) Scan(src interface{}) error {
 	if src == nil {
 		return nil
 	}
 	switch src := src.(type) {
 	case []byte:
-		err := json.Unmarshal(src, &m)
+		err := json.Unmarshal(src, m)
 		if err != nil {
 			return err
 		}

diff --git a/enterprise/cli/provisionerdaemons.go b/enterprise/cli/provisionerdaemons.go
@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"os"
 	"os/signal"
-	"strings"
 	"time"
 
 	"cdr.dev/slog"
@@ -60,13 +59,9 @@ func provisionerDaemonStart() *cobra.Command {
 				return xerrors.Errorf("get current organization: %w", err)
 			}
 
-			tags := map[string]string{}
-			for _, rawTag := range rawTags {
-				parts := strings.SplitN(rawTag, "=", 2)
-				if len(parts) < 2 {
-					return xerrors.Errorf("invalid tag format for %q. must be key=value", rawTag)
-				}
-				tags[parts[0]] = parts[1]
+			tags, err := agpl.ParseProvisionerTags(rawTags)
+			if err != nil {
+				return err
 			}
 
 			err = os.MkdirAll(cacheDir, 0o700)
@@ -106,6 +101,8 @@ func provisionerDaemonStart() *cobra.Command {
 				return err
 			}
 
+			logger.Info(ctx, "starting provisioner daemon", slog.F("tags", tags))
+
 			provisioners := provisionerd.Provisioners{
 				string(database.ProvisionerTypeTerraform): proto.NewDRPCProvisionerClient(provisionersdk.Conn(terraformClient)),
 			}

diff --git a/enterprise/coderd/coderd.go b/enterprise/coderd/coderd.go
@@ -227,13 +227,14 @@ func (api *API) updateEntitlements(ctx context.Context) error {
 	defer api.entitlementsMu.Unlock()
 
 	entitlements, err := license.Entitlements(ctx, api.Database, api.Logger, len(api.replicaManager.All()), len(api.GitAuthConfigs), api.Keys, map[string]bool{
-		codersdk.FeatureAuditLog:         api.AuditLogging,
-		codersdk.FeatureBrowserOnly:      api.BrowserOnly,
-		codersdk.FeatureSCIM:             len(api.SCIMAPIKey) != 0,
-		codersdk.FeatureWorkspaceQuota:   api.UserWorkspaceQuota != 0,
-		codersdk.FeatureHighAvailability: api.DERPServerRelayAddress != "",
-		codersdk.FeatureMultipleGitAuth:  len(api.GitAuthConfigs) > 1,
-		codersdk.FeatureTemplateRBAC:     api.RBAC,
+		codersdk.FeatureAuditLog:                   api.AuditLogging,
+		codersdk.FeatureBrowserOnly:                api.BrowserOnly,
+		codersdk.FeatureSCIM:                       len(api.SCIMAPIKey) != 0,
+		codersdk.FeatureWorkspaceQuota:             api.UserWorkspaceQuota != 0,
+		codersdk.FeatureHighAvailability:           api.DERPServerRelayAddress != "",
+		codersdk.FeatureMultipleGitAuth:            len(api.GitAuthConfigs) > 1,
+		codersdk.FeatureTemplateRBAC:               api.RBAC,
+		codersdk.FeatureExternalProvisionerDaemons: true,
 	})
 	if err != nil {
 		return err

diff --git a/enterprise/coderd/provisionerdaemons.go b/enterprise/coderd/provisionerdaemons.go
@@ -75,13 +75,15 @@ func (api *API) provisionerDaemons(rw http.ResponseWriter, r *http.Request) {
 		})
 		return
 	}
-
-	httpapi.Write(ctx, rw, http.StatusOK, daemons)
+	apiDaemons := make([]codersdk.ProvisionerDaemon, 0)
+	for _, daemon := range daemons {
+		apiDaemons = append(apiDaemons, convertProvisionerDaemon(daemon))
+	}
+	httpapi.Write(ctx, rw, http.StatusOK, apiDaemons)
 }
 
 // Serves the provisioner daemon protobuf API over a WebSocket.
 func (api *API) provisionerDaemonServe(rw http.ResponseWriter, r *http.Request) {
-
 	tags := map[string]string{}
 	if r.URL.Query().Has("tag") {
 		for _, tag := range r.URL.Query()["tag"] {
@@ -102,13 +104,13 @@ func (api *API) provisionerDaemonServe(rw http.ResponseWriter, r *http.Request)
 		return
 	}
 
-	provisioners := map[codersdk.ProvisionerType]struct{}{}
+	provisionersMap := map[codersdk.ProvisionerType]struct{}{}
 	for _, provisioner := range r.URL.Query()["provisioner"] {
 		switch provisioner {
 		case string(codersdk.ProvisionerTypeEcho):
-			provisioners[codersdk.ProvisionerTypeEcho] = struct{}{}
+			provisionersMap[codersdk.ProvisionerTypeEcho] = struct{}{}
 		case string(codersdk.ProvisionerTypeTerraform):
-			provisioners[codersdk.ProvisionerTypeTerraform] = struct{}{}
+			provisionersMap[codersdk.ProvisionerTypeTerraform] = struct{}{}
 		default:
 			httpapi.Write(r.Context(), rw, http.StatusBadRequest, codersdk.Response{
 				Message: fmt.Sprintf("Unknown provisioner type %q", provisioner),
@@ -132,12 +134,22 @@ func (api *API) provisionerDaemonServe(rw http.ResponseWriter, r *http.Request)
 		}
 	}
 
+	provisioners := make([]database.ProvisionerType, 0)
+	for p := range provisionersMap {
+		switch p {
+		case codersdk.ProvisionerTypeTerraform:
+			provisioners = append(provisioners, database.ProvisionerTypeTerraform)
+		case codersdk.ProvisionerTypeEcho:
+			provisioners = append(provisioners, database.ProvisionerTypeEcho)
+		}
+	}
+
 	name := namesgenerator.GetRandomName(1)
 	daemon, err := api.Database.InsertProvisionerDaemon(r.Context(), database.InsertProvisionerDaemonParams{
 		ID:           uuid.New(),
 		CreatedAt:    database.Now(),
 		Name:         name,
-		Provisioners: []database.ProvisionerType{database.ProvisionerTypeEcho, database.ProvisionerTypeTerraform},
+		Provisioners: provisioners,
 		Tags:         tags,
 	})
 	if err != nil {