Merge pull request from devenes/test

Update app

Author: devenes

README.md

@@ -2,13 +2,31 @@
 
 ![api](./readme/boto3.jpg)
 
-### Python API uses Flask and Boto3 libraries. It has the features of Instance listing, Instance start and Instance stop; it has 3 endpoints communicate with EC2 service on AWS.
+### Python API uses the Flask and Boto3 libraries. It has instance listing, instance start, instance stop, instance create and instance terminate features; It has 5 endpoints communicating with EC2 service on AWS.
+
+---
+
+## Create Instance
+
+You send a POST request to the `create` endpoint with the following parameters and it will create Ubuntu EC2 instance. You create your EC2 Instance with the `region_name`, `KeyName` and `SecurityGroupId` parameters you send in the request.
+
+```
+http://<api_host>:<api_port>/ec2/create
+```
+
+| Parameter               | Type     | Description           |
+| :---------------------- | :------- | :-------------------- |
+| `aws_access_key_id`     | `string` | AWS Access Key ID     |
+| `aws_secret_access_key` | `string` | AWS Secret Access Key |
+| `region_name`           | `string` | AWS Region Name       |
+| `KeyName`               | `string` | AWS Key Name          |
+| `SecurityGroupId`       | `string` | AWS Security Group ID |
 
 ---
 
 ## List Instances
 
-You send a request to this endpoint by entering the following parameters, and you can list all the instances in your AWS account in the region you specify and their status.
+You send a GET request to the `list` endpoint by entering the following parameters, then you can list all the instances and their status in your AWS account in the region you specify.
 
 ```
 http://<api_host>:<api_port>/ec2/list
@@ -24,7 +42,7 @@ http://<api_host>:<api_port>/ec2/list
 
 ## Start Instance
 
-You send a request to this endpoint by entering the following parameters, and you can start the instance you specified with `instance_id`, in the region you specified with `region_name` and the status of the instance will be changed to `running`.
+You send a POST request to the `start` endpoint by entering the following parameters, and you can start the instance you specified with `instance_id`, in the region you specified with `region_name` and the status of the instance will be changed to `pending` and then to `running`.
 
 ```
 http://<api_host>:<api_port>/ec2/start
@@ -41,7 +59,7 @@ http://<api_host>:<api_port>/ec2/start
 
 ## Stop Instance
 
-You send a request to this endpoint by entering the following parameters, and you can stop the instance you specified with `instance_id`, in the region you specified with `region_name` and the status of the instance will be changed to `stopped`.
+You send a POST request to the `stop` endpoint by entering the following parameters, and you can stop the instance you specified with `instance_id`, in the region you specified with `region_name` and the status of the instance will be changed to `stopping` and then to `stopped`.
 
 ```
 http://<api_host>:<api_port>/ec2/stop
@@ -55,3 +73,18 @@ http://<api_host>:<api_port>/ec2/stop
 | `instance_id`           | `string` | Instance ID Number    |
 
 ---
+
+## Terminate Instance
+
+You send a POST request to the `terminate` endpoint by entering the following parameters, and you can terminate the instance you specified with `instance_id`, in the region you specified with `region_name` and the status of the instance will be changed to `shutting-down` and then `terminated`.
+
+```
+http://<api_host>:<api_port>/ec2/terminate
+```
+
+| Parameter               | Type     | Description           |
+| :---------------------- | :------- | :-------------------- |
+| `aws_access_key_id`     | `string` | AWS Access Key ID     |
+| `aws_secret_access_key` | `string` | AWS Secret Access Key |
+| `region_name`           | `string` | AWS Region Name       |
+| `instance_id`           | `string` | Instance ID Number    |

app.py

@@ -23,7 +23,7 @@ def get_aws_client(request):
 
 
 # Endpoint: http://<api_host>:<api_port>/ec2/list
-@ app.route('/ec2/list', methods=['GET'])
+@app.route('/ec2/list', methods=['GET'])
 def aws_list():
     try:
         client = get_aws_client(request)
@@ -90,7 +90,48 @@ def stop_ec2_instances():
         return jsonify({'Message': "Unexpected Error occured", 'Error': str(error)}), 500
 
 
+@app.route("/ec2/create", methods=["POST"])
+def create_ec2_instance():
+    try:
+        client = get_aws_client(request)
+        KeyName = request.args.get("KeyName")
+        SecurityGroupIds = request.args.get("SecurityGroupId")
+
+        response = client.run_instances(
+            ImageId='ami-0fb653ca2d3203ac1',  # Ubuntu Server 20.04, 64-bit x86
+            InstanceType='t2.micro',  # 1 vCPU, 1 GB RAM (Free tier ^^)
+            MinCount=1,
+            MaxCount=1,
+            KeyName=KeyName,
+            SecurityGroupIds=[SecurityGroupIds]
+        )
+
+        print(response)
+        return jsonify(response["Instances"][0]), 200
+
+    except Exception as error:
+        print(str(error))
+        return jsonify({'Message': "Unexpected Error occured", 'Error': str(error)}), 500
+
+
+@app.route("/ec2/terminate", methods=["POST"])
+def terminate_ec2_instance():
+    try:
+        client = get_aws_client(request)
+        InstanceId = request.args.get("InstanceId")
+
+        response = client.terminate_instances(
+            InstanceIds=[InstanceId]
+        )
+
+        return jsonify(response["TerminatingInstances"][0]), 200
+
+    except Exception as error:
+        print(str(error))
+        return jsonify({'Message': "Unexpected Error occured", 'Error': str(error)}), 500
+
+
 if __name__ == "__main__":
     app.run(host=config["host"],
             port=config["port"],
-            debug=False)
+            debug=True)