sysupdate: rename isEnabled to enabled

The "isEnabled" name was changed from "enabled" post v261 by accident
(because a6f7ded859 replaced json
formatting via table formatter to a native json generator which was
introduced for varlink, which changed the names). THis was later made
official in #43603, but it should rather have changed things back to the
original name, in particular as the underling .feature file field
actually is called "Enabled=" and not "IsEnabled=".

We really should take care to generate the same names for Varlink JSON
data as for the data returned by the systemd-sysupdate cli.
a6f7ded859 ensured that, so that's great.
But at the same time I think the varlink names should be adjusted to the
old names, since varlink support for this was just added in this cycle.

Given that v262 is not tagged yet, let's now revert to the old name.

NEWS

@@ -144,10 +144,10 @@ CHANGES WITH 262 in spe:
           hierarchy that is not merged is now shown as "-" instead of "none".
 
         * The JSON payload returned by systemd-sysupdated's DescribeFeature()
-          method changed the "name" and "enabled" keys to "id" and
-          "isEnabled", respectively. The "appStream" key is now "appstream",
-          and the "documentation" key is now an array of strings. Consumers
-          of this interface must update their JSON parsing accordingly.
+          method changed the "name" keys to "id". The "appStream" key is now
+          "appstream", and the "documentation" key is now an array of strings.
+          Consumers of this interface must update their JSON parsing
+          accordingly.
 
         * The PrivateUsersOwnership= setting in .nspawn files now defaults to
           "auto" when PrivateUsers= is "pick" or "managed", matching the

man/org.freedesktop.sysupdate1.xml

@@ -333,7 +333,7 @@ node /org/freedesktop/sysupdate1/target/host {
         </varlistentry>
 
         <varlistentry>
-          <term><literal>isEnabled</literal></term>
+          <term><literal>enabled</literal></term>
           <listitem><para>A boolean indicating whether this feature is enabled.</para></listitem>
         </varlistentry>
 

src/shared/varlink-io.systemd.SysUpdate.c

@@ -41,7 +41,7 @@ static SD_VARLINK_DEFINE_STRUCT_TYPE(
                 SD_VARLINK_FIELD_COMMENT("A URL to an AppStream catalog XML file describing the feature."),
                 SD_VARLINK_DEFINE_FIELD(appstream, SD_VARLINK_STRING, SD_VARLINK_NULLABLE),
                 SD_VARLINK_FIELD_COMMENT("Whether the feature is enabled."),
-                SD_VARLINK_DEFINE_FIELD(isEnabled, SD_VARLINK_BOOL, 0),
+                SD_VARLINK_DEFINE_FIELD(enabled, SD_VARLINK_BOOL, 0),
                 SD_VARLINK_FIELD_COMMENT("Whether the feature is suggested for enablement."),
                 SD_VARLINK_DEFINE_FIELD(suggested, SD_VARLINK_BOOL, SD_VARLINK_NULLABLE),
                 SD_VARLINK_FIELD_COMMENT("Array of IDs of the transfers (including currently disabled ones) which are controlled by this feature."),

src/sysupdate/sysupdate.c

@@ -2443,7 +2443,7 @@ static int feature_to_json(Context *context, const Feature *f, sd_json_variant *
                         JSON_BUILD_PAIR_STRING_NON_EMPTY("description", f->description),
                         JSON_BUILD_PAIR_STRV_NON_EMPTY("documentation", f->documentation),
                         JSON_BUILD_PAIR_STRING_NON_EMPTY("appstream", f->appstream),
-                        SD_JSON_BUILD_PAIR_BOOLEAN("isEnabled", f->enabled),
+                        SD_JSON_BUILD_PAIR_BOOLEAN("enabled", f->enabled),
                         SD_JSON_BUILD_PAIR_CONDITION(suggested >= 0, "suggested", SD_JSON_BUILD_BOOLEAN(suggested > 0)),
                         JSON_BUILD_PAIR_STRV_NON_EMPTY("transfers", transfers));
         if (r < 0)

src/sysupdate/updatectl.c

@@ -1420,7 +1420,7 @@ static int describe_feature(sd_bus *bus, const char *feature, Feature *ret) {
         static const sd_json_dispatch_field dispatch_table[] = {
                 { "id",            SD_JSON_VARIANT_STRING,  sd_json_dispatch_string,   offsetof(Feature, id),            SD_JSON_MANDATORY },
                 { "description",   SD_JSON_VARIANT_STRING,  sd_json_dispatch_string,   offsetof(Feature, description),   SD_JSON_NULLABLE  },
-                { "isEnabled",     SD_JSON_VARIANT_BOOLEAN, sd_json_dispatch_stdbool,  offsetof(Feature, enabled),       SD_JSON_MANDATORY },
+                { "enabled",       SD_JSON_VARIANT_BOOLEAN, sd_json_dispatch_stdbool,  offsetof(Feature, enabled),       SD_JSON_MANDATORY },
                 { "suggested",     SD_JSON_VARIANT_BOOLEAN, sd_json_dispatch_tristate, offsetof(Feature, suggested),     SD_JSON_NULLABLE  },
                 { "documentation", SD_JSON_VARIANT_ARRAY,   sd_json_dispatch_strv,     offsetof(Feature, documentation), SD_JSON_NULLABLE  },
                 { "appstream",     SD_JSON_VARIANT_STRING,  sd_json_dispatch_string,   offsetof(Feature, appstream),     SD_JSON_NULLABLE  },

test/units/TEST-72-SYSUPDATE.sh

@@ -507,7 +507,7 @@ EOF
             "https://example.com/optional-more"
         ]
     ' <<<"$feature_json" >/dev/null
-    jq -e '.isEnabled == false' <<<"$feature_json" >/dev/null
+    jq -e '.enabled == false' <<<"$feature_json" >/dev/null
     jq -e '.suggested == false' <<<"$feature_json" >/dev/null
     jq -e '.appstream == "https://example.com/optional.appstream.xml"' <<<"$feature_json" >/dev/null