CORE-338: fix Azure unit tests, maybe fix live database utils (#1836)

Author: davidangb

service/src/main/resources/application.yml

@@ -30,7 +30,7 @@ env:
     tps: ${TPS_ADDRESS:https://tps.dsde-dev.broadinstitute.org/}
     lzs: ${LZS_ADDRESS:https://landingzone.dsde-dev.broadinstitute.org/}
   azure:
-    environment: ${AZURE_ENVIRONMENT:AZURE}
+    environment: ${AZURE_ENVIRONMENT:AzureCloud}
     customer:
       usage-attribute: ${AZURE_CUSTOMER_USAGE_ATTRIBUTE:}
 

service/src/test/java/bio/terra/workspace/service/resource/controlled/cloud/azure/database/AzureDatabaseUtilsRunnerTest.java

@@ -49,8 +49,11 @@ public class AzureDatabaseUtilsRunnerTest extends BaseMockitoStrictStubbingTest
   @Mock private ApiAzureLandingZoneDeployedResource mockDatabase;
   @Mock private ApiAzureLandingZoneDeployedResource mockAdminIdentity;
 
+  private final String AZURE_ENV = "AzureCloud";
+
   @BeforeEach
   public void createAzureDatabaseUtilsRunner() {
+    when(mockAzureConfig.getAzureEnvironmentConfigString()).thenReturn(AZURE_ENV);
     azureDatabaseUtilsRunner =
         new AzureDatabaseUtilsRunner(
             mockAzureConfig,
@@ -171,6 +174,8 @@ private void assertResults(Map<String, String> expectedEnv) {
     var expectedEnvWithCommon = new HashMap<>(expectedEnv);
     expectedEnvWithCommon.putAll(
         Map.of(
+            "AZURE_ENVIRONMENT",
+            AZURE_ENV,
             "DB_SERVER_NAME",
             mockDatabase.getResourceId(),
             "ADMIN_DB_USER_NAME",