commit 430ea8553b307c0287574e31948d575e88ba339b · pyrox.dev/nixpkgs

+1 -1

nixos/tests/all-tests.nix

···

       162
       162
        
         alloy = runTest ./alloy.nix;

     

       163
       163
        
         allTerminfo = runTest ./all-terminfo.nix;

     

       164
       164
        
         alps = runTest ./alps.nix;

     

       165
       165
       -
         amazon-cloudwatch-agent = handleTest ./amazon-cloudwatch-agent.nix {};

     

       165
       165
       +
         amazon-cloudwatch-agent = runTest ./amazon-cloudwatch-agent.nix;

     

       166
       166
        
         amazon-init-shell = handleTest ./amazon-init-shell.nix {};

     

       167
       167
        
         amazon-ssm-agent = handleTest ./amazon-ssm-agent.nix {};

     

       168
       168
        
         amd-sev = runTest ./amd-sev.nix;

+74 -76

nixos/tests/amazon-cloudwatch-agent.nix

···

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

     

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

     

       3
       3
       -
         let

     

       4
       4
       -
           # See https://docs.aws.amazon.com/sdkref/latest/guide/file-format.html.

     

       5
       5
       -
           iniFormat = pkgs.formats.ini { };

     

       1
       1
       +
       { pkgs, ... }:

     

       2
       2
       +
       let

     

       3
       3
       +
         # See https://docs.aws.amazon.com/sdkref/latest/guide/file-format.html.

     

       4
       4
       +
         iniFormat = pkgs.formats.ini { };

     

       6
       5
        
       

     

       7
       7
       -
           region = "ap-northeast-1";

     

       8
       8
       -
           sharedConfigurationDefaultProfile = "default";

     

       9
       9
       -
           sharedConfigurationFile = iniFormat.generate "config" {

     

       10
       10
       -
             "${sharedConfigurationDefaultProfile}" = {

     

       11
       11
       -
               region = region;

     

       12
       12
       -
             };

     

       6
       6
       +
         region = "ap-northeast-1";

     

       7
       7
       +
         sharedConfigurationDefaultProfile = "default";

     

       8
       8
       +
         sharedConfigurationFile = iniFormat.generate "config" {

     

       9
       9
       +
           "${sharedConfigurationDefaultProfile}" = {

     

       10
       10
       +
             region = region;

     

       13
       11
        
           };

     

       14
       14
       -
           sharedCredentialsFile = iniFormat.generate "credentials" {

     

       15
       15
       -
             "${sharedConfigurationDefaultProfile}" = {

     

       16
       16
       -
               aws_access_key_id = "placeholder";

     

       17
       17
       -
               aws_secret_access_key = "placeholder";

     

       18
       18
       -
               aws_session_token = "placeholder";

     

       19
       19
       -
             };

     

       12
       12
       +
         };

     

       13
       13
       +
         sharedCredentialsFile = iniFormat.generate "credentials" {

     

       14
       14
       +
           "${sharedConfigurationDefaultProfile}" = {

     

       15
       15
       +
             aws_access_key_id = "placeholder";

     

       16
       16
       +
             aws_secret_access_key = "placeholder";

     

       17
       17
       +
             aws_session_token = "placeholder";

     

       20
       18
        
           };

     

       21
       21
       -
           sharedConfigurationDirectory = pkgs.runCommand ".aws" { } ''

     

       22
       22
       -
             mkdir $out

     

       19
       19
       +
         };

     

       20
       20
       +
         sharedConfigurationDirectory = pkgs.runCommand ".aws" { } ''

     

       21
       21
       +
           mkdir $out

     

       23
       22
        
       

     

       24
       24
       -
             cp ${sharedConfigurationFile} $out/config

     

       25
       25
       -
             cp ${sharedCredentialsFile} $out/credentials

     

       26
       26
       -
           '';

     

       27
       27
       -
         in

     

       28
       28
       -
         {

     

       29
       29
       -
           name = "amazon-cloudwatch-agent";

     

       23
       23
       +
           cp ${sharedConfigurationFile} $out/config

     

       24
       24
       +
           cp ${sharedCredentialsFile} $out/credentials

     

       25
       25
       +
         '';

     

       26
       26
       +
       in

     

       27
       27
       +
       {

     

       28
       28
       +
         name = "amazon-cloudwatch-agent";

     

       30
       29
        
       

     

       31
       31
       -
           nodes.machine =

     

       32
       32
       -
             { config, pkgs, ... }:

     

       33
       33
       -
             {

     

       34
       34
       -
               services.amazon-cloudwatch-agent = {

     

       35
       35
       -
                 enable = true;

     

       36
       36
       -
                 commonConfiguration = {

     

       37
       37
       -
                   credentials = {

     

       38
       38
       -
                     shared_credential_profile = sharedConfigurationDefaultProfile;

     

       39
       39
       -
                     shared_credential_file = "${sharedConfigurationDirectory}/credentials";

     

       40
       40
       -
                   };

     

       30
       30
       +
         nodes.machine =

     

       31
       31
       +
           { config, pkgs, ... }:

     

       32
       32
       +
           {

     

       33
       33
       +
             services.amazon-cloudwatch-agent = {

     

       34
       34
       +
               enable = true;

     

       35
       35
       +
               commonConfiguration = {

     

       36
       36
       +
                 credentials = {

     

       37
       37
       +
                   shared_credential_profile = sharedConfigurationDefaultProfile;

     

       38
       38
       +
                   shared_credential_file = "${sharedConfigurationDirectory}/credentials";

     

       41
       39
        
                 };

     

       42
       42
       -
                 configuration = {

     

       43
       43
       -
                   agent = {

     

       44
       44
       -
                     # Required despite documentation saying the agent ignores it in "onPremise" mode.

     

       45
       45
       -
                     region = region;

     

       40
       40
       +
               };

     

       41
       41
       +
               configuration = {

     

       42
       42
       +
                 agent = {

     

       43
       43
       +
                   # Required despite documentation saying the agent ignores it in "onPremise" mode.

     

       44
       44
       +
                   region = region;

     

       46
       45
        
       

     

       47
       47
       -
                     # Show debug logs and write to a file for interactive debugging.

     

       48
       48
       -
                     debug = true;

     

       49
       49
       -
                     logfile = "/var/log/amazon-cloudwatch-agent/amazon-cloudwatch-agent.log";

     

       50
       50
       -
                   };

     

       51
       51
       -
                   logs = {

     

       52
       52
       -
                     logs_collected = {

     

       53
       53
       -
                       files = {

     

       54
       54
       -
                         collect_list = [

     

       55
       55
       -
                           {

     

       56
       56
       -
                             file_path = "/var/log/amazon-cloudwatch-agent/amazon-cloudwatch-agent.log";

     

       57
       57
       -
                             log_group_name = "/var/log/amazon-cloudwatch-agent/amazon-cloudwatch-agent.log";

     

       58
       58
       -
                             log_stream_name = "{local_hostname}";

     

       59
       59
       -
                           }

     

       60
       60
       -
                         ];

     

       61
       61
       -
                       };

     

       46
       46
       +
                   # Show debug logs and write to a file for interactive debugging.

     

       47
       47
       +
                   debug = true;

     

       48
       48
       +
                   logfile = "/var/log/amazon-cloudwatch-agent/amazon-cloudwatch-agent.log";

     

       49
       49
       +
                 };

     

       50
       50
       +
                 logs = {

     

       51
       51
       +
                   logs_collected = {

     

       52
       52
       +
                     files = {

     

       53
       53
       +
                       collect_list = [

     

       54
       54
       +
                         {

     

       55
       55
       +
                           file_path = "/var/log/amazon-cloudwatch-agent/amazon-cloudwatch-agent.log";

     

       56
       56
       +
                           log_group_name = "/var/log/amazon-cloudwatch-agent/amazon-cloudwatch-agent.log";

     

       57
       57
       +
                           log_stream_name = "{local_hostname}";

     

       58
       58
       +
                         }

     

       59
       59
       +
                       ];

     

       62
       60
        
                     };

     

       63
       61
        
                   };

     

       64
       64
       -
                   traces = {

     

       65
       65
       -
                     local_mode = true;

     

       66
       66
       -
                     traces_collected = {

     

       67
       67
       -
                       xray = { };

     

       68
       68
       -
                     };

     

       62
       62
       +
                 };

     

       63
       63
       +
                 traces = {

     

       64
       64
       +
                   local_mode = true;

     

       65
       65
       +
                   traces_collected = {

     

       66
       66
       +
                     xray = { };

     

       69
       67
        
                   };

     

       70
       68
        
                 };

     

       71
       71
       -
                 mode = "onPremise";

     

       72
       69
        
               };

     

       70
       70
       +
               mode = "onPremise";

     

       71
       71
       +
             };

     

       73
       72
        
       

     

       74
       74
       -
               # Keep the runtime directory for interactive debugging.

     

       75
       75
       -
               systemd.services.amazon-cloudwatch-agent.serviceConfig.RuntimeDirectoryPreserve = true;

     

       76
       76
       -
             };

     

       73
       73
       +
             # Keep the runtime directory for interactive debugging.

     

       74
       74
       +
             systemd.services.amazon-cloudwatch-agent.serviceConfig.RuntimeDirectoryPreserve = true;

     

       75
       75
       +
           };

     

       77
       76
        
       

     

       78
       78
       -
           testScript = ''

     

       79
       79
       -
             start_all()

     

       77
       77
       +
         testScript = ''

     

       78
       78
       +
           start_all()

     

       80
       79
        
       

     

       81
       81
       -
             machine.wait_for_unit("amazon-cloudwatch-agent.service")

     

       80
       80
       +
           machine.wait_for_unit("amazon-cloudwatch-agent.service")

     

       82
       81
        
       

     

       83
       83
       -
             machine.wait_for_file("/run/amazon-cloudwatch-agent/amazon-cloudwatch-agent.pid")

     

       84
       84
       -
             machine.wait_for_file("/run/amazon-cloudwatch-agent/amazon-cloudwatch-agent.toml")

     

       85
       85
       -
             # "config-translator" omits this file if no trace configurations are specified.

     

       86
       86
       -
             #

     

       87
       87
       -
             # See https://github.com/aws/amazon-cloudwatch-agent/issues/1320.

     

       88
       88
       -
             machine.wait_for_file("/run/amazon-cloudwatch-agent/amazon-cloudwatch-agent.yaml")

     

       89
       89
       -
             machine.wait_for_file("/run/amazon-cloudwatch-agent/env-config.json")

     

       90
       90
       -
           '';

     

       91
       91
       -
         }

     

       92
       92
       -
       )

     

       82
       82
       +
           machine.wait_for_file("/run/amazon-cloudwatch-agent/amazon-cloudwatch-agent.pid")

     

       83
       83
       +
           machine.wait_for_file("/run/amazon-cloudwatch-agent/amazon-cloudwatch-agent.toml")

     

       84
       84
       +
           # "config-translator" omits this file if no trace configurations are specified.

     

       85
       85
       +
           #

     

       86
       86
       +
           # See https://github.com/aws/amazon-cloudwatch-agent/issues/1320.

     

       87
       87
       +
           machine.wait_for_file("/run/amazon-cloudwatch-agent/amazon-cloudwatch-agent.yaml")

     

       88
       88
       +
           machine.wait_for_file("/run/amazon-cloudwatch-agent/env-config.json")

     

       89
       89
       +
         '';

     

       90
       90
       +
       }