From d6e96b979e38f3532f938ceaf086c651efd6da3e Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Thu, 31 Mar 2022 17:53:17 +0100 Subject: [PATCH] kubescape: 2.0.149 -> 2.0.150 --- pkgs/tools/security/kubescape/default.nix | 25 ++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/security/kubescape/default.nix b/pkgs/tools/security/kubescape/default.nix index e881fad4a929..377327e6571c 100644 --- a/pkgs/tools/security/kubescape/default.nix +++ b/pkgs/tools/security/kubescape/default.nix @@ -6,37 +6,48 @@ buildGoModule rec { pname = "kubescape"; - version = "2.0.149"; + version = "2.0.150"; src = fetchFromGitHub { owner = "armosec"; repo = pname; rev = "v${version}"; - hash = "sha256-m6tJjC5BXxFC+bSOHbKXXGZQlJIM0+fIA+JYWBntgk8="; + hash = "sha256-1D/ixtZI7/H05MD6zRtZCF8yhW1FhvRpdPWieAPwxHs="; }; nativeBuildInputs = [ installShellFiles ]; - vendorSha256 = "sha256-vplHaaT7x0ZSpvityJF5aGKDARvGPBT9DMltOpUkOMo="; + modRoot = "cmd"; + vendorSha256 = "sha256-Nznf793OMQ7ZCWb5voVcLyMiBa1Z8Dswp7Tdn1AzlJA="; ldflags = [ "-s" "-w" - "-X github.com/armosec/kubescape/clihandler/cmd.BuildNumber=v${version}" + "-X github.com/armosec/kubescape/core/cautils.BuildNumber=v${version}" ]; + postBuild = '' + # kubescape/cmd should be called kubescape + mv $GOPATH/bin/{cmd,kubescape} + ''; + postInstall = '' - # Running kubescape to generate completions outputs error warnings - # but does not crash and completes successfully - # https://github.com/armosec/kubescape/issues/200 installShellCompletion --cmd kubescape \ --bash <($out/bin/kubescape completion bash) \ --fish <($out/bin/kubescape completion fish) \ --zsh <($out/bin/kubescape completion zsh) ''; + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + $out/bin/kubescape --help + $out/bin/kubescape --version | grep "v${version}" + runHook postInstallCheck + ''; + meta = with lib; { description = "Tool for testing if Kubernetes is deployed securely"; homepage = "https://github.com/armosec/kubescape";