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

Bump jsonwebtoken and serverless-offline #45

Open
wants to merge 70 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
70 commits
Select commit Hold shift + click to select a range
a280020
Merge pull request #29 from LCOGT/main
timbeccue Jun 24, 2022
d19b7af
Update dependencies
darrenhunt2 Jul 4, 2022
a4e185d
Update Github Actions, Python version
darrenhunt2 Jul 4, 2022
c80f481
Improve formatting
darrenhunt2 Jul 4, 2022
f82c1ec
Finish docstrings in handler; update readme draft
darrenhunt2 Jul 4, 2022
b5f7664
Delete unzip_requirements.py
darrenhunt2 Jul 4, 2022
b128817
Delete serverless-deploy-helpers directory
darrenhunt2 Jul 4, 2022
6071af6
Delete de421.bsp
darrenhunt2 Jul 4, 2022
35993f9
Delete examples.py
darrenhunt2 Jul 4, 2022
44728ab
Add back deleted file
darrenhunt2 Jul 4, 2022
57a716f
Delete de421.bsp
darrenhunt2 Jul 4, 2022
6cfffab
Add docstrings to several files
darrenhunt2 Jul 5, 2022
2b544ff
Add docstrings and cleanup to db.py and remotehq_helpers.py
darrenhunt2 Jul 6, 2022
a8aeef6
Remove unused weather.py
darrenhunt2 Jul 8, 2022
f46e330
Combine Github Actions into one file
darrenhunt2 Jul 8, 2022
060ce15
Syntax
darrenhunt2 Jul 8, 2022
a4f8dfb
Readme updates; minor docstring formatting
darrenhunt2 Jul 12, 2022
c8dd96b
Missing word
darrenhunt2 Jul 12, 2022
cd3f653
Fix typo in readme
darrenhunt2 Jul 12, 2022
13120f5
Minor changes according to review comments
darrenhunt2 Jul 12, 2022
0e016bc
Merge pull request #31 from LCOGT/feature/edit-readme
darrenhunt2 Jul 12, 2022
98b35b4
Fix wrong version for a Python requirement
darrenhunt2 Jul 12, 2022
1811ec4
Small changes to the Actions file
darrenhunt2 Jul 12, 2022
f093b98
Missing dollar sign in front of variable
darrenhunt2 Jul 12, 2022
bfd9ab2
Add back & update Dockerfile to reduce deployment size
darrenhunt2 Jul 13, 2022
bb098b0
Attempt 1 at de-fzing a fits file to download
mfitzasp Sep 29, 2022
68ca508
Merge pull request #34 from LCOGT/bz2Tofz
mfitzasp Sep 29, 2022
94783c3
Revert "Bz2 tofz"
mfitzasp Sep 29, 2022
4db9403
Merge pull request #35 from LCOGT/revert-34-bz2Tofz
mfitzasp Sep 29, 2022
77df9b5
adjusted file pointers from bz2 to fz
mfitzasp Sep 29, 2022
5de4155
Merge pull request #36 from LCOGT/bz2Tofz
mfitzasp Sep 29, 2022
718fbf1
added in helper functions
mfitzasp Sep 29, 2022
a4399a8
removed stretch from save_fz_to_fits function
mfitzasp Sep 30, 2022
c0c8b30
fixed up the fits file naming strings in save_fz_to_fits
mfitzasp Sep 30, 2022
df30968
strangely had the one important function commented out
mfitzasp Sep 30, 2022
909f297
hunting formatting of filename in save_fz_to_fits
mfitzasp Sep 30, 2022
5705a30
updating tif function to use fz file
mfitzasp Sep 30, 2022
407eb49
updating tif function to use fz file #1
mfitzasp Sep 30, 2022
1c8f3b8
removed a bz2 reference for tif making
mfitzasp Sep 30, 2022
347bec3
a + rather than a '. So embarassing.
mfitzasp Sep 30, 2022
511ab6b
Now figuring out what is occuring with the small fits file
mfitzasp Sep 30, 2022
950f334
Removed logging code and added in some function comments
mfitzasp Sep 30, 2022
bb2c856
Merge pull request #37 from LCOGT/test
mfitzasp Sep 30, 2022
3d153fd
Add simple change to test deploy
timbeccue Feb 15, 2023
f6336cd
test higher res jpeg
kciurleo Feb 15, 2023
314cd9d
Merge branch 'test' of https://github.com/LCOGT/photonranch-api into …
kciurleo Feb 15, 2023
a6ea6d4
Update output syntax
timbeccue Feb 15, 2023
c86f343
Merge pull request #52 from LCOGT/fix/github-actions-syntax
timbeccue Feb 15, 2023
088190a
Change broken job env
timbeccue Feb 15, 2023
7d36e8c
Try differnt env access
timbeccue Feb 15, 2023
ae6e9ae
Change env routine
timbeccue Feb 15, 2023
47d8bc5
Combine the determine-stage and deploy jobs
timbeccue Feb 15, 2023
c678a2d
Clean up deploy script
timbeccue Feb 15, 2023
2206633
Update aws credential job to use node 16
timbeccue Feb 15, 2023
68c3399
try 20 execpt 10
kciurleo Feb 15, 2023
a4082ae
Merge branch 'test' of https://github.com/LCOGT/photonranch-api into …
kciurleo Feb 15, 2023
e17cd6f
raise error for presigned URL of nonexistent file
kciurleo Feb 15, 2023
3cb7e04
Remove Dockerfile previously used for deploys
timbeccue Feb 16, 2023
86dfd73
Remove unused serverless plugins
timbeccue Feb 16, 2023
41c8d97
Merge branch 'test' into dev
timbeccue Feb 22, 2023
a88ac54
Add delete endpoint for night log
timbeccue Feb 22, 2023
da25203
Add custom ttl to night log notes
timbeccue Feb 22, 2023
b88a913
Fix bug with nightlog note ttl type
timbeccue Feb 22, 2023
4150d06
Fix bug with response when getting night log
timbeccue Feb 22, 2023
36cc54b
Change http response for empty night log queries
timbeccue Feb 22, 2023
ba7471a
Return no_content http status if no info image exists
timbeccue Feb 22, 2023
8c5e842
Update test to reflect change in http response
timbeccue Feb 22, 2023
6bc5508
Update github actions checkout to v3
timbeccue Feb 22, 2023
52ff61a
Merge branch 'dev'
timbeccue Feb 22, 2023
536f9dc
Bump jsonwebtoken and serverless-offline
dependabot[bot] Feb 22, 2023
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
109 changes: 109 additions & 0 deletions .github/workflows/deployment.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,109 @@
name: Test and Deploy

on:
push:
branches: [main, dev, test]

jobs:

run-tests:
runs-on: ubuntu-latest
steps:
# Checks-out your repository under $GITHUB_WORKSPACE
- name: Check out repository
uses: actions/checkout@v3

- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v1-node16
with:
aws-access-key-id: ${{ secrets.SLS_AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.SLS_AWS_SECRET_ACCESS_KEY }}
aws-region: us-east-1

# Set up Python 3.9 environment
- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: 3.9

# Install Python dependencies
- name: Install Dependencies
run: |
python -m pip install --upgrade pip
pip install -r requirements.txt

# Run tests
- name: Run tests
run: python -m pytest


deploy:
needs:
- run-tests
runs-on: ubuntu-latest
steps:

# Configure the deployment stage name from the active branch
- name: Set up deployment stage name
id: deployment-stage
run: |
echo "DEPLOY_STAGE=${{ fromJSON('{"main":"prod","dev":"dev","test":"test"}')[github.ref_name] }}" >> $GITHUB_ENV

- name: Verify Stage
run: echo $DEPLOY_STAGE

# Checks-out the repository under $GITHUB_WORKSPACE
- uses: actions/checkout@v2

# Configure Auth0 secrets
- name: Create public_key file
run: |
cat > /home/runner/work/photonranch-api/photonranch-api/public_key << EOF
-----BEGIN CERTIFICATE-----
${{ secrets.AUTH0_PUBLIC_KEY }}
-----END CERTIFICATE-----
EOF

- name: Create Auth0 secrets file
run: |
cat > /home/runner/work/photonranch-api/photonranch-api/secrets.json << EOF
{
"AUTH0_CLIENT_ID": "${{ secrets.AUTH0_CLIENT_ID }}"
}
EOF

# Set up Node
- name: Set up Node
uses: actions/setup-node@v3
with:
node-version: 16.x

# Set up Python 3.9 environment
- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: 3.9

# Install serverless
- name: Install Serverless
run: npm install -g serverless

# Install Node dependencies
- name: Set up Environment
run: npm ci

# Install Serverless plugins
- name: Install Plugins
run: |
serverless plugin install --name serverless-python-requirements &&
serverless plugin install --name serverless-domain-manager &&
serverless plugin install --name serverless-prune-plugin &&
serverless plugin install --name serverless-offline

# Deploy to stage
- name: Serverless Deploy
run: serverless deploy --stage $DEPLOY_STAGE
env:
SERVERLESS_ACCESS_KEY: ${{ secrets.SLS_SECRET_KEY }}
AWS_ACCESS_KEY_ID: ${{ secrets.SLS_AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.SLS_AWS_SECRET_ACCESS_KEY }}
75 changes: 0 additions & 75 deletions .github/workflows/main-deploy.yml

This file was deleted.

75 changes: 0 additions & 75 deletions .github/workflows/test-deploy.yml

This file was deleted.

Loading