Skip to content

Commit 94b575a

Browse files
committed
renamed to authorization
1 parent c67d25f commit 94b575a

34 files changed

+323
-211
lines changed

quickwit/Cargo.lock

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

quickwit/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
resolver = "2"
33
members = [
44
"quickwit-actors",
5-
"quickwit-auth",
5+
"quickwit-authorize",
66
"quickwit-aws",
77
"quickwit-cli",
88
"quickwit-cluster",
@@ -42,7 +42,7 @@ members = [
4242
# from the default member to ease build/deps.
4343
default-members = [
4444
"quickwit-actors",
45-
"quickwit-auth",
45+
"quickwit-authorize",
4646
"quickwit-aws",
4747
"quickwit-cli",
4848
"quickwit-cluster",
@@ -305,7 +305,7 @@ opendal = { version = "0.44", default-features = false }
305305
reqsign = { version = "0.14", default-features = false }
306306

307307
quickwit-actors = { path = "quickwit-actors" }
308-
quickwit-auth = { path = "quickwit-auth" }
308+
quickwit-authorize = { path = "quickwit-authorize" }
309309
quickwit-aws = { path = "quickwit-aws" }
310310
quickwit-cli = { path = "quickwit-cli" }
311311
quickwit-cluster = { path = "quickwit-cluster" }

quickwit/quickwit-auth/Cargo.toml renamed to quickwit/quickwit-authorize/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[package]
2-
name = "quickwit-auth"
2+
name = "quickwit-authorize"
33
version.workspace = true
44
edition.workspace = true
55
homepage.workspace = true

quickwit/quickwit-codegen/example/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ tower = { workspace = true }
2727
utoipa = { workspace = true }
2828

2929
quickwit-actors = { workspace = true }
30-
quickwit-auth = { workspace = true }
30+
quickwit-authorize = { workspace = true }
3131
quickwit-common = { workspace = true }
3232
quickwit-proto = { workspace = true }
3333

@@ -41,4 +41,4 @@ quickwit-codegen = { workspace = true }
4141

4242
[features]
4343
testsuite = ["mockall"]
44-
enterprise = [ "quickwit-auth/enterprise" ]
44+
enterprise = [ "quickwit-authorize/enterprise" ]

quickwit/quickwit-codegen/example/src/authorization.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,31 +15,31 @@
1515
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
1616
// SOFTWARE.
1717

18-
use quickwit_auth::{Authorization, AuthorizationError, AuthorizationToken, StreamAuthorization};
18+
use quickwit_authorize::{Authorization, AuthorizationError, AuthorizationToken, StreamAuthorization};
1919

2020
use crate::{GoodbyeRequest, HelloRequest, PingRequest};
2121

2222
impl Authorization for HelloRequest {
2323
fn attenuate(
2424
&self,
25-
auth_token: quickwit_auth::AuthorizationToken,
26-
) -> Result<quickwit_auth::AuthorizationToken, AuthorizationError> {
25+
auth_token: AuthorizationToken,
26+
) -> Result<AuthorizationToken, AuthorizationError> {
2727
Ok(auth_token)
2828
}
2929
}
3030

3131
impl Authorization for GoodbyeRequest {
3232
fn attenuate(
3333
&self,
34-
auth_token: quickwit_auth::AuthorizationToken,
34+
auth_token: AuthorizationToken,
3535
) -> Result<AuthorizationToken, AuthorizationError> {
3636
Ok(auth_token)
3737
}
3838
}
3939

4040
impl StreamAuthorization for PingRequest {
4141
fn attenuate(
42-
auth_token: quickwit_auth::AuthorizationToken,
42+
auth_token: AuthorizationToken,
4343
) -> Result<AuthorizationToken, AuthorizationError> {
4444
Ok(auth_token)
4545
}

quickwit/quickwit-codegen/example/src/codegen/hello.rs

Lines changed: 13 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

quickwit/quickwit-codegen/example/src/error.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
use std::fmt;
2121

2222
use quickwit_actors::AskError;
23-
use quickwit_auth::AuthorizationError;
23+
use quickwit_authorize::AuthorizationError;
2424
use quickwit_proto::error::GrpcServiceError;
2525
pub use quickwit_proto::error::{grpc_error_to_grpc_status, grpc_status_to_service_error};
2626
use quickwit_proto::{ServiceError, ServiceErrorCode};

quickwit/quickwit-codegen/src/codegen.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1170,7 +1170,7 @@ fn generate_grpc_client_adapter_methods(context: &CodegenContext) -> TokenStream
11701170
let method = if syn_method.client_streaming {
11711171
quote! {
11721172
async fn #method_name(&self, request: #request_type) -> #result_type<#response_type> {
1173-
let tonic_request = quickwit_auth::build_tonic_stream_request_with_auth_token(request)?;
1173+
let tonic_request = quickwit_authorize::build_tonic_stream_request_with_auth_token(request)?;
11741174
self.inner
11751175
.clone()
11761176
.#method_name(tonic_request)
@@ -1182,7 +1182,7 @@ fn generate_grpc_client_adapter_methods(context: &CodegenContext) -> TokenStream
11821182
} else {
11831183
quote! {
11841184
async fn #method_name(&self, request: #request_type) -> #result_type<#response_type> {
1185-
let tonic_request = quickwit_auth::build_tonic_request_with_auth_token(request)?;
1185+
let tonic_request = quickwit_authorize::build_tonic_request_with_auth_token(request)?;
11861186
self.inner
11871187
.clone()
11881188
.#method_name(tonic_request)
@@ -1273,8 +1273,8 @@ fn generate_grpc_server_adapter_methods(context: &CodegenContext) -> TokenStream
12731273
#associated_type
12741274

12751275
async fn #method_name(&self, request: tonic::Request<#request_type>) -> Result<tonic::Response<#response_type>, tonic::Status> {
1276-
let auth_token = quickwit_auth::get_auth_token(request.metadata())?;
1277-
quickwit_auth::execute_with_authorization(auth_token, self.inner.0.#method_name(#method_arg)).await
1276+
let auth_token = quickwit_authorize::get_auth_token(request.metadata())?;
1277+
quickwit_authorize::execute_with_authorization(auth_token, self.inner.0.#method_name(#method_arg)).await
12781278
.map(#into_response_type)
12791279
.map_err(crate::error::grpc_error_to_grpc_status)
12801280
}

quickwit/quickwit-ingest/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ ulid = { workspace = true }
3636
utoipa = { workspace = true }
3737

3838
quickwit-actors = { workspace = true }
39-
quickwit-auth = { workspace = true }
39+
quickwit-authorize = { workspace = true }
4040
quickwit-cluster = { workspace = true }
4141
quickwit-common = { workspace = true, features = ["testsuite"] }
4242
quickwit-config = { workspace = true }
@@ -63,4 +63,4 @@ quickwit-codegen = { workspace = true }
6363
failpoints = ["fail/failpoints"]
6464
no-failpoints = []
6565
testsuite = ["mockall"]
66-
enterprise = ["quickwit-auth/enterprise"]
66+
enterprise = ["quickwit-authorize/enterprise"]

quickwit/quickwit-ingest/src/authorize.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
1616
// SOFTWARE.
1717

18-
use quickwit_auth::{Authorization, AuthorizationError, AuthorizationToken};
18+
use quickwit_authorize::::{Authorization, AuthorizationError, AuthorizationToken};
1919

2020
use crate::{FetchRequest, IngestRequest, TailRequest};
2121

quickwit/quickwit-ingest/src/codegen/ingest_service.rs

Lines changed: 15 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

quickwit/quickwit-ingest/src/error.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ use std::io;
2121

2222
use mrecordlog::error::*;
2323
use quickwit_actors::AskError;
24-
use quickwit_auth::AuthorizationError;
24+
use quickwit_authorize::AuthorizationError;
2525
use quickwit_common::rate_limited_error;
2626
use quickwit_common::tower::BufferError;
2727
pub(crate) use quickwit_proto::error::{grpc_error_to_grpc_status, grpc_status_to_service_error};

quickwit/quickwit-metastore/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ tracing = { workspace = true }
3939
ulid = { workspace = true, features = ["serde"] }
4040
utoipa = { workspace = true }
4141

42-
quickwit-auth = { workspace = true }
42+
quickwit-authorize = { workspace = true }
4343
quickwit-common = { workspace = true }
4444
quickwit-config = { workspace = true }
4545
quickwit-doc-mapper = { workspace = true }

quickwit/quickwit-metastore/src/error.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,5 +42,5 @@ pub enum MetastoreResolverError {
4242

4343
/// The requested operation is not authorized.
4444
#[error("unauthorized: `{0}`")]
45-
Unauthorized(#[from] quickwit_auth::AuthorizationError),
45+
Unauthorized(#[from] quickwit_authorize::AuthorizationError),
4646
}

quickwit/quickwit-proto/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ utoipa = { workspace = true }
3636
zstd = { workspace = true }
3737

3838
quickwit-actors = { workspace = true }
39-
quickwit-auth = { workspace = true }
39+
quickwit-authorize = { workspace = true }
4040
quickwit-common = { workspace = true }
4141

4242
[dev-dependencies]
@@ -53,4 +53,4 @@ quickwit-codegen = { workspace = true }
5353
[features]
5454
postgres = ["sea-query", "sqlx"]
5555
testsuite = ["mockall", "futures"]
56-
enterprise = [ "quickwit-auth/enterprise"]
56+
enterprise = [ "quickwit-authorize/enterprise"]

quickwit/quickwit-proto/src/authorization.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use std::time::{Duration, SystemTime};
22

33
use biscuit_auth::builder_ext::BuilderExt;
44
use biscuit_auth::macros::*;
5-
use quickwit_auth::{Authorization, AuthorizationError, AuthorizationToken, StreamAuthorization};
5+
use quickwit_authorize::::{Authorization, AuthorizationError, AuthorizationToken, StreamAuthorization};
66

77
use crate::cluster::FetchClusterStateRequest;
88
use crate::control_plane::{AdviseResetShardsRequest, GetOrCreateOpenShardsRequest};

quickwit/quickwit-proto/src/cluster/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ pub enum ClusterError {
4040
#[error("service unavailable: {0}")]
4141
Unavailable(String),
4242
#[error("unauthorized: {0}")]
43-
Unauthorized(#[from] quickwit_auth::AuthorizationError),
43+
Unauthorized(#[from] quickwit_authorize::AuthorizationError),
4444
}
4545

4646
impl ServiceError for ClusterError {

0 commit comments

Comments
 (0)