From 6f7d7e8d989ce9b3ecd59deef81c9a49bd0c68d5 Mon Sep 17 00:00:00 2001 From: Johannes Kirschbauer Date: Wed, 9 Apr 2025 17:30:48 +0200 Subject: [PATCH] chore(checks/inventory): regenerate test vars --- .../sops/machines/admin1/key.json | 10 ++++---- .../sops/machines/peer1/key.json | 10 ++++---- .../sops/secrets/admin1-age.key/secret | 17 +++++--------- .../sops/secrets/peer1-age.key/secret | 17 +++++--------- .../sops/users/admin/key.json | 5 +--- .../dummy-generator/generated-password/secret | 21 +++++++---------- .../admin1/dummy-generator/host-id/value | 2 +- .../dummy-generator/generated-password/secret | 23 ++++++++----------- .../peer1/dummy-generator/host-id/value | 2 +- .../per-machine/peer1/new-service/hello/value | 1 + checks/lib/test-inventory.nix | 6 ++--- 11 files changed, 48 insertions(+), 66 deletions(-) create mode 100644 checks/dummy-inventory-test/vars/per-machine/peer1/new-service/hello/value diff --git a/checks/dummy-inventory-test/sops/machines/admin1/key.json b/checks/dummy-inventory-test/sops/machines/admin1/key.json index 388a517cb..9c12c4e55 100755 --- a/checks/dummy-inventory-test/sops/machines/admin1/key.json +++ b/checks/dummy-inventory-test/sops/machines/admin1/key.json @@ -1,4 +1,6 @@ -{ - "publickey": "age17fkfrtwwaxx6nhgnrh2vyzpejesyucng90f6y2j48yt96vspwyrsqhknpj", - "type": "age" -} +[ + { + "publickey": "age1hd2exjq88h7538y6mvjvexx3u5gp6a03yfn5nj32h2667yyksyaqcuk5qs", + "type": "age" + } +] \ No newline at end of file diff --git a/checks/dummy-inventory-test/sops/machines/peer1/key.json b/checks/dummy-inventory-test/sops/machines/peer1/key.json index 978a7a94e..cbf8250e6 100755 --- a/checks/dummy-inventory-test/sops/machines/peer1/key.json +++ b/checks/dummy-inventory-test/sops/machines/peer1/key.json @@ -1,4 +1,6 @@ -{ - "publickey": "age1uehj0t7lhprwenmfvsamrja8xs9uvruw830nfll7m0pmuhddqd9sdwke7q", - "type": "age" -} +[ + { + "publickey": "age19urkt89q45a2wk6a4yaramzufjtnw6nq2snls0v7hmf7tqf73axsfx50tk", + "type": "age" + } +] \ No newline at end of file diff --git a/checks/dummy-inventory-test/sops/secrets/admin1-age.key/secret b/checks/dummy-inventory-test/sops/secrets/admin1-age.key/secret index a94170f7b..125255224 100644 --- a/checks/dummy-inventory-test/sops/secrets/admin1-age.key/secret +++ b/checks/dummy-inventory-test/sops/secrets/admin1-age.key/secret @@ -1,20 +1,15 @@ { - "data": "ENC[AES256_GCM,data:uIzee4V2eBKH+1FR+BvrdyMg1SIpSshdAD0Yl1g5WMBrknvhGaQczaVzzwBBmorhmM2qUyS99F5CnSxx9JsF1ojnHrH1QWe9GzI=,iv:LCTp/3dWDVuxcLzQt8LI8gTNzYkG2rymNBkKD/clnw8=,tag:M32g0FuAvZ+nnGq/VSGYEQ==,type:str]", + "data": "ENC[AES256_GCM,data:hhuFgZcPqht0h3tKxGtheS4GlrVDo4TxH0a9lxgPYj2i12QUmE04rB07A+hu4Z8WNWLYvdM5069mEOZYm3lSeTzBHQPxYZRuVj0=,iv:sA1srRFQqsMlJTAjFcb09tI/Jg2WjOVJL5NZkPwiLoU=,tag:6xXo9FZpmAJw6hCBsWzf8Q==,type:str]", "sops": { - "kms": null, - "gcp_kms": null, - "azure_kv": null, - "hc_vault": null, "age": [ { "recipient": "age1qm0p4vf9jvcnn43s6l4prk8zn6cx0ep9gzvevxecv729xz540v8qa742eg", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBrTkwxeUlCTTNUWjVsMThT\nZ3l5emRDL2t0cHhIQ1hiNGRCU3lDQXA0c1NnCnZPUm15RXVkTFhmdXZtdURPcE40\nVHgyK2N1dW9LRGw5ZzRNUW8wWmtkZ00KLS0tIE8yQU1GaXNVM0ZRdk1CWXpjU1Aw\nSWZKWEUza00yL3QxNEEvb21LT05zdkkKMXkIG2IroZ3Fb+4JiGMkspgHaQF5ZYhM\nt2HjXDP+H4J2Mi3WN17aXpZNzeEJeRYZzhQZp/2RN8fucGtjOvgTHw==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBGaGVHeTgrN3dJQ2VITFBM\neWVzbDhjb0pwNUhBUjdUc0p5OTVta1dvSno4ClJxeUc4Z0hiaFRkVlJ1YTA4Lyta\neWdwV005WGYvMUNRVG1qOVdicTk0NUkKLS0tIFQvaDNFS1JMSFlHRXlhc3lsZm03\nYVhDaHNsam5wN1VqdzA3WTZwM1JwV2sKZk/SiZJgjllADdfHLSWuQcU4+LttDpt/\nqqDUATEuqYaALljC/y3COT+grTM2bwGjj6fsfsfiO/EL9iwzD3+7oA==\n-----END AGE ENCRYPTED FILE-----\n" } ], - "lastmodified": "2025-04-08T14:05:14Z", - "mac": "ENC[AES256_GCM,data:fMscucQv/EpEY5jaOqDS7CGfQnhRTNhIJprIYX2JoiQoTdZo2yP/h8wZnvKBCAWKut5KRj3VRENPjAiKq31UhWtEU271fqzHeOadrLQ9VD7DK31qFSXgYGLBn51rlewQd3I+VXXRCfNJRFcE8i38YAMKbDsKRuqUdh8b4V7ernw=,iv:rslGG25fVSVl3li/vZGriy/QsSCWNkBUzKvHBhxwj+I=,tag:Cg0j6Ea9OpgUfEo7/+QJ8w==,type:str]", - "pgp": null, + "lastmodified": "2025-04-09T15:10:16Z", + "mac": "ENC[AES256_GCM,data:xuXj4833G6nhvcRo2ekDxz8G5phltmU8h1GgGofH9WndzrqLKeRSqm/n03IHRW0f4F68XxnyAkfvokVh6vW3LRQAFkqIlXz5U4+zFNcaVaPobS5gHTgxsCoTUoalWPvHWtXd50hUVXeAt8rPfTfeveVGja8bOERk8mvwUPxb6h4=,iv:yP1usA9m8tKl6Z/UK9PaVMJlZlF5qpY4EiM4+ByVlik=,tag:8DgoIhLstp3MRki90VfEvw==,type:str]", "unencrypted_suffix": "_unencrypted", - "version": "3.9.4" + "version": "3.10.1" } -} \ No newline at end of file +} diff --git a/checks/dummy-inventory-test/sops/secrets/peer1-age.key/secret b/checks/dummy-inventory-test/sops/secrets/peer1-age.key/secret index 5e558fc63..b5353a201 100644 --- a/checks/dummy-inventory-test/sops/secrets/peer1-age.key/secret +++ b/checks/dummy-inventory-test/sops/secrets/peer1-age.key/secret @@ -1,20 +1,15 @@ { - "data": "ENC[AES256_GCM,data:FfuscjTuIoAdSt9JU1mxeMlXGyGb57wtYPvi3HEMVY6xM4XcVNI0HwIVj+rAR02ae/DxUppq4t+UWb/Hm4un98UNUoksSWV1cpA=,iv:RJGGTIg/Qn+oLub+i7CGxj1wT1kggKhCriTwBkwXzgQ=,tag:8js1JJGW37IwgR25Vw0LKg==,type:str]", + "data": "ENC[AES256_GCM,data:rwPhbayGf6mE1E9NCN+LuL7VfWWOfhoJW6H2tNSoyebtyTpM3GO2jWca1+N7hI0juhNkUk+rIsYQYbCa/5DZQiV0/2Jgu4US1XY=,iv:B5mcaQsDjb6BacxGB4Kk88/qLCpVOjQNRvGN+fgUiEo=,tag:Uz0A8kAF5NzFetbv9yHIjQ==,type:str]", "sops": { - "kms": null, - "gcp_kms": null, - "azure_kv": null, - "hc_vault": null, "age": [ { "recipient": "age1qm0p4vf9jvcnn43s6l4prk8zn6cx0ep9gzvevxecv729xz540v8qa742eg", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB0dDgwcEkwNFBVa3NEZnM2\nWjk4YWxJZkoydFhKMEprWDRJZTluajV1b0drCnlzKytwaHNEenZaSFJhZ0daQWpB\nMzU2MStFU3pTbjk4d1Jjc2tkS2VVT3cKLS0tIFF1QW5hdkQzK0ZtallIcU11aFE5\nM2FWU05pazZYNHM3dDRRZmhyRmpya3MKuzKn13nDHDJI4I6Hdwg3/zAh9xSm8N6n\nDTN7nyWO4E9NRJiqAyjq+Ivfi22/mx0eBww/odGASRHGogZyNB6Fkg==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBWY0hKQ1dnV0tMYytDMCtj\nTDV4Zk5NeVN0bCtqaWRQV3d4M0VlcGVZMkhZCm02dHZyOGVlYzJ5Z3FlUWNXMVQ0\nb2ZrTXZQRzRNdzFDeWZCVGhlTS9rMm8KLS0tIEJkY1QwOENRYWw3cjIwd3I0bzdz\nOEtQNm1saE5wNWt2UUVnYlN4NWtGdFkKmWHU5ttZoQ3NZu/zkX5VxfC2sMpSOyod\neb7LRhFqPfo5N1XphJcCqr5QUoZOfnH0xFhZ2lxWUS3ItiRpU4VDwg==\n-----END AGE ENCRYPTED FILE-----\n" } ], - "lastmodified": "2025-04-08T14:05:32Z", - "mac": "ENC[AES256_GCM,data:NDcR67xbWQOnSJ04ytFMW0wXqKYo99f5Qxtv3vyiGb6GD1rvzI05EYhzc0ZEQRxjcSV5Qm5UbDG4h7P3fZ1UhmeErtN+0gKrQY3t+Q6sZ5w/JwgLxIzS5D37T2INHuPdBfZbA3xoK/fq3soObxOhYcOWlFH8JWruTFcukRoeh0Q=,iv:WiD5qMzil3S3ufSIkzvm9QAoQJ32rRCyTvtl9NagI4c=,tag:1cf3PVABwHor7nMhrjlq9Q==,type:str]", - "pgp": null, + "lastmodified": "2025-04-09T15:10:41Z", + "mac": "ENC[AES256_GCM,data:pab0G2GPjgs59sbiZ8XIV5SdRtq5NPU0yq18FcqiMV8noAL94fyVAY7fb+9HILQWQsEjcykgk9mA2MQ0KpK/XG8+tDQKcBH+F+2aQnw5GJevXmfi7KLTU0P224SNo7EnKlfFruB/+NZ0WBtkbbg1OzekrbplchpSI6BxWz/jASE=,iv:TCj9FCxgfMF2+PJejr67zgGnF+CFS+YeJiejnHbf7j0=,tag:s7r9SqxeqpAkncohYvIQ2Q==,type:str]", "unencrypted_suffix": "_unencrypted", - "version": "3.9.4" + "version": "3.10.1" } -} \ No newline at end of file +} diff --git a/checks/dummy-inventory-test/sops/users/admin/key.json b/checks/dummy-inventory-test/sops/users/admin/key.json index e408aa96b..e337dccd1 100644 --- a/checks/dummy-inventory-test/sops/users/admin/key.json +++ b/checks/dummy-inventory-test/sops/users/admin/key.json @@ -1,4 +1 @@ -{ - "publickey": "age1qm0p4vf9jvcnn43s6l4prk8zn6cx0ep9gzvevxecv729xz540v8qa742eg", - "type": "age" -} +{"publickey": "age1qm0p4vf9jvcnn43s6l4prk8zn6cx0ep9gzvevxecv729xz540v8qa742eg", "type": "age"} \ No newline at end of file diff --git a/checks/dummy-inventory-test/vars/per-machine/admin1/dummy-generator/generated-password/secret b/checks/dummy-inventory-test/vars/per-machine/admin1/dummy-generator/generated-password/secret index f854baf6b..a5c81196f 100644 --- a/checks/dummy-inventory-test/vars/per-machine/admin1/dummy-generator/generated-password/secret +++ b/checks/dummy-inventory-test/vars/per-machine/admin1/dummy-generator/generated-password/secret @@ -1,24 +1,19 @@ { - "data": "ENC[AES256_GCM,data:WSKPca2m,iv:HLdB11pEOW06u1YKHl8zrEzmnAiYvZ7muKIDnoTQ2/w=,tag:Jnf1k27hE96+p6OTjGSYbA==,type:str]", + "data": "ENC[AES256_GCM,data:bxM9aYMK,iv:SMNYtk9FSyZ1PIfEzayTKKdCnZWdhcyUEiTwFUNb988=,tag:qJYW4+VQyhF1tGPQPTKlOQ==,type:str]", "sops": { - "kms": null, - "gcp_kms": null, - "azure_kv": null, - "hc_vault": null, "age": [ { - "recipient": "age17fkfrtwwaxx6nhgnrh2vyzpejesyucng90f6y2j48yt96vspwyrsqhknpj", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSByM1Zqc1o0WG9RUFRsdEhk\nclVwd2YwVUZrSzJscnJSWG1VYlJ5TTV3Y3drCnRMMlpyenJJTUNDZ3phbWdScTU5\neUhtc0svbTE3aGRtTmFyYUpOVGR1VkUKLS0tIHBMVjdLZU51aFpqUysrdnRROVV1\nZy9OcnBseE0ycHI5OEFLQzYwQXBGMEUK3JsnrTRbxVvD4j14WZ2ZNcMTvfamQvJL\ni3TE2rOe1sB2J0n58hlx8UxoBd6+LI/q4V0H6FSHG2Yswi0G/tGlaA==\n-----END AGE ENCRYPTED FILE-----\n" + "recipient": "age1hd2exjq88h7538y6mvjvexx3u5gp6a03yfn5nj32h2667yyksyaqcuk5qs", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAvZDZYYXdpcXVqRFRnQ2Jx\nTFhFWEJTR290cHZhTXZadFFvcHM4MHVIN3lFCmJhOEZrL3g4TFBZVllxdDFZakJn\nR3NxdXo0eE8vTDh3QlhWOFpVZ0lNUHcKLS0tIEE4dkpCalNzaXJ0Qks3VHJSUzZF\nb2N3NGdjNHJnSUN6bW8welZ1VDdJakEKGKZ7nn1p11IyJB6DMxu2HJMvZ+0+5WpE\nPLWh2NlGJO3XrrL4Fw7xetwbqE+QUZPNl/JbEbu4KLIUGLjqk9JDhQ==\n-----END AGE ENCRYPTED FILE-----\n" }, { "recipient": "age1qm0p4vf9jvcnn43s6l4prk8zn6cx0ep9gzvevxecv729xz540v8qa742eg", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBZOWd6c01pZ01RcmFXQXRR\ndnpNdW84T3VCNnVKVHM3a2YwS2t6LzByQ3lBCnJqcTR4QUlqU3hkTGVuMGViR3ZS\ncG85Zy9LdDE4TGRuNHExN2trT2h3c2sKLS0tIDZtM3JFbWFOeXB2QzFyQ2VKZ0hJ\nSXpLc1hKTytXSk1FUXoycmJBVHBVQ3MKP444/bnDxNHLnC9vWhKfUyaMPnCTTItn\nifeT3KAvjZ9JfMygh1y24GRAE8D1ECo7Wz6fnQmivFurhft4kff+wg==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBHckJCQVFyb21aT1R0d2Rr\nMWxNMHVqcGxabHBmS0RibW9sN0gyZDI1b1dFCnRWUk5LSWdxV3c4RWVZdUtEN1Fv\nRk4xVmwwT2xrdWVERkJXUVVlVXJjTVUKLS0tIC9ERG9KMGxTNEsrbzFHUGRiVUlm\nRi9qakxoc1FOVVV1TkUrckwxRUVnajQKE8ms/np2NMswden3xkjdC8cXccASLOoN\nu+EaEk69UvBvnOg9VBjyPAraIKgNrTc4WWwz+DOBj1pCwVbu9XxUlA==\n-----END AGE ENCRYPTED FILE-----\n" } ], - "lastmodified": "2025-04-08T14:05:23Z", - "mac": "ENC[AES256_GCM,data:CFR43lubMAh7Oa/QF4rtqVrw8HWehGp+keTgsmIKsDK7SbKh1InbUX3mvBqlOk684f6l3uco3R9whh4WDKx24cqIrqo/aExM/9cq73Bw0IlZGlnpQLA43YUsXbBAy1gV1QB2nP/8T+X4cOB3ZE4KL9B5lzHBcqilzMQWz2cwR50=,iv:nB16rMtgjOnOTWL0E/VP7dQjcNLZasSH3MuEHdM7CeM=,tag:eyBHqnAJNJMlW2Zq8aFwog==,type:str]", - "pgp": null, + "lastmodified": "2025-04-09T15:10:30Z", + "mac": "ENC[AES256_GCM,data:cIwWctUbAFI8TRMxYWy5xqlKDVLMqBIxVv4LInnLqi3AauL0rJ3Z7AxK/wb2dCQM07E1N7YaORNqgUpFC1xo0hObAA8mrPaToPotKDkjua0zuyTUNS1COoraYjZpI/LKwmik/qtk399LMhiC7aHs+IliT9Dd41B8LSMBXwdMldY=,iv:sZ+//BrYH5Ay2JJAGs7K+WfO2ASK82syDlilQjGmgFs=,tag:nY+Af9eQRLwkiHZe85dQ9A==,type:str]", "unencrypted_suffix": "_unencrypted", - "version": "3.9.4" + "version": "3.10.1" } -} \ No newline at end of file +} diff --git a/checks/dummy-inventory-test/vars/per-machine/admin1/dummy-generator/host-id/value b/checks/dummy-inventory-test/vars/per-machine/admin1/dummy-generator/host-id/value index 3453d8d71..9816ca393 100644 --- a/checks/dummy-inventory-test/vars/per-machine/admin1/dummy-generator/host-id/value +++ b/checks/dummy-inventory-test/vars/per-machine/admin1/dummy-generator/host-id/value @@ -1 +1 @@ -16493 +13898 diff --git a/checks/dummy-inventory-test/vars/per-machine/peer1/dummy-generator/generated-password/secret b/checks/dummy-inventory-test/vars/per-machine/peer1/dummy-generator/generated-password/secret index 882ff3c25..3efdb7ad1 100644 --- a/checks/dummy-inventory-test/vars/per-machine/peer1/dummy-generator/generated-password/secret +++ b/checks/dummy-inventory-test/vars/per-machine/peer1/dummy-generator/generated-password/secret @@ -1,24 +1,19 @@ { - "data": "ENC[AES256_GCM,data:D3aHBQ==,iv:tKAbvLTJGX3uy7GbGv0Ar6ZirIkcAsvcOKA3nN4wIh4=,tag:gAZBZWEpbHYWrZxyEAwwMQ==,type:str]", + "data": "ENC[AES256_GCM,data:ImlGIKxE,iv:UUWxjLNRKJCD2WHNpw8lfvCc8rnXPCqc2pni1ODckjE=,tag:HFCqiv31E9bShIIaAEjF0A==,type:str]", "sops": { - "kms": null, - "gcp_kms": null, - "azure_kv": null, - "hc_vault": null, "age": [ { - "recipient": "age1qm0p4vf9jvcnn43s6l4prk8zn6cx0ep9gzvevxecv729xz540v8qa742eg", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBtUDFSTTdJeTdFd284Z094\nZUhCRnBiUlVCUURtSFVBb2JXT2dDcVI5b1FnCmdNRkVJbU9aRnFER1VUZnFMSmVy\nblVsTEt5VVhxTEQrNWpyaUgyV0ljL2cKLS0tIDdJNWQrZXpRT3NFclZmVDRhazRC\nU2FVMTVkTEE4TEVuQ29jamwzWGZaeTgK/ehUsaFUgHvQFtS7GMmx22PkgmdDnewS\nmwvy7HSGYXrUjJQVpb2/KtB2dbhEHcv4CGXLBq7FjKVgdLR8EnSsIQ==\n-----END AGE ENCRYPTED FILE-----\n" + "recipient": "age19urkt89q45a2wk6a4yaramzufjtnw6nq2snls0v7hmf7tqf73axsfx50tk", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBpTEROZjh6NjBhSlJSc1Av\nSHhjdkhwVUd3VzBZemhQb3dhMlJXalBmZlFjCkZPYkhZZGVOVTNjUWdFU0s4cWFn\nL2NXbkRCdUlMdElnK2lGbG5iV0w1cHMKLS0tIFREcmxDdHlUNVBFVGRVZSt0c0E5\nbnpHaW1Vb3R3ZFFnZVMxY3djSjJmOU0KIwqCSQf5S9oA59BXu7yC/V6yqvCh88pa\nYgmNyBjulytPh1aAfOuNWIGdIxBpcEf+gFjz3EiJY9Kft3fTmhp2bw==\n-----END AGE ENCRYPTED FILE-----\n" }, { - "recipient": "age1uehj0t7lhprwenmfvsamrja8xs9uvruw830nfll7m0pmuhddqd9sdwke7q", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBDc3kwWnYxa3ZCVUNLSXlO\nZ0JwY0xHR3U4TG1LUXQrblVzem13a3EyMlRrCmtEbWRPTDc3akRpUFdOZjNrdWtT\nYTRQandScHpRNTljTUJvZWpEbEd1SlkKLS0tIGIvU2F3aTgwUkRycGdLVmdDNWc0\nNG5sd3VoZWxFbjNudXMyc3JlYnpHTkkK8MIKY3dhpW0B59aWl3Q1aVWilEKs5KQ/\nGILM5YxSB8HfslC2SxdTVY2bGgFnOCU09nQCv7y1vqyqvvZVJLfviQ==\n-----END AGE ENCRYPTED FILE-----\n" + "recipient": "age1qm0p4vf9jvcnn43s6l4prk8zn6cx0ep9gzvevxecv729xz540v8qa742eg", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSArN3R4TThibjdYbE9TMDE1\naUhuNDlscExjaktIR2VmTk1OMWtVM0NpTUJZClJUNEcwVDlibExWQk84TTNEWFhp\nMjYyZStHc1N0ZTh1S3VTVk45WGxlWWMKLS0tIHFab25LY1R1d1l6NE5XbHJvQ3lj\nNGsxUldFVHQ5RVJERDlGbi9NY29hNWsKENBTcAS/R/dTGRYdaWv5Mc/YG4bkah5w\nb421ZMQF+r4CYnzUqnwivTG8TMRMqJLavfkutE6ZUfJbbLufrTk5Lw==\n-----END AGE ENCRYPTED FILE-----\n" } ], - "lastmodified": "2025-04-08T14:05:41Z", - "mac": "ENC[AES256_GCM,data:OeNZkdkKiosQlhKxQ3XlIJqpxPiEzu9MYHNFNol5TKzlLBLrNbbeoBO5qDyY4dJLzbqYWeUakG9L1UVuCZ3WIZYqO0R4W2JM5Y6IvYVxhLm0uqrjYRvZJgRajm2LFLcNed3ZLHQDWsdTkJ4aBnv1cqz/ACq+vrHe5lhCLDrijRE=,iv:ZLn8pRiKzy/vYx+cSlGCF5owVq8yWUQaSP7rf3sdqtI=,tag:VO79CECmhdJv3WGU3VIZNw==,type:str]", - "pgp": null, + "lastmodified": "2025-04-09T15:11:04Z", + "mac": "ENC[AES256_GCM,data:JdJzocQZWVprOmZ4Ni04k1tpD1TpFcK5neKy3+0/c3+uPBwjwaMayISKRaa/ILUXlalg60oTqxB4fUFoYVm8KGQVhDwPhO/T1hyYVQqidonrcYfJfCYg00mVSREV/AWqXb7RTnaEBfrdnRJvaAQF9g2qDXGVgzp3eACdlItclv4=,iv:nOw1jQjIWHWwU3SiKpuQgMKXyu8MZYI+zI9UYYd9fCI=,tag:ewUkemIPm/5PkmuUD0EcAQ==,type:str]", "unencrypted_suffix": "_unencrypted", - "version": "3.9.4" + "version": "3.10.1" } -} \ No newline at end of file +} diff --git a/checks/dummy-inventory-test/vars/per-machine/peer1/dummy-generator/host-id/value b/checks/dummy-inventory-test/vars/per-machine/peer1/dummy-generator/host-id/value index 5a216dfa0..7fdc87f8c 100644 --- a/checks/dummy-inventory-test/vars/per-machine/peer1/dummy-generator/host-id/value +++ b/checks/dummy-inventory-test/vars/per-machine/peer1/dummy-generator/host-id/value @@ -1 +1 @@ -24602 +30661 diff --git a/checks/dummy-inventory-test/vars/per-machine/peer1/new-service/hello/value b/checks/dummy-inventory-test/vars/per-machine/peer1/new-service/hello/value new file mode 100644 index 000000000..c96b63723 --- /dev/null +++ b/checks/dummy-inventory-test/vars/per-machine/peer1/new-service/hello/value @@ -0,0 +1 @@ +This is a dummy script diff --git a/checks/lib/test-inventory.nix b/checks/lib/test-inventory.nix index a9c740bc7..feb712586 100644 --- a/checks/lib/test-inventory.nix +++ b/checks/lib/test-inventory.nix @@ -4,13 +4,13 @@ let inherit (pkgs) lib; inherit (lib) mkOption flip mapAttrs; inherit (lib.types) path raw; - inherit (self.clanLib.inventory) buildInventory; + inherit (self.clanLib) buildClan; nixos-lib = import (pkgs.path + "/nixos/lib") { }; in (nixos-lib.runTest ( { config, ... }: let - serviceConfigs = buildInventory { + result = buildClan { inventory = config.inventory.inventory; # TODO: make directory argument optional in buildInventory directory = config.inventory.directory; @@ -29,7 +29,7 @@ in }; }; config = { - nodes = flip mapAttrs serviceConfigs.machines ( + nodes = flip mapAttrs result.clanInternals.inventoryClass.machines ( machineName: attrs: { imports = attrs.machineImports ++ [ self.nixosModules.clanCore ]; clan.core.settings.directory = "${config.inventory.directory}";