diff --git a/Lambdas/Lists/src/main/java/ListAdd.java b/Lambdas/Lists/src/main/java/InputUtils.java similarity index 50% rename from Lambdas/Lists/src/main/java/ListAdd.java rename to Lambdas/Lists/src/main/java/InputUtils.java index d5a698b..0457585 100644 --- a/Lambdas/Lists/src/main/java/ListAdd.java +++ b/Lambdas/Lists/src/main/java/InputUtils.java @@ -1,14 +1,7 @@ -import java.io.IOException; -import java.sql.SQLException; import java.util.Map; -import com.amazonaws.services.lambda.runtime.Context; -import com.amazonaws.services.lambda.runtime.RequestHandler; - -public class ListAdd implements RequestHandler, String>{ - - - public String handleRequest(Map inputMap, Context unfilled) { +public class InputUtils { + public static String getCognitoIDFromBody(Map inputMap) { System.out.println(inputMap.keySet()); System.out.println(inputMap.entrySet()); Map contextMap; @@ -19,13 +12,5 @@ public class ListAdd implements RequestHandler, String>{ } System.out.println(inputMap.get("context")); System.out.println(contextMap.get("sub")); - try { - System.out.println(new DBConnector()); - } catch (IOException e) { - e.printStackTrace(); - } catch (SQLException e) { - e.printStackTrace(); - } - return null; } } diff --git a/Lambdas/Lists/src/main/java/ListsPOST.java b/Lambdas/Lists/src/main/java/ListsPOST.java new file mode 100644 index 0000000..a4588a0 --- /dev/null +++ b/Lambdas/Lists/src/main/java/ListsPOST.java @@ -0,0 +1,22 @@ +import java.io.IOException; +import java.sql.SQLException; +import java.util.Map; + +import com.amazonaws.services.lambda.runtime.Context; +import com.amazonaws.services.lambda.runtime.RequestHandler; + +public class ListsPOST implements RequestHandler, String>{ + + + public String handleRequest(Map inputMap, Context unfilled) { + String cognitoID = InputUtils.getCognitoIDFromBody(inputMap); + try { + System.out.println(new DBConnector()); + } catch (IOException e) { + e.printStackTrace(); + } catch (SQLException e) { + e.printStackTrace(); + } + return null; + } +} diff --git a/Tooling/EndpointSetup.sh b/Tooling/EndpointSetup.sh index 81c2d08..6f2bf00 100644 --- a/Tooling/EndpointSetup.sh +++ b/Tooling/EndpointSetup.sh @@ -28,7 +28,7 @@ zipPath=${functionPath}.zip zip ${zipPath} ${jarPath} -RAWLAMBDA=$(aws lambda create-function --function-name ${functionName}${method} --zip-file fileb://${zipPath} --runtime ${LANGUAGE} --role ${LAMBDAROLE} --handler ${functionName}.lambda_handler) +RAWLAMBDA=$(aws lambda create-function --function-name ${functionName}${method} --zip-file fileb://${zipPath} --runtime ${LANGUAGE} --role ${LAMBDAROLE} --handler ${functionName}${method}.lambda_handler 2>${DEBUGFILE}) if [[ $? -ne 0 ]]; then echo "Unable to create Lamba" >&2 @@ -39,11 +39,15 @@ LAMBDAARN=$(echo $RAWLAMBDA | head -n 3 | tail -n 1 | cut -d \" -f 8) echo ${LAMBDAARN} > ${DEBUGFILE} -RAWRESOURCEID=$(aws apigateway create-resource --rest-api-id ${APIID} --parent-id ${ROOTRESOURCEID} --path-part ${functionName}) +RAWRESOURCEID=$(aws apigateway create-resource --rest-api-id ${APIID} --parent-id ${ROOTRESOURCEID} --path-part ${functionName} 2>${DEBUGFILE}) if [[ $? -ne 0 ]]; then - echo "Unable to create Resource. This needs to be handled at some future point" >&2 - exit 1 + echo "Unable to create resource." > ${DEBUGFILE} + RAWRESOURCEID=$(aws apigateway get-resources --rest-api-id datoh7woc9 --query "items[?pathPart==\`${functionName}\`].{id:id}" | head -n 3 | tail -n 1) + if [[ $RAWRESOURCEID == "[]" ]]; then + echo "Unable to create or find API Gateway resource." >&2 + exit 1 + fi fi RESOURCEID=$(echo ${RAWRESOURCEID} | head -n 2 | tail -n 1 | cut -d \" -f 4)