Unverified Commit fa14a146 authored by Mario Rodas's avatar Mario Rodas Committed by GitHub
Browse files

Merge pull request #258036 from anthonyroussel/fix-ssm-seelog 

nixos/amazon-ssm-agent: fix missing seelog.xml file
parents c93541b2 4f7eab6d

nixos/modules/services/misc/amazon-ssm-agent.nix

+6 −3
Original line number Diff line number Diff line
@@ -33,19 +33,22 @@ in { 
  };



  config = mkIf cfg.enable {

    # See https://github.com/aws/amazon-ssm-agent/blob/mainline/packaging/linux/amazon-ssm-agent.service

    systemd.services.amazon-ssm-agent = {

      inherit (cfg.package.meta) description;

      after    = [ "network.target" ];

      after    = [ "network-online.target" ];

      wantedBy = [ "multi-user.target" ];



      path = [ fake-lsb-release pkgs.coreutils ];



      serviceConfig = {

        ExecStart = "${cfg.package}/bin/amazon-ssm-agent";

        KillMode = "process";

        # We want this restating pretty frequently. It could be our only means

        # of accessing the instance.

        Restart = "always";

        RestartSec = "1min";

        RestartPreventExitStatus = 194;

        RestartSec = "90";

      };

    };
@@ -70,7 +73,7 @@ in { 
      group = "ssm-user";

    };



    environment.etc."amazon/ssm/seelog.xml".source = "${cfg.package}/seelog.xml.template";

    environment.etc."amazon/ssm/seelog.xml".source = "${cfg.package}/etc/amazon/ssm/seelog.xml.template";



    environment.etc."amazon/ssm/amazon-ssm-agent.json".source =  "${cfg.package}/etc/amazon/ssm/amazon-ssm-agent.json.template";

nixos/tests/all-tests.nix

+1 −0
Original line number Diff line number Diff line
@@ -117,6 +117,7 @@ in { 
  allTerminfo = handleTest ./all-terminfo.nix {};

  alps = handleTest ./alps.nix {};

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

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

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

  anbox = runTest ./anbox.nix;

  anuko-time-tracker = handleTest ./anuko-time-tracker.nix {};

nixos/tests/amazon-ssm-agent.nix

0 → 100644
+17 −0
Original line number Diff line number Diff line 
import ./make-test-python.nix ({ lib, pkgs, ... }: {

  name = "amazon-ssm-agent";

  meta.maintainers = [ lib.maintainers.anthonyroussel ];



  nodes.machine = { config, pkgs, ... }: {

    services.amazon-ssm-agent.enable = true;

  };



  testScript = ''

    start_all()



    machine.wait_for_file("/etc/amazon/ssm/seelog.xml")

    machine.wait_for_file("/etc/amazon/ssm/amazon-ssm-agent.json")



    machine.wait_for_unit("amazon-ssm-agent.service")

  '';

})

pkgs/by-name/am/amazon-ssm-agent/package.nix

+8 −4
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
, dmidecode

, bashInteractive

, nix-update-script

, nixosTests

, testers

, amazon-ssm-agent

, overrideEtc ? true
@@ -147,12 +148,15 @@ buildGoModule rec { 
  '';



  passthru = {

    updateScript = nix-update-script { };

    tests.version = testers.testVersion {

    tests = {

      inherit (nixosTests) amazon-ssm-agent;

      version = testers.testVersion {

        package = amazon-ssm-agent;

        command = "amazon-ssm-agent --version";

      };

    };

    updateScript = nix-update-script { };

  };



  __darwinAllowLocalNetworking = true;