Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 0 additions & 5 deletions crates/openshell-cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,6 @@ hyper-util = { workspace = true }
hyper-rustls = { version = "0.27", default-features = false, features = ["native-tokio", "http1", "http2", "tls12", "logging"] }
rustls = { workspace = true }
rustls-pemfile = { workspace = true }
tokio-rustls = { workspace = true }
tower = { workspace = true }
reqwest = { workspace = true }

# Error handling
Expand All @@ -71,9 +69,6 @@ tempfile = "3"
oauth2 = { version = "5", default-features = false, features = ["reqwest"] }
base64 = { workspace = true }

# WebSocket (Cloudflare tunnel proxy)
tokio-tungstenite = { workspace = true }

# Streams
futures = { workspace = true }
tokio-stream = { workspace = true }
Expand Down
19 changes: 3 additions & 16 deletions crates/openshell-cli/src/completers.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,10 @@ use openshell_bootstrap::edge_token::load_edge_token;
use openshell_bootstrap::oidc_token::{is_token_expired, load_oidc_token, store_oidc_token};
use openshell_bootstrap::{list_gateways, load_active_gateway, load_gateway_metadata};
use openshell_core::ObjectName;
use openshell_core::auth::EdgeAuthInterceptor;
use openshell_core::proto::open_shell_client::OpenShellClient;
use openshell_core::proto::{ListProvidersRequest, ListSandboxesRequest, ListWorkspacesRequest};
use tonic::service::interceptor::InterceptedService;
use tonic::transport::Channel;

use crate::oidc_auth::oidc_refresh_token;
use crate::tls::{TlsOptions, build_channel};
use crate::tls::{GrpcClient, TlsOptions, grpc_client};

/// Complete gateway names from local metadata files (no network call).
pub fn complete_gateway_names(_prefix: &OsStr) -> Vec<CompletionCandidate> {
Expand Down Expand Up @@ -130,10 +126,7 @@ fn resolve_active_gateway() -> Option<(String, String)> {
Some((metadata.gateway_endpoint, name))
}

async fn completion_grpc_client(
server: &str,
gateway_name: &str,
) -> Option<OpenShellClient<InterceptedService<Channel, EdgeAuthInterceptor>>> {
async fn completion_grpc_client(server: &str, gateway_name: &str) -> Option<GrpcClient> {
let mut tls_opts = TlsOptions::default().with_gateway_name(gateway_name);
tls_opts.gateway_insecure = std::env::var("OPENSHELL_GATEWAY_INSECURE")
.is_ok_and(|v| !v.is_empty() && v != "0" && v != "false");
Expand Down Expand Up @@ -172,13 +165,7 @@ async fn completion_grpc_client(
}
}

let channel = build_channel(server, &tls_opts).await.ok()?;
let interceptor = EdgeAuthInterceptor::new(
tls_opts.oidc_token.as_deref(),
tls_opts.edge_token.as_deref(),
)
.ok()?;
Some(OpenShellClient::with_interceptor(channel, interceptor))
grpc_client(server, &tls_opts).await.ok()
}

/// Run an async future on a dedicated thread to avoid nested tokio runtime panics.
Expand Down
261 changes: 0 additions & 261 deletions crates/openshell-cli/src/edge_tunnel.rs

This file was deleted.

1 change: 0 additions & 1 deletion crates/openshell-cli/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ pub mod auth;
pub mod color;
pub(crate) mod commands;
pub mod completers;
pub mod edge_tunnel;
pub mod oidc_auth;
pub mod output;
pub(crate) mod policy_update;
Expand Down
Loading
Loading