cloudflared: 2022.8.2 -> 2022.11.1, add tests and additional platforms
This commit is contained in:
parent
e3e35e4057
commit
91ccc07020
@ -1,14 +1,14 @@
|
|||||||
{ lib, buildGoModule, fetchFromGitHub, stdenv }:
|
{ lib, buildGoModule, fetchFromGitHub, stdenv, callPackage }:
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "cloudflared";
|
pname = "cloudflared";
|
||||||
version = "2022.8.2";
|
version = "2022.11.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "cloudflare";
|
owner = "cloudflare";
|
||||||
repo = "cloudflared";
|
repo = "cloudflared";
|
||||||
rev = version;
|
rev = version;
|
||||||
hash = "sha256-Kyt5d3KmLefTVVUmUUU23UV0lghzhLFCKLlmwTjN68I=";
|
hash = "sha256-aG63CEJfEL9r0SviZu9VzArtt3e4VuAbOMaYk9atSGo=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = null;
|
vendorSha256 = null;
|
||||||
@ -17,22 +17,56 @@ buildGoModule rec {
|
|||||||
|
|
||||||
preCheck = ''
|
preCheck = ''
|
||||||
# Workaround for: sshgen_test.go:74: mkdir /homeless-shelter/.cloudflared: no such file or directory
|
# Workaround for: sshgen_test.go:74: mkdir /homeless-shelter/.cloudflared: no such file or directory
|
||||||
export HOME="$(mktemp -d)";
|
export HOME="$(mktemp -d)"
|
||||||
|
|
||||||
# Workaround for: protocol_test.go:11:
|
# Workaround for: protocol_test.go:11:
|
||||||
# lookup protocol-v2.argotunnel.com on [::1]:53: read udp [::1]:51876->[::1]:53: read: connection refused
|
# lookup protocol-v2.argotunnel.com on [::1]:53: read udp [::1]:51876->[::1]:53: read: connection refused
|
||||||
|
|
||||||
substituteInPlace "edgediscovery/protocol_test.go" \
|
substituteInPlace "edgediscovery/protocol_test.go" \
|
||||||
--replace "TestProtocolPercentage" "SkipProtocolPercentage"
|
--replace "TestProtocolPercentage" "SkipProtocolPercentage"
|
||||||
|
|
||||||
|
# Workaround for: origin_icmp_proxy_test.go:46:
|
||||||
|
# cannot create ICMPv4 proxy: socket: permission denied nor ICMPv6 proxy: socket: permission denied
|
||||||
|
substituteInPlace "ingress/origin_icmp_proxy_test.go" \
|
||||||
|
--replace "TestICMPRouterEcho" "SkipICMPRouterEcho"
|
||||||
|
|
||||||
|
# Workaround for: origin_icmp_proxy_test.go:110:
|
||||||
|
# cannot create ICMPv4 proxy: socket: permission denied nor ICMPv6 proxy: socket: permission denied
|
||||||
|
substituteInPlace "ingress/origin_icmp_proxy_test.go" \
|
||||||
|
--replace "TestConcurrentRequestsToSameDst" "SkipConcurrentRequestsToSameDst"
|
||||||
|
|
||||||
|
# Workaround for: origin_icmp_proxy_test.go:242:
|
||||||
|
# cannot create ICMPv4 proxy: socket: permission denied nor ICMPv6 proxy: socket: permission denied
|
||||||
|
substituteInPlace "ingress/origin_icmp_proxy_test.go" \
|
||||||
|
--replace "TestICMPRouterRejectNotEcho" "SkipICMPRouterRejectNotEcho"
|
||||||
|
|
||||||
|
# Workaround for: origin_icmp_proxy_test.go:108:
|
||||||
|
# Received unexpected error: cannot create ICMPv4 proxy: Group ID 100 is not between ping group 65534 to 65534 nor ICMPv6 proxy: socket: permission denied
|
||||||
|
substituteInPlace "ingress/origin_icmp_proxy_test.go" \
|
||||||
|
--replace "TestTraceICMPRouterEcho" "SkipTraceICMPRouterEcho"
|
||||||
|
|
||||||
|
# Workaround for: icmp_posix_test.go:28: socket: permission denied
|
||||||
|
substituteInPlace "ingress/icmp_posix_test.go" \
|
||||||
|
--replace "TestFunnelIdleTimeout" "SkipFunnelIdleTimeout"
|
||||||
|
|
||||||
|
# Workaround for: icmp_posix_test.go:88: Received unexpected error: Group ID 100 is not between ping group 65534 to 65534
|
||||||
|
substituteInPlace "ingress/icmp_posix_test.go" \
|
||||||
|
--replace "TestReuseFunnel" "SkipReuseFunnel"
|
||||||
|
|
||||||
|
# Workaround for: supervisor_test.go:49:
|
||||||
|
# Expected nil, but got: Could not lookup srv records on _us-v2-origintunneld._tcp.argotunnel.com: lookup _us-v2-origintunneld._tcp.argotunnel.com on [::1]:53: read udp [::1]:49342->[::1]:53: read: connection refused
|
||||||
|
substituteInPlace "supervisor/supervisor_test.go" \
|
||||||
|
--replace "Test_Initialize_Same_Protocol" "Skip_Initialize_Same_Protocol"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
doCheck = !stdenv.isDarwin;
|
doCheck = !stdenv.isDarwin;
|
||||||
|
|
||||||
|
passthru.tests.simple = callPackage ./tests.nix { inherit version; };
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "CloudFlare Tunnel daemon (and DNS-over-HTTPS client)";
|
description = "Cloudflare Tunnel daemon, Cloudflare Access toolkit, and DNS-over-HTTPS client";
|
||||||
homepage = "https://www.cloudflare.com/products/tunnel";
|
homepage = "https://www.cloudflare.com/products/tunnel";
|
||||||
license = licenses.asl20;
|
license = licenses.asl20;
|
||||||
platforms = platforms.unix;
|
platforms = platforms.unix ++ platforms.windows;
|
||||||
maintainers = with maintainers; [ bbigras enorris thoughtpolice ];
|
maintainers = with maintainers; [ bbigras enorris thoughtpolice piperswe ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
44
pkgs/applications/networking/cloudflared/tests.nix
Normal file
44
pkgs/applications/networking/cloudflared/tests.nix
Normal file
@ -0,0 +1,44 @@
|
|||||||
|
{ version, lib, stdenv, pkgsCross, testers, cloudflared, runCommand, wine, wine64 }:
|
||||||
|
|
||||||
|
let
|
||||||
|
inherit (stdenv) buildPlatform;
|
||||||
|
in
|
||||||
|
{
|
||||||
|
version = testers.testVersion {
|
||||||
|
package = cloudflared;
|
||||||
|
command = "cloudflared help";
|
||||||
|
};
|
||||||
|
refuses-to-autoupdate = runCommand "cloudflared-${version}-refuses-to-autoupdate"
|
||||||
|
{
|
||||||
|
nativeBuildInputs = [ cloudflared ];
|
||||||
|
} ''
|
||||||
|
set -e
|
||||||
|
cloudflared update 2>&1 | tee output.txt
|
||||||
|
if ! grep "cloudflared was installed by nixpkgs" output.txt
|
||||||
|
then
|
||||||
|
echo "cloudflared's output didn't contain the package manager name"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
mkdir $out
|
||||||
|
'';
|
||||||
|
} // lib.optionalAttrs (buildPlatform.isLinux && (buildPlatform.isi686 || buildPlatform.isx86_64)) {
|
||||||
|
runs-through-wine = runCommand "cloudflared-${version}-runs-through-wine"
|
||||||
|
{
|
||||||
|
nativeBuildInputs = [ wine ];
|
||||||
|
exe = "${pkgsCross.mingw32.cloudflared}/bin/cloudflared.exe";
|
||||||
|
} ''
|
||||||
|
export HOME="$(mktemp -d)"
|
||||||
|
wine $exe help
|
||||||
|
mkdir $out
|
||||||
|
'';
|
||||||
|
} // lib.optionalAttrs (buildPlatform.isLinux && buildPlatform.isx86_64) {
|
||||||
|
runs-through-wine64 = runCommand "cloudflared-${version}-runs-through-wine64"
|
||||||
|
{
|
||||||
|
nativeBuildInputs = [ wine64 ];
|
||||||
|
exe = "${pkgsCross.mingwW64.cloudflared}/bin/cloudflared.exe";
|
||||||
|
} ''
|
||||||
|
export HOME="$(mktemp -d)"
|
||||||
|
wine64 $exe help
|
||||||
|
mkdir $out
|
||||||
|
'';
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user