Use preflight if either viewer-request or origin-request is specified

samvera · Mar 21, 2024 · bdda29b · bdda29b
1 parent 185574a
commit bdda29b
Show file tree

Hide file tree

Showing 13 changed files with 914 additions and 765 deletions.
diff --git a/bin/update_version b/bin/update_version
@@ -18,7 +18,7 @@ else
   sedreplace="sed -Ei"
 fi
 
-for edition in . standalone cloudfront; do
-  $sedreplace "s/SemanticVersion: .+/SemanticVersion: $version/" $root/sam/$edition/template.yml
+for template in sam/template.yml sam/standalone/template.yml sam/cloudfront/template.yml examples/sam/customization/template.yaml examples/cloudformation/custom_hostname.yml; do
+  $sedreplace "s/SemanticVersion: .+/SemanticVersion: $version/" $root/$template
 done
 $sedreplace "s/  serverless_iiif_app_version   =.+/  serverless_iiif_app_version   = \"$version\"/" $root/extras/terraform/main.tf
diff --git a/dependencies/package-lock.json b/dependencies/package-lock.json
diff --git a/dependencies/package.json b/dependencies/package.json
@@ -1,6 +1,6 @@
 {
   "name": "serverless-iiif-dependencies",
-  "version": "5.0.2",
+  "version": "5.0.3",
   "description": "Dependencies for serverless IIIF",
   "author": "Michael B. Klein",
   "license": "Apache-2.0",

diff --git a/examples/cloudformation/custom_hostname.yml b/examples/cloudformation/custom_hostname.yml
@@ -21,7 +21,7 @@ Resources:
     Properties:
       Location:
         ApplicationId: arn:aws:serverlessrepo:us-east-1:625046682746:applications/serverless-iiif-standalone-dev
-        SemanticVersion: 5.0.0
+        SemanticVersion: 5.0.3
       Parameters:
         SourceBucket: !Ref IiifSourceBucket
   ResponseHeaderPolicy:

diff --git a/examples/sam/customization/template.yaml b/examples/sam/customization/template.yaml
@@ -126,7 +126,7 @@ Resources:
     Properties:
       Location:
         ApplicationId: arn:aws:serverlessrepo:us-east-1:625046682746:applications/serverless-iiif
-        SemanticVersion: 5.0.0
+        SemanticVersion: 5.0.3
       Parameters:
         CorsAllowOrigin: REFLECT_ORIGIN
         ForceHost: !Ref CacheDomainName

diff --git a/extras/terraform/main.tf b/extras/terraform/main.tf
@@ -10,7 +10,7 @@ terraform {
 
 locals {
   serverless_iiif_app_id        = "arn:aws:serverlessrepo:us-east-1:625046682746:applications/serverless-iiif"
-  serverless_iiif_app_version   = "5.0.2"
+  serverless_iiif_app_version   = "5.0.3"
 }
 
 resource "aws_serverlessapplicationrepository_cloudformation_stack" "serverless_iiif" {

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "serverless-iiif",
-  "version": "5.0.2",
+  "version": "5.0.3",
   "description": "Lambda wrapper for iiif-processor",
   "author": "Michael B. Klein",
   "license": "Apache-2.0",

diff --git a/sam/cloudfront/template.yml b/sam/cloudfront/template.yml
@@ -9,7 +9,7 @@ Metadata:
     ReadmeUrl: ./README.md
     Labels: ["iiif", "image-processing"]
     HomePageUrl: https://samvera.github.io/serverless-iiif
-    SemanticVersion: 5.0.2
+    SemanticVersion: 5.0.3
     SourceCodeUrl: https://github.com/samvera/serverless-iiif
   AWS::CloudFormation::Interface:
     ParameterGroups:
@@ -180,6 +180,10 @@ Conditions:
   UseOriginResponse:
     Fn::Not:
       - Fn::Equals: [!Ref OriginResponseARN, ""]
+  UsePreflight:
+    Fn::Or:
+      - Condition: UseOriginRequest
+      - Condition: UseViewerRequest
   UseViewerRequest:
     Fn::And:
       - Fn::Not:
@@ -320,7 +324,7 @@ Resources:
     Properties:
       Location:
         ApplicationId: arn:aws:serverlessrepo:us-east-1:625046682746:applications/serverless-iiif
-        SemanticVersion: 5.0.2
+        SemanticVersion: 5.0.3
       Parameters:
         CorsAllowCredentials: !Ref CorsAllowCredentials
         CorsAllowOrigin: !Ref CorsAllowOrigin
@@ -337,7 +341,7 @@ Resources:
         PixelDensity: !Ref PixelDensity
         Preflight:
           Fn::If:
-            - UseViewerRequest
+            - UsePreflight
             - true
             - false
         PyramidLimit: !Ref PyramidLimit

diff --git a/sam/standalone/template.yml b/sam/standalone/template.yml
@@ -9,7 +9,7 @@ Metadata:
     ReadmeUrl: ./README.md
     Labels: ["iiif", "image-processing"]
     HomePageUrl: https://samvera.github.io/serverless-iiif
-    SemanticVersion: 5.0.2
+    SemanticVersion: 5.0.3
     SourceCodeUrl: https://github.com/samvera/serverless-iiif
   AWS::CloudFormation::Interface:
     ParameterGroups:
@@ -118,7 +118,7 @@ Resources:
     Properties:
       Location:
         ApplicationId: arn:aws:serverlessrepo:us-east-1:625046682746:applications/serverless-iiif
-        SemanticVersion: 5.0.2
+        SemanticVersion: 5.0.3
       Parameters:
         CorsAllowCredentials: !Ref CorsAllowCredentials
         CorsAllowHeaders: !Ref CorsAllowHeaders

diff --git a/sam/template.yml b/sam/template.yml
@@ -9,7 +9,7 @@ Metadata:
     ReadmeUrl: ../README.md
     Labels: ["iiif", "image-processing"]
     HomePageUrl: https://samvera.github.io/serverless-iiif
-    SemanticVersion: 5.0.2
+    SemanticVersion: 5.0.3
     SourceCodeUrl: https://github.com/samvera/serverless-iiif
   AWS::CloudFormation::Interface:
     ParameterGroups: