test: match test minimal keys to chalk collect

src/collect.nim

@@ -63,18 +63,6 @@ proc registerKeys(templ: string) =
       if useOpt.isSome() and useOpt.get():
         subscribedKeys[name] = true
 
-proc registerOutconfKeys() =
-  # We always subscribe to _VALIDATED, even if they don't want to
-  # report it; they might subscribe to the error logs it generates.
-  #
-  # This basically ends up forcing getRunTimeArtifactInfo() to run in
-  # the system plugin.
-  #
-  # TODO: The config should hand us a list of keys to force.
-  subscribedKeys["_VALIDATED"] = true
-  registerKeys(getMarkTemplate())
-  registerKeys(getReportTemplate())
-
 proc collectChalkTimeHostInfo*() =
   if hostCollectionSuspended():
     return
@@ -120,7 +108,17 @@ proc initCollection*(collectHost = true) =
     "METADATA_ID",
     "HASH",
   ])
-  registerOutconfKeys()
+
+  # We always subscribe to _VALIDATED, even if they don't want to
+  # report it; they might subscribe to the error logs it generates.
+  #
+  # This basically ends up forcing getRunTimeArtifactInfo() to run in
+  # the system plugin.
+  #
+  # TODO: The config should hand us a list of keys to force.
+  subscribedKeys["_VALIDATED"] = true
+  registerKeys(getMarkTemplate())
+  registerKeys(getReportTemplate())
 
   # Next, register for any custom reports.
   for name in getChalkSubsections("custom_report"):

src/config.nim

@@ -73,8 +73,7 @@ proc getReportTemplate*(spec = ""): string =
     tmplName = attrGetOpt[string](ns & ".report_template").get("null")
   return "report_template." & tmplName
 
-template forceReportKeys*(keynames: openarray[string]) =
-  let templateRef = getReportTemplate()
+proc forceKeys(keynames: openarray[string], templateRef: string) =
   let section     = templateRef & ".key"
 
   # Create the "key" section if required.
@@ -93,25 +92,11 @@ template forceReportKeys*(keynames: openarray[string]) =
       Con4mType(kind: TypeBool),
     )
 
-proc forceChalkKeys*(keynames: openarray[string]) =
-  let templateRef = getMarkTemplate()
-  let section     = templateRef & ".key"
+proc forceReportKeys*(keynames: openarray[string]) =
+  forceKeys(keynames, getReportTemplate())
 
-  # Create the "key" section if required.
-  if not sectionExists(section) and keynames.len > 0:
-    con4mSectionCreate(section)
-
-  let keys = attrGetObject(section).getContents()
-
-  for item in keynames:
-    # Create the item section if required.
-    if item notin keys:
-      con4mSectionCreate(section & "." & item)
-    con4mAttrSet(
-      section & "." & item & ".use",
-      pack(true),
-      Con4mType(kind: TypeBool),
-    )
+proc forceChalkKeys*(keynames: openarray[string]) =
+  forceKeys(keynames, getMarkTemplate())
 
 proc runCallback*(cb: CallbackObj, args: seq[Box]): Option[Box] =
   return con4mRuntime.configState.sCall(cb, args)

tests/functional/test_config.py

@@ -498,6 +498,7 @@ def test_profiles(
         "CHALK_ID",
         "CHALK_VERSION",
         "METADATA_ID",
+        "HASH",
     }
     for key in minimal_chalk:
         assert key in chalk_mark