refactor(manifest): unify naming of parsed values

mirkolenz · Jan 22, 2025 · 5910287 · 5910287
1 parent 86118b3
commit 5910287
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/src/docker-manifest/default.nix b/src/docker-manifest/default.nix
@@ -23,7 +23,7 @@ let
   craneExe = lib.getExe' crane "crane";
 in
 
-assert lib.assertMsg (cfg.uniqueTags != [ ]) "At least one `tag` must be set";
+assert lib.assertMsg (cfg.parsedTags != [ ]) "At least one `tag` must be set";
 
 assert lib.assertMsg (cfg.registries != { }) "At least one `registry` must be set";
 
@@ -59,7 +59,7 @@ writeShellScriptBin "docker-manifest" ''
     --annotation "org.opencontainers.image.revision=$(${lib.getExe git} rev-parse HEAD)" \
     ${
       lib.concatLines (
-        lib.mapAttrsToList (key: value: ''--annotation "${key}=${value}" \'') cfg.annotationLeaves
+        lib.mapAttrsToList (key: value: ''--annotation "${key}=${value}" \'') cfg.parsedAnnotations
       )
     } "${cfg.manifestName}" \
     || exit 1
@@ -96,14 +96,14 @@ writeShellScriptBin "docker-manifest" ''
         --all \
         --format ${cfg.format} \
         "${cfg.manifestName}" \
-        "docker://${registryName}/${registryParams.repo}:${lib.head cfg.uniqueTags}" \
+        "docker://${registryName}/${registryParams.repo}:${lib.head cfg.parsedTags}" \
         || exit 1
 
       ${lib.concatMapStringsSep "\n" (tag: ''
         ${craneExe} tag \
-          "${registryName}/${registryParams.repo}:${lib.head cfg.uniqueTags}" \
+          "${registryName}/${registryParams.repo}:${lib.head cfg.parsedTags}" \
           "${tag}"
-      '') (lib.tail cfg.uniqueTags)}
+      '') (lib.tail cfg.parsedTags)}
     '') cfg.registries
   )}
 ''
diff --git a/src/docker-manifest/module.nix b/src/docker-manifest/module.nix
@@ -82,7 +82,7 @@ in
       default = [ ];
       description = "List of custom/additional tags to be added to the manifest.";
     };
-    uniqueTags = mkOption {
+    parsedTags = mkOption {
       type = types.listOf types.str;
       readOnly = true;
       internal = true;
@@ -143,7 +143,7 @@ in
         Most `org.opencontainers.image` annotations are set automatically if the GitHub option is enabled.
       '';
     };
-    annotationLeaves = mkOption {
+    parsedAnnotations = mkOption {
       type = types.attrsOf types.str;
       readOnly = true;
       internal = true;
@@ -232,11 +232,11 @@ in
     {
       parsedVersion =
         if lib'.isNotEmpty config.version then lib.removePrefix "v" config.version else null;
-      uniqueTags = lib.unique (lib.filter lib'.isNotEmpty config.tags);
+      parsedTags = lib.unique (lib.filter lib'.isNotEmpty config.tags);
       annotations.org.opencontainers.image = {
         version = config.parsedVersion;
       };
-      annotationLeaves = lib.mapAttrs escapeAnnotations (
+      parsedAnnotations = lib.mapAttrs escapeAnnotations (
         lib.filterAttrs (name: value: lib'.isNotEmpty value) (lib'.getLeaves config.annotations)
       );
       tags = lib.concatLists [