-
Notifications
You must be signed in to change notification settings - Fork 4
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
[DDO-2905] Migrate local development config out of firecloud-develop #1162
Conversation
Codecov ReportPatch and project coverage have no change.
Additional details and impacted files@@ Coverage Diff @@
## develop #1162 +/- ##
========================================
Coverage 69.54% 69.54%
========================================
Files 101 101
Lines 3471 3471
Branches 362 362
========================================
Hits 2414 2414
Misses 1057 1057 ☔ View full report in Codecov by Sentry. |
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.
lgtm! Sorry for the delay and thanks for this important PR.
As far as the secret/dsde/firecloud/local/firecloud-orchestration/whitelists
change, I'd love to hear from Identiteam about how to manage that, since they own these features.
Co-authored-by: Bria Morgan <[email protected]>
14a6805
to
1fe54c5
Compare
I chatted with Identiteam on Slack and it sounds like they're fine with removing the NIH configs entirely for local development. |
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.
Seems reasonable and follows the pattern. Stamp.
jenkins retest |
1 similar comment
jenkins retest |
The goal of this PR is to do the minimal amount of work to migrate the existing Orch local development configuration out of firecloud-develop.
Under the existing process, developers clone firecloud-develop and run
sh run-context/local/scripts/firecloud-setup.sh
, which populates theconfigs
subdirectory with a bunch of configuration files and secrets, as well as a script calleddocker-rsync-local-orch.sh
, which can be run to spin up a local Orch server inside a container.This PR replaces the firecloud-develop step with a new helper script,
local-dev/bin/render
, that generates the same set of files. Therender
tool generates 3 types of configuration files, giving it approximate parity with firecloud-develop'sconfigure.rb
:local-dev/secrets.yaml
)local-dev/templates
without a.ctmpl
extension)local-dev/templates
with a.ctmpl
extension)Testing
I verified that I could:
docker-rsync-local-orch.sh
scriptGET /api/configurations
andGET /api/workspaces
API callsModified files
A diff on the files generated by the old process and the new process showed the following delta:
firecloud-orchestration.conf
The firecloud-develop template contains a large hard-coded JSON structure of whitelists. After chatting with Identiteam, it's fine to omit the
nih
config struct altogether.local.broadinstitute.org cert & key
These files are the
local.broadinstitute.org
cert & key pair located atsecret/dsde/firecloud/local/common
. They were removed from firecloud-develop configs for by https://github.com/broadinstitute/firecloud-develop/pull/3326, which broke TLS for Orch. This PR adds them back.site.conf
Removed the Apache proxy's OAuth claim allowlist as done with Rawls.
TCell
Intentionally removed; there is no need to run TCell as part of local development.
trial billing account
Intentionally removed; the trial billing SA key is no longer used by Orch.
Related
Have you read CONTRIBUTING.md lately? If not, do that first.
I, the developer opening this PR, do solemnly pinky swear that:
In all cases: