Merge branch 'promotions/2023-05-31' into prod (#5252, PR #5253)

DataBiosphere · May 31, 2023 · 861b7af · 861b7af
2 parents 5093a46 + 1f28050
commit 861b7af
Show file tree

Hide file tree

Showing 41 changed files with 1,274 additions and 279 deletions.
diff --git a/.github/PULL_REQUEST_TEMPLATE/backport.md b/.github/PULL_REQUEST_TEMPLATE/backport.md
@@ -47,8 +47,9 @@ Uncheck the *before every review* checklists. Update the `N reviews` label.
 - [ ] Build passes in `anvilbox` deployment <sub>or PR is labeled `no sandbox`</sub>
 - [ ] Reviewed build logs for anomalies in `sandbox` deployment <sub>or PR is labeled `no sandbox`</sub>
 - [ ] Reviewed build logs for anomalies in `anvilbox` deployment <sub>or PR is labeled `no sandbox`</sub>
+- [ ] Title of merge commit starts with title from this PR
 - [ ] Added PR reference (this PR) to merge commit title
-- [ ] Collected commit title tags in merge commit title
+- [ ] Added commit title tags to merge commit title
 - [ ] Pushed merge commit to GitHub
 
 

diff --git a/.github/PULL_REQUEST_TEMPLATE/gitlab.md b/.github/PULL_REQUEST_TEMPLATE/gitlab.md
@@ -42,15 +42,23 @@ Connected issue: #4014
 - [ ] Squashed PR branch and rebased onto `develop`
 - [ ] Sanity-checked history
 - [ ] Pushed PR branch to GitHub
+- [ ] Title of merge commit starts with title from this PR
 - [ ] Added PR reference to merge commit title
-- [ ] Collected commit title tags in merge commit title
+- [ ] Added commit title tags to merge commit title
 - [ ] Moved connected issue to Merged column in ZenHub
 - [ ] Pushed merge commit to GitHub
 
 
+### Operator (chain shortening)
+
+- [ ] Changed the target branch of the blocked PR to `develop` <sub>or this PR is not labeled `base`</sub>
+- [ ] Removed the `chained` label from the blocked PR <sub>or this PR is not labeled `base`</sub>
+- [ ] Removed the blocking relationship from the blocked PR <sub>or this PR is not labeled `base`</sub>
+- [ ] Removed the `base` label from this PR <sub>or this PR is not labeled `base`</sub>
+
+
 ### Operator (after pushing the merge commit)
 
-- [ ] Shortened the PR chain <sub>or this PR is not labeled `base`</sub>
 - [ ] Deleted PR branch from GitHub
 
 

diff --git a/.github/PULL_REQUEST_TEMPLATE/hotfix.md b/.github/PULL_REQUEST_TEMPLATE/hotfix.md
@@ -48,8 +48,9 @@ Connected issue: #0000
 - [ ] Squashed PR branch and rebased onto `prod`
 - [ ] Sanity-checked history
 - [ ] Pushed PR branch to GitHub
+- [ ] Title of merge commit starts with title from this PR
 - [ ] Added PR reference to merge commit title
-- [ ] Collected commit title tags in merge commit title
+- [ ] Added commit title tags to merge commit title
 - [ ] Moved connected issue to *Merged prod* column in ZenHub
 - [ ] Pushed merge commit to GitHub
 

diff --git a/.github/PULL_REQUEST_TEMPLATE/promotion.md b/.github/PULL_REQUEST_TEMPLATE/promotion.md
@@ -41,8 +41,9 @@ Connected issue: #0000
 ### Operator (before pushing merge the commit)
 
 - [ ] Pushed PR branch to GitHub
+- [ ] Title of merge commit starts with title from this PR
 - [ ] Added PR reference to merge commit title
-- [ ] Collected commit title tags in merge commit title
+- [ ] Added commit title tags to merge commit title
 - [ ] Pushed merge commit to GitHub
 
 

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -119,15 +119,23 @@ Uncheck the *before every review* checklists. Update the `N reviews` label.
 - [ ] Started reindex in `anvilbox` <sub>or this PR does not require reindexing `sandbox`</sub>
 - [ ] Checked for failures in `sandbox` <sub>or this PR does not require reindexing `sandbox`</sub>
 - [ ] Checked for failures in `anvilbox` <sub>or this PR does not require reindexing `sandbox`</sub>
+- [ ] Title of merge commit starts with title from this PR
 - [ ] Added PR reference to merge commit title
-- [ ] Collected commit title tags in merge commit title
+- [ ] Added commit title tags to merge commit title
 - [ ] Moved connected issues to Merged column in ZenHub
 - [ ] Pushed merge commit to GitHub
 
 
+### Operator (chain shortening)
+
+- [ ] Changed the target branch of the blocked PR to `develop` <sub>or this PR is not labeled `base`</sub>
+- [ ] Removed the `chained` label from the blocked PR <sub>or this PR is not labeled `base`</sub>
+- [ ] Removed the blocking relationship from the blocked PR <sub>or this PR is not labeled `base`</sub>
+- [ ] Removed the `base` label from this PR <sub>or this PR is not labeled `base`</sub>
+
+
 ### Operator (after pushing the merge commit)
 
-- [ ] Shortened the PR chain <sub>or this PR is not labeled `base`</sub>
 - [ ] Pushed merge commit to GitLab `dev` <sub>or PR is labeled `no sandbox`</sub>
 - [ ] Pushed merge commit to GitLab `anvildev` <sub>or PR is labeled `no sandbox`</sub>
 - [ ] Build passes on GitLab `dev`<sup>1</sup>

diff --git a/.github/pull_request_template.md.template.py b/.github/pull_request_template.md.template.py
@@ -284,11 +284,13 @@ def main():
                 },
                 {
                     'type': 'cli',
-                    'content': 'Added `base` label to the blocking PR', 'alt': 'or this PR is not chained to another PR'
+                    'content': 'Added `base` label to the blocking PR',
+                    'alt': 'or this PR is not chained to another PR'
                 },
                 {
                     'type': 'cli',
-                    'content': 'Added `chained` label to this PR', 'alt': 'or this PR is not chained to another PR'
+                    'content': 'Added `chained` label to this PR',
+                    'alt': 'or this PR is not chained to another PR'
                 }
             ]),
             *iif(t in (T.default, T.promotion), [
@@ -303,11 +305,13 @@ def main():
                 }),
                 iif(t is T.default, {
                     'type': 'cli',
-                    'content': 'Added `u` tag to commit title', 'alt': 'or this PR does not require upgrading'
+                    'content': 'Added `u` tag to commit title',
+                    'alt': 'or this PR does not require upgrading'
                 }),
                 {
                     'type': 'cli',
-                    'content': 'Added `upgrade` label to PR', 'alt': 'or this PR does not require upgrading'
+                    'content': 'Added `upgrade` label to PR',
+                    'alt': 'or this PR does not require upgrading'
                 }
             ]),
             *iif(t is T.default, [
@@ -378,11 +382,13 @@ def main():
                 },
                 {
                     'type': 'cli',
-                    'content': 'Added `R` tag to commit title', 'alt': 'or this PR does not touch requirements*.txt'
+                    'content': 'Added `R` tag to commit title',
+                    'alt': 'or this PR does not touch requirements*.txt'
                 },
                 {
                     'type': 'cli',
-                    'content': 'Added `reqs` label to PR', 'alt': 'or this PR does not touch requirements*.txt'
+                    'content': 'Added `reqs` label to PR',
+                    'alt': 'or this PR does not touch requirements*.txt'
                 },
                 iif(t is T.default, {
                     'type': 'cli',
@@ -568,13 +574,17 @@ def main():
                 for i, (d, s) in enumerate(t.deployments.items())
                 if s is not None
             ))),
+            {
+                'type': 'cli',
+                'content': 'Title of merge commit starts with title from this PR'
+            },
             {
                 'type': 'cli',
                 'content': f"Added PR reference {iif(t is T.backport, '(this PR) ')}to merge commit title"
             },
             {
                 'type': 'cli',
-                'content': 'Collected commit title tags in merge commit title'
+                'content': 'Added commit title tags to merge commit title'
             },
             iif(t in (T.default, T.gitlab, T.hotfix), {
                 'type': 'cli',
@@ -588,14 +598,29 @@ def main():
                 'type': 'cli',
                 'content': 'Pushed merge commit to GitHub'
             },
+            *iif(t in (T.default, T.gitlab), [
+                {
+                    'type': 'h2',
+                    'content': 'Operator (chain shortening)'
+                },
+                *[
+                    {
+                        'type': 'cli',
+                        'content': content,
+                        'alt': 'or this PR is not labeled `base`'
+                    }
+                    for content in [
+                        'Changed the target branch of the blocked PR to `develop`',
+                        'Removed the `chained` label from the blocked PR',
+                        'Removed the blocking relationship from the blocked PR',
+                        'Removed the `base` label from this PR'
+                    ]
+                ]
+            ]),
             {
                 'type': 'h2',
                 'content': 'Operator (after pushing the merge commit)'
             },
-            iif(t in (T.default, T.gitlab), {
-                'type': 'cli',
-                'content': 'Shortened the PR chain', 'alt': 'or this PR is not labeled `base`'
-            }),
             *[
                 {
                     'type': 'cli',

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -36,7 +36,7 @@ jobs:
           # to `docker run` and bind-mount an /etc/passwd that maps that to `developer`.
           # We also need write permissions for the group
           chmod -R g+w . && sudo chgrp -R 1000 . && make format && sudo chgrp -R $(id -g) .
-          make openapi
+          make -C lambdas openapi
           make check_clean
           make pep8
           AZUL_DEBUG=0 GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }} make test

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -73,7 +73,7 @@ test:
   script:
     - make format  # Any ill-formatted sources, ...
     - test "$azul_is_sandbox" = 1 && make requirements_update  # ... stale transitive dependencies ...
-    - make openapi # ... or changes to the canned OpenAPI definition document ...
+    - make -C lambdas openapi # ... or changes to the canned OpenAPI definition document ...
     - make check_clean  # would dirty up the working copy and fail the build.
     - make pep8
     - AZUL_DEBUG=0 make test

diff --git a/Makefile b/Makefile
@@ -242,7 +242,3 @@ integration_test: check_python check_branch $(project_root)/lambdas/service/.cha
 .PHONY: check_clean
 check_clean: check_env
 	git diff --exit-code && git diff --cached --exit-code
-
-.PHONY: openapi
-openapi:
-	python $(project_root)/scripts/generate_openapi_document.py
diff --git a/OPERATOR.rst b/OPERATOR.rst
@@ -232,13 +232,6 @@ For an example of how to document failures within a PR `click here`_.
 
 .. _click here: https://github.com/DataBiosphere/azul/pull/3050#issuecomment-840033931
 
-Chain shortening
-^^^^^^^^^^^^^^^^
-
-Change the target branch of the blocked PR to ``develop`` and remove the ``chained``
-label from that PR. Remove the ``base`` label from the blocking PR. Lastly, remove the blocking
-relationship.
-
 Updating the AMI for GitLab instances
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 

diff --git a/README.md b/README.md
@@ -2384,7 +2384,7 @@ Changes to the OpenAPI definition are tracked in the source tree. When making
 changes that affect the definition, run:
 
 ```
-make openapi
+make -C lambdas openapi
 ```
 
 and commit any modifications to the `openapi.json` file. Failure to do so will 

diff --git a/...untime/certifi-2022.12.7-py3-none-any.whl → ...runtime/certifi-2023.5.7-py3-none-any.whl b/...untime/certifi-2022.12.7-py3-none-any.whl → ...runtime/certifi-2023.5.7-py3-none-any.whl
diff --git a/bin/wheels/runtime/charset_normalizer-2.1.1-py3-none-any.whl b/bin/wheels/runtime/charset_normalizer-2.1.1-py3-none-any.whl
diff --git a/...runtime/charset_normalizer-3.1.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl b/...runtime/charset_normalizer-3.1.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
diff --git a/bin/wheels/runtime/grpcio-1.54.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl b/bin/wheels/runtime/grpcio-1.54.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
diff --git a/bin/wheels/runtime/grpcio-1.55.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl b/bin/wheels/runtime/grpcio-1.55.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
diff --git a/...ime/grpcio_status-1.54.0-py3-none-any.whl → ...ime/grpcio_status-1.55.0-py3-none-any.whl b/...ime/grpcio_status-1.54.0-py3-none-any.whl → ...ime/grpcio_status-1.55.0-py3-none-any.whl
diff --git a/bin/wheels/runtime/protobuf-4.22.3-cp37-abi3-manylinux2014_x86_64.whl b/bin/wheels/runtime/protobuf-4.22.3-cp37-abi3-manylinux2014_x86_64.whl
diff --git a/bin/wheels/runtime/protobuf-4.23.1-cp37-abi3-manylinux2014_x86_64.whl b/bin/wheels/runtime/protobuf-4.23.1-cp37-abi3-manylinux2014_x86_64.whl
diff --git a/bin/wheels/runtime/requests-2.28.1-py3-none-any.whl b/bin/wheels/runtime/requests-2.28.1-py3-none-any.whl
diff --git a/bin/wheels/runtime/requests-2.31.0-py3-none-any.whl b/bin/wheels/runtime/requests-2.31.0-py3-none-any.whl
diff --git a/...runtime/s3transfer-0.6.0-py3-none-any.whl → ...runtime/s3transfer-0.6.1-py3-none-any.whl b/...runtime/s3transfer-0.6.0-py3-none-any.whl → ...runtime/s3transfer-0.6.1-py3-none-any.whl
diff --git a/bin/wheels/runtime/typing_extensions-4.5.0-py3-none-any.whl b/bin/wheels/runtime/typing_extensions-4.5.0-py3-none-any.whl
diff --git a/bin/wheels/runtime/typing_extensions-4.6.0-py3-none-any.whl b/bin/wheels/runtime/typing_extensions-4.6.0-py3-none-any.whl
diff --git a/lambdas/Makefile b/lambdas/Makefile
@@ -17,4 +17,8 @@ service: check_env
 
 .PHONY: clean
 clean: check_env
-	for d in indexer service layer; do $(MAKE) -C $$d clean; done
+	for d in indexer service layer; do $(MAKE) -C $$d clean || ! break; done
+
+.PHONY: openapi
+openapi: check_env
+	for d in indexer service; do $(MAKE) -C $$d openapi || ! break; done