Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release v1.0.3 #453

Merged
merged 55 commits into from
Jan 2, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
85eda2b
Bump boto3 from 1.35.10 to 1.35.14
dependabot[bot] Sep 9, 2024
1e3b6ac
Bump cryptography from 43.0.0 to 43.0.1
dependabot[bot] Sep 9, 2024
c201c4c
Merge pull request #425 from asfadmin/dependabot/pip/boto3-1.35.14
jtherrmann Sep 10, 2024
53a11b1
Merge pull request #426 from asfadmin/dependabot/pip/cryptography-43.0.1
jtherrmann Sep 10, 2024
dade690
Bump boto3 from 1.35.14 to 1.35.19
dependabot[bot] Sep 16, 2024
f87c95b
Merge pull request #427 from asfadmin/dependabot/pip/boto3-1.35.19
jtherrmann Sep 16, 2024
4f81a31
Bump boto3 from 1.35.19 to 1.35.24
dependabot[bot] Sep 23, 2024
27be238
Merge pull request #428 from asfadmin/dependabot/pip/boto3-1.35.24
jtherrmann Sep 24, 2024
31dd14b
Bump boto3 from 1.35.24 to 1.35.29
dependabot[bot] Sep 30, 2024
1354f5e
Merge pull request #429 from asfadmin/dependabot/pip/boto3-1.35.29
jtherrmann Sep 30, 2024
57403a6
Bump boto3 from 1.35.29 to 1.35.34
dependabot[bot] Oct 7, 2024
ef8f7f8
Merge pull request #430 from asfadmin/dependabot/pip/boto3-1.35.34
jtherrmann Oct 9, 2024
a20a31e
Bump boto3 from 1.35.34 to 1.35.39
dependabot[bot] Oct 14, 2024
79fd092
Merge pull request #431 from asfadmin/dependabot/pip/boto3-1.35.39
jtherrmann Oct 18, 2024
56120a3
Bump boto3 from 1.35.39 to 1.35.44
dependabot[bot] Oct 21, 2024
2236f90
Bump cryptography from 43.0.1 to 43.0.3
dependabot[bot] Oct 21, 2024
bf81a07
Bump ASFHyP3/actions from 0.11.2 to 0.12.0
dependabot[bot] Oct 21, 2024
34e983e
Merge pull request #434 from asfadmin/dependabot/github_actions/ASFHy…
jtherrmann Oct 24, 2024
f785384
Merge pull request #433 from asfadmin/dependabot/pip/cryptography-43.0.3
jtherrmann Oct 24, 2024
f8c5f40
Merge pull request #432 from asfadmin/dependabot/pip/boto3-1.35.44
jtherrmann Oct 24, 2024
a3fddc4
deploy concurrency
jtherrmann Oct 24, 2024
e683d78
Merge pull request #435 from asfadmin/deploy-concurrency
jtherrmann Oct 25, 2024
0fe4862
Bump boto3 from 1.35.44 to 1.35.49
dependabot[bot] Oct 28, 2024
6deecb8
Bump serverless-wsgi from 3.0.4 to 3.0.5
dependabot[bot] Oct 28, 2024
9ac1c32
Merge pull request #436 from asfadmin/dependabot/pip/boto3-1.35.49
jtherrmann Oct 28, 2024
6bf64b6
Merge pull request #437 from asfadmin/dependabot/pip/serverless-wsgi-…
jtherrmann Oct 28, 2024
578091f
Bump boto3 from 1.35.49 to 1.35.54
dependabot[bot] Nov 4, 2024
8663348
Merge pull request #438 from asfadmin/dependabot/pip/boto3-1.35.54
jtherrmann Nov 4, 2024
8a83b2f
Bump boto3 from 1.35.54 to 1.35.57
dependabot[bot] Nov 11, 2024
bce1c75
Merge pull request #439 from asfadmin/dependabot/pip/boto3-1.35.57
jtherrmann Nov 12, 2024
a1c4ab4
Bump pyjwt from 2.9.0 to 2.10.0
dependabot[bot] Nov 18, 2024
06bf877
Bump boto3 from 1.35.57 to 1.35.63
dependabot[bot] Nov 18, 2024
7a64653
Merge pull request #442 from asfadmin/dependabot/pip/boto3-1.35.63
jtherrmann Nov 19, 2024
0c3c7fb
Bump flask from 3.0.3 to 3.1.0
dependabot[bot] Nov 19, 2024
4a9d884
Merge pull request #440 from asfadmin/dependabot/pip/pyjwt-2.10.0
jtherrmann Nov 19, 2024
f67bcc2
Merge branch 'test' into dependabot/pip/flask-3.1.0
jtherrmann Nov 19, 2024
4a921a6
Merge pull request #441 from asfadmin/dependabot/pip/flask-3.1.0
jtherrmann Nov 19, 2024
01899df
Bump boto3 from 1.35.63 to 1.35.68
dependabot[bot] Nov 25, 2024
26d5211
Merge pull request #443 from asfadmin/dependabot/pip/boto3-1.35.68
jtherrmann Nov 25, 2024
c48cdae
Bump pyjwt from 2.10.0 to 2.10.1
dependabot[bot] Dec 2, 2024
d415c46
Bump cryptography from 43.0.3 to 44.0.0
dependabot[bot] Dec 2, 2024
f78efea
Bump boto3 from 1.35.68 to 1.35.72
dependabot[bot] Dec 2, 2024
7524dc8
Merge pull request #446 from asfadmin/dependabot/pip/boto3-1.35.72
jtherrmann Dec 2, 2024
e9a5e5f
Merge pull request #444 from asfadmin/dependabot/pip/pyjwt-2.10.1
jtherrmann Dec 2, 2024
fca2170
Merge pull request #445 from asfadmin/dependabot/pip/cryptography-44.0.0
jtherrmann Dec 2, 2024
b9c6aa6
Bump boto3 from 1.35.72 to 1.35.76
dependabot[bot] Dec 9, 2024
c2908c0
Merge pull request #447 from asfadmin/dependabot/pip/boto3-1.35.76
jtherrmann Dec 12, 2024
3916b53
Bump boto3 from 1.35.76 to 1.35.81
dependabot[bot] Dec 16, 2024
7c1530b
Merge pull request #448 from asfadmin/dependabot/pip/boto3-1.35.81
jtherrmann Dec 18, 2024
abc3ebf
Bump ASFHyP3/actions from 0.12.0 to 0.13.2
dependabot[bot] Dec 23, 2024
66d379a
Bump boto3 from 1.35.81 to 1.35.90
dependabot[bot] Dec 30, 2024
3ee1d1d
replace flake8 with ruff
jtherrmann Jan 2, 2025
ee14437
Merge pull request #452 from asfadmin/add-ruff
jtherrmann Jan 2, 2025
ee02664
Merge pull request #449 from asfadmin/dependabot/github_actions/ASFHy…
jtherrmann Jan 2, 2025
326d88c
Merge pull request #451 from asfadmin/dependabot/pip/boto3-1.35.90
jtherrmann Jan 2, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/changelog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@
jobs:
call-changelog-check-workflow:
# Docs: https://github.com/ASFHyP3/actions
uses: ASFHyP3/actions/.github/workflows/reusable-changelog-check.yml@v0.11.2
uses: ASFHyP3/actions/.github/workflows/reusable-changelog-check.yml@v0.13.2

Check warning

Code scanning / CodeQL

Workflow does not contain permissions Medium

Actions Job or Workflow does not set permissions
2 changes: 1 addition & 1 deletion .github/workflows/create-jira-issue.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@

jobs:
call-create-jira-issue-workflow:
uses: ASFHyP3/actions/.github/workflows/reusable-create-jira-issue.yml@v0.11.2
uses: ASFHyP3/actions/.github/workflows/reusable-create-jira-issue.yml@v0.13.2
secrets:
JIRA_BASE_URL: ${{ secrets.JIRA_BASE_URL }}
JIRA_USER_EMAIL: ${{ secrets.JIRA_USER_EMAIL }}
JIRA_API_TOKEN: ${{ secrets.JIRA_API_TOKEN }}
JIRA_PROJECT: ${{ secrets.JIRA_PROJECT }}
JIRA_FIELDS: ${{ secrets.JIRA_FIELDS }}

Check warning

Code scanning / CodeQL

Workflow does not contain permissions Medium

Actions Job or Workflow does not set permissions
2 changes: 2 additions & 0 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ on:
- prod
- test

concurrency: ${{ github.workflow }}-${{ github.ref }}

jobs:
deploy:
runs-on: ubuntu-latest
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/labeled-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@
jobs:
call-labeled-pr-check-workflow:
# Docs: https://github.com/ASFHyP3/actions
uses: ASFHyP3/actions/.github/workflows/reusable-labeled-pr-check.yml@v0.11.2
uses: ASFHyP3/actions/.github/workflows/reusable-labeled-pr-check.yml@v0.13.2

Check warning

Code scanning / CodeQL

Workflow does not contain permissions Medium

Actions Job or Workflow does not set permissions
2 changes: 1 addition & 1 deletion .github/workflows/release-checklist-comment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:
jobs:
call-release-workflow:
# Docs: https://github.com/ASFHyP3/actions
uses: ASFHyP3/actions/.github/workflows/reusable-release-checklist-comment.yml@v0.11.2
uses: ASFHyP3/actions/.github/workflows/reusable-release-checklist-comment.yml@v0.13.2
permissions:
pull-requests: write
secrets:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@

jobs:
call-release-workflow:
uses: ASFHyP3/actions/.github/workflows/reusable-release.yml@v0.11.2
uses: ASFHyP3/actions/.github/workflows/reusable-release.yml@v0.13.2
with:
release_prefix: GRFN Distribution
release_branch: prod
develop_branch: test
secrets:
USER_TOKEN: ${{ secrets.TOOLS_BOT_PAK }}

Check warning

Code scanning / CodeQL

Workflow does not contain permissions Medium

Actions Job or Workflow does not set permissions
17 changes: 2 additions & 15 deletions .github/workflows/static-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,10 @@

jobs:

flake8:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4

- uses: actions/setup-python@v5
with:
python-version: 3.12

- run: |
python -m pip install --upgrade pip
python -m pip install flake8 flake8-import-order flake8-blind-except flake8-builtins

- run: flake8 --max-line-length=120 --import-order-style=pycharm --statistics --application-import-names door
call-ruff-workflow:
uses: ASFHyP3/actions/.github/workflows/reusable-ruff.yml@v0.13.2

cfn-lint:

Check warning

Code scanning / CodeQL

Workflow does not contain permissions Medium

Actions Job or Workflow does not set permissions
runs-on: ubuntu-latest

steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tag-version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
jobs:
call-bump-version-workflow:
# Docs: https://github.com/ASFHyP3/actions
uses: ASFHyP3/actions/.github/workflows/reusable-bump-version.yml@v0.11.2
uses: ASFHyP3/actions/.github/workflows/reusable-bump-version.yml@v0.13.2
with:
user: tools-bot
email: UAF-asf-apd@alaska.edu
secrets:
USER_TOKEN: ${{ secrets.TOOLS_BOT_PAK }}

Check warning

Code scanning / CodeQL

Workflow does not contain permissions Medium

Actions Job or Workflow does not set permissions
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [PEP 440](https://www.python.org/dev/peps/pep-0440/)
and uses [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [1.0.3]
### Changed
- Replaced `flake8` with `ruff`.

## [1.0.2]
### Fixed
- Upgraded to flask-cors v5.0.0 from v4.0.1. Resolves [CVE-2024-6221](https://github.com/asfadmin/grfn-distribution/security/dependabot/6).
Expand Down
1 change: 1 addition & 0 deletions door/src/door/__init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
from flask import Flask


app = Flask(__name__)

from door import routes # noqa Has to be at end of file or will cause circular import
Expand Down
3 changes: 2 additions & 1 deletion door/src/door/__main__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from door import app

if __name__ == "__main__":

if __name__ == '__main__':
app.run(port=8080)
5 changes: 3 additions & 2 deletions door/src/door/routes.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import os
from datetime import datetime, timedelta, timezone
from datetime import UTC, datetime, timedelta
from urllib.parse import quote_plus

import boto3
Expand All @@ -12,6 +12,7 @@

from door import app


CORS(app, origins=r'https?://([-\w]+\.)*asf\.alaska\.edu', supports_credentials=True)
s3 = boto3.client('s3')

Expand Down Expand Up @@ -60,7 +61,7 @@ def rsa_signer(message):
return rsa.sign(message, key, 'SHA-1')

base_url = f'https://{os.environ["CLOUDFRONT_DOMAIN_NAME"]}/{object_key}?userid={user_id}'
expiration_datetime = datetime.now(tz=timezone.utc) + timedelta(seconds=int(os.environ['EXPIRE_TIME_IN_SECONDS']))
expiration_datetime = datetime.now(tz=UTC) + timedelta(seconds=int(os.environ['EXPIRE_TIME_IN_SECONDS']))
cf_signer = CloudFrontSigner(os.environ['CLOUDFRONT_KEY_PAIR_ID'], rsa_signer)
signed_url = cf_signer.generate_presigned_url(base_url, date_less_than=expiration_datetime)
return signed_url
31 changes: 31 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
[project]
requires-python = "==3.12"

[tool.ruff]
line-length = 120
# The directories to consider when resolving first- vs. third-party imports.
# See: https://docs.astral.sh/ruff/settings/#src
src = ["**/src"]

[tool.ruff.format]
indent-style = "space"
quote-style = "single"

[tool.ruff.lint]
extend-select = [
"I", # isort: https://docs.astral.sh/ruff/rules/#isort-i
"UP", # pyupgrade: https://docs.astral.sh/ruff/rules/#pyupgrade-up

# TODO: uncomment the following extensions and address their warnings:
#"D", # pydocstyle: https://docs.astral.sh/ruff/rules/#pydocstyle-d
#"ANN", # annotations: https://docs.astral.sh/ruff/rules/#flake8-annotations-ann

"PTH", # use-pathlib-pth: https://docs.astral.sh/ruff/rules/#flake8-use-pathlib-pth
]

[tool.ruff.lint.pydocstyle]
convention = "google"

[tool.ruff.lint.isort]
case-sensitive = true
lines-after-imports = 2
2 changes: 1 addition & 1 deletion requirements-door-binary.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
cryptography==43.0.0
cryptography==44.0.0
8 changes: 4 additions & 4 deletions requirements-door.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
boto3==1.35.10
Flask==3.0.3
boto3==1.35.90
Flask==3.1.0
Flask-Cors==5.0.0
rsa==4.9
serverless_wsgi==3.0.4
PyJWT==2.9.0
serverless_wsgi==3.0.5
PyJWT==2.10.1
Loading