Added test for os minor version

Signed-off-by: Victor Moene <victor.moene@northern.tech>

Author: victormlg

libenv/sysinfo.c

@@ -3786,7 +3786,6 @@ static void SysOsVersionMajor(EvalContext *ctx)
 
 static const char *OSReleaseGet(EvalContext *ctx, const char *field)
 {
-    #ifndef __MINGW32__
     DataType type_out;
     const JsonElement *os_rel = EvalContextVariableGetSpecial(
         ctx, SPECIAL_SCOPE_SYS, "os_release", &type_out);
@@ -3802,52 +3801,75 @@ static const char *OSReleaseGet(EvalContext *ctx, const char *field)
     }
     const char *result = JsonPrimitiveGetAsString(child);
     return result;
+}
 
-    #else
-
-    Log(LOG_LEVEL_ERR, "os-release is not defined on Windows")
-    return NULL;
-
-    #endif
+static void OSVersionMinorPut(EvalContext *ctx, const char *minor)
+{
+    EvalContextVariablePutSpecial(ctx, SPECIAL_SCOPE_SYS,
+                                "os_version_minor",
+                                (minor == NULL) ? "Unknown" : minor,
+                                CF_DATA_TYPE_STRING, 
+                                "source=agent,derived-from=os_release");
 }
 
 static void SysOSVersionMinor(EvalContext *ctx)
 {
+    #ifndef __MINGW32__
+
     const char *version_id = OSReleaseGet(ctx, "VERSION_ID");
     const char *name = OSReleaseGet(ctx, "NAME");
-
-    char *minor;
-    if (version_id != NULL)
+    if (version_id == NULL)
     {
-        Item *version_tuple = SplitString(version_id, '.');
-
-        if (version_tuple != NULL)
-        {
-            if (name != NULL && (StringStartsWith(name, "solaris") || StringStartsWith(name, "sunos")))
-            {
-                minor = version_tuple->name;
-            }
-            else if (version_tuple->next != NULL)
-            {
-                minor = version_tuple->next->name;
-            }
-        }
-        free(version_tuple);
+        return OSVersionMinorPut(ctx, NULL);
     }
-
-    if (NULL_OR_EMPTY(minor))
+    if (name == NULL)
     {
-        EvalContextVariablePutSpecial(ctx, SPECIAL_SCOPE_SYS,
-                                      "os_version_minor", "Unknown",
-                                      CF_DATA_TYPE_STRING, "source=agent");
+        return OSVersionMinorPut(ctx, NULL);
     }
-    else
+    Item *version_tuple = SplitString(version_id, '.');
+    if (version_tuple == NULL)
+    {
+        return OSVersionMinorPut(ctx, NULL);
+    }
+    if (name != NULL && (StringStartsWith(name, "solaris") || StringStartsWith(name, "sunos")))
     {
+        OSVersionMinorPut(ctx, version_tuple->name);
+        return DeleteItemList(version_tuple);
+    }
+    if (version_tuple->next == NULL)
+    {
+        OSVersionMinorPut(ctx, NULL);
+        return DeleteItemList(version_tuple);
+    }
+    OSVersionMinorPut(ctx, version_tuple->next->name);
+    return DeleteItemList(version_tuple);
+
+    #else
+
+    char *release = SafeStringDuplicate(VSYSNAME.release);
+    char *major = NULL;
+    char *minor = NULL;
+    char *rel;
+    rel = FindNextInteger(release, &major);
+    if (rel == NULL)
+    {
+        free(release);
         EvalContextVariablePutSpecial(ctx, SPECIAL_SCOPE_SYS,
-                                      "os_version_minor", minor,
-                                      CF_DATA_TYPE_STRING,
-                                      "source=agent,derived-from=os_release");
+                                "os_version_minor",
+                                "Unknown",
+                                CF_DATA_TYPE_STRING, 
+                                "source=agent")
+        return;
     }
+    rel = FindNextInteger(rel, &minor);
+    EvalContextVariablePutSpecial(ctx, SPECIAL_SCOPE_SYS,
+                                "os_version_minor",
+                                (minor == NULL) ? "Unknown" : minor,
+                                CF_DATA_TYPE_STRING, 
+                                "source=agent");
+    free(release);
+
+    #endif
 }
 
 

tests/acceptance/01_vars/01_basic/os_version_minor.cf

@@ -0,0 +1,74 @@
+body common control
+{
+  bundlesequence => { "test", "check" };
+}
+
+bundle agent test
+{
+
+  vars:
+    # Platforms to test
+    any::
+      "platforms"
+        slist => { "debian", "ubuntu", "redhat", "rhel", "centos", "fedora",
+                   "aix", "hpux", "suse", "opensuse", "opensuse_leap", "sles",
+                   "solaris", "sunos", "windows", "freebsd", "macos" };
+
+
+    # Regex matching current platforms OS-class with version numbers
+    !solaris&!sunos::
+      "class_regex"
+        string => format("^(%s)_[0-9]+_[0-9]+$", join("|", "platforms"));
+    solaris|sunos::
+      "class_regex"
+        string => format("^(%s)_[0-9]+$", join("|", "platforms"));
+
+    # Regex to extract major version number from OS-class
+    # Edge cases:
+    #  - On Solaris/SunOS major version comes second
+    #    E.g. Solaris 11 has class "solaris_5_11"
+    any::
+      "extract_regex"
+        string => ifelse("solaris|sunos", "^[a-z]+_([0-9]+)$",
+                         "opensuse_leap", "^[a-z_]+_[0-9]+_([0-9]+$)",
+                                          "^[a-z]+_[0-9]+_([0-9]+$)");
+
+    # Find OS-class with version numbers using regex
+    any::
+      "os_class"
+        string => nth(classesmatching("$(class_regex)"), "0");
+
+    # Get extracted major version number
+    any::
+      "expected"
+        string => nth("version_number", "1");
+
+  classes:
+    any::
+      "regextract_success"
+        expression => regextract("$(extract_regex)", "$(os_class)", "version_number");
+}
+
+bundle agent check
+{
+  vars:
+    any::
+      "defined_classes"
+        slist => classesmatching(".*");
+
+  classes:
+    any::
+      "passed"
+        expression => strcmp("$(test.expected)", "$(sys.os_version_minor)");
+
+  reports:
+    DEBUG::
+      "Version number extracted from class: $(test.os_class)";
+      "Defined classes: $(defined_classes)";
+      "$(this.promise_filename) Expected: $(test.expected)";
+      "$(this.promise_filename) Found: $(sys.os_version_minor)";
+    passed::
+      "$(this.promise_filename) Pass";
+    !passed::
+      "$(this.promise_filename) FAIL";
+}