Merge branch 'main' into Release

Author: devenes

app.py

@@ -11,96 +11,83 @@
 )
 
 
+def get_aws_client(request):
+    aws_access_key_id = request.args.get("aws_access_key_id")
+    aws_secret_access_key = request.args.get("aws_secret_access_key")
+    region_name = request.args.get("region_name")
+    return boto3.client('ec2',
+                        aws_access_key_id=aws_access_key_id,
+                        aws_secret_access_key=aws_secret_access_key,
+                        region_name=region_name
+                        )
+
+
 # Endpoint: http://<api_host>:<api_port>/ec2/list
-@app.route('/ec2/list', methods=['POST', 'GET'])
+@ app.route('/ec2/list', methods=['GET'])
 def aws_list():
     try:
-        aws_access_key_id = request.args.get("aws_access_key_id")
-        aws_secret_access_key = request.args.get("aws_secret_access_key")
-        region_name = request.args.get("region_name")
-        client = boto3.client('ec2',
-                              aws_access_key_id=aws_access_key_id,
-                              aws_secret_access_key=aws_secret_access_key,
-                              region_name=region_name
-                              )
+        client = get_aws_client(request)
+
+        instances = client.describe_instances()
+        output = []
+        for reservation in instances['Reservations']:
+            for instance in reservation['Instances']:
+                output.append(
+                    {
+                        'id': instance['InstanceId'],
+                        "instance-type": instance['InstanceType'],
+                        "instance-state": instance['State']['Name'],
+                        "private-ip": instance['PrivateIpAddress'],
+                        "key-name": instance['KeyName'],
+                        "image-id": instance['ImageId'],
+                        "vpc-id": instance['VpcId'],
+                        "subnet-id": instance['SubnetId'],
+                        "security-group-ids": instance['SecurityGroups'],
+                    }
+                )
+
+        print(output)
+        return jsonify(output), 200
 
     except Exception as error:
         print(str(error))
-        return jsonify({'Error': "Unexpected Error occured"}), 500
-
-    instances = client.describe_instances()
-    output = []
-    for reservation in instances['Reservations']:
-        output.extend([
-            {
-                'id': instance['InstanceId'],
-                "instance-type": instance['InstanceType'],
-                "instance-state": instance['State']['Name']
-            }
-            for instance in reservation['Instances']])
-
-    # print(output)
-    return jsonify(output), 200
+        return jsonify({'Message': "Unexpected Error occured", 'Error': str(error)}), 500
 
 
 # Endpoint: http://<api_host>:<api_port>/ec2/start
-@app.route("/ec2/start", methods=["POST", "GET"])
+@app.route("/ec2/start", methods=["POST"])
 def start_ec2_instances():
     try:
-        aws_access_key_id = request.args.get("aws_access_key_id")
-        aws_secret_access_key = request.args.get("aws_secret_access_key")
-        region_name = request.args.get("region_name")
-        InstanceIds = request.args.get("InstanceId")
-        client = boto3.client('ec2',
-                              aws_access_key_id=aws_access_key_id,
-                              aws_secret_access_key=aws_secret_access_key,
-                              region_name=region_name,
-                              )
-
-    except Exception as error:
-        print(str(error))
-        return jsonify({'Error': "Unexpected Error occured"}), 500
+        client = get_aws_client(request)
+        InstanceId = request.args.get("InstanceId")
 
-    response = client.describe_instances()
-    InstanceIds = []
-    for instance in response["Reservations"][0]["Instances"]:
-        InstanceIds.append(instance["InstanceId"])
+        response = client.start_instances(
+            InstanceIds=[InstanceId]
+        )
 
-    response = client.start_instances(
-        InstanceIds=InstanceIds
-    )
+        return jsonify(response["StartingInstances"][0]), 200
 
-    return jsonify(response["StartingInstances"][0]), 200
+    except Exception as error:
+        print(str(error))
+        return jsonify({'Message': "Unexpected Error occured", 'Error': str(error)}), 500
 
 
 # Endpoint: http://<api_host>:<api_port>/ec2/stop
-@app.route("/ec2/stop", methods=["POST", "GET"])
+@app.route("/ec2/stop", methods=["POST"])
 def stop_ec2_instances():
     try:
-        aws_access_key_id = request.args.get("aws_access_key_id")
-        aws_secret_access_key = request.args.get("aws_secret_access_key")
-        region_name = request.args.get("region_name")
-        InstanceIds = request.args.get("InstanceId")
-        client = boto3.client('ec2',
-                              aws_access_key_id=aws_access_key_id,
-                              aws_secret_access_key=aws_secret_access_key,
-                              region_name=region_name,
-                              )
+        client = get_aws_client(request)
+        InstanceId = request.args.get("InstanceId")
 
-    except Exception as error:
-        print(str(error))
-        return jsonify({'Error': "Unexpected Error occured"}), 500
+        response = client.stop_instances(
+            InstanceIds=[InstanceId]
+        )
 
-    response = client.describe_instances()
-    InstanceIds = []
-    for instance in response["Reservations"][0]["Instances"]:
-        InstanceIds.append(instance["InstanceId"])
+        return jsonify(response["StoppingInstances"][0]), 200
 
-    response = client.stop_instances(
-        InstanceIds=InstanceIds
-    )
-
-    return jsonify(response["StoppingInstances"][0]), 200
+    except Exception as error:
+        print(str(error))
+        return jsonify({'Message': "Unexpected Error occured", 'Error': str(error)}), 500
 
 
 if __name__ == "__main__":

config.py

@@ -2,5 +2,5 @@
     "host": "0.0.0.0",
     "port": 8080,
     "log_file": "logs/app.log",
-    "log_level": "INFO"
+    "log_level": "DEBUG",
 }