Unverified Commit 50a07732 authored by Doron Behar's avatar Doron Behar Committed by GitHub
Browse files

Merge pull request #259259 from Lassulus/syncthing_stale

nixos/syncthing: match stale ids by subtracting in jq
parents b2c9d3ce 34888cd1
Loading
Loading
Loading
Loading
+7 −7
Original line number Diff line number Diff line
@@ -100,13 +100,13 @@ let
      the Nix configured list of IDs
      */
      + lib.optionalString s.override ''
        old_conf_${conf_type}_ids="$(curl -X GET ${s.baseAddress} | ${jq} --raw-output '.[].${s.GET_IdAttrName}')"
        for id in ''${old_conf_${conf_type}_ids}; do
          if echo ${lib.concatStringsSep " " s.new_conf_IDs} | grep -q $id; then
            continue
          else
        stale_${conf_type}_ids="$(curl -X GET ${s.baseAddress} | ${jq} \
          --argjson new_ids ${lib.escapeShellArg (builtins.toJSON s.new_conf_IDs)} \
          --raw-output \
          '[.[].${s.GET_IdAttrName}] - $new_ids | .[]'
        )"
        for id in ''${stale_${conf_type}_ids}; do
          curl -X DELETE ${s.baseAddress}/$id
          fi
        done
      ''
    ))
+0 −1
Original line number Diff line number Diff line
import ./make-test-python.nix ({ lib, pkgs, ... }: let

  testId = "7CFNTQM-IMTJBHJ-3UWRDIU-ZGQJFR6-VCXZ3NB-XUH3KZO-N52ITXR-LAIYUAU";
  testName = "testDevice foo'bar";

in {
  name = "syncthing-init";