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.

Sign up for GitHub

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

[WOR-1448]: Bump com.azure.resourcemanager:azure-resourcemanager-batch from 1.0.0 to 2.0.0 #508

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

[WOR-1448]: Bump com.azure.resourcemanager:azure-resourcemanager-batch from 1.0.0 to 2.0.0 #508

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
92754e1
[WOR-1448]: Bump com.azure.resourcemanager:azure-resourcemanager-batch
dependabot[bot] Jan 2, 2025
e3fdbaa
use fromJson
marctalbott Jan 15, 2025
dc84f98
Merge branch 'main' into dependabot/gradle/main/com.azure.resourceman…
marctalbott Jan 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion library/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ dependencies {

implementation group: 'com.azure.resourcemanager', name: 'azure-resourcemanager', version: '2.46.0'
implementation group: 'com.azure.resourcemanager', name: 'azure-resourcemanager-relay', version: '1.0.0'
implementation group: 'com.azure.resourcemanager', name: 'azure-resourcemanager-batch', version: '1.0.0'
implementation group: 'com.azure.resourcemanager', name: 'azure-resourcemanager-batch', version: '2.0.0'
implementation group: 'com.azure.resourcemanager', name: 'azure-resourcemanager-postgresqlflexibleserver', version: '1.1.0'
implementation group: 'com.azure.resourcemanager', name: 'azure-resourcemanager-loganalytics', version: '1.1.0'
implementation group: 'com.azure.resourcemanager', name: 'azure-resourcemanager-applicationinsights', version: '1.1.0'
Expand Down
14 changes: 9 additions & 5 deletions ...va/bio/terra/landingzone/library/landingzones/management/quotas/BatchQuotaReaderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,14 @@
import static org.mockito.Mockito.when;

import bio.terra.landingzone.library.landingzones.management.AzureResourceTypeUtils;
import com.azure.json.JsonOptions;
import com.azure.json.implementation.DefaultJsonProvider;
import com.azure.resourcemanager.batch.BatchManager;
import com.azure.resourcemanager.batch.models.BatchAccount;
import com.azure.resourcemanager.batch.models.BatchAccounts;
import com.azure.resourcemanager.batch.models.VirtualMachineFamilyCoreQuota;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import java.io.IOException;
import java.util.List;
import java.util.Map;
import org.junit.jupiter.api.BeforeEach;
Expand Down Expand Up @@ -57,20 +59,22 @@ private void setUpBatchManager() {
when(batchAccount.lowPriorityCoreQuota()).thenReturn(LOW_PRI_CORE_QUOTA);
}

private void setUpDedicatedCoreQuotaPerFamily() throws JsonProcessingException {
private void setUpDedicatedCoreQuotaPerFamily() throws IOException {
vmQuota = createVmFamilyCoreQuota();
List<VirtualMachineFamilyCoreQuota> quotaPerVMFamily = List.of(vmQuota);
when(batchAccount.dedicatedCoreQuotaPerVMFamily()).thenReturn(quotaPerVMFamily);
when(batchAccount.dedicatedCoreQuotaPerVMFamilyEnforced()).thenReturn(true);
}

private VirtualMachineFamilyCoreQuota createVmFamilyCoreQuota() throws JsonProcessingException {
private VirtualMachineFamilyCoreQuota createVmFamilyCoreQuota() throws IOException {
var familyCoreQuotaJson = "{\"name\":\"vmsku\",\"coreQuota\":10}";
return new ObjectMapper().readValue(familyCoreQuotaJson, VirtualMachineFamilyCoreQuota.class);

return VirtualMachineFamilyCoreQuota.fromJson(
new DefaultJsonProvider().createReader(familyCoreQuotaJson, new JsonOptions()));
}

@Test
void getResourceQuota_returnsValidQuotaForBatchAccount() throws JsonProcessingException {
void getResourceQuota_returnsValidQuotaForBatchAccount() throws IOException {

setUpBatchManager();
setUpDedicatedCoreQuotaPerFamily();
Expand Down
Loading