Improve login command ux

CHANGELOG.md

@@ -24,6 +24,8 @@ Recommendation: for ease of reading, use the following order:
 - Simplified error handling code in repositories
 - Hidden part of the test code behind the feature gate
 - Updated our crate dependencies so they can be built in isolation
+- `kamu push <dataset>` command now can be called without `--to` reference and Alias or Remote dataset repository will be used as destination
+- `kamu login` command now will store repository to Repository registry. Name can be provided with `--repo-name` flag and to skip creating repo can be used `--skip-add-repo` flag
 
 ## [0.204.4] - 2024-09-30
 ### Changed

resources/cli-reference.md

@@ -526,6 +526,8 @@ Authentiates with a remote ODF server interactively
 * `--user` — Store access token in the user home folder rather than in the workspace
 * `--check` — Check whether existing authorization is still valid without triggering a login flow
 * `--access-token <ACCESS_TOKEN>` — Provide an existing access token
+* `--repo-name <REPO_NAME>` — Repository name which will be used to store in repositories list
+* `--skip-add-repo` — Don't automatically add a remote repository for this host
 
 
 

src/adapter/http/src/data/account_handler.rs

@@ -0,0 +1,95 @@
+// Copyright Kamu Data, 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.
+
+// Copyright Kamu Data, 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 axum::extract::Extension;
+use axum::response::Json;
+use chrono::{DateTime, Utc};
+use database_common_macros::transactional_handler;
+use dill::Catalog;
+use http_common::*;
+use kamu_accounts::{
+    Account,
+    AccountDisplayName,
+    AccountType,
+    AuthenticationService,
+    CurrentAccountSubject,
+};
+use opendatafabric::{AccountID, AccountName};
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+#[derive(Debug, serde::Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct AccountResponse {
+    pub id: AccountID,
+    pub account_name: AccountName,
+    pub email: Option<String>,
+    pub display_name: AccountDisplayName,
+    pub account_type: AccountType,
+    pub avatar_url: Option<String>,
+    pub registered_at: DateTime<Utc>,
+    pub is_admin: bool,
+    pub provider: String,
+    pub provider_identity_key: String,
+}
+
+impl From<Account> for AccountResponse {
+    fn from(value: Account) -> Self {
+        Self {
+            id: value.id,
+            account_name: value.account_name,
+            email: value.email,
+            display_name: value.display_name,
+            account_type: value.account_type,
+            avatar_url: value.avatar_url,
+            registered_at: value.registered_at,
+            is_admin: value.is_admin,
+            provider: value.provider,
+            provider_identity_key: value.provider_identity_key,
+        }
+    }
+}
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+#[transactional_handler]
+pub async fn account_handler(
+    Extension(catalog): Extension<Catalog>,
+) -> Result<Json<AccountResponse>, ApiError> {
+    let response = get_account(&catalog).await?;
+    tracing::debug!(?response, "Get account info response");
+    Ok(response)
+}
+
+async fn get_account(catalog: &Catalog) -> Result<Json<AccountResponse>, ApiError> {
+    let current_account_subject = catalog.get_one::<CurrentAccountSubject>().unwrap();
+    match current_account_subject.as_ref() {
+        CurrentAccountSubject::Anonymous(_) => Err(ApiError::new_unauthorized()),
+        CurrentAccountSubject::Logged(account) => {
+            let auth_service = catalog.get_one::<dyn AuthenticationService>().unwrap();
+            let full_account_info_maybe = auth_service.account_by_id(&account.account_id).await?;
+            if let Some(full_account_info) = full_account_info_maybe {
+                return Ok(Json(full_account_info.into()));
+            }
+
+            Err(ApiError::not_found_without_body())
+        }
+    }
+}
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

src/adapter/http/src/data/dataset_info_handler.rs

@@ -0,0 +1,75 @@
+// Copyright Kamu Data, 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.
+
+// Copyright Kamu Data, 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 axum::extract::{Extension, Path};
+use axum::response::Json;
+use database_common_macros::transactional_handler;
+use dill::Catalog;
+use http_common::*;
+use kamu_core::{DatasetRepository, GetDatasetError};
+use opendatafabric::{AccountName, DatasetHandle, DatasetID, DatasetName};
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+#[derive(Debug, serde::Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct DatasetInfoResponse {
+    pub id: DatasetID,
+    pub account_name: Option<AccountName>,
+    pub dataset_name: DatasetName,
+}
+
+impl From<DatasetHandle> for DatasetInfoResponse {
+    fn from(value: DatasetHandle) -> Self {
+        Self {
+            id: value.id,
+            account_name: value.alias.account_name,
+            dataset_name: value.alias.dataset_name,
+        }
+    }
+}
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+#[transactional_handler]
+pub async fn dataset_info_handler(
+    Extension(catalog): Extension<Catalog>,
+    Path(dataset_id): Path<DatasetID>,
+) -> Result<Json<DatasetInfoResponse>, ApiError> {
+    let response = get_dataset_by_id(&catalog, &dataset_id).await?;
+    tracing::debug!(?response, "Get dataset by id info response");
+    Ok(response)
+}
+
+async fn get_dataset_by_id(
+    catalog: &Catalog,
+    dataset_id: &DatasetID,
+) -> Result<Json<DatasetInfoResponse>, ApiError> {
+    let dataset_repo = catalog.get_one::<dyn DatasetRepository>().unwrap();
+    let dataset_handle = dataset_repo
+        .resolve_dataset_ref(&dataset_id.clone().as_local_ref())
+        .await
+        .map_err(|err| match err {
+            GetDatasetError::NotFound(e) => ApiError::not_found(e),
+            GetDatasetError::Internal(e) => e.api_err(),
+        })?;
+
+    Ok(Json(dataset_handle.into()))
+}
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

src/adapter/http/src/data/mod.rs

@@ -7,12 +7,15 @@
 // the Business Source License, use of this software will be governed
 // by the Apache License, Version 2.0.
 
+mod account_handler;
+mod dataset_info_handler;
 mod ingest_handler;
 pub mod metadata_handler;
 mod query_handler;
 pub mod query_types;
 mod router;
 mod tail_handler;
 mod verify_handler;
+mod workspace_info_handler;
 
 pub use router::*;

src/adapter/http/src/data/query_handler.rs

@@ -143,7 +143,7 @@ pub(crate) async fn query_handler_post_v2(
             },
         })
     } else {
-        Err(ApiError::not_implemented(ResponseSigningNotCongigured))?
+        Err(ApiError::not_implemented(ResponseSigningNotConfigured))?
     };
 
     Ok(Json(response))
@@ -223,4 +223,4 @@ pub async fn query_handler(
 
 #[derive(Debug, thiserror::Error)]
 #[error("Response signing is not enabled by the node operator")]
-struct ResponseSigningNotCongigured;
+struct ResponseSigningNotConfigured;

src/adapter/http/src/data/router.rs

@@ -29,6 +29,18 @@ pub fn root_router() -> axum::Router {
             "/verify",
             axum::routing::post(super::verify_handler::verify_handler),
         )
+        .route(
+            "/workspace/info",
+            axum::routing::get(super::workspace_info_handler::workspace_info_handler),
+        )
+        .route(
+            "/me",
+            axum::routing::get(super::account_handler::account_handler),
+        )
+        .route(
+            "/datasets/:id",
+            axum::routing::get(super::dataset_info_handler::dataset_info_handler),
+        )
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

src/adapter/http/src/data/workspace_info_handler.rs

@@ -0,0 +1,51 @@
+// Copyright Kamu Data, 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.
+
+// Copyright Kamu Data, 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 axum::extract::Extension;
+use axum::response::Json;
+use dill::Catalog;
+use http_common::*;
+use kamu_core::DatasetRepository;
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+#[derive(Debug, serde::Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct WorkspaceInfoResponse {
+    pub is_multi_tenant: bool,
+}
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+pub async fn workspace_info_handler(
+    Extension(catalog): Extension<Catalog>,
+) -> Result<Json<WorkspaceInfoResponse>, ApiError> {
+    let response = get_workspace_info(&catalog);
+    tracing::debug!(?response, "Get workspace info response");
+    Ok(response)
+}
+
+fn get_workspace_info(catalog: &Catalog) -> Json<WorkspaceInfoResponse> {
+    let dataset_repo = catalog.get_one::<dyn DatasetRepository>().unwrap();
+
+    Json(WorkspaceInfoResponse {
+        is_multi_tenant: dataset_repo.is_multi_tenant(),
+    })
+}
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

src/adapter/http/tests/harness/client_side_harness.rs

@@ -8,13 +8,15 @@
 // by the Apache License, Version 2.0.
 
 use std::path::PathBuf;
+use std::str::FromStr;
 use std::sync::Arc;
 
 use auth::OdfServerAccessTokenResolver;
 use container_runtime::ContainerRuntime;
 use database_common::NoOpDatabasePlugin;
 use dill::Component;
 use headers::Header;
+use internal_error::{InternalError, ResultIntoInternal};
 use kamu::domain::*;
 use kamu::*;
 use kamu_accounts::CurrentAccountSubject;
@@ -27,7 +29,8 @@ use opendatafabric::{
     DatasetID,
     DatasetRef,
     DatasetRefAny,
-    DatasetRefRemote,
+    RepoName,
+    TransferDatasetRef,
 };
 use tempfile::TempDir;
 use time_source::SystemTimeSourceDefault;
@@ -106,6 +109,7 @@ impl ClientSideHarness {
         b.add::<RemoteRepositoryRegistryImpl>();
 
         b.add::<RemoteAliasesRegistryImpl>();
+        b.add::<RemoteAliasResolverImpl>();
 
         b.add::<EngineProvisionerNull>();
 
@@ -239,7 +243,7 @@ impl ClientSideHarness {
     pub async fn push_dataset(
         &self,
         dataset_local_ref: DatasetRef,
-        dataset_remote_ref: DatasetRefRemote,
+        dataset_remote_ref: TransferDatasetRef,
         force: bool,
         dataset_visibility: DatasetVisibility,
     ) -> Vec<PushResponse> {
@@ -266,7 +270,7 @@ impl ClientSideHarness {
     pub async fn push_dataset_result(
         &self,
         dataset_local_ref: DatasetRef,
-        dataset_remote_ref: DatasetRefRemote,
+        dataset_remote_ref: TransferDatasetRef,
         force: bool,
         dataset_visibility: DatasetVisibility,
     ) -> SyncResult {
@@ -288,6 +292,24 @@ impl ClientSideHarness {
         }
     }
 
+    pub fn add_repository(
+        &self,
+        repo_name: &RepoName,
+        base_url: &str,
+    ) -> Result<(), InternalError> {
+        let remote_repo_reg = self
+            .catalog
+            .get_one::<dyn RemoteRepositoryRegistry>()
+            .unwrap();
+
+        remote_repo_reg
+            .add_repository(
+                repo_name,
+                Url::from_str(&format!("http://{base_url}")).unwrap(),
+            )
+            .int_err()
+    }
+
     pub fn internal_datasets_folder_path(&self) -> PathBuf {
         self.tempdir.path().join("datasets")
     }