features: add wasm annotation

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
containers · Jun 27, 2023 · 7ab96c6 · 7ab96c6
1 parent 36b1a59
commit 7ab96c6
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 1 deletion.
diff --git a/src/libcrun/container.c b/src/libcrun/container.c
@@ -3855,7 +3855,7 @@ retrieve_mount_options (struct features_info_s **info)
 }
 
 int
-libcrun_container_get_features (libcrun_context_t *context arg_unused, struct features_info_s **info, libcrun_error_t *err)
+libcrun_container_get_features (libcrun_context_t *context, struct features_info_s **info, libcrun_error_t *err)
 {
   // Allocate memory for the features_info_s structure
   size_t num_namspaces = sizeof (namespaces) / sizeof (namespaces[0]);
@@ -3920,6 +3920,9 @@ libcrun_container_get_features (libcrun_context_t *context arg_unused, struct fe
   }
 #endif
 
+  if (context->handler_manager && handler_by_name (context->handler_manager, "wasm"))
+    (*info)->annotations.run_oci_crun_wasm = true;
+
 #if HAVE_CRIU && HAVE_DLOPEN
   (*info)->annotations.run_oci_crun_checkpoint_enabled = true;
 #endif

diff --git a/src/libcrun/container.h b/src/libcrun/container.h
@@ -137,6 +137,7 @@ struct annotations_info_s
   bool run_oci_crun_checkpoint_enabled;
   char *run_oci_crun_commit;
   char *run_oci_crun_version;
+  bool run_oci_crun_wasm;
 };
 
 struct features_info_s

diff --git a/src/oci_features.c b/src/oci_features.c
@@ -183,6 +183,8 @@ crun_features_add_annotations_info (yajl_gen json_gen, const struct annotations_
   add_string_to_json (json_gen, "run.oci.crun.commit", annotation->run_oci_crun_commit);
   add_string_to_json (json_gen, "run.oci.crun.version", annotation->run_oci_crun_version);
 
+  add_bool_to_json (json_gen, "run.oci.crun.wasm", annotation->run_oci_crun_wasm);
+
   yajl_gen_map_close (json_gen);
 }
 

diff --git a/tests/test_oci_features.py b/tests/test_oci_features.py
@@ -188,6 +188,11 @@ def test_crun_features():
                     annotations = features["annotations"]
                     if not annotations.get("run.oci.crun.commit") == get_crun_commit():
                         return -1
+
+                    if ('WASM' in get_crun_feature_string()
+                        and not (annotations.get("run.oci.crun.wasm") is True)):
+                            return -1
+
                     if ('CRIU' in get_crun_feature_string()
                         and not (annotations.get("org.opencontainers.runc.checkpoint.enabled") is True and
                                  annotations.get("run.oci.crun.checkpoint.enabled") is True)):