Unify HTTP servers

Author: alex-hunt-materialize

Cargo.lock

@@ -8,6 +8,7 @@ members = [
     "src/arrow-util",
     "src/audit-log",
     "src/auth",
+    "src/authenticator",
     "src/avro",
     "src/aws-secrets-controller",
     "src/aws-util",
@@ -131,6 +132,8 @@ default-members = [
     "src/alloc",
     "src/arrow-util",
     "src/audit-log",
+    "src/auth",
+    "src/authenticator",
     "src/avro",
     "src/aws-secrets-controller",
     "src/aws-util",
@@ -237,7 +240,6 @@ default-members = [
     "src/workspace-hack",
     "test/metabase/smoketest",
     "test/test-util",
-    "src/auth",
 ]
 
 exclude = [

Cargo.toml

@@ -596,6 +596,8 @@ crates_repository(
         "//:src/alloc/Cargo.toml",
         "//:src/arrow-util/Cargo.toml",
         "//:src/audit-log/Cargo.toml",
+        "//:src/auth/Cargo.toml",
+        "//:src/authenticator/Cargo.toml",
         "//:src/avro/Cargo.toml",
         "//:src/aws-secrets-controller/Cargo.toml",
         "//:src/aws-util/Cargo.toml",
@@ -704,7 +706,6 @@ crates_repository(
         "//:test/metabase/smoketest/Cargo.toml",
         "//:test/test-util/Cargo.toml",
         "//:misc/bazel/cargo-gazelle/Cargo.toml",
-        "//:src/auth/Cargo.toml",
     ],
     rust_version = RUST_VERSION,
     # Restricting the set of platform triples we support _greatly_ reduces the

WORKSPACE

@@ -0,0 +1,91 @@
+# Code generated by cargo-gazelle DO NOT EDIT
+
+# Copyright Materialize, Inc. and contributors. All rights reserved.
+#
+# Use of this software is governed by the Business Source License
+# included in the LICENSE file at the root of this repository.
+#
+# As of the Change Date specified in that file, in accordance with
+# the Business Source License, use of this software will be governed
+# by the Apache License, Version 2.0.
+
+load("@crates_io//:defs.bzl", "aliases", "all_crate_deps")
+load("@rules_rust//cargo:defs.bzl", "extract_cargo_lints")
+load("@rules_rust//rust:defs.bzl", "rust_doc_test", "rust_library", "rust_test")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "mz_authenticator",
+    srcs = glob(["src/**/*.rs"]),
+    aliases = aliases(
+        normal = True,
+        proc_macro = True,
+    ),
+    compile_data = [],
+    crate_features = ["default"],
+    data = [],
+    lint_config = ":lints",
+    proc_macro_deps = [] + all_crate_deps(proc_macro = True),
+    rustc_env = {},
+    rustc_flags = [],
+    version = "0.1.0",
+    deps = [
+        "//src/frontegg-auth:mz_frontegg_auth",
+        "//src/server-core:mz_server_core",
+    ] + all_crate_deps(normal = True),
+)
+
+alias(
+    name = "authenticator",
+    actual = "mz_authenticator",
+)
+
+rust_test(
+    name = "mz_authenticator_lib_tests",
+    size = "medium",
+    aliases = aliases(
+        normal = True,
+        normal_dev = True,
+        proc_macro = True,
+        proc_macro_dev = True,
+    ),
+    compile_data = [],
+    crate = ":mz_authenticator",
+    crate_features = ["default"],
+    data = [],
+    env = {},
+    lint_config = ":lints",
+    proc_macro_deps = [] + all_crate_deps(
+        proc_macro = True,
+        proc_macro_dev = True,
+    ),
+    rustc_env = {},
+    rustc_flags = [],
+    version = "0.1.0",
+    deps = [
+        "//src/frontegg-auth:mz_frontegg_auth",
+        "//src/server-core:mz_server_core",
+    ] + all_crate_deps(
+        normal = True,
+        normal_dev = True,
+    ),
+)
+
+rust_doc_test(
+    name = "mz_authenticator_doc_test",
+    crate = ":mz_authenticator",
+    deps = [
+        "//src/frontegg-auth:mz_frontegg_auth",
+        "//src/server-core:mz_server_core",
+    ] + all_crate_deps(
+        normal = True,
+        normal_dev = True,
+    ),
+)
+
+extract_cargo_lints(
+    name = "lints",
+    manifest = "Cargo.toml",
+    workspace = "@//:Cargo.toml",
+)

src/authenticator/BUILD.bazel

@@ -0,0 +1,20 @@
+[package]
+name = "mz-authenticator"
+version = "0.1.0"
+authors = ["Materialize, Inc."]
+license = "proprietary"
+edition.workspace = true
+rust-version.workspace = true
+publish = false
+
+[dependencies]
+mz-frontegg-auth = { path = "../frontegg-auth" }
+mz-server-core = { path = "../server-core" }
+serde = { version = "1.0.219", features = ["derive"] }
+workspace-hack = { version = "0.0.0", path = "../workspace-hack", optional = true }
+
+[lints]
+workspace = true
+
+[features]
+default = ["workspace-hack"]

src/authenticator/Cargo.toml

@@ -0,0 +1,16 @@
+// Copyright Materialize, Inc. and contributors. All rights reserved.
+//
+// Use of this software is governed by the Business Source License
+// included in the LICENSE file.
+//
+// As of the Change Date specified in that file, in accordance with
+// the Business Source License, use of this software will be governed
+// by the Apache License, Version 2.0.
+
+use mz_frontegg_auth::Authenticator as FronteggAuthenticator;
+
+#[derive(Debug, Clone)]
+pub enum Authenticator {
+    Frontegg(FronteggAuthenticator),
+    None,
+}

src/authenticator/src/lib.rs

@@ -51,6 +51,8 @@ rust_library(
         "//src/adapter-types:mz_adapter_types",
         "//src/alloc:mz_alloc",
         "//src/alloc-default:mz_alloc_default",
+        "//src/auth:mz_auth",
+        "//src/authenticator:mz_authenticator",
         "//src/aws-secrets-controller:mz_aws_secrets_controller",
         "//src/build-info:mz_build_info",
         "//src/catalog:mz_catalog",
@@ -124,6 +126,8 @@ rust_test(
         "//src/adapter-types:mz_adapter_types",
         "//src/alloc:mz_alloc",
         "//src/alloc-default:mz_alloc_default",
+        "//src/auth:mz_auth",
+        "//src/authenticator:mz_authenticator",
         "//src/aws-secrets-controller:mz_aws_secrets_controller",
         "//src/build-info:mz_build_info",
         "//src/catalog:mz_catalog",
@@ -173,6 +177,8 @@ rust_doc_test(
         "//src/adapter-types:mz_adapter_types",
         "//src/alloc:mz_alloc",
         "//src/alloc-default:mz_alloc_default",
+        "//src/auth:mz_auth",
+        "//src/authenticator:mz_authenticator",
         "//src/aws-secrets-controller:mz_aws_secrets_controller",
         "//src/build-info:mz_build_info",
         "//src/catalog:mz_catalog",
@@ -254,6 +260,8 @@ rust_test(
         "//src/adapter-types:mz_adapter_types",
         "//src/alloc:mz_alloc",
         "//src/alloc-default:mz_alloc_default",
+        "//src/auth:mz_auth",
+        "//src/authenticator:mz_authenticator",
         "//src/aws-secrets-controller:mz_aws_secrets_controller",
         "//src/build-info:mz_build_info",
         "//src/catalog:mz_catalog",
@@ -323,6 +331,8 @@ rust_test(
         "//src/adapter-types:mz_adapter_types",
         "//src/alloc:mz_alloc",
         "//src/alloc-default:mz_alloc_default",
+        "//src/auth:mz_auth",
+        "//src/authenticator:mz_authenticator",
         "//src/aws-secrets-controller:mz_aws_secrets_controller",
         "//src/build-info:mz_build_info",
         "//src/catalog:mz_catalog",
@@ -392,6 +402,8 @@ rust_test(
         "//src/adapter-types:mz_adapter_types",
         "//src/alloc:mz_alloc",
         "//src/alloc-default:mz_alloc_default",
+        "//src/auth:mz_auth",
+        "//src/authenticator:mz_authenticator",
         "//src/aws-secrets-controller:mz_aws_secrets_controller",
         "//src/build-info:mz_build_info",
         "//src/catalog:mz_catalog",
@@ -461,6 +473,8 @@ rust_test(
         "//src/adapter-types:mz_adapter_types",
         "//src/alloc:mz_alloc",
         "//src/alloc-default:mz_alloc_default",
+        "//src/auth:mz_auth",
+        "//src/authenticator:mz_authenticator",
         "//src/aws-secrets-controller:mz_aws_secrets_controller",
         "//src/build-info:mz_build_info",
         "//src/catalog:mz_catalog",
@@ -530,6 +544,8 @@ rust_test(
         "//src/adapter-types:mz_adapter_types",
         "//src/alloc:mz_alloc",
         "//src/alloc-default:mz_alloc_default",
+        "//src/auth:mz_auth",
+        "//src/authenticator:mz_authenticator",
         "//src/aws-secrets-controller:mz_aws_secrets_controller",
         "//src/build-info:mz_build_info",
         "//src/catalog:mz_catalog",
@@ -599,6 +615,8 @@ rust_test(
         "//src/adapter-types:mz_adapter_types",
         "//src/alloc:mz_alloc",
         "//src/alloc-default:mz_alloc_default",
+        "//src/auth:mz_auth",
+        "//src/authenticator:mz_authenticator",
         "//src/aws-secrets-controller:mz_aws_secrets_controller",
         "//src/build-info:mz_build_info",
         "//src/catalog:mz_catalog",
@@ -668,6 +686,8 @@ rust_test(
         "//src/adapter-types:mz_adapter_types",
         "//src/alloc:mz_alloc",
         "//src/alloc-default:mz_alloc_default",
+        "//src/auth:mz_auth",
+        "//src/authenticator:mz_authenticator",
         "//src/aws-secrets-controller:mz_aws_secrets_controller",
         "//src/build-info:mz_build_info",
         "//src/catalog:mz_catalog",
@@ -737,6 +757,8 @@ rust_test(
         "//src/adapter-types:mz_adapter_types",
         "//src/alloc:mz_alloc",
         "//src/alloc-default:mz_alloc_default",
+        "//src/auth:mz_auth",
+        "//src/authenticator:mz_authenticator",
         "//src/aws-secrets-controller:mz_aws_secrets_controller",
         "//src/build-info:mz_build_info",
         "//src/catalog:mz_catalog",
@@ -804,6 +826,8 @@ rust_binary(
         "//src/adapter-types:mz_adapter_types",
         "//src/alloc:mz_alloc",
         "//src/alloc-default:mz_alloc_default",
+        "//src/auth:mz_auth",
+        "//src/authenticator:mz_authenticator",
         "//src/aws-secrets-controller:mz_aws_secrets_controller",
         "//src/build-info:mz_build_info",
         "//src/catalog:mz_catalog",

src/environmentd/BUILD.bazel

@@ -40,6 +40,8 @@ libc = "0.2.172"
 mime = "0.3.16"
 mz-alloc = { path = "../alloc" }
 mz-alloc-default = { path = "../alloc-default", optional = true }
+mz-auth = { path = "../auth" }
+mz-authenticator = { path = "../authenticator" }
 mz-aws-secrets-controller = { path = "../aws-secrets-controller" }
 mz-build-info = { path = "../build-info" }
 mz-adapter = { path = "../adapter" }

src/environmentd/Cargo.toml

@@ -15,6 +15,7 @@ use std::sync::{Arc, Mutex};
 use mz_orchestratord::controller::materialize::environmentd::DeploymentStatus;
 use mz_ore::channel::trigger::{self, Trigger};
 
+#[derive(Debug)]
 enum DeploymentStateInner {
     Initializing,
     CatchingUp { _skip_trigger: Option<Trigger> },
@@ -128,7 +129,7 @@ impl DeploymentState {
 /// `environmentd` (e.g., the HTTP server). It provides methods to inspect the
 /// current leadership state, and to promote the deployment to the leader if it
 /// is ready to do so.
-#[derive(Clone)]
+#[derive(Debug, Clone)]
 pub struct DeploymentStateHandle {
     inner: Arc<Mutex<DeploymentStateInner>>,
 }