Merge pull request #284451 from wiboris/patch-1

Jill Grant · web-flow · commit d01635e27a2b · 2024-08-28T17:22:44.000-06:00
Update managed-identity-pools.md
diff --git a/articles/batch/batch-customer-managed-key.md b/articles/batch/batch-customer-managed-key.md
@@ -2,7 +2,7 @@
 title: Configure customer-managed keys for your Azure Batch account with Azure Key Vault and Managed Identity
 description: Learn how to encrypt Batch data using customer-managed keys.
 ms.topic: how-to
-ms.date: 04/03/2023
+ms.date: 08/12/2024
 ms.devlang: csharp
 ms.custom: devx-track-azurecli
 ---
@@ -136,27 +136,33 @@ As an example using the Batch management .NET client, you can create a Batch acc
 and customer-managed keys.
 
 ```c#
-EncryptionProperties encryptionProperties = new EncryptionProperties()
+string subscriptionId = "Your SubscriptionID";
+string resourceGroupName = "Your ResourceGroup name";
+         
+var credential = new DefaultAzureCredential();
+ArmClient _armClient = new ArmClient(credential);
+
+ResourceIdentifier resourceGroupResourceId = ResourceGroupResource.CreateResourceIdentifier(subscriptionId, resourceGroupName);
+ResourceGroupResource resourceGroupResource = _armClient.GetResourceGroupResource(resourceGroupResourceId);
+
+var data = new BatchAccountCreateOrUpdateContent(AzureLocation.EastUS)
 {
-    KeySource = KeySource.MicrosoftKeyVault,
-    KeyVaultProperties = new KeyVaultProperties()
+    Encryption = new BatchAccountEncryptionConfiguration()
     {
-        KeyIdentifier = "Your Key Azure Resource Manager Resource ID"
-    }
-};
+        KeySource = BatchAccountKeySource.MicrosoftKeyVault,
+        KeyIdentifier = new Uri("Your Key Azure Resource Manager Resource ID"),
+    },
 
-BatchAccountIdentity identity = new BatchAccountIdentity()
-{
-    Type = ResourceIdentityType.UserAssigned,
-    UserAssignedIdentities = new Dictionary<string, BatchAccountIdentityUserAssignedIdentitiesValue>
+    Identity = new ManagedServiceIdentity(ManagedServiceIdentityType.UserAssigned)
     {
-            ["Your Identity Azure Resource Manager ResourceId"] = new BatchAccountIdentityUserAssignedIdentitiesValue()
+        UserAssignedIdentities = {
+            [new ResourceIdentifier("Your Identity Azure Resource Manager ResourceId")] = new UserAssignedIdentity(),
+        },
     }
 };
-var parameters = new BatchAccountCreateParameters(TestConfiguration.ManagementRegion, encryption:encryptionProperties, identity: identity);
 
-var account = await batchManagementClient.Account.CreateAsync("MyResourceGroup",
-    "mynewaccount", parameters);
+var lro = resourceGroupResource.GetBatchAccounts().CreateOrUpdate(WaitUntil.Completed, "Your BatchAccount name", data);
+BatchAccountResource batchAccount = lro.Value;
 ```
 
 ## Update the customer-managed key version
diff --git a/articles/batch/batch-management-dotnet.md b/articles/batch/batch-management-dotnet.md
@@ -2,7 +2,7 @@
 title: Use the Batch Management .NET library to manage account resources
 description: Create, delete, and modify Azure Batch account resources with the Batch Management .NET library.
 ms.topic: how-to
-ms.date: 06/13/2024
+ms.date: 08/12/2024
 ms.devlang: csharp
 ms.custom: has-adal-ref, devx-track-csharp, devx-track-dotnet
 ---
@@ -20,53 +20,67 @@ You can lower maintenance overhead in your Azure Batch applications by using the
 
 ## Create and delete Batch accounts
 
-One of the primary features of the Batch Management API is to create and delete [Batch accounts](accounts.md) in an Azure region. To do so, use [BatchManagementClient.Account.CreateAsync](/dotnet/api/microsoft.azure.management.batch.batchaccountoperationsextensions.createasync) and [DeleteAsync](/dotnet/api/microsoft.azure.management.batch.batchaccountoperationsextensions.deleteasync), or their synchronous counterparts.
+One of the primary features of the Batch Management API is to create and delete [Batch accounts](accounts.md) in an Azure region. To do so, use [BatchAccountCollection.CreateOrUpdate](/dotnet/api/azure.resourcemanager.batch.batchaccountcollection.createorupdate) and [Delete](/dotnet/api/azure.resourcemanager.batch.batchaccountresource.delete), or their asynchronous counterparts.
 
-The following code snippet creates an account, obtains the newly created account from the Batch service, and then deletes it. In this snippet and the others in this article, `batchManagementClient` is a fully initialized instance of [BatchManagementClient](/dotnet/api/microsoft.azure.management.batch.batchmanagementclient).
+The following code snippet creates an account, obtains the newly created account from the Batch service, and then deletes it. 
 
 ```csharp
-// Create a new Batch account
-await batchManagementClient.Account.CreateAsync("MyResourceGroup",
-    "mynewaccount",
-    new BatchAccountCreateParameters() { Location = "West US" });
-
-// Get the new account from the Batch service
-AccountResource account = await batchManagementClient.Account.GetAsync(
-    "MyResourceGroup",
-    "mynewaccount");
-
-// Delete the account
-await batchManagementClient.Account.DeleteAsync("MyResourceGroup", account.Name);
+ string subscriptionId = "Your SubscriptionID";
+ string resourceGroupName = "Your ResourceGroup name";
+
+ var credential = new DefaultAzureCredential();
+ ArmClient _armClient = new ArmClient(credential);
+
+ ResourceIdentifier resourceGroupResourceId = ResourceGroupResource.CreateResourceIdentifier(subscriptionId, resourceGroupName);
+ ResourceGroupResource resourceGroupResource = _armClient.GetResourceGroupResource(resourceGroupResourceId);
+
+ var data = new BatchAccountCreateOrUpdateContent(AzureLocation.EastUS);
+
+ // Create a new batch account
+ resourceGroupResource.GetBatchAccounts().CreateOrUpdate(WaitUntil.Completed, "Your BatchAccount name", data);
+ 
+ // Get an existing batch account
+ BatchAccountResource batchAccount = resourceGroupResource.GetBatchAccount("Your BatchAccount name");
+
+ // Delete the batch account
+ batchAccount.Delete(WaitUntil.Completed);
 ```
 
 > [!NOTE]
-> Applications that use the Batch Management .NET library and its BatchManagementClient class require service administrator or coadministrator access to the subscription that owns the Batch account to be managed. For more information, see the Microsoft Entra ID section and the [AccountManagement](https://github.com/Azure-Samples/azure-batch-samples/tree/master/CSharp/AccountManagement) code sample.
+> Applications that use the Batch Management .NET library require service administrator or coadministrator access to the subscription that owns the Batch account to be managed. For more information, see the Microsoft Entra ID section and the [AccountManagement](https://github.com/Azure-Samples/azure-batch-samples/tree/master/CSharp/AccountManagement) code sample.
 
 ## Retrieve and regenerate account keys
 
-Obtain primary and secondary account keys from any Batch account within your subscription by using [GetKeysAsync](/dotnet/api/microsoft.azure.management.batch.batchaccountoperationsextensions.getkeysasync). You can regenerate those keys by using [RegenerateKeyAsync](/dotnet/api/microsoft.azure.management.batch.batchaccountoperationsextensions.regeneratekeyasync).
+Obtain primary and secondary account keys from any Batch account within your subscription by using [GetKeys](/dotnet/api/azure.resourcemanager.batch.batchaccountresource.getkeys). You can regenerate those keys by using [RegenerateKey](/dotnet/api/microsoft.azure.management.batch.batchaccountoperationsextensions.regeneratekey).
 
 ```csharp
+string subscriptionId = "Your SubscriptionID";
+string resourceGroupName = "Your ResourceGroup name";
+
+var credential = new DefaultAzureCredential();
+ArmClient _armClient = new ArmClient(credential);
+
+ResourceIdentifier resourceGroupResourceId = ResourceGroupResource.CreateResourceIdentifier(subscriptionId, resourceGroupName);
+ResourceGroupResource resourceGroupResource = _armClient.GetResourceGroupResource(resourceGroupResourceId);
+
+var data = new BatchAccountCreateOrUpdateContent(AzureLocation.EastUS);
+
+// Get an existing batch account
+BatchAccountResource batchAccount = resourceGroupResource.GetBatchAccount("Your BatchAccount name");
+
 // Get and print the primary and secondary keys
-BatchAccountGetKeyResult accountKeys =
-    await batchManagementClient.Account.GetKeysAsync(
-        "MyResourceGroup",
-        "mybatchaccount");
+BatchAccountKeys accountKeys = batchAccount.GetKeys();
+
 Console.WriteLine("Primary key:   {0}", accountKeys.Primary);
 Console.WriteLine("Secondary key: {0}", accountKeys.Secondary);
 
 // Regenerate the primary key
-BatchAccountRegenerateKeyResponse newKeys =
-    await batchManagementClient.Account.RegenerateKeyAsync(
-        "MyResourceGroup",
-        "mybatchaccount",
-        new BatchAccountRegenerateKeyParameters() {
-            KeyName = AccountKeyType.Primary
-            });
+BatchAccountRegenerateKeyContent regenerateKeyContent = new BatchAccountRegenerateKeyContent(BatchAccountKeyType.Primary);
+batchAccount.RegenerateKey(regenerateKeyContent);
 ```
 
 > [!TIP]
-> You can create a streamlined connection workflow for your management applications. First, obtain an account key for the Batch account you wish to manage with [GetKeysAsync](/dotnet/api/microsoft.azure.management.batch.batchaccountoperationsextensions.getkeysasync). Then, use this key when initializing the Batch .NET library's [BatchSharedKeyCredentials](/dotnet/api/microsoft.azure.batch.auth.batchsharedkeycredentials) class, which is used when initializing [BatchClient](/dotnet/api/microsoft.azure.batch.batchclient).
+> You can create a streamlined connection workflow for your management applications. First, obtain an account key for the Batch account you wish to manage with [GetKeys](/dotnet/api/azure.resourcemanager.batch.batchaccountresource.getkeys). Then, use this key when initializing the Batch .NET library's [BatchSharedKeyCredentials](/dotnet/api/microsoft.azure.batch.auth.batchsharedkeycredentials) class, which is used when initializing [BatchClient](/dotnet/api/microsoft.azure.batch.batchclient).
 
 ## Check Azure subscription and Batch account quotas
 
@@ -76,28 +90,30 @@ Azure subscriptions and the individual Azure services like Batch all have defaul
 
 Before creating a Batch account in a region, you can check your Azure subscription to see whether you are able to add an account in that region.
 
-In the code snippet below, we first use **ListAsync** to get a collection of all Batch accounts that are within a subscription. Once we've obtained this collection, we determine how many accounts are in the target region. Then we use **GetQuotasAsync** to obtain the Batch account quota and determine how many accounts (if any) can be created in that region.
+In the code snippet below, we first use **GetBatchAccounts** to get a collection of all Batch accounts that are within a subscription. Once we've obtained this collection, we determine how many accounts are in the target region. Then we use **GetBatchQuotas** to obtain the Batch account quota and determine how many accounts (if any) can be created in that region.
 
 ```csharp
+string subscriptionId = "Your SubscriptionID";
+ArmClient _armClient = new ArmClient(new DefaultAzureCredential());
+
+ResourceIdentifier subscriptionResourceId = SubscriptionResource.CreateResourceIdentifier(subscriptionId);
+SubscriptionResource subscriptionResource = _armClient.GetSubscriptionResource(subscriptionResourceId);
+
 // Get a collection of all Batch accounts within the subscription
-BatchAccountListResponse listResponse =
-        await batchManagementClient.BatchAccount.ListAsync(new AccountListParameters());
-IList<AccountResource> accounts = listResponse.Accounts;
-Console.WriteLine("Total number of Batch accounts under subscription id {0}:  {1}",
-    creds.SubscriptionId,
-    accounts.Count);
+var batchAccounts = subscriptionResource.GetBatchAccounts();
+Console.WriteLine("Total number of Batch accounts under subscription id {0}:  {1}", subscriptionId, batchAccounts.Count());
 
 // Get a count of all accounts within the target region
-string region = "westus";
-int accountsInRegion = accounts.Count(o => o.Location == region);
+string region = "eastus";
+int accountsInRegion = batchAccounts.Count(o => o.Data.Location == region);
 
 // Get the account quota for the specified region
-SubscriptionQuotasGetResponse quotaResponse = await batchManagementClient.Location.GetQuotasAsync(region);
-Console.WriteLine("Account quota for {0} region: {1}", region, quotaResponse.AccountQuota);
+BatchLocationQuota batchLocationQuota = subscriptionResource.GetBatchQuotas(AzureLocation.EastUS);
+Console.WriteLine("Account quota for {0} region: {1}", region, batchLocationQuota.AccountQuota);
 
 // Determine how many accounts can be created in the target region
 Console.WriteLine("Accounts in {0}: {1}", region, accountsInRegion);
-Console.WriteLine("You can create {0} accounts in the {1} region.", quotaResponse.AccountQuota - accountsInRegion, region);
+Console.WriteLine("You can create {0} accounts in the {1} region.", batchLocationQuota.AccountQuota - accountsInRegion, region);
 ```
 
 In the snippet above, `creds` is an instance of **TokenCredentials**. To see an example of creating this object, see the [AccountManagement](https://github.com/Azure-Samples/azure-batch-samples/tree/master/CSharp/AccountManagement) code sample on GitHub.
@@ -107,15 +123,22 @@ In the snippet above, `creds` is an instance of **TokenCredentials**. To see an
 Before increasing compute resources in your Batch solution, you can check to ensure the resources you want to allocate won't exceed the account's quotas. In the code snippet below, we print the quota information for the Batch account named `mybatchaccount`. In your own application, you could use such information to determine whether the account can handle the additional resources to be created.
 
 ```csharp
-// First obtain the Batch account
-BatchAccountGetResponse getResponse =
-    await batchManagementClient.Account.GetAsync("MyResourceGroup", "mybatchaccount");
-AccountResource account = getResponse.Resource;
+string subscriptionId = "Your SubscriptionID";
+string resourceGroupName = "Your ResourceGroup name";
+
+var credential = new DefaultAzureCredential();
+ArmClient _armClient = new ArmClient(credential);
+
+ResourceIdentifier resourceGroupResourceId = ResourceGroupResource.CreateResourceIdentifier(subscriptionId, resourceGroupName);
+ResourceGroupResource resourceGroupResource = _armClient.GetResourceGroupResource(resourceGroupResourceId);
+
+// Get an existing batch account
+BatchAccountResource batchAccount = resourceGroupResource.GetBatchAccount("Your BatchAccount name");
 
 // Now print the compute resource quotas for the account
-Console.WriteLine("Core quota: {0}", account.Properties.CoreQuota);
-Console.WriteLine("Pool quota: {0}", account.Properties.PoolQuota);
-Console.WriteLine("Active job and job schedule quota: {0}", account.Properties.ActiveJobAndJobScheduleQuota);
+Console.WriteLine("Core quota: {0}", batchAccount.Data.DedicatedCoreQuota);
+Console.WriteLine("Pool quota: {0}", batchAccount.Data.PoolQuota);
+Console.WriteLine("Active job and job schedule quota: {0}", batchAccount.Data.ActiveJobAndJobScheduleQuota);
 ```
 
 > [!IMPORTANT]
@@ -152,4 +175,4 @@ To run the sample application successfully, you must first register it with your
 ## Next steps
 
 - Learn about the [Batch service workflow and primary resources](batch-service-workflow-features.md) such as pools, nodes, jobs, and tasks.
-- Learn the basics of developing a Batch-enabled application using the [Batch .NET client library](quick-run-dotnet.md) or [Python](quick-run-python.md). These quickstarts guide you through a sample application that uses the Batch service to execute a workload on multiple compute nodes, using Azure Storage for workload file staging and retrieval.git pus
+- Learn the basics of developing a Batch-enabled application using the [Batch .NET client library](quick-run-dotnet.md) or [Python](quick-run-python.md). These quickstarts guide you through a sample application that uses the Batch service to execute a workload on multiple compute nodes, using Azure Storage for workload file staging and retrieval.
diff --git a/articles/batch/create-pool-availability-zones.md b/articles/batch/create-pool-availability-zones.md
@@ -2,7 +2,7 @@
 title: Create a pool across availability zones
 description: Learn how to create a Batch pool with zonal policy to help protect against failures.
 ms.topic: how-to
-ms.date: 05/25/2023
+ms.date: 08/12/2024
 ms.devlang: csharp
 ms.custom:
 ---
@@ -33,10 +33,47 @@ The following examples show how to create a Batch pool across Availability Zones
 ### Batch Management Client .NET SDK
 
 ```csharp
-pool.DeploymentConfiguration.VirtualMachineConfiguration.NodePlacementConfiguration = new NodePlacementConfiguration()
+var credential = new DefaultAzureCredential();
+ArmClient _armClient = new ArmClient(credential);
+
+var batchAccountIdentifier = ResourceIdentifier.Parse("your-batch-account-resource-id");
+
+BatchAccountResource batchAccount = _armClient.GetBatchAccountResource(batchAccountIdentifier);
+
+var poolName = "pool2";
+var imageReference = new BatchImageReference()
+{
+    Publisher = "canonical",
+    Offer = "0001-com-ubuntu-server-jammy",
+    Sku = "22_04-lts",
+    Version = "latest"
+};
+string nodeAgentSku = "batch.node.ubuntu 22.04";
+
+var batchAccountPoolData = new BatchAccountPoolData()
+{
+    VmSize = "Standard_DS1_v2",
+    DeploymentConfiguration = new BatchDeploymentConfiguration()
     {
-        Policy = NodePlacementPolicyType.Zonal
-    };
+        VmConfiguration = new BatchVmConfiguration(imageReference, nodeAgentSku)
+        {
+            NodePlacementPolicy = BatchNodePlacementPolicyType.Zonal,
+        },
+    },
+    ScaleSettings = new BatchAccountPoolScaleSettings()
+    {
+        FixedScale = new BatchAccountFixedScaleSettings()
+        {
+            TargetDedicatedNodes = 5,
+            ResizeTimeout = TimeSpan.FromMinutes(15),
+        }
+    },
+    
+};
+
+ArmOperation<BatchAccountPoolResource> armOperation = batchAccount.GetBatchAccountPools().CreateOrUpdate(
+    WaitUntil.Completed, poolName, batchAccountPoolData);
+BatchAccountPoolResource pool = armOperation.Value;
 
 ```
 
diff --git a/articles/batch/managed-identity-pools.md b/articles/batch/managed-identity-pools.md
