Add test for multiple replicas

kylecarbs · kylecarbs · commit d5555f693897 · 2022-10-13T17:53:54.000Z
diff --git a/coderd/coderd.go b/coderd/coderd.go
@@ -124,6 +124,7 @@ func New(options *Options) *API {
 	}
 	if options.DERPServer == nil {
 		options.DERPServer = derp.NewServer(key.NewNode(), tailnet.Logger(options.Logger))
+		options.DERPServer.SetMeshKey("todo-kyle-change-this")
 	}
 	if options.Auditor == nil {
 		options.Auditor = audit.NewNop()
diff --git a/enterprise/coderd/coderdenttest/coderdenttest.go b/enterprise/coderd/coderdenttest/coderdenttest.go
@@ -63,11 +63,12 @@ func NewWithAPI(t *testing.T, options *Options) (*codersdk.Client, io.Closer, *c
 	}
 	srv, cancelFunc, oop := coderdtest.NewOptions(t, options.Options)
 	coderAPI, err := coderd.New(context.Background(), &coderd.Options{
-		RBAC:                       true,
-		AuditLogging:               options.AuditLogging,
-		BrowserOnly:                options.BrowserOnly,
-		SCIMAPIKey:                 options.SCIMAPIKey,
-		DERPServerRelayAddress:     oop.AccessURL.String(),
+		RBAC:         true,
+		AuditLogging: options.AuditLogging,
+		BrowserOnly:  options.BrowserOnly,
+		SCIMAPIKey:   options.SCIMAPIKey,
+		// TODO: Kyle change this before merge!
+		DERPServerRelayAddress:     oop.AccessURL.String() + "/derp",
 		DERPServerRegionID:         1,
 		HighAvailability:           true,
 		ReplicaID:                  uuid.New(),
diff --git a/enterprise/coderd/license/license.go b/enterprise/coderd/license/license.go
@@ -153,9 +153,6 @@ func Entitlements(
 			case codersdk.EntitlementNotEntitled:
 				entitlements.Warnings = append(entitlements.Warnings,
 					fmt.Sprintf("%s is enabled but your license is not entitled to this feature.", niceName))
-				// Disable the feature and add a warning...
-				feature.Enabled = false
-				entitlements.Features[featureName] = feature
 			case codersdk.EntitlementGracePeriod:
 				entitlements.Warnings = append(entitlements.Warnings,
 					fmt.Sprintf("%s is enabled but your license for this feature is expired.", niceName))
@@ -164,6 +161,14 @@ func Entitlements(
 		}
 	}
 
+	for _, featureName := range codersdk.FeatureNames {
+		feature := entitlements.Features[featureName]
+		if feature.Entitlement == codersdk.EntitlementNotEntitled {
+			feature.Enabled = false
+			entitlements.Features[featureName] = feature
+		}
+	}
+
 	return entitlements, nil
 }
 
diff --git a/enterprise/coderd/license/license_test.go b/enterprise/coderd/license/license_test.go
@@ -31,7 +31,7 @@ func TestEntitlements(t *testing.T) {
 	t.Run("Defaults", func(t *testing.T) {
 		t.Parallel()
 		db := databasefake.New()
-		entitlements, err := license.Entitlements(context.Background(), db, slog.Logger{}, coderdenttest.Keys, map[string]bool{})
+		entitlements, err := license.Entitlements(context.Background(), db, slog.Logger{}, coderdenttest.Keys, all)
 		require.NoError(t, err)
 		require.False(t, entitlements.HasLicense)
 		require.False(t, entitlements.Trial)
diff --git a/enterprise/coderd/replicas_test.go b/enterprise/coderd/replicas_test.go
@@ -2,14 +2,16 @@ package coderd_test
 
 import (
 	"context"
-	"fmt"
 	"testing"
+	"time"
 
 	"github.com/stretchr/testify/require"
 
+	"cdr.dev/slog"
+	"cdr.dev/slog/sloggers/slogtest"
+
 	"github.com/coder/coder/coderd/coderdtest"
 	"github.com/coder/coder/coderd/database/dbtestutil"
-	"github.com/coder/coder/codersdk"
 	"github.com/coder/coder/enterprise/coderd/coderdenttest"
 )
 
@@ -18,11 +20,15 @@ func TestReplicas(t *testing.T) {
 	db, pubsub := dbtestutil.NewDB(t)
 	firstClient := coderdenttest.New(t, &coderdenttest.Options{
 		Options: &coderdtest.Options{
-			Database: db,
-			Pubsub:   pubsub,
+			IncludeProvisionerDaemon: true,
+			Database:                 db,
+			Pubsub:                   pubsub,
 		},
 	})
-	_ = coderdtest.CreateFirstUser(t, firstClient)
+	firstUser := coderdtest.CreateFirstUser(t, firstClient)
+	coderdenttest.AddLicense(t, firstClient, coderdenttest.LicenseOptions{
+		HighAvailability: true,
+	})
 
 	secondClient := coderdenttest.New(t, &coderdenttest.Options{
 		Options: &coderdtest.Options{
@@ -32,7 +38,13 @@ func TestReplicas(t *testing.T) {
 	})
 	secondClient.SessionToken = firstClient.SessionToken
 
-	user, err := secondClient.User(context.Background(), codersdk.Me)
+	agentID := setupWorkspaceAgent(t, firstClient, firstUser)
+	conn, err := secondClient.DialWorkspaceAgentTailnet(context.Background(), slogtest.Make(t, nil).Leveled(slog.LevelDebug), agentID)
 	require.NoError(t, err)
-	fmt.Printf("%+v\n", user)
+	require.Eventually(t, func() bool {
+		_, err = conn.Ping()
+		return err == nil
+	}, 10*time.Second, 250*time.Millisecond)
+
+	_ = conn.Close()
 }

Original file line number	Diff line number	Diff line change
`@@ -124,6 +124,7 @@ func New(options Options) API {`
`124`	`124`	`}`
`125`	`125`	`if options.DERPServer == nil {`
`126`	`126`	`options.DERPServer = derp.NewServer(key.NewNode(), tailnet.Logger(options.Logger))`
	`127`	`+ options.DERPServer.SetMeshKey("todo-kyle-change-this")`
`127`	`128`	`}`
`128`	`129`	`if options.Auditor == nil {`
`129`	`130`	`options.Auditor = audit.NewNop()`