Merge pull request #86 from lsst-sqre/tickets/DM-29879

jonathansick · web-flow · commit e44560787535 · 2021-04-27T16:37:22.000-04:00
DM-29879: Increase presigned-URL TTL and update dependencies
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -10,7 +10,7 @@ jobs:
       - uses: actions/checkout@v2
 
       - name: Set up Python
-        uses: actions/setup-python@v2.1.3
+        uses: actions/setup-python@v2
         with:
           python-version: 3.8
 
@@ -40,7 +40,7 @@ jobs:
       - uses: actions/checkout@v2
 
       - name: Set up Python
-        uses: actions/setup-python@v2.1.3
+        uses: actions/setup-python@v2
         with:
           python-version: 3.8
 
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,6 +2,13 @@
 Change log
 ##########
 
+1.22.0 (2021-04-27)
+===================
+
+- Increase presigned post URL expiration to 24 hrs (from 1 hr).
+  This should give greater flexibility to uploads so that the URLs don't expire during the build upload process.
+- Update development and production dependencies
+
 1.21.0 (2020-11-30)
 ===================
 
diff --git a/keeper/api/post_products_builds.py b/keeper/api/post_products_builds.py
@@ -367,7 +367,7 @@ def _create_presigned_url_for_prefix(
         s3_session=s3_session,
         bucket_name=bucket_name,
         prefix=prefix,
-        expiration=3600,
+        expiration=86400,
         conditions=url_conditions,
         fields=url_fields,
     )
diff --git a/keeper/logutils.py b/keeper/logutils.py
@@ -40,6 +40,7 @@ def decorated_function(*args, **kwargs):  # type: ignore
             # Close out the logger
             end_time = timer()
             log.info(
+                "Call finalized",
                 status=response.status_code,
                 response_time=end_time - start_time,
             )
diff --git a/manifests/kustomization.yaml b/manifests/kustomization.yaml
@@ -10,4 +10,4 @@ resources:
 
 images:
   - name: lsstsqre/ltd-keeper
-    newTag: 1.21.0
+    newTag: 1.22.0
diff --git a/requirements/dev.txt b/requirements/dev.txt
diff --git a/requirements/main.in b/requirements/main.in
@@ -18,4 +18,4 @@ boto3
 requests
 structlog
 celery[redis]
-flower
+flower==0.9.5
diff --git a/requirements/main.txt b/requirements/main.txt

Original file line number	Diff line number	Diff line change
`@@ -367,7 +367,7 @@ def _create_presigned_url_for_prefix(`
`367`	`367`	`s3_session=s3_session,`
`368`	`368`	`bucket_name=bucket_name,`
`369`	`369`	`prefix=prefix,`
`370`		`- expiration=3600,`
	`370`	`+ expiration=86400,`
`371`	`371`	`conditions=url_conditions,`
`372`	`372`	`fields=url_fields,`
`373`	`373`	`)`
Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,7 @@ def decorated_function(args, *kwargs): # type: ignore`
`40`	`40`	`# Close out the logger`
`41`	`41`	`end_time = timer()`
`42`	`42`	`log.info(`
	`43`	`+ "Call finalized",`
`43`	`44`	`status=response.status_code,`
`44`	`45`	`response_time=end_time - start_time,`
`45`	`46`	`)`