-
Notifications
You must be signed in to change notification settings - Fork 2
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
CORE-2016: support scheduled rate and quota default changes. #63
Merged
Merged
Changes from 25 commits
Commits
Show all changes
29 commits
Select commit
Hold shift + click to select a range
a722913
CORE-2016: began implementing the database changes for subscription r…
slr71 f5357ab
CORE-2016: finished the initial schema migrations for shceduled subsc…
slr71 cacafbe
CORE-2016: add a new column to record the rate used for purchased add…
slr71 428efbf
CORE-2016: update some existing migrations to make the more likely to…
slr71 e59fc0f
CORE-2016: set up direnv to simplify local development testing
slr71 07c021e
CORE-2016: changed money columns to numeric columns in the database
slr71 7466e13
CORE-2016: added support for the effective_date field to the plans en…
slr71 12ea653
CORE-2016: removed the POST /v1/plans/quota-defaults endpoint
slr71 ba44de1
CORE-2016: added an endpoint to add quota defaults to an existing plan
slr71 55b6516
CORE-2016: fixed a tpyo
slr71 3e4e89b
CORE-2016: fixed some Swagger warnings
slr71 dd1172c
CORE-2016: fixed a couple of errors in the POST /v1/plans/{plan-id}/q…
slr71 b224beb
CORE-2016: added stubs for three new endpoints
slr71 1c6dfab
CORE-2016: implemented the GET /v1/plans/:plan-id/active-rate endpoint
slr71 f59ea57
CORE-2016: implemented the POST /v1/plans/:plan-id/rates and GET /v1/…
slr71 9ec70b4
CORE-2016: added a missing swagger code annotation
slr71 4db2914
CORE-2016: updated the subscription endpoints to support plan rates a…
slr71 2ea589f
CORE-2016: fixed a lint warning
slr71 524185a
CORE-2016: added unique indexes on plan rates and plan quota defaults
slr71 c69bb51
CORE-2016: removed the all_active_users endpoint
slr71 5d84e2c
CORE-2016: added duplicate checks for plan quota defaults and plan rates
slr71 99476db
CORE-2016: added request body validation to the `POST /v1/plans/:plan…
slr71 fb8dffa
CORE-2016: fixed a bug in the PUT /v1/resource-types/:resource-type-i…
slr71 6b9d053
CORE-2016: added a response to the Swagger comments
slr71 fa43dc9
CORE-2016: removed some unused endpoints
slr71 266304a
CORE-2016: slight changes to the response body for the subscriptions …
slr71 ecc50af
CORE-2016: reimplemented GetDefaultQuotaValue in terms of GetDefaultQ…
slr71 2e51283
CORE-2016: fixed a few errors in the Swager docs
slr71 9bdd2e1
CORE-2016: fixed the capitalization on one of the JSON fields
slr71 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| #!/usr/bin/env bash | ||
| QMS_DATABASE_URI=postgres://de@localhost/qms?sslmode=disable | ||
| QMS_DATABASE_MIGRATE=false | ||
| QMS_DATABASE_REINIT=false | ||
| QMS_USERNAME_SUFFIX=iplantcollaborative.org | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| #!/usr/bin/env bash | ||
|
|
||
| _PWD=$(pwd) | ||
| _APP=`echo $_PWD | grep -Eo -i '([[:alnum:]-]*)$'` | ||
| echo "Starting $_APP environment..." | ||
| export PATH="$_PWD/bin:$PATH" | ||
|
|
||
| export PRJ_ROOT_DIR=$(realpath "$_PWD") | ||
|
|
||
| [ -f ${PRJ_ROOT_DIR}/.env ] && source ${PRJ_ROOT_DIR}/.env || { echo "Missing ${PRJ_ROOT_DIR}/.env!"; exit 1; } | ||
| ## Export all VARS in .env | ||
| ALL_ENV_PRJ_VARS=($(grep -E '^[[:space:]]*[A-Z_][A-Z0-9_]*[[:space:]]*=' ${PRJ_ROOT_DIR}/.env | cut -f1 -d"=" | tr '\n' ' ')) | ||
| for idx in "${!ALL_ENV_PRJ_VARS[@]}"; do | ||
| # echo "idx: $idx :: ${ALL_ENV_PRJ_VARS[idx]}=${!ALL_ENV_PRJ_VARS[idx]}" | ||
| eval "export ${ALL_ENV_PRJ_VARS[idx]}='${!ALL_ENV_PRJ_VARS[idx]}'" | ||
| done | ||
|
|
||
| ## GOPRIVATE="gitlab.com/cyverse*,github.com/cyverse*,bitbucket.org/cyverse*" | ||
| export GOPRIVATE="gitlab.com/cyverse*" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -31,3 +31,6 @@ swagger.json | |
| jobservices.yml | ||
| jobservices.yaml | ||
| dotenv | ||
|
|
||
| # Ignore .env files. | ||
| .env | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I've found
direnvto be extremely useful for development testing, so I thought I'd set it up for this repository.