fix: fix field type & bugs

Author: jinyoungmoonDEV

src/spaceone/inventory/connector/aws_cloud_watch_connector/connector.py

@@ -164,6 +164,7 @@ def _set_alarm_history(self, raw_alarm: Alarms) -> None:
 
         alarm_histories = self.get_alarm_history(raw_alarm["AlarmName"])
         for alarm_history in alarm_histories:
+            print(alarm_history["Timestamp"])
             history.append(
                 {
                     "date": alarm_history["Timestamp"],

src/spaceone/inventory/connector/aws_cloud_watch_connector/schema/data.py

@@ -3,6 +3,7 @@
 from schematics import Model
 from schematics.types import StringType, DateType, ModelType, ListType
 
+from spaceone.inventory.libs.schema.dynamic_field import DateTimeDyField
 from spaceone.inventory.libs.schema.resource import AWSCloudService
 
 _LOGGER = logging.getLogger(__name__)
@@ -18,7 +19,7 @@ class Action(Model):
 
 
 class History(Model):
-    date = DateType(deserialize_from="date")
+    date = DateTimeDyField(deserialize_from="date")
     type = StringType(choices=("ConfigurationUpdate","StateUpdate","Action"), deserialize_from="type")
     description = StringType(deserialize_from="description")
 
@@ -27,7 +28,7 @@ class Alarms(AWSCloudService):
     alarm_arn = StringType(deserialize_from="AlarmArn")
     name = StringType(deserialize_from="AlarmName")
     state_value = StringType(choices=("OK","ALARM","INSUFFICIENT_DATA"), deserialize_from="StateValue")
-    state_updated_timestamp = DateType(deserialize_from="StateUpdatedTimestamp")
+    state_updated_timestamp = DateTimeDyField(deserialize_from="StateUpdatedTimestamp")
     actions_enabled = StringType(deserialize_from="actions_enabled")
     conditions = StringType(deserialize_from="conditions")
     actions = ListType(ModelType(Action, deserialize_from="action"), deserialize_from="actions")

src/spaceone/inventory/connector/aws_cloud_watch_connector/schema/resource.py

@@ -7,20 +7,20 @@
 
 
 cw_actions = TableDynamicLayout.set_fields(
-    "Actions",
+    "Actions", "data.actions",
     fields=[
-        TextDyField.data_source("Type", "data.actions.type"),
-        TextDyField.data_source("Description", "data.actions.description"),
-        TextDyField.data_source("Config", "data.actions.config")
+        TextDyField.data_source("Type", "type"),
+        TextDyField.data_source("Description", "description"),
+        TextDyField.data_source("Config", "config")
     ],
 )
 
 cw_history = TableDynamicLayout.set_fields(
-    "History",
+    "History", 'data.history',
     fields=[
-        DateTimeDyField.data_source("Date", "data.history.date"),
-        TextDyField.data_source("Type", "data.history.type"),
-        TextDyField.data_source("Description", "data.history.description"),
+        DateTimeDyField.data_source("Date", "date"),
+        TextDyField.data_source("Type", "type"),
+        TextDyField.data_source("Description", "description"),
     ],
 )
 

src/spaceone/inventory/connector/aws_cloud_watch_connector/schema/service_type.py

@@ -32,7 +32,7 @@
     ],
     search=[
         SearchField.set(name="Alarm ARN", key="data.alarm_arn"),
-        SearchField.set(name="Alarm Name", key="data.alarm_name"),
+        SearchField.set(name="Alarm Name", key="name"),
         SearchField.set(name="State", key="data.state_value"),
         SearchField.set(name="Actions", key="data.actions_enabled"),
     ],

src/spaceone/inventory/connector/aws_elb_connector/schema/resource.py

@@ -206,15 +206,15 @@
 )
 
 tg_health = TableDynamicLayout.set_fields(
-    "Target Health",
+    "Target Health", "data.targets_health",
     fields=[
-        TextDyField.data_source("ID", "data.targets_health.target.id"),
-        TextDyField.data_source("Port", "data.targets_health.target.port"),
-        TextDyField.data_source("AvailabilityZone", "data.targets_health.target.availability_zone"),
-        TextDyField.data_source("HealthCheckPort", "data.targets_health.health_check_port"),
+        TextDyField.data_source("ID", "target.id"),
+        TextDyField.data_source("Port", "target.port"),
+        TextDyField.data_source("AvailabilityZone", "target.availability_zone"),
+        TextDyField.data_source("HealthCheckPort", "health_check_port"),
         EnumDyField.data_source(
             "State",
-            "data.targets_health.target_health.state",
+            "target_health.state",
             default_badge={"green.500": ["healthy"], "gray.500": ["initial","unused","unavailable","draining"], "red.600": ["unhealthy","unhealthy.draining"]},
         ),
     ],