renamed to authorization

quickwit-oss · Nov 4, 2024 · 94b575a · 94b575a
1 parent c67d25f
commit 94b575a
Show file tree

Hide file tree

Showing 34 changed files with 323 additions and 211 deletions.
diff --git a/quickwit/Cargo.lock b/quickwit/Cargo.lock
diff --git a/quickwit/Cargo.toml b/quickwit/Cargo.toml
@@ -2,7 +2,7 @@
 resolver = "2"
 members = [
   "quickwit-actors",
-  "quickwit-auth",
+  "quickwit-authorize",
   "quickwit-aws",
   "quickwit-cli",
   "quickwit-cluster",
@@ -42,7 +42,7 @@ members = [
 # from the default member to ease build/deps.
 default-members = [
   "quickwit-actors",
-  "quickwit-auth",
+  "quickwit-authorize",
   "quickwit-aws",
   "quickwit-cli",
   "quickwit-cluster",
@@ -305,7 +305,7 @@ opendal = { version = "0.44", default-features = false }
 reqsign = { version = "0.14", default-features = false }
 
 quickwit-actors = { path = "quickwit-actors" }
-quickwit-auth = { path = "quickwit-auth" }
+quickwit-authorize = { path = "quickwit-authorize" }
 quickwit-aws = { path = "quickwit-aws" }
 quickwit-cli = { path = "quickwit-cli" }
 quickwit-cluster = { path = "quickwit-cluster" }

diff --git a/quickwit/quickwit-auth/Cargo.toml → quickwit/quickwit-authorize/Cargo.toml b/quickwit/quickwit-auth/Cargo.toml → quickwit/quickwit-authorize/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "quickwit-auth"
+name = "quickwit-authorize"
 version.workspace = true
 edition.workspace = true
 homepage.workspace = true

diff --git a/.../quickwit-auth/src/authorization_layer.rs → ...kwit-authorize/src/authorization_layer.rs b/.../quickwit-auth/src/authorization_layer.rs → ...kwit-authorize/src/authorization_layer.rs
diff --git a/quickwit/quickwit-auth/src/community.rs → quickwit/quickwit-authorize/src/community.rs b/quickwit/quickwit-auth/src/community.rs → quickwit/quickwit-authorize/src/community.rs
diff --git a/quickwit/quickwit-auth/src/enterprise.rs → ...kwit/quickwit-authorize/src/enterprise.rs b/quickwit/quickwit-auth/src/enterprise.rs → ...kwit/quickwit-authorize/src/enterprise.rs
diff --git a/quickwit/quickwit-auth/src/lib.rs → quickwit/quickwit-authorize/src/lib.rs b/quickwit/quickwit-auth/src/lib.rs → quickwit/quickwit-authorize/src/lib.rs
diff --git a/quickwit/quickwit-codegen/example/Cargo.toml b/quickwit/quickwit-codegen/example/Cargo.toml
@@ -27,7 +27,7 @@ tower = { workspace = true }
 utoipa = { workspace = true }
 
 quickwit-actors = { workspace = true }
-quickwit-auth = { workspace = true }
+quickwit-authorize = { workspace = true }
 quickwit-common = { workspace = true }
 quickwit-proto = { workspace = true }
 
@@ -41,4 +41,4 @@ quickwit-codegen = { workspace = true }
 
 [features]
 testsuite = ["mockall"]
-enterprise = [ "quickwit-auth/enterprise" ]
+enterprise = [ "quickwit-authorize/enterprise" ]
diff --git a/quickwit/quickwit-codegen/example/src/authorization.rs b/quickwit/quickwit-codegen/example/src/authorization.rs
@@ -15,31 +15,31 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-use quickwit_auth::{Authorization, AuthorizationError, AuthorizationToken, StreamAuthorization};
+use quickwit_authorize::{Authorization, AuthorizationError, AuthorizationToken, StreamAuthorization};
 
 use crate::{GoodbyeRequest, HelloRequest, PingRequest};
 
 impl Authorization for HelloRequest {
     fn attenuate(
         &self,
-        auth_token: quickwit_auth::AuthorizationToken,
-    ) -> Result<quickwit_auth::AuthorizationToken, AuthorizationError> {
+        auth_token: AuthorizationToken,
+    ) -> Result<AuthorizationToken, AuthorizationError> {
         Ok(auth_token)
     }
 }
 
 impl Authorization for GoodbyeRequest {
     fn attenuate(
         &self,
-        auth_token: quickwit_auth::AuthorizationToken,
+        auth_token: AuthorizationToken,
     ) -> Result<AuthorizationToken, AuthorizationError> {
         Ok(auth_token)
     }
 }
 
 impl StreamAuthorization for PingRequest {
     fn attenuate(
-        auth_token: quickwit_auth::AuthorizationToken,
+        auth_token: AuthorizationToken,
     ) -> Result<AuthorizationToken, AuthorizationError> {
         Ok(auth_token)
     }

diff --git a/quickwit/quickwit-codegen/example/src/codegen/hello.rs b/quickwit/quickwit-codegen/example/src/codegen/hello.rs
diff --git a/quickwit/quickwit-codegen/example/src/error.rs b/quickwit/quickwit-codegen/example/src/error.rs
@@ -20,7 +20,7 @@
 use std::fmt;
 
 use quickwit_actors::AskError;
-use quickwit_auth::AuthorizationError;
+use quickwit_authorize::AuthorizationError;
 use quickwit_proto::error::GrpcServiceError;
 pub use quickwit_proto::error::{grpc_error_to_grpc_status, grpc_status_to_service_error};
 use quickwit_proto::{ServiceError, ServiceErrorCode};

diff --git a/quickwit/quickwit-codegen/src/codegen.rs b/quickwit/quickwit-codegen/src/codegen.rs
@@ -1170,7 +1170,7 @@ fn generate_grpc_client_adapter_methods(context: &CodegenContext) -> TokenStream
         let method = if syn_method.client_streaming {
             quote! {
                 async fn #method_name(&self, request: #request_type) -> #result_type<#response_type> {
-                    let tonic_request = quickwit_auth::build_tonic_stream_request_with_auth_token(request)?;
+                    let tonic_request = quickwit_authorize::build_tonic_stream_request_with_auth_token(request)?;
                     self.inner
                     .clone()
                     .#method_name(tonic_request)
@@ -1182,7 +1182,7 @@ fn generate_grpc_client_adapter_methods(context: &CodegenContext) -> TokenStream
         } else {
             quote! {
                 async fn #method_name(&self, request: #request_type) -> #result_type<#response_type> {
-                    let tonic_request = quickwit_auth::build_tonic_request_with_auth_token(request)?;
+                    let tonic_request = quickwit_authorize::build_tonic_request_with_auth_token(request)?;
                     self.inner
                         .clone()
                         .#method_name(tonic_request)
@@ -1273,8 +1273,8 @@ fn generate_grpc_server_adapter_methods(context: &CodegenContext) -> TokenStream
             #associated_type
 
             async fn #method_name(&self, request: tonic::Request<#request_type>) -> Result<tonic::Response<#response_type>, tonic::Status> {
-                let auth_token = quickwit_auth::get_auth_token(request.metadata())?;
-                quickwit_auth::execute_with_authorization(auth_token, self.inner.0.#method_name(#method_arg)).await
+                let auth_token = quickwit_authorize::get_auth_token(request.metadata())?;
+                quickwit_authorize::execute_with_authorization(auth_token, self.inner.0.#method_name(#method_arg)).await
                     .map(#into_response_type)
                     .map_err(crate::error::grpc_error_to_grpc_status)
             }

diff --git a/quickwit/quickwit-ingest/Cargo.toml b/quickwit/quickwit-ingest/Cargo.toml
@@ -36,7 +36,7 @@ ulid = { workspace = true }
 utoipa = { workspace = true }
 
 quickwit-actors = { workspace = true }
-quickwit-auth = { workspace = true }
+quickwit-authorize = { workspace = true }
 quickwit-cluster = { workspace = true }
 quickwit-common = { workspace = true, features = ["testsuite"] }
 quickwit-config = { workspace = true }
@@ -63,4 +63,4 @@ quickwit-codegen = { workspace = true }
 failpoints = ["fail/failpoints"]
 no-failpoints = []
 testsuite = ["mockall"]
-enterprise = ["quickwit-auth/enterprise"]
+enterprise = ["quickwit-authorize/enterprise"]
diff --git a/quickwit/quickwit-ingest/src/authorize.rs b/quickwit/quickwit-ingest/src/authorize.rs
@@ -15,7 +15,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-use quickwit_auth::{Authorization, AuthorizationError, AuthorizationToken};
+use quickwit_authorize::::{Authorization, AuthorizationError, AuthorizationToken};
 
 use crate::{FetchRequest, IngestRequest, TailRequest};
 

diff --git a/quickwit/quickwit-ingest/src/codegen/ingest_service.rs b/quickwit/quickwit-ingest/src/codegen/ingest_service.rs
diff --git a/quickwit/quickwit-ingest/src/error.rs b/quickwit/quickwit-ingest/src/error.rs
@@ -21,7 +21,7 @@ use std::io;
 
 use mrecordlog::error::*;
 use quickwit_actors::AskError;
-use quickwit_auth::AuthorizationError;
+use quickwit_authorize::AuthorizationError;
 use quickwit_common::rate_limited_error;
 use quickwit_common::tower::BufferError;
 pub(crate) use quickwit_proto::error::{grpc_error_to_grpc_status, grpc_status_to_service_error};

diff --git a/quickwit/quickwit-metastore/Cargo.toml b/quickwit/quickwit-metastore/Cargo.toml
@@ -39,7 +39,7 @@ tracing = { workspace = true }
 ulid = { workspace = true, features = ["serde"] }
 utoipa = { workspace = true }
 
-quickwit-auth = { workspace = true }
+quickwit-authorize = { workspace = true }
 quickwit-common = { workspace = true }
 quickwit-config = { workspace = true }
 quickwit-doc-mapper = { workspace = true }

diff --git a/quickwit/quickwit-metastore/src/error.rs b/quickwit/quickwit-metastore/src/error.rs
@@ -42,5 +42,5 @@ pub enum MetastoreResolverError {
 
     /// The requested operation is not authorized.
     #[error("unauthorized: `{0}`")]
-    Unauthorized(#[from] quickwit_auth::AuthorizationError),
+    Unauthorized(#[from] quickwit_authorize::AuthorizationError),
 }
diff --git a/quickwit/quickwit-proto/Cargo.toml b/quickwit/quickwit-proto/Cargo.toml
@@ -36,7 +36,7 @@ utoipa = { workspace = true }
 zstd = { workspace = true }
 
 quickwit-actors = { workspace = true }
-quickwit-auth = { workspace = true }
+quickwit-authorize = { workspace = true }
 quickwit-common = { workspace = true }
 
 [dev-dependencies]
@@ -53,4 +53,4 @@ quickwit-codegen = { workspace = true }
 [features]
 postgres = ["sea-query", "sqlx"]
 testsuite = ["mockall", "futures"]
-enterprise = [ "quickwit-auth/enterprise"]
+enterprise = [ "quickwit-authorize/enterprise"]
diff --git a/quickwit/quickwit-proto/src/authorization.rs b/quickwit/quickwit-proto/src/authorization.rs
@@ -2,7 +2,7 @@ use std::time::{Duration, SystemTime};
 
 use biscuit_auth::builder_ext::BuilderExt;
 use biscuit_auth::macros::*;
-use quickwit_auth::{Authorization, AuthorizationError, AuthorizationToken, StreamAuthorization};
+use quickwit_authorize::::{Authorization, AuthorizationError, AuthorizationToken, StreamAuthorization};
 
 use crate::cluster::FetchClusterStateRequest;
 use crate::control_plane::{AdviseResetShardsRequest, GetOrCreateOpenShardsRequest};

diff --git a/quickwit/quickwit-proto/src/cluster/mod.rs b/quickwit/quickwit-proto/src/cluster/mod.rs
@@ -40,7 +40,7 @@ pub enum ClusterError {
     #[error("service unavailable: {0}")]
     Unavailable(String),
     #[error("unauthorized: {0}")]
-    Unauthorized(#[from] quickwit_auth::AuthorizationError),
+    Unauthorized(#[from] quickwit_authorize::AuthorizationError),
 }
 
 impl ServiceError for ClusterError {