Use licenses for entitlements API

Signed-off-by: Spike Curtis <spike@coder.com>
coder · spikecurtis · Aug 29, 2022 · Aug 26, 2022 · Aug 26, 2022 · Aug 26, 2022
commit 8c52b2ada656f5eababcb4878536b8eb8d18ba6f
diff --git a/cli/features.go b/cli/features.go
@@ -1,6 +1,7 @@
 package cli
 
 import (
+	"bytes"
 	"encoding/json"
 	"fmt"
 	"strings"
@@ -53,12 +54,14 @@ func featuresList() *cobra.Command {
 					return xerrors.Errorf("render table: %w", err)
 				}
 			case "json":
-				outBytes, err := json.Marshal(entitlements)
+				buf := new(bytes.Buffer)
+				enc := json.NewEncoder(buf)
+				enc.SetIndent("", "  ")
+				err = enc.Encode(entitlements)
 				if err != nil {
 					return xerrors.Errorf("marshal features to JSON: %w", err)
 				}
-
-				out = string(outBytes)
+				out = buf.String()
 			default:
 				return xerrors.Errorf(`unknown output format %q, only "table" and "json" are supported`, outputFormat)
 			}

diff --git a/coderd/coderd.go b/coderd/coderd.go
@@ -68,6 +68,7 @@ type Options struct {
 	TracerProvider       *sdktrace.TracerProvider
 	AutoImportTemplates  []AutoImportTemplate
 	LicenseHandler       http.Handler
+	FeaturesService      FeaturesService
 }
 
 // New constructs a Coder API handler.
@@ -97,6 +98,9 @@ func New(options *Options) *API {
 	if options.LicenseHandler == nil {
 		options.LicenseHandler = licenses()
 	}
+	if options.FeaturesService == nil {
+		options.FeaturesService = featuresService{}
+	}
 
 	siteCacheDir := options.CacheDir
 	if siteCacheDir != "" {
@@ -404,7 +408,7 @@ func New(options *Options) *API {
 		})
 		r.Route("/entitlements", func(r chi.Router) {
 			r.Use(apiKeyMiddleware)
-			r.Get("/", entitlements)
+			r.Get("/", api.FeaturesService.EntitlementsAPI)
 		})
 		r.Route("/licenses", func(r chi.Router) {
 			r.Use(apiKeyMiddleware)

diff --git a/coderd/database/databasefake/databasefake.go b/coderd/database/databasefake/databasefake.go
@@ -246,6 +246,19 @@ func (q *fakeQuerier) GetUserCount(_ context.Context) (int64, error) {
 	return int64(len(q.users)), nil
 }
 
+func (q *fakeQuerier) GetActiveUserCount(_ context.Co
8000
ntext) (int64, error) {
+	q.mutex.RLock()
+	defer q.mutex.RUnlock()
+
+	active := int64(0)
+	for _, u := range q.users {
+		if u.Status == database.UserStatusActive {
+			active++
+		}
+	}
+	return active, nil
+}
+
 func (q *fakeQuerier) GetUsers(_ context.Context, params database.GetUsersParams) ([]database.User, error) {
 	q.mutex.RLock()
 	defer q.mutex.RUnlock()

diff --git a/coderd/database/querier.go b/coderd/database/querier.go
diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go
diff --git a/coderd/database/queries/users.sql b/coderd/database/queries/users.sql
@@ -28,6 +28,14 @@ SELECT
 FROM
 	users;
 
+-- name: GetActiveUserCount :one
+SELECT
+	COUNT(*)
+FROM
+	users
+WHERE
+    status = 'active'::public.user_status;
+
 -- name: InsertUser :one
 INSERT INTO
 	users (

diff --git a/coderd/features.go b/coderd/features.go
@@ -7,7 +7,13 @@ import (
 	"github.com/coder/coder/codersdk"
 )
 
-func entitlements(rw http.ResponseWriter, _ *http.Request) {
+type FeaturesService interface {
+	EntitlementsAPI(w http.ResponseWriter, r *http.Request)
+}
+
+type featuresService struct{}
+
+func (featuresService) EntitlementsAPI(rw http.ResponseWriter, _ *http.Request) {
 	features := make(map[string]codersdk.Feature)
 	for _, f := range codersdk.FeatureNames {
 		features[f] = codersdk.Feature{

diff --git a/coderd/features_internal_test.go b/coderd/features_internal_test.go
@@ -18,7 +18,7 @@ func TestEntitlements(t *testing.T) {
 		t.Parallel()
 		r := httptest.NewRequest("GET", "https://example.com/api/v2/entitlements", nil)
 		rw := httptest.NewRecorder()
-		entitlements(rw, r)
+		featuresService{}.EntitlementsAPI(rw, r)
 		resp := rw.Result()
 		defer resp.Body.Close()
 		assert.Equal(t, http.StatusOK, resp.StatusCode)

diff --git a/codersdk/features.go b/codersdk/features.go
@@ -24,8 +24,8 @@ var FeatureNames = []string{FeatureUserLimit, FeatureAuditLog}
 type Feature struct {
 	Entitlement Entitlement `json:"entitlement"`
 	Enabled     bool        `json:"enabled"`
-	Limit       *int64      `json:"limit"`
-	Actual      *int64      `json:"actual"`
+	Limit       *int64      `json:"limit,omitempty"`
+	Actual      *int64      `json:"actual,omitempty"`
 }
 
 type Entitlements struct {

diff --git a/enterprise/coderd/coderd.go b/enterprise/coderd/coderd.go
@@ -1,12 +1,18 @@
 package coderd
 
 import (
+	"context"
+	"os"
+	"strings"
+
 	"golang.org/x/xerrors"
 
 	"github.com/coder/coder/coderd"
 	"github.com/coder/coder/coderd/rbac"
 )
 
+const EnvAuditLogEnable = "CODER_AUDIT_LOG_ENABLE"
+
 func NewEnterprise(options *coderd.Options) *coderd.API {
 	var eOpts = *options
 	if eOpts.Authorizer == nil {
@@ -26,5 +32,18 @@ func NewEnterprise(options *coderd.Options) *coderd.API {
 			Authorizer: eOpts.Authorizer,
 			Logger:     eOpts.Logger,
 		}).handler()
+	en := Enablements{AuditLogs: true}
+	auditLog := os.Getenv(EnvAuditLogEnable)
+	auditLog = strings.ToLower(auditLog)
+	if auditLog == "disable" || auditLog == "false" || auditLog == "0" || auditLog == "no" {
+		en.AuditLogs = false
+	}
+	eOpts.FeaturesService = newFeaturesService(
+		context.Background(),
+		eOpts.Logger,
+		eOpts.Database,
+		eOpts.Pubsub,
+		en,
+	)
 	return coderd.New(&eOpts)
 }