Skip to content
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

Support for deployment in Azure Government Cloud (WSM) #1806

Open
wants to merge 23 commits into
base: main
Choose a base branch
from

Conversation

bennettn4
Copy link

@bennettn4 bennettn4 commented Dec 2, 2024

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

  • [wsm] Added config value azureEnvironment
  • [azureDatabaseUtils] Added environment variable for AZURE_ENVIRONMENT

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

@bennettn4 bennettn4 marked this pull request as ready for review December 10, 2024 16:21
@bennettn4 bennettn4 requested a review from a team as a code owner December 10, 2024 16:21
@bennettn4 bennettn4 requested review from dvoet and samanehsan and removed request for a team December 10, 2024 16:21
settings.gradle Outdated
@@ -11,6 +11,7 @@ pluginManagement {
}
}
}
mavenLocal()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think we want this in general

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed, good catch this was for local testing

Comment on lines 2 to 3
AzureUSGovernmentCloud: ${DB_SERVER_NAME}.postgres.database.usgovcloudapi.net
AzureCloud: ${DB_SERVER_NAME}.postgres.database.azure.com
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

these are db host names, can you include that in the property name?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Made subvalues of dbHostNames

port: 5432
host: ${azureEnvironmentConfig.${AZURE_ENVIRONMENT:AzureCloud}}:5432
#host: ${DB_SERVER_NAME}.postgres.database.azure.com:5432
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove the commented line and the one below

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed

@@ -166,6 +166,7 @@ workspace:
state: operating

azure:
azureEnvironment: AZURE
Copy link
Contributor

@samanehsan samanehsan Dec 11, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this necessary? There is already azure-environment on line 178 with the value ${env.azure.environment} which refers to line 33 environment: ${AZURE_ENVIRONMENT:AZURE}

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed

@bennettn4 bennettn4 requested a review from dvoet January 15, 2025 18:47
@bennettn4 bennettn4 requested a review from samanehsan January 21, 2025 15:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants