Merge pull request #87969 from QuentinI/summon

summon: init at 0.8.2
This commit is contained in:
Lassulus 2020-08-22 18:52:16 +02:00 committed by GitHub
commit afde337f4a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 82 additions and 0 deletions

View file

@ -6755,6 +6755,12 @@
githubId = 115877;
name = "Kenny Shen";
};
quentini = {
email = "quentini@airmail.cc";
github = "QuentinI";
githubId = 18196237;
name = "Quentin Inkling";
};
qyliss = {
email = "hi@alyssa.is";
github = "alyssais";

View file

@ -0,0 +1,35 @@
{ stdenv, buildGoModule, fetchFromGitHub, lib, patchResolver ? true }:
with stdenv.lib;
buildGoModule rec {
pname = "summon";
version = "0.8.2";
src = fetchFromGitHub {
owner = "cyberark";
repo = "summon";
rev = "v${version}";
sha256 = "1z4xnrncwvp3rfm97zvc0ivvw2fh1hrjhj3rplvidzxjfyasbvwv";
};
vendorSha256 = "1597vrs4b7k6gkmkvf7xnd38rvjixmlcz0j7npmik9nbkm57l74m";
subPackages = [ "cmd" ];
# Patches provider resolver to support resolving unqualified names
# from $PATH, e.g. `summon -p gopass` instead of `summon -p $(which gopass)`
patches = optional patchResolver [ ./resolve-paths.patch ];
postInstall = ''
mv $out/bin/cmd $out/bin/summon
'';
meta = with lib; {
description =
"CLI that provides on-demand secrets access for common DevOps tools";
homepage = "https://cyberark.github.io/summon";
license = lib.licenses.mit;
maintainers = with maintainers; [ quentini ];
};
}

View file

@ -0,0 +1,39 @@
From dd34727ebfbd59738084eeb7c2a020e40a4d0abe Mon Sep 17 00:00:00 2001
From: Quentin <Quentin Inkling>
Date: Mon, 29 Jun 2020 17:35:04 +0300
Subject: [PATCH] Patch for
---
provider/provider.go | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/provider/provider.go b/provider/provider.go
index c1e28d9..f20fdaa 100644
--- a/provider/provider.go
+++ b/provider/provider.go
@@ -78,7 +78,22 @@ func expandPath(provider string) string {
if path.Base(provider) != provider {
return provider
}
+
+ var (
+ stdOut bytes.Buffer
+ stdErr bytes.Buffer
+ )
+ cmd := exec.Command("which", provider)
+ cmd.Stdout = &stdOut
+ cmd.Stderr = &stdErr
+ err := cmd.Run()
+
+ if err == nil {
+ return strings.TrimSpace(stdOut.String())
+ }
+
return path.Join(DefaultPath, provider)
+
}
func getDefaultPath() string {
--
2.27.0

View file

@ -11392,6 +11392,8 @@ in
strace = callPackage ../development/tools/misc/strace { };
summon = callPackage ../development/tools/summon { };
swarm = callPackage ../development/tools/analysis/swarm { };
swiftformat = callPackage ../development/tools/swiftformat { };