add options to PUT with id

Author: adamwhitingnhs

infrastructure/gateway-document-reference.tf

@@ -21,3 +21,19 @@ module "document_reference_gateway" {
   require_credentials = true
   origin              = contains(["prod"], terraform.workspace) ? "'https://${var.domain}'" : "'https://${terraform.workspace}.${var.domain}'"
 }
+
+module "document_reference_id_gateway" {
+  source              = "./modules/gateway"
+  api_gateway_id      = aws_api_gateway_rest_api.ndr_doc_store_api.id
+  parent_id           = module.document_reference_gateway.gateway_resource_id
+  http_methods        = ["PUT"]
+  authorization       = "CUSTOM"
+  gateway_path        = "{id}"
+  authorizer_id       = aws_api_gateway_authorizer.repo_authoriser.id
+  require_credentials = true
+  origin              = contains(["prod"], terraform.workspace) ? "'https://${var.domain}'" : "'https://${terraform.workspace}.${var.domain}'"
+
+  request_parameters = {
+    "method.request.path.id" = true
+  }
+}

infrastructure/lambda-update-doc-ref.tf

@@ -1,12 +1,6 @@
-resource "aws_api_gateway_resource" "update_document_reference_with_id" {
-  rest_api_id = aws_api_gateway_rest_api.ndr_doc_store_api.id
-  parent_id   = module.document_reference_gateway.gateway_resource_id
-  path_part   = "{id}"
-}
-
 resource "aws_api_gateway_method" "update_document_reference_with_id" {
   rest_api_id   = aws_api_gateway_rest_api.ndr_doc_store_api.id
-  resource_id   = aws_api_gateway_resource.update_document_reference_with_id.id
+  resource_id   = module.document_reference_id_gateway.gateway_resource_id.id
   http_method   = "PUT"
   authorization = "CUSTOM"
   authorizer_id = aws_api_gateway_authorizer.repo_authoriser.id
@@ -73,7 +67,7 @@ module "update_doc_ref_lambda" {
   ]
   kms_deletion_window = var.kms_deletion_window
   rest_api_id         = aws_api_gateway_rest_api.ndr_doc_store_api.id
-  resource_id         = aws_api_gateway_resource.update_document_reference_with_id.id
+  resource_id         = module.document_reference_id_gateway.gateway_resource_id.id
   http_methods        = ["PUT"]
   memory_size         = 512
 

infrastructure/modules/gateway/main.tf

@@ -13,13 +13,14 @@ resource "aws_api_gateway_method" "preflight_method" {
 }
 
 resource "aws_api_gateway_method" "proxy_method" {
-  for_each         = toset(var.http_methods)
-  rest_api_id      = var.api_gateway_id
-  resource_id      = aws_api_gateway_resource.gateway_resource.id
-  http_method      = each.key
-  authorization    = var.authorization
-  authorizer_id    = var.authorizer_id
-  api_key_required = var.api_key_required
+  for_each           = toset(var.http_methods)
+  rest_api_id        = var.api_gateway_id
+  resource_id        = aws_api_gateway_resource.gateway_resource.id
+  http_method        = each.key
+  authorization      = var.authorization
+  authorizer_id      = var.authorizer_id
+  api_key_required   = var.api_key_required
+  request_parameters = var.request_parameters
 }
 
 resource "aws_api_gateway_method_response" "preflight_method_response" {

infrastructure/modules/gateway/variable.tf

@@ -45,3 +45,9 @@ variable "api_key_required" {
   type        = bool
   default     = false
 }
+
+variable "request_parameters" {
+  description = "Request parameters for the API Gateway method."
+  type        = map(string)
+  default     = {}
+}