[plugin_aws]fix unable to get metadata in aws.py

- exec_cmd() cmd type is a str, cannot execute when
it is a list
- removed spaces after X-aws-ec2-metadata-token and
X-aws-ec2-metadata-token-ttl-seconds

Signed-off-by: Frank Liang <[email protected]>

Author: liangxiao1

sos/report/plugins/aws.py

@@ -41,21 +41,19 @@ def setup(self):
 
         # Try to get an IMDSv2 token
         token_url = 'http://169.254.169.254/latest/api/token'
-        token_cmd = [
-            'curl', '-sS', '-X', 'PUT', '-H',
-            'X-aws-ec2-metadata-token-ttl-seconds: 21600',
-            token_url]
+        token_cmd = f'curl -sS -X PUT -H \
+            X-aws-ec2-metadata-token-ttl-seconds:21600 {token_url}'
 
         try:
-            token = self.exec_cmd(token_cmd, timeout=1)
+            token = self.exec_cmd(token_cmd, timeout=1)['output']
         except Exception:
             token = ''
 
         # Add header only if token retrieval succeeded
-        token_header = []
+        token_header = ''
 
         if token:
-            token_header = ['-H', f'X-aws-ec2-metadata-token: {token}']
+            token_header = f'-H X-aws-ec2-metadata-token:{token}'
 
         # List of metadata paths we want to get
         metadata_paths = [
@@ -73,7 +71,7 @@ def setup(self):
             meta_url = base_url + path
             safe_name = path.replace('/', '_')
             self.add_cmd_output(
-                    ['curl', '-sS'] + token_header + [meta_url],
+                    f'curl -sS {token_header} {meta_url}',
                     suggest_filename=f'aws_metadata_{safe_name}.txt'
             )