commit 6ac38abf29cc60f2e4c7b405692dfa0b03afe60d · pyrox.dev/nixpkgs

+4 -1

nixos/tests/all-tests.nix

···

       407
        
         enlightenment = handleTest ./enlightenment.nix { };

     

       408
        
         env = handleTest ./env.nix { };

     

       409
        
         envfs = handleTest ./envfs.nix { };

     

       410
       -
         envoy = handleTest ./envoy.nix { };

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       411
        
         ergo = handleTest ./ergo.nix { };

     

       412
        
         ergochat = handleTest ./ergochat.nix { };

     

       413
        
         eris-server = handleTest ./eris-server.nix { };

···

       407
        
         enlightenment = handleTest ./enlightenment.nix { };

     

       408
        
         env = handleTest ./env.nix { };

     

       409
        
         envfs = handleTest ./envfs.nix { };

     

       410
       +
         envoy = runTest {

     

       411
       +
           imports = [ ./envoy.nix ];

     

       412
       +
           _module.args.envoyPackage = pkgs.envoy;

     

       413
       +
         };

     

       414
        
         ergo = handleTest ./ergo.nix { };

     

       415
        
         ergochat = handleTest ./ergochat.nix { };

     

       416
        
         eris-server = handleTest ./eris-server.nix { };

+53 -55

nixos/tests/envoy.nix

···

       1
       -
       import ./make-test-python.nix (

     

       2
       -
         { pkgs, lib, ... }:

     

       3
       -
         {

     

       4
       -
           name = "envoy";

     

       5
       -
           meta = with pkgs.lib.maintainers; {

     

       6
       -
             maintainers = [ cameronnemo ];

     

       7
       -
           };

     

       8
        
       

     

       9
       -
           nodes.machine =

     

       10
       -
             { pkgs, ... }:

     

       11
       -
             {

     

       12
       -
               services.envoy.enable = true;

     

       13
       -
               services.envoy.settings = {

     

       14
       -
                 admin = {

     

       15
       -
                   access_log_path = "/dev/null";

     

       16
       -
                   address = {

     

       17
       -
                     socket_address = {

     

       18
       -
                       protocol = "TCP";

     

       19
       -
                       address = "127.0.0.1";

     

       20
       -
                       port_value = 80;

     

       21
       -
                     };

     

       22
       -
                   };

     

       23
       -
                 };

     

       24
       -
                 static_resources = {

     

       25
       -
                   listeners = [ ];

     

       26
       -
                   clusters = [ ];

     

       27
        
                 };

     

       28
        
               };

     

       29
       -
               specialisation = {

     

       30
       -
                 withoutConfigValidation.configuration =

     

       31
       -
                   { ... }:

     

       32
       -
                   {

     

       33
       -
                     services.envoy = {

     

       34
       -
                       requireValidConfig = false;

     

       35
       -
                       settings.admin.access_log_path = lib.mkForce "/var/log/envoy/access.log";

     

       36
       -
                     };

     

       37
       -
                   };

     

       38
       -
               };

     

       39
        
             };

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       40
        
       

     

       41
       -
           testScript =

     

       42
       -
             { nodes, ... }:

     

       43
       -
             let

     

       44
       -
               specialisations = "${nodes.machine.system.build.toplevel}/specialisation";

     

       45
       -
             in

     

       46
       -
             ''

     

       47
       -
               machine.start()

     

       48
        
       

     

       49
       -
               with subtest("envoy.service starts and responds with ready"):

     

       50
       -
                 machine.wait_for_unit("envoy.service")

     

       51
       -
                 machine.wait_for_open_port(80)

     

       52
       -
                 machine.wait_until_succeeds("curl -fsS localhost:80/ready")

     

       53
        
       

     

       54
       -
               with subtest("envoy.service works with config path not available at eval time"):

     

       55
       -
                 machine.succeed('${specialisations}/withoutConfigValidation/bin/switch-to-configuration test')

     

       56
       -
                 machine.wait_for_unit("envoy.service")

     

       57
       -
                 machine.wait_for_open_port(80)

     

       58
       -
                 machine.wait_until_succeeds("curl -fsS localhost:80/ready")

     

       59
       -
                 machine.succeed('test -f /var/log/envoy/access.log')

     

       60
       -
             '';

     

       61
       -
         }

     

       62
       -
       )

···

       1
       +
       { envoyPackage, lib, ... }:

     

       2
       +
       {

     

       3
       +
         name = envoyPackage.pname;

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       4
        
       

     

       5
       +
         meta = with lib.maintainers; {

     

       6
       +
           maintainers = [ cameronnemo ];

     

       7
       +
         };

     

       8
       +
       

     

       9
       +
         nodes.machine = {

     

       10
       +
           services.envoy.enable = true;

     

       11
       +
           services.envoy.package = envoyPackage;

     

       12
       +
           services.envoy.settings = {

     

       13
       +
             admin = {

     

       14
       +
               access_log_path = "/dev/null";

     

       15
       +
               address = {

     

       16
       +
                 socket_address = {

     

       17
       +
                   protocol = "TCP";

     

       18
       +
                   address = "127.0.0.1";

     

       19
       +
                   port_value = 80;

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       20
        
                 };

     

       21
        
               };

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       22
        
             };

     

       23
       +
             static_resources = {

     

       24
       +
               listeners = [ ];

     

       25
       +
               clusters = [ ];

     

       26
       +
             };

     

       27
       +
           };

     

       28
       +
           specialisation = {

     

       29
       +
             withoutConfigValidation.configuration =

     

       30
       +
               { ... }:

     

       31
       +
               {

     

       32
       +
                 services.envoy = {

     

       33
       +
                   requireValidConfig = false;

     

       34
       +
                   settings.admin.access_log_path = lib.mkForce "/var/log/envoy/access.log";

     

       35
       +
                 };

     

       36
       +
               };

     

       37
       +
           };

     

       38
       +
         };

     

       39
        
       

     

       40
       +
         testScript =

     

       41
       +
           { nodes, ... }:

     

       42
       +
           let

     

       43
       +
             specialisations = "${nodes.machine.system.build.toplevel}/specialisation";

     

       44
       +
           in

     

       45
       +
           ''

     

       46
       +
             machine.start()

     

       47
        
       

     

       48
       +
             with subtest("envoy.service starts and responds with ready"):

     

       49
       +
               machine.wait_for_unit("envoy.service")

     

       50
       +
               machine.wait_for_open_port(80)

     

       51
       +
               machine.wait_until_succeeds("curl -fsS localhost:80/ready")

     

       52
        
       

     

       53
       +
             with subtest("envoy.service works with config path not available at eval time"):

     

       54
       +
               machine.succeed('${specialisations}/withoutConfigValidation/bin/switch-to-configuration test')

     

       55
       +
               machine.wait_for_unit("envoy.service")

     

       56
       +
               machine.wait_for_open_port(80)

     

       57
       +
               machine.wait_until_succeeds("curl -fsS localhost:80/ready")

     

       58
       +
               machine.succeed('test -f /var/log/envoy/access.log')

     

       59
       +
           '';

     

       60
       +
       }

     

       0