Merge pull request #5275 from wazuh/bug/5228-ddt1-allocatiton-module-…

…bug-macos-host-dediicated Fixed deploy for macOS in AWS
wazuh · Apr 19, 2024 · 8e24f34 · 8e24f34
2 parents ea0a03f + 2988be0
commit 8e24f34
Showing 1 changed file with 18 additions and 14 deletions.
diff --git a/deployability/modules/allocation/aws/provider.py b/deployability/modules/allocation/aws/provider.py
@@ -299,19 +299,23 @@ def _generate_dedicated_host(config: AWSConfig, arch: str) -> str:
         client = boto3.client('ec2')
         dedicated_host_name = str(config.name) + '-Host-' + arch
         logger.info(f"Creating dedicated host: {dedicated_host_name}")
-        host = client.allocate_hosts(InstanceType=config.type,
-                                        AutoPlacement='on',
-                                        AvailabilityZone=config.zone,
-                                        Quantity=1,
-                                        TagSpecifications=[{
-                                            'ResourceType': 'dedicated-host',
-                                            'Tags': [
-                                                {'Key': 'Name', 'Value': dedicated_host_name},
-                                                {'Key': 'termination_date', 'Value': config.termination_date},
-                                                {'Key': 'issue', 'Value': config.issue},
-                                                {'Key': 'team', 'Value': config.team}
-                                            ]
-                                        }])
+        params = {
+            'InstanceType': config.type,
+            'AutoPlacement': 'on',
+            'AvailabilityZone': config.zone,
+            'Quantity': 1,
+            'TagSpecifications': [{
+                'ResourceType': 'dedicated-host',
+                'Tags': [
+                    {'Key': 'Name', 'Value': config.name},
+                    {'Key': 'termination_date', 'Value': config.termination_date},
+                    {'Key': 'team', 'Value': config.team}
+                ]
+            }]
+        }
+        if config.issue:
+            params['TagSpecifications'][0]['Tags'].append({'Key': 'issue', 'Value': config.issue})
+        host = client.allocate_hosts(**params)
         logger.info(f"Dedicated host created: {host['HostIds'][0]}")
         return host['HostIds'][0]
 
@@ -332,7 +336,7 @@ def _release_dedicated_host(host_identifier: str) -> str:
         if host['Unsuccessful']:
             unsuccessful_messages = [item['Error']['Message'] for item in host['Unsuccessful']]
             for message in unsuccessful_messages:
-                logger.info(f"{message}")
+                logger.warning(f"{message}")
         else:
             logger.info(f"Dedicated host released: {host_identifier}")