+
+
+
BSMSapp
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
@@ -39,46 +43,86 @@
e.preventDefault();
const formData = new FormData(thisForm).entries()
const str = JSON.stringify(Object.fromEntries(formData))
- console.log(str.replace(/\"/g, ''))
- const response = await fetch("${ENDPOINT}/resource", {
+ const response = await fetch("${ENDPOINT}/products", {
method: 'POST',
- headers: {
+ headers: {
'Content-Type': 'application/json'
},
body: str.replace(/\"/g, '')
});
const result = await response.json();
- console.log(result)
});
function adjust_textarea(h) {
h.style.height = "20px";
- h.style.height = (h.scrollHeight)+"px";
+ h.style.height = (h.scrollHeight) + "px";
}
+
+ async function get_table() {
+ const request = await fetch("${ENDPOINT}/products", {
+ method: 'GET',
+ headers: {
+ 'Content-Type': 'application/json'
+ }
+ });
+
+ const list = await request.json();
+
+ var cols = [];
+ for (var i = 0; i < list.length; i++) {
+ for (var k in list[i]) {
+ if (cols.indexOf(k) === -1) {
+ cols.push(k);
+ }
+ }
+ }
+
+ var table = document.createElement("table");
+ var tr = table.insertRow(-1);
+ for (var i = 0; i < cols.length; i++) {
+ var theader = document.createElement("th");
+ theader.innerHTML = cols[i];
+ tr.appendChild(theader);
+ }
+
+ for (var i = 0; i < list.length; i++) {
+ trow = table.insertRow(-1);
+ for (var j = 0; j < cols.length; j++) {
+ var cell = trow.insertCell(-1);
+ cell.innerHTML = list[i][cols[j]];
+ }
+ }
+
+ var el = document.getElementById("table");
+ el.innerHTML = "";
+ el.appendChild(table);
+ }
+
\ No newline at end of file
diff --git a/terraform/organization/lambda.tf b/terraform/organization/lambda.tf
index 5ce1bc9..4f2ddf2 100644
--- a/terraform/organization/lambda.tf
+++ b/terraform/organization/lambda.tf
@@ -16,6 +16,6 @@ module "lambda" {
package = each.value.package
iam_role = each.value.role
- vpc_subnet_ids = module.vpc.public_subnets
- vpc_security_group_ids = [module.vpc.default_security_group_id]
+ vpc_subnet_ids = module.vpc.private_subnets
+ vpc_security_group_ids = [aws_security_group.dynamodb_sg.id]
}
diff --git a/terraform/organization/locals.tf b/terraform/organization/locals.tf
index 976b902..6563032 100644
--- a/terraform/organization/locals.tf
+++ b/terraform/organization/locals.tf
@@ -1,5 +1,5 @@
locals {
- bucket_name = "b123123123123-itba-cloud-computing-g3-test"
+ bucket_name = "bsmsapp-itba-cloud-computing-g3-test"
path = "../resources"
s3 = {
@@ -33,9 +33,16 @@ locals {
}
lambdas = {
- lambda = {
- package = "${local.path}/lambda/lambda.zip"
- function_name = "AWSLambdaHandler-${replace(local.bucket_name, "-", "")}"
+ lambdaSQS = {
+ package = "${local.path}/lambda/lambdaSQS.zip"
+ function_name = "AWSLambdaHandlerAPISQSDBg3test"
+ role = "arn:aws:iam::${data.aws_caller_identity.current.account_id}:role/LabRole"
+ handler = "lambda_handler.main"
+ runtime = "python3.9"
+ },
+ lambdaDB = {
+ package = "${local.path}/lambda/lambdaDB.zip"
+ function_name = "AWSLambdaHandlerAPIDBg3test"
role = "arn:aws:iam::${data.aws_caller_identity.current.account_id}:role/LabRole"
handler = "lambda_handler.main"
runtime = "python3.9"
diff --git a/terraform/organization/sqs.tf b/terraform/organization/sqs.tf
index fe7a009..52c705a 100644
--- a/terraform/organization/sqs.tf
+++ b/terraform/organization/sqs.tf
@@ -10,7 +10,7 @@ module "sqs" {
]
name = "AWS-SQS-g3"
- lambda_name = "AWSLambdaHandler-${replace(local.bucket_name, "-", "")}"
+ lambda_name = module.lambda["lambdaSQS"].lambda_function_name
tags = {
name = "SQS"
diff --git a/terraform/organization/vpc.tf b/terraform/organization/vpc.tf
index e21583d..ea71b4b 100644
--- a/terraform/organization/vpc.tf
+++ b/terraform/organization/vpc.tf
@@ -3,19 +3,11 @@ locals {
{
rule_number = 100
rule_action = "allow"
- from_port = 80
- to_port = 80
+ from_port = 1024
+ to_port = 65535
protocol = "tcp"
- cidr_block = "10.0.1.0/24"
- },
- {
- rule_number = 110
- rule_action = "allow"
- from_port = 80
- to_port = 80
- protocol = "tcp"
- cidr_block = "10.0.2.0/24"
- },
+ cidr_block = "0.0.0.0/0"
+ }
]
private_outbound = [
{
@@ -24,16 +16,8 @@ locals {
from_port = 443
to_port = 443
protocol = "tcp"
- cidr_block = "10.0.1.0/24"
- },
- {
- rule_number = 110
- rule_action = "allow"
- from_port = 443
- to_port = 443
- protocol = "tcp"
- cidr_block = "10.0.2.0/24"
- },
+ cidr_block = "0.0.0.0/0"
+ }
]
}
@@ -142,32 +126,6 @@ resource "aws_security_group" "dynamodb_sg" {
}
}
-# resource "aws_network_acl" "private_nacl" {
-# vpc_id = module.vpc.vpc_id
-
-# egress {
-# protocol = "tcp"
-# rule_no = 200
-# action = "allow"
-# cidr_block = ["10.0.1.0/24", "10.0.2.0/24"]
-# from_port = 443
-# to_port = 443
-# }
-
-# ingress {
-# protocol = "tcp"
-# rule_no = 100
-# action = "allow"
-# cidr_block = ["10.0.1.0/24", "10.0.2.0/24"]
-# from_port = 80
-# to_port = 80
-# }
-
-# tags = {
-# Name = "vpc-g3-bsmsapp"
-# }
-# }
-
data "aws_iam_policy_document" "dynamodb_endpoint_policy" {
statement {
effect = "Deny"
@@ -226,3 +184,6 @@ resource "aws_security_group" "vpc_tls" {
}
}
+# output "aws_security_group_dynamodb" {
+# value = aws_security_group.dynamodb_sg.id
+# }
diff --git a/terraform/resources/html/index.html b/terraform/resources/html/index.html
deleted file mode 100644
index 73eec9e..0000000
--- a/terraform/resources/html/index.html
+++ /dev/null
@@ -1,47 +0,0 @@
-
-
-
-
-
BSMSapp
-
-
-
-
-
BSMSapp
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/terraform/resources/lambda/lambdaDB.zip b/terraform/resources/lambda/lambdaDB.zip
new file mode 100644
index 0000000..b897c88
Binary files /dev/null and b/terraform/resources/lambda/lambdaDB.zip differ
diff --git a/terraform/resources/lambda/lambdaDB/lambda_handler.py b/terraform/resources/lambda/lambdaDB/lambda_handler.py
new file mode 100644
index 0000000..5e83579
--- /dev/null
+++ b/terraform/resources/lambda/lambdaDB/lambda_handler.py
@@ -0,0 +1,26 @@
+import json
+import boto3
+from decimal import *
+
+class DecimalEncoder(json.JSONEncoder):
+ def default(self, obj):
+ if isinstance(obj, Decimal):
+ return str(obj)
+ return json.JSONEncoder.default(self, obj)
+
+
+def main (event, context):
+ client = boto3.resource('dynamodb', region_name="us-east-1")
+ table = client.Table("AWSDynamoDB-g3")
+
+ data = table.scan()["Items"]
+
+ resp = {
+ "statusCode": 200,
+ "headers": {
+ "Access-Control-Allow-Origin": "*",
+ },
+ "body": json.dumps(data, cls=DecimalEncoder)
+ }
+
+ return resp
\ No newline at end of file
diff --git a/terraform/resources/lambda/lambda.zip b/terraform/resources/lambda/lambdaSQS.zip
similarity index 100%
rename from terraform/resources/lambda/lambda.zip
rename to terraform/resources/lambda/lambdaSQS.zip
diff --git a/terraform/resources/lambda/lambda_handler.py b/terraform/resources/lambda/lambdaSQS/lambda_handler.py
similarity index 100%
rename from terraform/resources/lambda/lambda_handler.py
rename to terraform/resources/lambda/lambdaSQS/lambda_handler.py