Remove need environmentsjson #147
Merged
Conversation
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
marjo-luc
reviewed
Dec 4, 2024
bsatoriu
reviewed
Dec 4, 2024
|
|
Added error handling and passing checks Tested that when I purposely do the wrong environments.json file path, the API gives a 500 error |
marjo-luc
approved these changes
Dec 5, 2024
grallewellyn
added a commit
that referenced
this pull request
Feb 26, 2025
* Add support for DPS sandbox queue (#136) * Respond with HTTP 400 if invalid queue provided during registration * Update dos job time limits if using dps sand box queue * Ensure that message is of type string * update code to use new job_queue.get_user_queues() function * Move queue settings to db * add is_default and time_limit_minutes to job_queue endpoints * Job submission bug fix --------- Co-authored-by: bsatoriu <[email protected]> * /version 4.1.0a8 * /version 4.2.0a0 * /version 4.1.0rc1 * Mount maap-dps env file to read api host and dps token from the host (#139) * /version 4.1.0rc2 * Set job time limit based on the queue time limits if specified (#140) * /version 4.1.0rc3 * Convert time from minutes to seconds (#141) * /version 4.1.0rc4 * Add orgs to user profile * /version 4.1.0rc5 * Update SQLALCHEMY_ENGINE_OPTIONS settings * /version 4.1.0rc6 * /version 4.1.0 * /version 4.1.1a0 * Bug/edc credentials null error (#144) * Fix edcCredentials null reference bug * Update api/endpoints/members.py Co-authored-by: Chuck Daniels <[email protected]> --------- Co-authored-by: bsatoriu <[email protected]> Co-authored-by: Chuck Daniels <[email protected]> * /version 4.1.1a1 * Bug/user bucket inline policy (1126) (#145) * expand inline folder policy to support reading/writing * Update members.py --------- Co-authored-by: bsatoriu <[email protected]> * /version 4.1.1a2 * Remove need environmentsjson (#147) * rewrote get_config function to match jupyter server extension * added additional print statements * added more print statements * printing all environment variables * reverted to the correct function and added back environment to settings.py * added more print statements * changed the backup environments.json filepath * now reading from environments.json in MAAP API * updated import for environments.json * corrected to json.load * removed print statements * added error handling * purposely added error * corrected mistake * changed to FileNotFoundError to be more descriptive to pass test * /version 4.1.1a3 * Change log update 420 (#149) * updated changelog * fixed version in changelog * /version 4.1.1a4 * Fix bug by checking out develop Bug was causing the version bump to happen on the newly created branch instead of on develop * /version 4.2.0rc1 --------- Co-authored-by: Sujen Shah <[email protected]> Co-authored-by: bsatoriu <[email protected]> Co-authored-by: bsatoriu <[email protected]> Co-authored-by: bsatoriu <[email protected]> Co-authored-by: Chuck Daniels <[email protected]> Co-authored-by: grallewellyn <[email protected]> Co-authored-by: Frank Greguska <[email protected]> Co-authored-by: frankinspace <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
https://raw.githubusercontent.com/MAAP-Project/maap-jupyter-ide/develop/maap_environments.json was giving a 403 when the API tried to access it
Instead, I added the environments.json file to this repository. I think if we need to maintain this file on git, then this repo makes the most sense
The API can now access the environments.json correctly
I don't see any reason to continue having
MAAP_ENVIRONMENT_FILEin the api/settings.py and it does not seem to be mentioned anywhere else https://github.com/search?q=org%3AMAAP-Project%20MAAP_ENVIRONMENT_FILE&type=codeRelated to: MAAP-Project/Community#1055