Fix for DHFPROD-1552, failing ssl tests #1600
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
aebadirad
approved these changes
Nov 29, 2018
There was a problem hiding this comment.
Thank you for adding the custom verifier support for ssl for the collector, it's been a gap we've not addressed before. excellent work @srinathgit
aebadirad
pushed a commit
that referenced
this pull request
Dec 3, 2018
* Springify HubConfig with singleton scope * Added beans for DataHubImpl, HubProjectImpl * Code cleanup * Updated test * Reverting back to reading the properties file from DHF code * Some junit 5 and spring testing experiments * Checkpoint for springification * Checkpoint, spring context is pretty much there now * checkpoint springification * Checkpoint, still hitting project change issues * more cleaning * Springification almost complete * Installer and uninstaller * Make project directory configurable from properties * missed rename in build file for installer * Fix up junit 5 for one more test, get a project property into static context for tests * Resolved issues with EasyMock test * Remove junit4 from core * DataHubTest code cleanup * Move Application Config * gradle plugin deps update * Updating junit, gradle wrapper versions * catch exception if datahub is not installed (#1460) * Refresh project props before loading new props refresh props in test * fix exportAllJobs test * fixed testInstallUserModules test to use the default project dir * Added ability to switch between flowRunnerConfig and adminConfig Fixed tests * Fixed FlowRunner tests * Fixed ScaffoldingValidator tests * Fixed StreamCollector tests * Minor changes to test setup/teardown * Running ssl/cert-auth tests in spring context * Fixing the formatting * Fixing getHubFlowRunnerConfig() and not running pii tests with ssl * Making PiiE2E not run in ssl/certauth tests * No, no com.google.* * added spring dependency management to gradle plugin * added scaffolding bean to the project * updated gradle tasks to use spring managed beans * Added bean for userStagingModules * Modifying plugin tasks,getting tests to run and update legacy flows * Fixed switching between adminHubConfig and flowRunnerHubConfig * added method to create a project and set the project dir * QS experiment spring * QS experiment spring * Checkpoint * rename packages * Checkpoint * Quickstart context mostly working * App context working mostly, auth is not. I introduced some issues here too: * WIP Spring qs (#1563) * qs spring checkpoint * Added ConnectionAuthenticationFilter as a spring bean * use the username and password submitted by the user * added refreshProject * Init hub project (#1566) * Init hub and include junit platform dependency * Reverting installHubModules() to 'protected' * fixed ssl test * WIP-Fixing test in spring context (#1570) * create and init hub project * loading from current props file * Autowiring 'authFilter' * call refreshProject() in HubConfigImpl.createProject() * Address the trace UI vulnerabilities in trace UI + fix spring boot buld for the ml-data-hub plugin's main class def * fixed QS not starting up * fixed QS spring issues (#1577) * bring back envConfig as web layer depends on it * fixes dhf installation via QS * fixed input file path * set user submitted environment * re-enable tracing * send envconfig during uninstall * Making gradle plugin work in spring context (#1579) * Disable 'bootJar' and enable 'jar' * Updating the scaffolding gradle wrapper * Init hub if needed * Fix 'DeleteHubModuleTimestampsFileTask' to use hubProject * Develop sync to spring singleton branch (#1581) * navigate to url before spec (#1568) * Syncing develop with master post 4.0.3 release (#1562) * Changelog update * Update version numbers in code * Update version number in properties files * 4.0.2 example changes * gradle-tasks-demo Readme update * Create priv directories under the security directors to make more clear, equals ignore case on jobs just incase someone has a lower-case version of it (#1499) (#1501) * 4.0.2 reference changes * Updating version to be 4.0.2 * Updating version to be 4.0.2 * Updating version to be 4.0.2 * Updating version to be 4.0.2 * updating for 4.0.2 * Update CHANGELOG.md Fix format * 4.0.3 example changes * Update change log with 4.0.2 and 4.0.3 issues * Updating version to be 4.0.3 * Updating version to be 4.0.3 * Updating version to be 4.0.3 * Updating version to be 4.0.3 * Correcting version update for performance example * Making quickstart tests run (#1582) * Updated tests (#1584) removed invalid tests * Some cleanup of comments and interfaces * Dhfprod 1338 spring singleton (#1586) * navigate to url before spec (#1568) * Syncing develop with master post 4.0.3 release (#1562) * Changelog update * Update version numbers in code * Update version number in properties files * 4.0.2 example changes * gradle-tasks-demo Readme update * Create priv directories under the security directors to make more clear, equals ignore case on jobs just incase someone has a lower-case version of it (#1499) (#1501) * 4.0.2 reference changes * Updating version to be 4.0.2 * Updating version to be 4.0.2 * Updating version to be 4.0.2 * Updating version to be 4.0.2 * updating for 4.0.2 * Update CHANGELOG.md Fix format * 4.0.3 example changes * Update change log with 4.0.2 and 4.0.3 issues * Updating version to be 4.0.3 * Updating version to be 4.0.3 * Updating version to be 4.0.3 * Updating version to be 4.0.3 * Correcting version update for performance example * DHFPROD-1426 add index tooltips and help icons (#1583) - Add new Bootstrap tooltips for index icons - Replace existing MDL tooltips with Bootstrap tooltips - Add help icons to mapping and entities views - Destination docs page for help icons to come * Some cleanup of comments and interfaces * fixed path * Fix ssl issue (#1587) * Autowiring fail fixed * Fixes issue where mlUsername/mlPassword were not set in gradle.properties If they're set in gradle-local.properties but not gradle.properties, then the properties were not being set because hubConfig.withPropertiesFromEnvironment was not being called. Not familiar with writing DHF tests yet, but we definitely need a test where mlUsername/mlPassword are not in gradle.properties * Better fix for passing Gradle properties into HubConfigImpl (#1594) Added a comment for the part I'm not sure about - given that we don't want HubConfigImpl to load from gradle.properties when using Gradle (since Gradle has already loaded all the properties from that file and applied the properties plugin to them), when do we want to do this? Does the QS app expect to read from a gradle.properties file? Maybe just JUnit test cases? * 1546 Using DeployOtherDatabasesCommand to deploy all databases (#1595) The set of staging commands no longer has the database commands; since the final commands are executed first, they have the database commands, and DeployOtherDatabasesCommand is modified to use a custom impl of DeployDatabaseCommand that accounts for some DHF-specific stuff. Will soon have a single list of commands a single AppConfig. * 1547 Deploying all servers via a single command (#1598) * 1548 No more special handling for security resources (#1599) ml-gradle can handle all security resources, with the exception of hub amps - those are still in a separate list of commands with their own tasks (though they're still deployed as part of mlDeploy). Also fixed the hub-specific amp tasks - those still need a constructor for DeployHubAmpsCommand so they can pass in a HubConfig instance. * Fix for DHFPROD-1552, failing ssl tests (#1600) * Fix for DHFPROD-1552, qs issue * Fix hostname verifier for Collector, modify the tests * Remove redundant refresh * 1548 Fixing compile errors I didn't see * 1550 mlLoadSchemas now works; big shift to one AppConfig and one list of commands (#1603) * 1561 Fix for ordering database commands (#1605) See comments on the DeployHubDatabaseCommand constructor * 1561 Removing line that disables database ordering * Setting version back to 4.0.3 (#1607) * Changing the paths for trigger files, fixing tests (#1608) * 1562 Updating indexes now reuses mlDatabaseCommands for consistency (#1609) Note the comments about how "mlUpdateIndexes" in ml-gradle differs from how it works. That's probably fine though - I'm not 100% sure that the implementation in ml-gradle is how it should be. * 1562 Disabling forest creation when updating indexes (#1611) * 1551 mlLoadModules and mlWatch now work properly (#1612) Renamed LoadUserStagingModulesCommand to LoadHubUserCommand to make it more clear what it does (since it's not staging-specific). Depends on ml-gradle 3.10.2, which I just released, which provides a hook in WatchTask for HubWatchTask to use. * Removing the modules from ml-modules in pii-test (#1613) * mlLoadModules no longer depends on hubDeployUserModules * DHFPROD-1557 - remove used vectors for memory leak issue * Because I'm bad at things and prematurely check things in. * use hubDeployUserModules for loading hub specific modules test cleanup * 1563 Fixing module loading when final server is using SSL (#1614) * Resetting the hubConfig to its default values (#1616) * Wiring clients after changing hubConfig (#1622) * Fixed how the hub-specific amp tasks are defined (#1621) They were technically fine before, but with this approach, they have a description. * Corrected comment for modifying mlForestCommands (#1620) * Add "Description" for project.task() (#1623)
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.
This PR