From 2bccdba080f439fa60f2a966f99ffc7a6ebd56c6 Mon Sep 17 00:00:00 2001 From: Thinking-Dragon Date: Sat, 23 Aug 2025 17:23:19 -0400 Subject: [PATCH] Allow snap to access ssh-keys for ssh-based git operations --- dependency-analysis/src/dependency_tree_generators/mod.rs | 4 ++-- snapcraft.yaml | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dependency-analysis/src/dependency_tree_generators/mod.rs b/dependency-analysis/src/dependency_tree_generators/mod.rs index 8249104..f43e759 100644 --- a/dependency-analysis/src/dependency_tree_generators/mod.rs +++ b/dependency-analysis/src/dependency_tree_generators/mod.rs @@ -3,7 +3,7 @@ use source_wand_common::project_manipulator::project_manipulator::AnyProjectMani use crate::{ build_systems::build_system_identity::BuildSystemIdentity, - dependency_tree_generators::cdxgen_dependency_tree_generator::generate_cdxgen_dependency_tree, + dependency_tree_generators::{cdxgen_dependency_tree_generator::generate_cdxgen_dependency_tree, go_dependency_tree_generator::generate_go_dependency_tree}, dependency_tree_node::DependencyTreeNode }; @@ -33,7 +33,7 @@ pub fn generate_dependency_tree( generate_cdxgen_dependency_tree(project_manipulator, Some("java")) }, BuildSystemIdentity::Go => { - generate_cdxgen_dependency_tree(project_manipulator, Some("go")) + generate_go_dependency_tree(project_manipulator) }, BuildSystemIdentity::Unknown => { generate_cdxgen_dependency_tree(project_manipulator, None) diff --git a/snapcraft.yaml b/snapcraft.yaml index 61d3200..9b8c71d 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -1,5 +1,5 @@ name: source-wand -version: 0.14.0 +version: 0.15.0 summary: CLI tool that helps with large scale manipulations of source code description: | `source-wand` is a CLI tool that helps with large scale manipulations of source code. @@ -63,6 +63,7 @@ parts: - curl - git - jq + - openssh-client source: . after: - go-toolchain @@ -77,6 +78,7 @@ apps: PATH: $SNAP/node/bin:$SNAP/rust/cargo/bin:$SNAP/go-toolchain/bin:$PATH GIT_EXEC_PATH: $SNAP/usr/lib/git-core + GIT_SSH_COMMAND: "ssh -o StrictHostKeyChecking=no" CARGO_HOME: $SNAP_USER_DATA/.cargo RUSTUP_HOME: $SNAP_USER_DATA/.rustup @@ -86,3 +88,4 @@ apps: plugs: - home - network + - ssh-keys