Added os_version_minor sys variable

Ticket: ENT-8118
Changelog: Title
Signed-off-by: Victor Moene <victor.moene@northern.tech>

Author: victormlg

libenv/sysinfo.c

@@ -1234,6 +1234,16 @@ static void OSReleaseParse(EvalContext *ctx, const char *file_path)
         JsonDestroy(os_release_json);
     }
 }
+
+void OSReleasePut(EvalContext *ctx, const char *key, const char *value)
+{
+    DataType type_out;
+    JsonElement *os_rel = EvalContextVariableGetSpecial(
+        ctx, SPECIAL_SCOPE_SYS, "os_release", &type_out);
+
+    JsonObjectAppendString(os_rel, key, value);
+}
+
 #endif
 
 static void OSClasses(EvalContext *ctx)
@@ -2164,6 +2174,17 @@ static int Linux_Redhat_Version(EvalContext *ctx)
         }
     }
 
+    // For CentOS 7, os-release VERSION_ID only show the major version.
+    // This updates it with the version major.minor from redhat-release
+    if (major != -1  && minor != -2)
+    {
+        char version_id[CF_MAXVARSIZE];
+        strcat(version_id, strmajor);
+        strcat(version_id, ".");
+        strcat(version_id, strminor);
+        OSReleasePut(ctx, "VERSION_ID", version_id);
+    }
+
     return 0;
 }
 
@@ -3782,6 +3803,93 @@ static void SysOsVersionMajor(EvalContext *ctx)
     free(flavor);
 }
 
+/*****************************************************************************/
+
+static const char *OSReleaseGet(EvalContext *ctx, const char *field)
+{
+    DataType type_out;
+    const JsonElement *os_rel = EvalContextVariableGetSpecial(
+        ctx, SPECIAL_SCOPE_SYS, "os_release", &type_out);
+
+    if (type_out != CF_DATA_TYPE_CONTAINER)
+    {
+        return NULL;
+    }
+    const JsonElement *child = JsonObjectGet(os_rel, field);
+    if (child == NULL)
+    {
+        return NULL;
+    }
+    const char *result = JsonPrimitiveGetAsString(child);
+    return result;
+}
+
+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");
+    if ((version_id == NULL) || (name == NULL))
+    {
+        return OSVersionMinorPut(ctx, NULL);
+    }
+    Item *version_tuple = SplitString(version_id, '.');
+    if (version_tuple == NULL)
+    {
+        return OSVersionMinorPut(ctx, NULL);
+    }
+    if (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",
+                                "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
+}
+
+
 /*****************************************************************************/
 
 void DetectEnvironment(EvalContext *ctx)
@@ -3796,4 +3904,5 @@ void DetectEnvironment(EvalContext *ctx)
     GetDefVars(ctx);
     SysOSNameHuman(ctx);
     SysOsVersionMajor(ctx);
+    SysOSVersionMinor(ctx);
 }