e2e: plumb http server flags

Signed-off-by: Jimmy Zelinskie <jimmy@zelinskie.com>

e2e/newenemy/newenemy_test.go

@@ -85,6 +85,7 @@ func TestNoNewEnemy(t *testing.T) {
 	protectedSpiceDb := spice.NewClusterFromCockroachCluster(crdb,
 		spice.WithGrpcPort(50061),
 		spice.WithInternalPort(50062),
+		spice.WithHttpPort(8444),
 		spice.WithMetricsPort(9100),
 		spice.WithDashboardPort(8100),
 		spice.WithDbName(dbName))

e2e/spice/spicedb.go

@@ -26,6 +26,7 @@ type Node struct {
 	DbName        string
 	URI           string
 	GrpcPort      int
+	HttpPort      int
 	InternalPort  int
 	MetricsPort   int
 	DashboardPort int
@@ -46,6 +47,9 @@ func WithTestDefaults(opts ...SpiceDbOption) SpiceDbOption {
 		if s.InternalPort == 0 {
 			s.InternalPort = 50052
 		}
+		if s.HttpPort == 0 {
+			s.HttpPort = 443
+		}
 		if s.MetricsPort == 0 {
 			s.MetricsPort = 9090
 		}
@@ -74,9 +78,11 @@ func (s *Node) Start(ctx context.Context, logprefix string, args ...string) erro
 		"--log-level=debug",
 		"--grpc-preshared-key=" + s.PresharedKey,
 		"--grpc-no-tls",
+		"--http-no-tls",
 		"--datastore-engine=" + s.Datastore,
 		"--datastore-conn-uri=" + s.URI,
 		fmt.Sprintf("--grpc-addr=:%d", s.GrpcPort),
+		fmt.Sprintf("--http-addr=:%d", s.HttpPort),
 		fmt.Sprintf("--internal-grpc-addr=:%d", s.InternalPort),
 		fmt.Sprintf("--metrics-addr=:%d", s.MetricsPort),
 		fmt.Sprintf("--dashboard-addr=:%d", s.DashboardPort),
@@ -142,6 +148,7 @@ func NewClusterFromCockroachCluster(c cockroach.Cluster, opts ...SpiceDbOption)
 			URI:           c[i].ConnectionString(proto.DbName),
 			GrpcPort:      proto.GrpcPort + 2*i,
 			InternalPort:  proto.InternalPort + 2*i,
+			HttpPort:      proto.HttpPort + 2*i,
 			MetricsPort:   proto.MetricsPort + i,
 			DashboardPort: proto.DashboardPort + i,
 		})