Reads variables from .env file as well as envvars #264
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
kevgliss
added a commit
that referenced
this pull request
May 18, 2020
* Basic Authentication (#217) Initial work on Basic Authentication. * Task/active tasks (#240) * Adjusting tabs so they render correctly. * Only create tasks notifications for active incidents. * Allows incidents to be filtered by tag. (#238) * Allows incidents to be filtered by tag. * Adds 'load more' item to find tags not returned in the first 5 results * Feature/incident auto tagger (#233) * Initial work on auto tagging incidents * Initial work on decoupling plugins from creation flow (#223) * Initial work on decoupling plugins from creation flow * Small plugin fixes with alembic. (#242) * Updates auth and incident cost docs (#245) * Let's use Join Incident in all Slack buttons (#246) * Moving models around such that they are available for use. (#249) * Allows user auth to be disabled returning a default user. (#250) * Making some minor fixes around basic auth (#241) * Making some minor fixes around basic auth Co-authored-by: Marc Vilanova <39573146+mvilanova@users.noreply.github.com> * Minor edit (#251) * Moving basic auth to an auth plugin (#252) * Fixes incident types and priorities paths in the Web UI router config (#256) * Fixes incident types and priorities paths in the Web UI * Adds note * Importing main instead of api directly (#258) * Upgraded node version to 12.16.2 (#260) Signed-off-by: Daniel Sutton <daniel@ducksecops.uk> * Adds all plugin event API routes to the API router before adding them to the Web API framework (#261) * Adds flags to plugins allowing them to specify if they are required (#259) * Adds flags to plugins allowing them to specify if they can have more than one or are required for dispatch to work. * Adds more timeline events (#262) * Cleaning up old un-used commands (#263) * Reads variables from .env file as well as envvars (#264) * Refactors nlp logic in the route service to use the centralized nlp module (#265) * Fixing an issue with database being in a bad state (#268) (#269) * Fixes bug in the incident cost model (#274) * Fixing an issue with database being in a bad state (#268) * Fixes bug in the incident cost model (#273) Co-authored-by: kevgliss <kevgliss@gmail.com> * fix typo in setup.py (#275) * Fixed empty enabled column in table 'plugin' (#270) * Fixed empty enabled column in table 'plugin' * no getattr * Bugfix router login redirect (#277) * Fixed empty enabled column in table 'plugin' * no getattr * the user should continue on * Fixes metric query, and reduces bundle size by allowing for treeshaki… (#276) * Fixes metric query, and reduces bundle size by allowing for treeshaking of lodash. Co-authored-by: Marc Vilanova <39573146+mvilanova@users.noreply.github.com> * Fixes plugins version (#278) * Let's allow users to disable a plugin (#280) * Correctly check the current revision (#281) * Timeline event details (#282) * Updates typescript * Adds JSON-based, details column to the event data model * Adds switch * Using v-card so we can show all details * Addresses comments * Removes unused import * Allowing resources to be optionally created (#279) * Refactors incident table filter (#284) * Adding default icon (#285) * Initial work adding RBAC controls (#266) * Adding basic RBAC controls * Removing loading overlay (#286) * Fetching current user info from server (#287) * Fixing the generation of swagger documentation (#289) * Disabling after hours until we figure out a caching fix. (#290) * Fixes help links for multi-messages and adds task resolution directions. (#288) * Fixes help links for multi-messages and adds task resolution directions. Co-authored-by: Marc Vilanova <39573146+mvilanova@users.noreply.github.com> * Removing dead code (#292) * Moving notification caching to the database. (#291) * Moving notification caching to the database * removing un-needed code * We return a user object from current_user instead of an email string (#293) * Improves Dockerfile (#296) * Adding Conference tests. (#267) * `yield_fixture` is deprecated after pytest 3.0. Plain old `fixture` is fine. * [WIP] Adding Conference model and service tests. * Use four spaces per indent in Python files. * Add assertions and stub functions. * Fix naming convention for conference tests. * Remove 'name', as it's not present in the Conference model. * Return a List of Conferences. When asking for all the Conferences of a given resource type, it doesn't make sense to ask for only one, or None (and throw an exception). It seems more sensible to request the whole list, or even a paginated list. Since this method isn't used anywhere in the code yet, we'll just return all(). * Black formatting. * Ensure our stub functions have args. * Test retrieval of a List of Conferences. * Add a test fixture to create multiple conferences. * Class Meta above instance vars * Incorporating suggested change * Lowercase as suggested * Implements test_conference_get_by_conference_id * get_by_incident_id fails * Implements test_conference_get_all * Ensure we're testing the created Conference. * Move ConferenceFactory later. This way an IncidentFactory has been defined and is available. * Give mocked Incident objects a fake ID. * This test works fine now. * Adds Join Incident button to stable incidents in daily summary (#298) * Prevents user being redirected to /login on 401 requests for pkce flow (#300) * Prevents user being redirected to /login on 401 requests for pkce flow * Modifying incident get permissions * changing from prophet to statsmodels (#297) Co-authored-by: Shannon Morrison <shannonm@netflix.com> * Fixes the dialog behavior of columns (#304) * Fixes the dialog behavior of columns * Removing un-related files * Reporting incidents via Slack slash command (#294) * #180 : initial commit - initiating incident from slack via slack commands * Update src/dispatch/plugins/dispatch_slack/views.py Co-authored-by: Marc Vilanova <39573146+mvilanova@users.noreply.github.com> * Update src/dispatch/plugins/dispatch_slack/views.py Co-authored-by: Marc Vilanova <39573146+mvilanova@users.noreply.github.com> * Update src/dispatch/plugins/dispatch_slack/config.py Co-authored-by: Marc Vilanova <39573146+mvilanova@users.noreply.github.com> * Update src/dispatch/plugins/dispatch_slack/messaging.py Co-authored-by: Marc Vilanova <39573146+mvilanova@users.noreply.github.com> * Update src/dispatch/plugins/dispatch_slack/messaging.py Co-authored-by: Marc Vilanova <39573146+mvilanova@users.noreply.github.com> * Update src/dispatch/plugins/dispatch_slack/plugin.py Co-authored-by: Marc Vilanova <39573146+mvilanova@users.noreply.github.com> * Update src/dispatch/plugins/dispatch_slack/views.py Co-authored-by: Marc Vilanova <39573146+mvilanova@users.noreply.github.com> * Update src/dispatch/plugins/dispatch_slack/messaging.py Co-authored-by: Marc Vilanova <39573146+mvilanova@users.noreply.github.com> * updates based on comments provided * add report-incident to conversation enums.py * fix issues after starting the application dispatch * Delete launch.json * Delete settings.json * Revert "Delete launch.json" This reverts commit 55e2c40 Co-authored-by: Vagharsh Kandilian <vagharsh.kandilian@disqo.com> Co-authored-by: Marc Vilanova <39573146+mvilanova@users.noreply.github.com> * Adds expressions to hybrid properties (#124) * Adds expressions to hybrid properties * Removing commend * Fixes bugs in report incident Slack command (#305) * Making flake8 happy (#307) * Making flake8 happy * More fixes * MOAR fixes * Making statsmodels a required package (#308) * Making statsmodels a required package * Minor fixes * modifying launch (#309) * Failing gracefully if there is insufficent data. (#310) * Adjusting default landing page to admin UI dashboard. (#313) * Fixes bug and typo in status notifications (#314) * Fixes table loading state when API call fails (#315) * Adds hostname and database name to confirmation (#316) * Removing exception used for testing (#317) * Closes the report incident modal after it's submitted (#318) * Fixes an issue where the report incident modal is not closing after submitting * Using private metadata field to store channel id * Bugfix/search ui (#321) * Initial search work * Adding clickable items * Adds as join incident button to the incident status page (#322) * Adds as join incident button to the incident status page * Using incident flow * Fixes search/filter pagination reset (#323) * Standarizes save/close button icons (#324) * Using checkbox for table booleans (#325) * Ensures all table actions are under row ellipsis menu (#326) * fixing linting issue (#329) * Add custom profile field mapping for slack to get Team, Department, W… (#327) * Add custom profile field mapping for slack to get Team, Department, Weblink * Update config names to address PR feedback * Update docs with new config vars * Revert "Update docs with new config vars" This reverts commit 7889530. * update docs and revert unwanted files * remove unused import * Adding a unique constraint on the dispatch user email (#331) * Add author and author URL to zoom plugin to fix plugins page (#330) Co-authored-by: Stefan Mihartescu <stefanmihartescu@gmail.com> Co-authored-by: Marc Vilanova <39573146+mvilanova@users.noreply.github.com> Co-authored-by: Daniel Sutton <daniel@ducksecops.uk> Co-authored-by: batman <5187696+mlioo@users.noreply.github.com> Co-authored-by: Forest Monsen <forest.monsen@gmail.com> Co-authored-by: Shannon <snkilmartin@users.noreply.github.com> Co-authored-by: Shannon Morrison <shannonm@netflix.com> Co-authored-by: Vagharsh Kandilian <vagharsh@users.noreply.github.com> Co-authored-by: Vagharsh Kandilian <vagharsh.kandilian@disqo.com> Co-authored-by: Will Bengtson <william.bengtson@gmail.com>
kevgliss
added a commit
that referenced
this pull request
Jun 3, 2020
* Basic Authentication (#217) Initial work on Basic Authentication. * Task/active tasks (#240) * Adjusting tabs so they render correctly. * Only create tasks notifications for active incidents. * Allows incidents to be filtered by tag. (#238) * Allows incidents to be filtered by tag. * Adds 'load more' item to find tags not returned in the first 5 results * Feature/incident auto tagger (#233) * Initial work on auto tagging incidents * Initial work on decoupling plugins from creation flow (#223) * Initial work on decoupling plugins from creation flow * Small plugin fixes with alembic. (#242) * Updates auth and incident cost docs (#245) * Let's use Join Incident in all Slack buttons (#246) * Moving models around such that they are available for use. (#249) * Allows user auth to be disabled returning a default user. (#250) * Making some minor fixes around basic auth (#241) * Making some minor fixes around basic auth Co-authored-by: Marc Vilanova <39573146+mvilanova@users.noreply.github.com> * Minor edit (#251) * Moving basic auth to an auth plugin (#252) * Fixes incident types and priorities paths in the Web UI router config (#256) * Fixes incident types and priorities paths in the Web UI * Adds note * Importing main instead of api directly (#258) * Upgraded node version to 12.16.2 (#260) Signed-off-by: Daniel Sutton <daniel@ducksecops.uk> * Adds all plugin event API routes to the API router before adding them to the Web API framework (#261) * Adds flags to plugins allowing them to specify if they are required (#259) * Adds flags to plugins allowing them to specify if they can have more than one or are required for dispatch to work. * Adds more timeline events (#262) * Cleaning up old un-used commands (#263) * Reads variables from .env file as well as envvars (#264) * Refactors nlp logic in the route service to use the centralized nlp module (#265) * Fixing an issue with database being in a bad state (#268) (#269) * Fixes bug in the incident cost model (#274) * Fixing an issue with database being in a bad state (#268) * Fixes bug in the incident cost model (#273) Co-authored-by: kevgliss <kevgliss@gmail.com> * fix typo in setup.py (#275) * Fixed empty enabled column in table 'plugin' (#270) * Fixed empty enabled column in table 'plugin' * no getattr * Bugfix router login redirect (#277) * Fixed empty enabled column in table 'plugin' * no getattr * the user should continue on * Fixes metric query, and reduces bundle size by allowing for treeshaki… (#276) * Fixes metric query, and reduces bundle size by allowing for treeshaking of lodash. Co-authored-by: Marc Vilanova <39573146+mvilanova@users.noreply.github.com> * Fixes plugins version (#278) * Let's allow users to disable a plugin (#280) * Correctly check the current revision (#281) * Timeline event details (#282) * Updates typescript * Adds JSON-based, details column to the event data model * Adds switch * Using v-card so we can show all details * Addresses comments * Removes unused import * Allowing resources to be optionally created (#279) * Refactors incident table filter (#284) * Adding default icon (#285) * Initial work adding RBAC controls (#266) * Adding basic RBAC controls * Removing loading overlay (#286) * Fetching current user info from server (#287) * Fixing the generation of swagger documentation (#289) * Disabling after hours until we figure out a caching fix. (#290) * Fixes help links for multi-messages and adds task resolution directions. (#288) * Fixes help links for multi-messages and adds task resolution directions. Co-authored-by: Marc Vilanova <39573146+mvilanova@users.noreply.github.com> * Removing dead code (#292) * Moving notification caching to the database. (#291) * Moving notification caching to the database * removing un-needed code * We return a user object from current_user instead of an email string (#293) * Improves Dockerfile (#296) * Adding Conference tests. (#267) * `yield_fixture` is deprecated after pytest 3.0. Plain old `fixture` is fine. * [WIP] Adding Conference model and service tests. * Use four spaces per indent in Python files. * Add assertions and stub functions. * Fix naming convention for conference tests. * Remove 'name', as it's not present in the Conference model. * Return a List of Conferences. When asking for all the Conferences of a given resource type, it doesn't make sense to ask for only one, or None (and throw an exception). It seems more sensible to request the whole list, or even a paginated list. Since this method isn't used anywhere in the code yet, we'll just return all(). * Black formatting. * Ensure our stub functions have args. * Test retrieval of a List of Conferences. * Add a test fixture to create multiple conferences. * Class Meta above instance vars * Incorporating suggested change * Lowercase as suggested * Implements test_conference_get_by_conference_id * get_by_incident_id fails * Implements test_conference_get_all * Ensure we're testing the created Conference. * Move ConferenceFactory later. This way an IncidentFactory has been defined and is available. * Give mocked Incident objects a fake ID. * This test works fine now. * Adds Join Incident button to stable incidents in daily summary (#298) * Prevents user being redirected to /login on 401 requests for pkce flow (#300) * Prevents user being redirected to /login on 401 requests for pkce flow * Modifying incident get permissions * changing from prophet to statsmodels (#297) Co-authored-by: Shannon Morrison <shannonm@netflix.com> * Fixes the dialog behavior of columns (#304) * Fixes the dialog behavior of columns * Removing un-related files * Reporting incidents via Slack slash command (#294) * #180 : initial commit - initiating incident from slack via slack commands * Update src/dispatch/plugins/dispatch_slack/views.py Co-authored-by: Marc Vilanova <39573146+mvilanova@users.noreply.github.com> * Update src/dispatch/plugins/dispatch_slack/views.py Co-authored-by: Marc Vilanova <39573146+mvilanova@users.noreply.github.com> * Update src/dispatch/plugins/dispatch_slack/config.py Co-authored-by: Marc Vilanova <39573146+mvilanova@users.noreply.github.com> * Update src/dispatch/plugins/dispatch_slack/messaging.py Co-authored-by: Marc Vilanova <39573146+mvilanova@users.noreply.github.com> * Update src/dispatch/plugins/dispatch_slack/messaging.py Co-authored-by: Marc Vilanova <39573146+mvilanova@users.noreply.github.com> * Update src/dispatch/plugins/dispatch_slack/plugin.py Co-authored-by: Marc Vilanova <39573146+mvilanova@users.noreply.github.com> * Update src/dispatch/plugins/dispatch_slack/views.py Co-authored-by: Marc Vilanova <39573146+mvilanova@users.noreply.github.com> * Update src/dispatch/plugins/dispatch_slack/messaging.py Co-authored-by: Marc Vilanova <39573146+mvilanova@users.noreply.github.com> * updates based on comments provided * add report-incident to conversation enums.py * fix issues after starting the application dispatch * Delete launch.json * Delete settings.json * Revert "Delete launch.json" This reverts commit 55e2c40 Co-authored-by: Vagharsh Kandilian <vagharsh.kandilian@disqo.com> Co-authored-by: Marc Vilanova <39573146+mvilanova@users.noreply.github.com> * Adds expressions to hybrid properties (#124) * Adds expressions to hybrid properties * Removing commend * Fixes bugs in report incident Slack command (#305) * Making flake8 happy (#307) * Making flake8 happy * More fixes * MOAR fixes * Making statsmodels a required package (#308) * Making statsmodels a required package * Minor fixes * modifying launch (#309) * Failing gracefully if there is insufficent data. (#310) * Adjusting default landing page to admin UI dashboard. (#313) * Fixes bug and typo in status notifications (#314) * Fixes table loading state when API call fails (#315) * Adds hostname and database name to confirmation (#316) * Removing exception used for testing (#317) * Closes the report incident modal after it's submitted (#318) * Fixes an issue where the report incident modal is not closing after submitting * Using private metadata field to store channel id * Bugfix/search ui (#321) * Initial search work * Adding clickable items * Adds as join incident button to the incident status page (#322) * Adds as join incident button to the incident status page * Using incident flow * Fixes search/filter pagination reset (#323) * Standarizes save/close button icons (#324) * Using checkbox for table booleans (#325) * Ensures all table actions are under row ellipsis menu (#326) * fixing linting issue (#329) * Add custom profile field mapping for slack to get Team, Department, W… (#327) * Add custom profile field mapping for slack to get Team, Department, Weblink * Update config names to address PR feedback * Update docs with new config vars * Revert "Update docs with new config vars" This reverts commit 7889530. * update docs and revert unwanted files * remove unused import * Adding a unique constraint on the dispatch user email (#331) * Add author and author URL to zoom plugin to fix plugins page (#330) Co-authored-by: Stefan Mihartescu <stefanmihartescu@gmail.com> Co-authored-by: Marc Vilanova <39573146+mvilanova@users.noreply.github.com> Co-authored-by: Daniel Sutton <daniel@ducksecops.uk> Co-authored-by: batman <5187696+mlioo@users.noreply.github.com> Co-authored-by: Forest Monsen <forest.monsen@gmail.com> Co-authored-by: Shannon <snkilmartin@users.noreply.github.com> Co-authored-by: Shannon Morrison <shannonm@netflix.com> Co-authored-by: Vagharsh Kandilian <vagharsh@users.noreply.github.com> Co-authored-by: Vagharsh Kandilian <vagharsh.kandilian@disqo.com> Co-authored-by: Will Bengtson <william.bengtson@gmail.com>
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.
Should address #243