remove namespace first part

golemcloud · Mar 27, 2024 · 94c65bf · 94c65bf
1 parent 41c2dd1
commit 94c65bf
Show file tree

Hide file tree

Showing 17 changed files with 481 additions and 664 deletions.
diff --git a/golem-service-base/src/model.rs b/golem-service-base/src/model.rs
@@ -3116,3 +3116,31 @@ impl From<GrpcRoutingTableEntry> for RoutingTableEntry {
         }
     }
 }
+
+#[derive(
+    Debug, Clone, PartialEq, Eq, Hash, Ord, PartialOrd, serde::Serialize, serde::Deserialize, Object,
+)]
+#[serde(rename_all = "camelCase")]
+#[oai(rename_all = "camelCase")]
+pub struct ResourceLimits {
+    pub available_fuel: i64,
+    pub max_memory_per_worker: i64,
+}
+
+impl From<ResourceLimits> for golem_api_grpc::proto::golem::common::ResourceLimits {
+    fn from(value: ResourceLimits) -> Self {
+        Self {
+            available_fuel: value.available_fuel,
+            max_memory_per_worker: value.max_memory_per_worker,
+        }
+    }
+}
+
+impl From<golem_api_grpc::proto::golem::common::ResourceLimits> for ResourceLimits {
+    fn from(value: golem_api_grpc::proto::golem::common::ResourceLimits) -> Self {
+        Self {
+            available_fuel: value.available_fuel,
+            max_memory_per_worker: value.max_memory_per_worker,
+        }
+    }
+}
diff --git a/golem-worker-service-base/src/api/common.rs b/golem-worker-service-base/src/api/common.rs
@@ -99,7 +99,6 @@ impl ApiEndpointError {
 }
 
 mod conversion {
-    use golem_service_base::service::auth::AuthError;
     use poem_openapi::payload::Json;
 
     use super::{
@@ -112,12 +111,6 @@ mod conversion {
     impl From<ApiRegistrationError> for ApiEndpointError {
         fn from(error: ApiRegistrationError) -> Self {
             match error {
-                ApiRegistrationError::AuthenticationError(auth) => match auth {
-                    AuthError::Forbidden(_) => ApiEndpointError::forbidden(auth),
-                    AuthError::Unauthorized(_) => ApiEndpointError::unauthorized(auth),
-                    AuthError::Internal(_) => ApiEndpointError::internal(auth),
-                    AuthError::NotFound(_) => ApiEndpointError::not_found(auth),
-                },
                 ApiRegistrationError::RepoError(error) => match error {
                     ApiRegistrationRepoError::AlreadyExists(_) => {
                         ApiEndpointError::already_exists(error)

diff --git a/golem-worker-service-base/src/auth.rs b/golem-worker-service-base/src/auth.rs
@@ -1,12 +1,7 @@
 use std::fmt::{Display, Formatter};
 
-use async_trait::async_trait;
-use golem_api_grpc::proto::golem::common::ResourceLimits;
-use golem_common::model::AccountId;
-use golem_service_base::service::auth::{AuthError, AuthService, Permission};
 use serde::Deserialize;
 
-pub struct AuthServiceNoop {}
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct EmptyAuthCtx {}
 
@@ -16,6 +11,15 @@ impl Display for EmptyAuthCtx {
     }
 }
 
+impl IntoIterator for EmptyAuthCtx {
+    type Item = (String, String);
+    type IntoIter = std::iter::Empty<Self::Item>;
+
+    fn into_iter(self) -> Self::IntoIter {
+        std::iter::empty()
+    }
+}
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash, bincode::Encode, bincode::Decode, Deserialize)]
 pub struct CommonNamespace(String);
 
@@ -30,36 +34,3 @@ impl Display for CommonNamespace {
         write!(f, "{}", self.0)
     }
 }
-
-#[async_trait]
-impl<AuthCtx, Namespace: Default> AuthService<AuthCtx, Namespace> for AuthServiceNoop {
-    async fn is_authorized(
-        &self,
-        _permission: Permission,
-        _ctx: &AuthCtx,
-    ) -> Result<Namespace, AuthError> {
-        Ok(Namespace::default())
-    }
-}
-
-// TODO: Replace with metadata map
-pub trait HasMetadata {
-    fn get_metadata(&self) -> WorkerMetadata;
-}
-
-#[derive(Clone, Debug)]
-pub struct WorkerMetadata {
-    pub account_id: Option<AccountId>,
-    pub limits: Option<ResourceLimits>,
-}
-
-impl HasMetadata for CommonNamespace {
-    fn get_metadata(&self) -> WorkerMetadata {
-        WorkerMetadata {
-            account_id: Some(golem_common::model::AccountId {
-                value: "-1".to_string(),
-            }),
-            limits: None,
-        }
-    }
-}