Merge pull request #45 from mz-ko/master

Move platform information to os details.

Author: mz-ko

src/plugin/manager/ec2_server/ec2_instance_manager.py

@@ -112,16 +112,15 @@ def get_os_data(self, image, os_type, os_details, instance_information):
             "os_distro": self.get_os_distro(image.get("Name", ""), os_type),
             "os_arch": image.get("Architecture", ""),
             "os_type": os_type,
-            "details": os_details,
         }
 
-        if platform_type := instance_information.get("platform_type"):
-            os_data["platform_type"] = platform_type
-
         if platform_name := instance_information.get("platform_name"):
-            os_data["platform_name"] = (
-                f"{platform_name}{instance_information.get('platform_version', '')}"
-            )
+            if platform_version := instance_information.get("platform_version"):
+                f"{platform_name} {platform_version}"
+            else:
+                os_data["details"] = platform_name
+        else:
+            os_data["details"] = os_details
         return os_data
 
     def get_aws_data(self, instance):

src/plugin/metadata/ec2/instance.yaml

@@ -283,10 +283,6 @@ table:
     - OS Type: data.os.os_type
       is_optional: true
     - OS: data.os.os_distro
-    - Platform Name: data.os.platform_name
-      is_optional: true
-    - Platform Type: data.os.platform_type
-      is_optional: true
     - OS Architecture: data.os.os_arch
       is_optional: true
     - OS Details: data.os.details
@@ -379,8 +375,6 @@ tabs.1:
     - OS Details: data.os.details
     - OS Distribution: data.os.os_distro
     - OS Architecture: data.os.os_arch
-    - Platform Type: data.os.platform_type
-    - Platform Name: data.os.platform_name
 
 
 tabs.2: