From 51244884550ff187d86eceecae9059042bccaa23 Mon Sep 17 00:00:00 2001
From: James Sheppard <57200592+james-sheppard-gov-uk@users.noreply.github.com>
Date: Tue, 8 Oct 2024 15:58:11 +0100
Subject: [PATCH] Improved diagram

---
 ...ADR035-offer-amazon-s3-form-submissions.md | 33 ++++++++++---------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/ADR/ADR035-offer-amazon-s3-form-submissions.md b/ADR/ADR035-offer-amazon-s3-form-submissions.md
index 716cd21ae..6c492a6e9 100644
--- a/ADR/ADR035-offer-amazon-s3-form-submissions.md
+++ b/ADR/ADR035-offer-amazon-s3-form-submissions.md
@@ -4,17 +4,17 @@ Date: 2024-10-08
 
 ## Status
 
-Proposed
+Accepted
 
 ## Context
 
-Users of GOV.UK Forms have asked for an alternative to email delivery of form submissions to allow integration with form processing systems.
+Sending form submissions via email is useful for teams who already receive forms in an email inbox. Some users of GOV.UK Forms have asked for an alternative to email delivery of form submissions to allow automated integration with form processing systems.
 
-Initially it was thought this might be acheived via POST to an http endpoint.
+Initially it was thought this might be acheived via a [webhook mechanism similar to GOV.UK Pay](https://docs.payments.service.gov.uk/webhooks/), which requires setting up a custom endpoint that is both available and secure, with the associated ongoing support and maintenance. Advice from NCSC encouraged us to explore the use of managed services as alternatives to a self-hosted webhook.
 
 ## Decision
 
-Allow organisations to choose to send form submissions to an [Amazon S3](https://aws.amazon.com/s3/) bucket they host, with a policy configured to allow GOV.UK Forms to write to it. They can then integrate with their form processing systems as required.
+Allow organisations to choose to send form submissions to an [Amazon S3](https://aws.amazon.com/s3/) bucket they host, with a policy configured to allow GOV.UK Forms IAM role to write to it. They can then integrate with their form processing systems as required.
 
 ```mermaid
 ---
@@ -24,24 +24,26 @@ title: Form submission to Amazon S3
 graph LR
 
     classDef default fill:#fff,stroke:#333,stroke-width:2px;
-    classDef forms fill:#000,stroke:#333,stroke-width:5px,color:#fff,font-size:28px;
-    classDef org fill:#fe6,stroke:#fc3,stroke-width:5px,color:#000,padding:10px,font-size:20px;
 
-    forms[GOV.UK Forms]
+    subgraph forms_aws [GOV.UK Forms AWS Account]
+        forms[GOV.UK Forms]
+        role[/"IAM role"/]
 
-    class forms forms
-    class gds gds
+        role --- forms
 
-    subgraph org [Organisation]
+    end
+
+    subgraph org [Organisation AWS Account]
         s3[\Amazon S3/]
-        policy[/"bucket policy"/]
+        policy[/"bucket policy<br />allows IAM role"/]
+        event[/s3:ObjectCreated event/]
         processing{{Form Processing}}
 
-        s3 ==> processing
+        s3 --- event --- processing
+        s3 --- processing
         s3 --- policy
     end
     
-    class org org
 
     data[/"structured<br/>data"/]
     file[/"optional<br/>file(s)"/]
@@ -53,5 +55,6 @@ graph LR
 
 ## Consequences
 
-* The receiving organisation must be using Amazon Web Services for this option to be suitable. An additional option may be required for organisations that can't use Amazon S3.
-* When GOV.UK Forms supports file upload, these files can also be sent via Amazon S3
+* The format of the `structured data` that represents the submitted form can be defined in a separate ADR.
+* The receiving organisation must be using Amazon Web Services for this option to be suitable. An additional option may be required for organisations that can't use AWS and/or Amazon S3.
+* When GOV.UK Forms supports file upload, these files can also be sent via Amazon S3.