Support for deployment in Azure Government Cloud (Leonardo) #4813

bennettn4 · 2024-12-11T20:39:48Z

Part of large effort to add support for services to run in Azure Government cloud.

Two parts:

Support for government cloud curls

Added environment variable for AZURE_ENVIRONMENT
Updated azure-vm-init script to support gov suffix

Fixes for running Leo in Azure. The user pet token is unavailable in Azure so calls which used it for Leo->WSM were replaced with the Leo service account token, and appropriate permissions to the workspace were given to the Leo service account.

https://broadworkbench.atlassian.net/browse/TOAZ-372
See related pull requests here:
workbench-libs sam bpm wsm cromwell terra-helmfile

This reverts commit aa1586e.

codecov · 2024-12-30T16:49:37Z

Codecov Report

Attention: Patch coverage is 70.27027% with 22 lines in your changes missing coverage. Please review.

Project coverage is 74.74%. Comparing base (1a00c81) to head (c39ccc3).

Files with missing lines	Patch %	Lines
...sde/workbench/leonardo/monitor/MonitorAtBoot.scala	50.00%	8 Missing ⚠️
...bench/leonardo/config/AzureHostingModeConfig.scala	80.00%	3 Missing ⚠️
...workbench/leonardo/monitor/LeoMetricsMonitor.scala	50.00%	3 Missing ⚠️
...de/workbench/leonardo/app/CromwellAppInstall.scala	50.00%	2 Missing ⚠️
...kbench/leonardo/app/CromwellRunnerAppInstall.scala	60.00%	2 Missing ⚠️
...te/dsde/workbench/leonardo/app/WdsAppInstall.scala	60.00%	2 Missing ⚠️
...e/workbench/leonardo/app/WorkflowsAppInstall.scala	50.00%	2 Missing ⚠️

Additional details and impacted files

@@             Coverage Diff             @@
##           develop    #4813      +/-   ##
===========================================
- Coverage    74.77%   74.74%   -0.04%     
===========================================
  Files          166      166              
  Lines        14800    14821      +21     
  Branches      1112     1197      +85     
===========================================
+ Hits         11067    11078      +11     
- Misses        3733     3743      +10

Files with missing lines	Coverage Δ
...e/workbench/leonardo/app/HailBatchAppInstall.scala	`62.50% <ø> (ø)`
...rkbench/leonardo/http/AppDependenciesBuilder.scala	`97.91% <100.00%> (+0.02%)`	⬆️
...ch/leonardo/http/service/LeoAppServiceInterp.scala	`87.44% <100.00%> (+0.07%)`	⬆️
.../dsde/workbench/leonardo/util/AKSInterpreter.scala	`88.66% <100.00%> (-0.13%)`	⬇️
...e/workbench/leonardo/util/AzurePubsubHandler.scala	`84.56% <100.00%> (-0.11%)`	⬇️
...workbench/leonardo/util/BuildHelmChartValues.scala	`97.18% <ø> (ø)`
...de/workbench/leonardo/app/CromwellAppInstall.scala	`67.74% <50.00%> (-1.23%)`	⬇️
...kbench/leonardo/app/CromwellRunnerAppInstall.scala	`84.09% <60.00%> (-1.63%)`	⬇️
...te/dsde/workbench/leonardo/app/WdsAppInstall.scala	`78.94% <60.00%> (-3.41%)`	⬇️
...e/workbench/leonardo/app/WorkflowsAppInstall.scala	`66.66% <50.00%> (-1.34%)`	⬇️
... and 3 more

Continue to review full report in Codecov by Sentry.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 1a00c81...c39ccc3. Read the comment docs.

LizBaldo

Were you able to test this? The Azure integration tests have been removed a few months ago unfortunately 🤔

This looks good, but I have a few comments around preserving the pre-existing behavior for GCP as much as possible.

http/src/main/scala/org/broadinstitute/dsde/workbench/leonardo/app/CromwellAppInstall.scala

...src/main/scala/org/broadinstitute/dsde/workbench/leonardo/app/CromwellRunnerAppInstall.scala

LizBaldo · 2025-01-07T21:40:56Z

...src/main/scala/org/broadinstitute/dsde/workbench/leonardo/app/CromwellRunnerAppInstall.scala

-        raw"bard.enabled=${config.bardEnabled}"
+        raw"bard.enabled=${config.bardEnabled}",
+
+        // TEMPORARY HELM OVERRIDE VALUES WHILE WAITING FOR PR


Could you link the PR? if it is the terra helmfile one you should be good to merge I think

http/src/main/scala/org/broadinstitute/dsde/workbench/leonardo/app/WdsAppInstall.scala

http/src/main/scala/org/broadinstitute/dsde/workbench/leonardo/app/WorkflowsAppInstall.scala

...main/scala/org/broadinstitute/dsde/workbench/leonardo/http/service/LeoAppServiceInterp.scala

LizBaldo · 2025-01-07T22:04:09Z

http/src/main/scala/org/broadinstitute/dsde/workbench/leonardo/monitor/MonitorAtBoot.scala

-                  workspaceDescOpt <- tokenOpt.flatTraverse { token =>
-                    wsmClientProvider.getWorkspace(token, workspaceId)
-                  }
+                  leoAuth <- samDAO.getLeoAuthToken


Why the change here for both GCP and Azure case? I would like to keep using the cached token wherever possible.

jsaun · 2025-01-09T06:10:44Z

Were you able to test this? The Azure integration tests have been removed a few months ago unfortunately 🤔

Yeah, we've been running this branch in our dev environment for a while, it will need some final validation as I don't think we've tested the most recent commits though.

This looks good, but I have a few comments around preserving the pre-existing behavior for GCP as much as possible.

Yep, makes sense. I was trying to avoid the branching logic if possible to keep it consistent/simpler but I will try to update shortly for those cases you pointed out.

jsaun and others added 30 commits October 9, 2024 12:46

Replace pet Token with leo token

076a814

Replace pet service account tokens with leo service account

f96846a

Fix build

480ac44

Fix

7ffc656

Test custom chart

2a49a1d

Update wds chart

c9f44e8

Use local helm chart

da173ef

Update Dependencies.scala

79ebef8

carry over other changes

abe660c

Update clean_install.sh

59bc2ea

Update MonitorAtBoot.scala

e70ec14

Update AKSInterpreter.scala

548b753

Remove leo auth token from app charts

adad799

Update CromwellRunnerAppInstall.scala

6e056b6

Remove auth tokens from app configs

f912dea

Update LeoAppServiceInterp.scala

a7d27af

Update Dependencies.scala

b592443

Update Dependencies.scala

e597b53

Update Dependencies.scala

b050782

Update LeoAppServiceInterp.scala

aa1586e

Revert "Update LeoAppServiceInterp.scala"

23d6ca2

This reverts commit aa1586e.

Get leo email from token

134b8ac

Update reference.conf

59aff84

Update Dependencies.scala

58fd927

Update Dependencies.scala

7355698

update gov servicebus and sql suffixes

d1c31af

fix import and typo

83a04ac

update azure gov config

78df15b

update storage account suffix to support azure gov

9c521d9

Fix postgres suffix in commercial

e49ce53

jsaun and others added 15 commits December 17, 2024 18:01

Fix types

afd724a

Update WdsAppInstall.scala

a7fc8dd

Fix specs

a6c9800

scalaFmt

64a1920

scalaFmt again

25110ff

Merge branch 'develop' into jsaun/leo-service-account

80b8afe

Update HailBatchAppInstallSpec.scala

53d2399

Update AppServiceInterpSpec.scala

a0f5a16

Update AllowlistAuthProvider.scala

3627fe6

Update AppServiceInterpSpec.scala

59e0cc6

update helm override specs

ae716da

scalafmt

ef9015a

update specs

a29056c

update test specs

50dd92b

Update ConfigReaderSpec.scala

9f228c7

bennettn4 marked this pull request as ready for review December 30, 2024 17:40

bennettn4 requested a review from a team as a code owner December 30, 2024 17:40

LizBaldo reviewed Jan 7, 2025

View reviewed changes

jsaun added 10 commits January 28, 2025 08:55

Address pr comments

a209d3e

fix imports

df089ce

Merge branch 'develop' into jsaun/leo-service-account

64a81d7

Remove placeholder cromwell image

63f36e4

Merge branch 'develop' into jsaun/leo-service-account

5b3b326

Update CromwellRunnerAppInstallSpec.scala

3363e56

Update ConfigReaderSpec.scala

1c68ff4

Update ConfigReaderSpec.scala

c9abbea

Update ConfigReaderSpec.scala

52da05d

Update ConfigReaderSpec.scala

c39ccc3

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Support for deployment in Azure Government Cloud (Leonardo) #4813

Support for deployment in Azure Government Cloud (Leonardo) #4813

bennettn4 commented Dec 11, 2024 •

edited by jsaun

Loading

codecov bot commented Dec 30, 2024 •

edited

Loading

LizBaldo left a comment

LizBaldo Jan 7, 2025

LizBaldo Jan 7, 2025

jsaun commented Jan 9, 2025

Support for deployment in Azure Government Cloud (Leonardo) #4813

Are you sure you want to change the base?

Support for deployment in Azure Government Cloud (Leonardo) #4813

Conversation

bennettn4 commented Dec 11, 2024 • edited by jsaun Loading

codecov bot commented Dec 30, 2024 • edited Loading

Codecov Report

LizBaldo left a comment

Choose a reason for hiding this comment

LizBaldo Jan 7, 2025

Choose a reason for hiding this comment

LizBaldo Jan 7, 2025

Choose a reason for hiding this comment

jsaun commented Jan 9, 2025

bennettn4 commented Dec 11, 2024 •

edited by jsaun

Loading

codecov bot commented Dec 30, 2024 •

edited

Loading