Skip to content

Update Azure Batch cmdlets to latest SDK versions #8612

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

Merged
merged 11 commits into from
Mar 1, 2019
Merged

Update Azure Batch cmdlets to latest SDK versions #8612

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
3b03e5d
Update AzBatch module SDK versions
matthchr Jan 31, 2019
ca97936
Update Batch changelog and breaking changes
matthchr Feb 1, 2019
d22bc9d
Update cmdlet help
matthchr Feb 5, 2019
ce532d6
Fix PSImageReference format
matthchr Feb 8, 2019
31762e4
Fix issue with Batch error formatting
matthchr Feb 16, 2019
409e5e4
Change Metadata and EnviornmentSettings to be IDictionary
matthchr Feb 20, 2019
46ba3dd
Re-record tests
matthchr Feb 4, 2019
5b87eec
Update Microsoft.Extensions.Primitives to 2.2.0
matthchr Feb 25, 2019
ea20b51
Add SignatureIssues supression
matthchr Feb 26, 2019
ebb7e70
Update Batch psd1 required assemblies
matthchr Feb 27, 2019
822429e
Fix CredScan suppressions
matthchr Feb 27, 2019
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
8 changes: 4 additions & 4 deletions src/Batch/Batch.Test/ApplicationPackages/GetBatchApplicationPackageCommandTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,15 +43,15 @@ public void GetBatchApplicationPackageTest()
{
string accountName = "account01";
string resourceGroup = "resourceGroup";
string applicationId = "test";
string applicationName = "test";
string applicationVersion = "foo";

PSApplicationPackage expected = new PSApplicationPackage() { Id = applicationId, Version = applicationVersion };
batchClientMock.Setup(b => b.GetApplicationPackage(resourceGroup, accountName, applicationId, applicationVersion)).Returns(expected);
PSApplicationPackage expected = new PSApplicationPackage() { Name = applicationVersion };
batchClientMock.Setup(b => b.GetApplicationPackage(resourceGroup, accountName, applicationName, applicationVersion)).Returns(expected);

cmdlet.AccountName = accountName;
cmdlet.ResourceGroupName = resourceGroup;
cmdlet.ApplicationId = applicationId;
cmdlet.ApplicationName = applicationName;
cmdlet.ApplicationVersion = applicationVersion;

cmdlet.ExecuteCmdlet();
Expand Down
20 changes: 10 additions & 10 deletions src/Batch/Batch.Test/ApplicationPackages/NewBatchApplicationPackageCommandTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,18 +44,18 @@ public void UploadBatchApplicationPackageTest()
{
string accountName = "account01";
string resourceGroup = "resourceGroup";
string applicationId = "applicationId";
string applicationName = "applicationName";
string filePath = "~/fake/filepath";
string version = "version";
string format = "zip";

PSApplicationPackage applicationPackageResponse = new PSApplicationPackage();

batchClientMock.Setup(b => b.UploadAndActivateApplicationPackage(resourceGroup, accountName, applicationId, version, filePath, format, false)).Returns(applicationPackageResponse);
batchClientMock.Setup(b => b.UploadAndActivateApplicationPackage(resourceGroup, accountName, applicationName, version, filePath, format, false)).Returns(applicationPackageResponse);

cmdlet.AccountName = accountName;
cmdlet.ResourceGroupName = resourceGroup;
cmdlet.ApplicationId = applicationId;
cmdlet.ApplicationName = applicationName;
cmdlet.FilePath = filePath;
cmdlet.ApplicationVersion = version;
cmdlet.Format = format;
Expand All @@ -64,7 +64,7 @@ public void UploadBatchApplicationPackageTest()
commandRuntimeMock.Setup(f => f.ShouldProcess(It.IsAny<string>(), It.IsAny<string>())).Returns(true);
cmdlet.ExecuteCmdlet();

batchClientMock.Verify(b => b.UploadAndActivateApplicationPackage(resourceGroup, accountName, applicationId, version, filePath, format, false), Times.Once());
batchClientMock.Verify(b => b.UploadAndActivateApplicationPackage(resourceGroup, accountName, applicationName, version, filePath, format, false), Times.Once());
}

[Fact]
Expand All @@ -73,7 +73,7 @@ public void UploadBatchApplicationPackageNoFilePathProvidedTest()
{
string accountName = "account01";
string resourceGroup = "resourceGroup";
string applicationId = "applicationId";
string applicationName = "applicationName";
string version = "version";
string format = "zip";
string filePath = "";
Expand All @@ -82,7 +82,7 @@ public void UploadBatchApplicationPackageNoFilePathProvidedTest()

cmdlet.AccountName = accountName;
cmdlet.ResourceGroupName = resourceGroup;
cmdlet.ApplicationId = applicationId;
cmdlet.ApplicationName = applicationName;
cmdlet.ApplicationVersion = version;
cmdlet.FilePath = filePath;
cmdlet.Format = format;
Expand All @@ -98,17 +98,17 @@ public void ActivateApplicationPackageOnly()
{
string accountName = "account01";
string resourceGroup = "resourceGroup";
string applicationId = "applicationId";
string applicationName = "applicationName";
string version = "version";
string format = "zip";

PSApplicationPackage applicationPackageResponse = new PSApplicationPackage();

batchClientMock.Setup(b => b.UploadAndActivateApplicationPackage(resourceGroup, accountName, applicationId, version, null, format, true)).Returns(applicationPackageResponse);
batchClientMock.Setup(b => b.UploadAndActivateApplicationPackage(resourceGroup, accountName, applicationName, version, null, format, true)).Returns(applicationPackageResponse);

cmdlet.AccountName = accountName;
cmdlet.ResourceGroupName = resourceGroup;
cmdlet.ApplicationId = applicationId;
cmdlet.ApplicationName = applicationName;
cmdlet.ApplicationVersion = version;
cmdlet.Format = format;
cmdlet.ActivateOnly = true;
Expand All @@ -117,7 +117,7 @@ public void ActivateApplicationPackageOnly()
commandRuntimeMock.Setup(f => f.ShouldProcess(It.IsAny<string>(), It.IsAny<string>())).Returns(true);
cmdlet.ExecuteCmdlet();

batchClientMock.Verify(b => b.UploadAndActivateApplicationPackage(resourceGroup, accountName, applicationId, version, null, format, true), Times.Once());
batchClientMock.Verify(b => b.UploadAndActivateApplicationPackage(resourceGroup, accountName, applicationName, version, null, format, true), Times.Once());
}
}
}
6 changes: 3 additions & 3 deletions src/Batch/Batch.Test/ApplicationPackages/RemoveBatchApplicationPackageCommandTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,18 +43,18 @@ public void DeleteBatchApplicationPackageTest()
{
string accountName = "account01";
string resourceGroup = "resourceGroup";
string applicationId = "applicationId";
string applicationName = "applicationName";
string version = "version";

cmdlet.AccountName = accountName;
cmdlet.ResourceGroupName = resourceGroup;
cmdlet.ApplicationId = applicationId;
cmdlet.ApplicationName = applicationName;
cmdlet.ApplicationVersion = version;

commandRuntimeMock.Setup(f => f.ShouldProcess(It.IsAny<string>(), It.IsAny<string>())).Returns(true);
cmdlet.ExecuteCmdlet();

batchClientMock.Verify(b => b.DeleteApplicationPackage(resourceGroup, accountName, applicationId, version), Times.Once());
batchClientMock.Verify(b => b.DeleteApplicationPackage(resourceGroup, accountName, applicationName, version), Times.Once());
}
}
}
6 changes: 3 additions & 3 deletions src/Batch/Batch.Test/Applications/GetBatchApplicationCommandTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,14 +71,14 @@ public void GetBatchApplicationTest()
{
string accountName = "account01";
string resourceGroup = "resourceGroup";
string applicationId = "applicationId";
string applicationName = "applicationName";

PSApplication expected = new PSApplication();
batchClientMock.Setup(b => b.GetApplication(resourceGroup, accountName, applicationId)).Returns(expected);
batchClientMock.Setup(b => b.GetApplication(resourceGroup, accountName, applicationName)).Returns(expected);

cmdlet.AccountName = accountName;
cmdlet.ResourceGroupName = resourceGroup;
cmdlet.ApplicationId = applicationId;
cmdlet.ApplicationName = applicationName;

cmdlet.ExecuteCmdlet();

Expand Down
12 changes: 6 additions & 6 deletions src/Batch/Batch.Test/Applications/NewBatchApplicationCommandTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,16 +44,16 @@ public void AddBatchApplicationTest()
{
string accountName = "account01";
string resourceGroup = "resourceGroup";
string applicationId = "applicationId";
string applicationName = "applicationName";
string displayName = "displayName";

PSApplication expected = new PSApplication();

batchClientMock.Setup(b => b.AddApplication(resourceGroup, accountName, applicationId, true, displayName)).Returns(expected);
batchClientMock.Setup(b => b.AddApplication(resourceGroup, accountName, applicationName, true, displayName)).Returns(expected);

cmdlet.ResourceGroupName = resourceGroup;
cmdlet.AccountName = accountName;
cmdlet.ApplicationId = applicationId;
cmdlet.ApplicationName = applicationName;
cmdlet.AllowUpdates = true;
cmdlet.DisplayName = displayName;

Expand All @@ -68,16 +68,16 @@ public void AddBatchApplicationTestWithoutAllowUpdates()
{
string accountName = "account01";
string resourceGroup = "resourceGroup";
string applicationId = "applicationId";
string applicationName = "applicationName";
string displayName = "displayName";

PSApplication expected = new PSApplication();

batchClientMock.Setup(b => b.AddApplication(resourceGroup, accountName, applicationId, null, displayName)).Returns(expected);
batchClientMock.Setup(b => b.AddApplication(resourceGroup, accountName, applicationName, null, displayName)).Returns(expected);

cmdlet.ResourceGroupName = resourceGroup;
cmdlet.AccountName = accountName;
cmdlet.ApplicationId = applicationId;
cmdlet.ApplicationName = applicationName;

cmdlet.DisplayName = displayName;

Expand Down
6 changes: 3 additions & 3 deletions src/Batch/Batch.Test/Applications/RemoveBatchApplicationCommandTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,16 +43,16 @@ public void DeleteBatchApplicationTest()
{
string accountName = "account01";
string resourceGroup = "resourceGroup";
string applicationId = "applicationId";
string applicationName = "applicationName";

cmdlet.AccountName = accountName;
cmdlet.ResourceGroupName = resourceGroup;
cmdlet.ApplicationId = applicationId;
cmdlet.ApplicationName = applicationName;

commandRuntimeMock.Setup(f => f.ShouldProcess(It.IsAny<string>(), It.IsAny<string>())).Returns(true);
cmdlet.ExecuteCmdlet();

batchClientMock.Verify(b => b.DeleteApplication(resourceGroup, accountName, applicationId), Times.Once());
batchClientMock.Verify(b => b.DeleteApplication(resourceGroup, accountName, applicationName), Times.Once());
}
}
}
18 changes: 9 additions & 9 deletions src/Batch/Batch.Test/Applications/SetBatchApplicationCommandTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,21 +43,21 @@ public void UpdateBatchApplicationTest()
{
string accountName = "account01";
string resourceGroup = "resourceGroup";
string applicationId = "applicationId";
string applicationName = "applicationName";
string displayName = "name";
string defaultVersion = "version";

cmdlet.AccountName = accountName;
cmdlet.ResourceGroupName = resourceGroup;
cmdlet.ApplicationId = applicationId;
cmdlet.ApplicationName = applicationName;
cmdlet.AllowUpdates = true;
cmdlet.DefaultVersion = defaultVersion;
cmdlet.DisplayName = displayName;

commandRuntimeMock.Setup(f => f.ShouldProcess(It.IsAny<string>(), It.IsAny<string>())).Returns(true);
cmdlet.ExecuteCmdlet();

batchClientMock.Verify(b => b.UpdateApplication(resourceGroup, accountName, applicationId, true, defaultVersion, displayName), Times.Once());
batchClientMock.Verify(b => b.UpdateApplication(resourceGroup, accountName, applicationName, true, defaultVersion, displayName), Times.Once());
}

[Fact]
Expand All @@ -66,17 +66,17 @@ public void UpdateBatchApplicationAllowUpdatesOnlyTest()
{
string accountName = "account01";
string resourceGroup = "resourceGroup";
string applicationId = "applicationId";
string applicationName = "applicationName";

cmdlet.AccountName = accountName;
cmdlet.ResourceGroupName = resourceGroup;
cmdlet.ApplicationId = applicationId;
cmdlet.ApplicationName = applicationName;
cmdlet.AllowUpdates = true;

commandRuntimeMock.Setup(f => f.ShouldProcess(It.IsAny<string>(), It.IsAny<string>())).Returns(true);
cmdlet.ExecuteCmdlet();

batchClientMock.Verify(b => b.UpdateApplication(resourceGroup, accountName, applicationId, true, null, null), Times.Once());
batchClientMock.Verify(b => b.UpdateApplication(resourceGroup, accountName, applicationName, true, null, null), Times.Once());
}

[Fact]
Expand All @@ -85,16 +85,16 @@ public void UpdateBatchApplicationDefault()
{
string accountName = "account01";
string resourceGroup = "resourceGroup";
string applicationId = "applicationId";
string applicationName = "applicationName";

cmdlet.AccountName = accountName;
cmdlet.ResourceGroupName = resourceGroup;
cmdlet.ApplicationId = applicationId;
cmdlet.ApplicationName = applicationName;

commandRuntimeMock.Setup(f => f.ShouldProcess(It.IsAny<string>(), It.IsAny<string>())).Returns(true);
cmdlet.ExecuteCmdlet();

batchClientMock.Verify(b => b.UpdateApplication(resourceGroup, accountName, applicationId, null, null, null), Times.Once());
batchClientMock.Verify(b => b.UpdateApplication(resourceGroup, accountName, applicationName, null, null, null), Times.Once());
}
}
}
7 changes: 3 additions & 4 deletions src/Batch/Batch.Test/Batch.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<PsModuleName>Batch</PsModuleName>
Expand All @@ -14,9 +14,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Azure.Batch" Version="9.0.1" />
<PackageReference Include="Microsoft.Azure.Management.Batch" Version="4.2.1" />
<PackageReference Include="Microsoft.Extensions.Primitives" Version="2.1.1" />
<PackageReference Include="Microsoft.Azure.Batch" Version="10.1.0" />
<PackageReference Include="Microsoft.Azure.Management.Batch" Version="7.0.0" />
<PackageReference Include="WindowsAzure.Storage" Version="9.3.0" />
</ItemGroup>

Expand Down
3 changes: 2 additions & 1 deletion src/Batch/Batch.Test/BatchTestHelpers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,8 @@ public static BatchAccount CreateAccountResource(string accountName, string reso
string id = string.Format("id/subscriptions/{0}/resourceGroups/{1}/providers/Microsoft.Batch/batchAccounts/abc", subscription, resourceGroup);

BatchAccount resource = new BatchAccount(
coreQuota: DefaultQuotaCount,
dedicatedCoreQuota: DefaultQuotaCount,
lowPriorityCoreQuota: DefaultQuotaCount,
poolQuota: DefaultQuotaCount,
activeJobAndJobScheduleQuota: DefaultQuotaCount,
accountEndpoint: endpoint,
Expand Down
Loading