feat: app sharing pt.4

coder · deansheather · Oct 14, 2022 · Oct 5, 2022 · Oct 5, 2022 · Oct 5, 2022
commit a2eacaac1f0f7b7acc044f6ab2085a0f744a08c5
diff --git a/enterprise/cli/server.go b/enterprise/cli/server.go
@@ -7,6 +7,7 @@ import (
 
 	"github.com/coder/coder/cli/cliflag"
 	"github.com/coder/coder/cli/cliui"
+	"github.com/coder/coder/coderd/database"
 	"github.com/coder/coder/enterprise/coderd"
 
 	agpl "github.com/coder/coder/cli"
@@ -15,26 +16,33 @@ import (
 
 func server() *cobra.Command {
 	var (
-		auditLogging       bool
-		browserOnly        bool
-		scimAuthHeader     string
-		userWorkspaceQuota int
+		auditLogging                    bool
+		browserOnly                     bool
+		scimAuthHeader                  string
+		userWorkspaceQuota              int
+		allowedApplicationSharingLevels []string
 	)
 	cmd := agpl.Server(func(ctx context.Context, options *agplcoderd.Options) (*agplcoderd.API, error) {
+		appSharingLevels := make([]database.AppSharingLevel, len(allowedApplicationSharingLevels))
+		for i, val := range allowedApplicationSharingLevels {
+			appSharingLevels[i] = database.AppSharingLevel(val)
+		}
+
 		api, err := coderd.New(ctx, &coderd.Options{
-			AuditLogging:       auditLogging,
-			BrowserOnly:        browserOnly,
-			SCIMAPIKey:         []byte(scimAuthHeader),
-			UserWorkspaceQuota: userWorkspaceQuota,
-			Options:            options,
+			AuditLogging:                    auditLogging,
+			BrowserOnly:                     browserOnly,
+			SCIMAPIKey:                      []byte(scimAuthHeader),
+			UserWorkspaceQuota:              userWorkspaceQuota,
+			AllowedApplicationSharingLevels: appSharingLevels,
+			Options:                         options,
 		})
 		if err != nil {
 			return nil, err
 		}
 		return api.AGPL, nil
 	})
-	enterpriseOnly := cliui.Styles.Keyword.Render("This is an Enterprise feature. Contact sales@coder.com for licensing")
 
+	enterpriseOnly := cliui.Styles.Keyword.Render("This is an Enterprise feature. Contact sales@coder.com for licensing")
 	cliflag.BoolVarP(cmd.Flags(), &auditLogging, "audit-logging", "", "CODER_AUDIT_LOGGING", true,
 		"Specifies whether audit logging is enabled. "+enterpriseOnly)
 	cliflag.BoolVarP(cmd.Flags(), &browserOnly, "browser-only", "", "CODER_BROWSER_ONLY", false,
@@ -43,6 +51,8 @@ func server() *cobra.Command {
 		"Enables SCIM and sets the authentication header for the built-in SCIM server. New users are automatically created with OIDC authentication. "+enterpriseOnly)
 	cliflag.IntVarP(cmd.Flags(), &userWorkspaceQuota, "user-workspace-quota", "", "CODER_USER_WORKSPACE_QUOTA", 0,
 		"A positive number applies a limit on how many workspaces each user can create. "+enterpriseOnly)
+	cliflag.StringArrayVarP(cmd.Flags(), &allowedApplicationSharingLevels, "permitted-app-sharing-levels", "", "CODER_PERMITTED_APP_SHARING_LEVELS", []string{"owner"},
+		`Specifies the application sharing levels that are available site-wide. Available values are "owner", "template", "authenticated", "public". Multiple values can be specified, comma separated. `+enterpriseOnly)
 
 	return cmd
 }
diff --git a/provisioner/terraform/resources.go b/provisioner/terraform/resources.go
@@ -25,14 +25,14 @@ type agentAttributes struct {
 
 // A mapping of attributes on the "coder_app" resource.
 type agentAppAttributes struct {
-	AgentID      string                     `mapstructure:"agent_id"`
-	Name         string                     `mapstructure:"name"`
-	Icon         string                     `mapstructure:"icon"`
-	URL          string                     `mapstructure:"url"`
-	Command      string                     `mapstructure:"command"`
-	SharingLevel string                     `mapstructure:"share_level"`
-	Subdomain    bool                       `mapstructure:"subdomain"`
-	Healthcheck  []appHealthcheckAttributes `mapstructure:"healthcheck"`
+	AgentID     string                     `mapstructure:"agent_id"`
+	Name        string                     `mapstructure:"name"`
+	Icon        string                     `mapstructure:"icon"`
+	URL         string                     `mapstructure:"url"`
+	Command     string                     `mapstructure:"command"`
+	Share       string                     `mapstructure:"share"`
+	Subdomain   bool                       `mapstructure:"subdomain"`
+	Healthcheck []appHealthcheckAttributes `mapstructure:"healthcheck"`
 }
 
 // A mapping of attributes on the "healthcheck" resource.
@@ -236,19 +236,32 @@ func ConvertResources(module *tfjson.StateModule, rawGraph string) ([]*proto.Res
 			}
 		}
 
+		sharingLevel := proto.AppSharingLevel_OWNER
+		switch strings.ToLower(attrs.Share) {
+		case "owner":
+			sharingLevel = proto.AppSharingLevel_OWNER
+		case "template":
+			sharingLevel = proto.AppSharingLevel_TEMPLATE
+		case "authenticated":
+			sharingLevel = proto.AppSharingLevel_AUTHENTICATED
+		case "public":
+			sharingLevel = proto.AppSharingLevel_PUBLIC
+		}
+
 		for _, agents := range resourceAgents {
 			for _, agent := range agents {
 				// Find agents with the matching ID and associate them!
 				if agent.Id != attrs.AgentID {
 					continue
 				}
 				agent.Apps = append(agent.Apps, &proto.App{
-					Name:        attrs.Name,
-					Command:     attrs.Command,
-					Url:         attrs.URL,
-					Icon:        attrs.Icon,
-					Subdomain:   attrs.Subdomain,
-					Healthcheck: healthcheck,
+					Name:         attrs.Name,
+					Command:      attrs.Command,
+					Url:          attrs.URL,
+					Icon:         attrs.Icon,
+					Subdomain:    attrs.Subdomain,
+					SharingLevel: sharingLevel,
+					Healthcheck:  healthcheck,
 				})
 			}
 		}