diff --git a/src/HDInsight/HDInsight.Management.Sdk/Generated/HDInsightManagementClient.cs b/src/HDInsight/HDInsight.Management.Sdk/Generated/HDInsightManagementClient.cs
index 4736e2143dff..eba8b3e5817b 100644
--- a/src/HDInsight/HDInsight.Management.Sdk/Generated/HDInsightManagementClient.cs
+++ b/src/HDInsight/HDInsight.Management.Sdk/Generated/HDInsightManagementClient.cs
@@ -310,6 +310,9 @@ public HDInsightManagementClient(System.Uri baseUri, Microsoft.Rest.ServiceClien
///
/// Optional. The http client handler used to handle http transport.
///
+ ///
+ /// Optional. The delegating handlers to add to the http client pipeline.
+ ///
///
/// Thrown when a required parameter is null
///
@@ -353,7 +356,7 @@ private void Initialize()
this.ScriptExecutionHistory = new ScriptExecutionHistoryOperations(this);
this.VirtualMachines = new VirtualMachinesOperations(this);
this.BaseUri = new System.Uri("https://management.azure.com");
- this.ApiVersion = "2024-08-01-preview";
+ this.ApiVersion = "2025-01-15-preview";
this.AcceptLanguage = "en-US";
this.LongRunningOperationRetryTimeout = 30;
this.GenerateClientRequestId = true;
diff --git a/src/HDInsight/HDInsight.Management.Sdk/Generated/Models/EntraUserInfo.cs b/src/HDInsight/HDInsight.Management.Sdk/Generated/Models/EntraUserInfo.cs
new file mode 100644
index 000000000000..e1f71dd5b106
--- /dev/null
+++ b/src/HDInsight/HDInsight.Management.Sdk/Generated/Models/EntraUserInfo.cs
@@ -0,0 +1,72 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+// Changes may cause incorrect behavior and will be lost if the code is regenerated.
+
+namespace Microsoft.Azure.Management.HDInsight.Models
+{
+ using System.Linq;
+
+ ///
+ /// Details of an Entra user for gateway access.
+ ///
+ public partial class EntraUserInfo
+ {
+ ///
+ /// Initializes a new instance of the EntraUserInfo class.
+ ///
+ public EntraUserInfo()
+ {
+ CustomInit();
+ }
+
+ ///
+ /// Initializes a new instance of the EntraUserInfo class.
+ ///
+
+ /// The unique object ID of the Entra user or client ID of the enterprise
+ /// applications.
+ ///
+
+ /// The display name of the Entra user.
+ ///
+
+ /// The User Principal Name (UPN) of the Entra user. It may be empty in certain
+ /// cases, such as for enterprise applications.
+ ///
+ public EntraUserInfo(string objectId = default(string), string displayName = default(string), string upn = default(string))
+
+ {
+ this.ObjectId = objectId;
+ this.DisplayName = displayName;
+ this.Upn = upn;
+ CustomInit();
+ }
+
+ ///
+ /// An initialization method that performs custom operations like setting defaults
+ ///
+ partial void CustomInit();
+
+
+ ///
+ /// Gets or sets the unique object ID of the Entra user or client ID of the
+ /// enterprise applications.
+ ///
+ [Newtonsoft.Json.JsonProperty(PropertyName = "objectId")]
+ public string ObjectId {get; set; }
+
+ ///
+ /// Gets or sets the display name of the Entra user.
+ ///
+ [Newtonsoft.Json.JsonProperty(PropertyName = "displayName")]
+ public string DisplayName {get; set; }
+
+ ///
+ /// Gets or sets the User Principal Name (UPN) of the Entra user. It may be
+ /// empty in certain cases, such as for enterprise applications.
+ ///
+ [Newtonsoft.Json.JsonProperty(PropertyName = "upn")]
+ public string Upn {get; set; }
+ }
+}
\ No newline at end of file
diff --git a/src/HDInsight/HDInsight.Management.Sdk/Generated/Models/GatewaySettings.cs b/src/HDInsight/HDInsight.Management.Sdk/Generated/Models/GatewaySettings.cs
index 1fa6b2ad171f..aed968df6d3d 100644
--- a/src/HDInsight/HDInsight.Management.Sdk/Generated/Models/GatewaySettings.cs
+++ b/src/HDInsight/HDInsight.Management.Sdk/Generated/Models/GatewaySettings.cs
@@ -33,12 +33,16 @@ public GatewaySettings()
/// The gateway settings user password.
///
- public GatewaySettings(string isCredentialEnabled = default(string), string userName = default(string), string password = default(string))
+
+ /// List of Entra users for gateway access.
+ ///
+ public GatewaySettings(string isCredentialEnabled = default(string), string userName = default(string), string password = default(string), System.Collections.Generic.IList restAuthEntraUsers = default(System.Collections.Generic.IList))
{
this.IsCredentialEnabled = isCredentialEnabled;
this.UserName = userName;
this.Password = password;
+ this.RestAuthEntraUsers = restAuthEntraUsers;
CustomInit();
}
@@ -66,5 +70,11 @@ public GatewaySettings()
///
[Newtonsoft.Json.JsonProperty(PropertyName = "restAuthCredential.password")]
public string Password {get; private set; }
+
+ ///
+ /// Gets or sets list of Entra users for gateway access.
+ ///
+ [Newtonsoft.Json.JsonProperty(PropertyName = "restAuthEntraUsers")]
+ public System.Collections.Generic.IList RestAuthEntraUsers {get; set; }
}
}
\ No newline at end of file
diff --git a/src/HDInsight/HDInsight.Management.Sdk/Generated/Models/UpdateGatewaySettingsParameters.cs b/src/HDInsight/HDInsight.Management.Sdk/Generated/Models/UpdateGatewaySettingsParameters.cs
index e79589c55a4f..30df5df236a1 100644
--- a/src/HDInsight/HDInsight.Management.Sdk/Generated/Models/UpdateGatewaySettingsParameters.cs
+++ b/src/HDInsight/HDInsight.Management.Sdk/Generated/Models/UpdateGatewaySettingsParameters.cs
@@ -8,7 +8,8 @@ namespace Microsoft.Azure.Management.HDInsight.Models
using System.Linq;
///
- /// The update gateway settings request parameters.
+ /// The update gateway settings request parameters. Note either basic or entra
+ /// user should be provided at a time.
///
public partial class UpdateGatewaySettingsParameters
{
@@ -33,12 +34,16 @@ public UpdateGatewaySettingsParameters()
/// The gateway settings user password.
///
- public UpdateGatewaySettingsParameters(bool? isCredentialEnabled = default(bool?), string userName = default(string), string password = default(string))
+
+ /// List of Entra users for gateway access.
+ ///
+ public UpdateGatewaySettingsParameters(bool? isCredentialEnabled = default(bool?), string userName = default(string), string password = default(string), System.Collections.Generic.IList restAuthEntraUsers = default(System.Collections.Generic.IList))
{
this.IsCredentialEnabled = isCredentialEnabled;
this.UserName = userName;
this.Password = password;
+ this.RestAuthEntraUsers = restAuthEntraUsers;
CustomInit();
}
@@ -66,5 +71,11 @@ public UpdateGatewaySettingsParameters()
///
[Newtonsoft.Json.JsonProperty(PropertyName = "restAuthCredential.password")]
public string Password {get; set; }
+
+ ///
+ /// Gets or sets list of Entra users for gateway access.
+ ///
+ [Newtonsoft.Json.JsonProperty(PropertyName = "restAuthEntraUsers")]
+ public System.Collections.Generic.IList RestAuthEntraUsers {get; set; }
}
}
\ No newline at end of file
diff --git a/src/HDInsight/HDInsight.Management.Sdk/README.md b/src/HDInsight/HDInsight.Management.Sdk/README.md
index d5947c42b371..d1926bf4e5d1 100644
--- a/src/HDInsight/HDInsight.Management.Sdk/README.md
+++ b/src/HDInsight/HDInsight.Management.Sdk/README.md
@@ -29,18 +29,18 @@ skip-csproj: true
###
``` yaml
-commit: 339220060c53b1f6c04cdfa10dc577a9a961572f
+commit: 881a35f96dbb1f7cf7c83dd00ed29a628804464d
input-file:
- - https://github.com/Azure/azure-rest-api-specs/blob/$(commit)/specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/applications.json
- - https://github.com/Azure/azure-rest-api-specs/blob/$(commit)/specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/cluster.json
- - https://github.com/Azure/azure-rest-api-specs/blob/$(commit)/specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/configurations.json
- - https://github.com/Azure/azure-rest-api-specs/blob/$(commit)/specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/extensions.json
- - https://github.com/Azure/azure-rest-api-specs/blob/$(commit)/specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/locations.json
- - https://github.com/Azure/azure-rest-api-specs/blob/$(commit)/specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/operations.json
- - https://github.com/Azure/azure-rest-api-specs/blob/$(commit)/specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/privateEndpointConnections.json
- - https://github.com/Azure/azure-rest-api-specs/blob/$(commit)/specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/privateLinkResources.json
- - https://github.com/Azure/azure-rest-api-specs/blob/$(commit)/specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/scriptActions.json
- - https://github.com/Azure/azure-rest-api-specs/blob/$(commit)/specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/virtualMachines.json
+ - https://github.com/Azure/azure-rest-api-specs/blob/$(commit)/specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/applications.json
+ - https://github.com/Azure/azure-rest-api-specs/blob/$(commit)/specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/cluster.json
+ - https://github.com/Azure/azure-rest-api-specs/blob/$(commit)/specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/configurations.json
+ - https://github.com/Azure/azure-rest-api-specs/blob/$(commit)/specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/extensions.json
+ - https://github.com/Azure/azure-rest-api-specs/blob/$(commit)/specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/locations.json
+ - https://github.com/Azure/azure-rest-api-specs/blob/$(commit)/specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/operations.json
+ - https://github.com/Azure/azure-rest-api-specs/blob/$(commit)/specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/privateEndpointConnections.json
+ - https://github.com/Azure/azure-rest-api-specs/blob/$(commit)/specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/privateLinkResources.json
+ - https://github.com/Azure/azure-rest-api-specs/blob/$(commit)/specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/scriptActions.json
+ - https://github.com/Azure/azure-rest-api-specs/blob/$(commit)/specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/virtualMachines.json
output-folder: Generated
diff --git a/src/HDInsight/HDInsight.Test/ScenarioTests/Common.ps1 b/src/HDInsight/HDInsight.Test/ScenarioTests/Common.ps1
index aa9819be8486..f504315929a2 100644
--- a/src/HDInsight/HDInsight.Test/ScenarioTests/Common.ps1
+++ b/src/HDInsight/HDInsight.Test/ScenarioTests/Common.ps1
@@ -82,12 +82,13 @@ class ClusterCommonCreateParameter{
[string] $minSupportedTlsVersion
[string] $virtualNetworkId
[string] $subnet
+ [string] $version
ClusterCommonCreateParameter([string] $clusterName, [string] $location, [string] $resourceGroupName,
[string] $storageAccountResourceId, [string] $clusterType, [int] $clusterSizeInNodes,
[string] $storageAccountKey, [System.Management.Automation.PSCredential] $httpCredential,
[System.Management.Automation.PSCredential] $sshCredential, [string] $minSupportedTlsVersion,
- [string] $virtualNetworkId,[string] $subnet){
+ [string] $virtualNetworkId,[string] $subnet,[string] $version){
$this.clusterName=$clusterName
$this.location=$location
$this.resourceGroupName=$resourceGroupName
@@ -100,6 +101,7 @@ class ClusterCommonCreateParameter{
$this.minSupportedTlsVersion=$minSupportedTlsVersion
$this.virtualNetworkId=$virtualNetworkId
$this.subnet=$subnet
+ $this.version=$version
}
}
@@ -110,12 +112,13 @@ class ClusterCommonCreateParameter{
function Prepare-ClusterCreateParameter{
param(
[string] $clusterName="ps",
- [string] $location="eastus",
+ [string] $location="East Asia",
[string] $resourceGroupName="group-ps-test",
[string] $storageAccountName="storagepstest",
- [string] $clusterType="Spark",
- [string] $virtualNetworkId="/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/yuchen-ps-test/providers/Microsoft.Network/virtualNetworks/hdi-vn-0",
- [string] $subnet="default"
+ [string] $clusterType="Hadoop",
+ [string] $virtualNetworkId="/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/group-ps-test/providers/Microsoft.Network/virtualNetworks/hdi-vn-0",
+ [string] $subnet="default",
+ [string] $version="5.1"
)
$clusterName=Generate-Name($clusterName)
@@ -132,7 +135,7 @@ function Prepare-ClusterCreateParameter{
$storageAccountKey=$storageAccountKey[0].Value
$httpUser="admin"
- $textPassword= "YourPw!00953"
+ $textPassword= "Password"
$httpPassword=ConvertTo-SecureString $textPassword -AsPlainText -Force
$sshUser="sshuser"
$sshPassword=$httpPassword
@@ -143,7 +146,7 @@ function Prepare-ClusterCreateParameter{
$minSupportedTlsVersion="1.2"
return [ClusterCommonCreateParameter]::new($clusterName, $location, $resourceGroupName, $storageAccountResourceId,
$clusterType, $clusterSizeInNodes, $storageAccountKey, $httpCredential,
- $sshCredential, $minSupportedTlsVersion, $virtualNetworkId, $subnet)
+ $sshCredential, $minSupportedTlsVersion, $virtualNetworkId, $subnet,$version)
}
<#
diff --git a/src/HDInsight/HDInsight.Test/ScenarioTests/HDInsightAutoscaleTests.ps1 b/src/HDInsight/HDInsight.Test/ScenarioTests/HDInsightAutoscaleTests.ps1
index ab6a1a26887d..f5e533db0763 100644
--- a/src/HDInsight/HDInsight.Test/ScenarioTests/HDInsightAutoscaleTests.ps1
+++ b/src/HDInsight/HDInsight.Test/ScenarioTests/HDInsightAutoscaleTests.ps1
@@ -28,7 +28,7 @@ function Test-AutoscaleRelatedCommands{
$cluster = New-AzHDInsightCluster -Location $params.location -ResourceGroupName $params.resourceGroupName `
-ClusterName $params.clusterName -ClusterSizeInNodes $params.clusterSizeInNodes -ClusterType $params.clusterType `
-StorageAccountResourceId $params.storageAccountResourceId -StorageAccountKey $params.storageAccountKey `
- -HttpCredential $params.httpCredential -SshCredential $params.sshCredential `
+ -HttpCredential $params.httpCredential -SshCredential $params.sshCredential -Version $params.version `
-MinSupportedTlsVersion $params.minSupportedTlsVersion -VirtualNetworkId $params.virtualNetworkId -SubnetName "default"
Assert-NotNull $cluster
diff --git a/src/HDInsight/HDInsight.Test/ScenarioTests/HDInsightAzureMonitorTests.ps1 b/src/HDInsight/HDInsight.Test/ScenarioTests/HDInsightAzureMonitorTests.ps1
index fcbaa27140b0..1bc9dc2712e3 100644
--- a/src/HDInsight/HDInsight.Test/ScenarioTests/HDInsightAzureMonitorTests.ps1
+++ b/src/HDInsight/HDInsight.Test/ScenarioTests/HDInsightAzureMonitorTests.ps1
@@ -29,7 +29,7 @@ function Test-AzureMonitorRelatedCommands{
$cluster = New-AzHDInsightCluster -Location $params.location -ResourceGroupName $params.resourceGroupName `
-ClusterName $params.clusterName -ClusterSizeInNodes $params.clusterSizeInNodes -ClusterType $params.clusterType `
-StorageAccountResourceId $params.storageAccountResourceId -StorageAccountKey $params.storageAccountKey `
- -HttpCredential $params.httpCredential -SshCredential $params.sshCredential -Version 5.1 `
+ -HttpCredential $params.httpCredential -SshCredential $params.sshCredential -Version $params.version `
-MinSupportedTlsVersion $params.minSupportedTlsVersion -VirtualNetworkId $params.virtualNetworkId -SubnetName "default"
Assert-NotNull $cluster
@@ -78,12 +78,12 @@ function Test-AzureMonitorAgentRelatedCommands{
# Create some resources that will be used throughout test
try
{
- $location = "East US"
+ # $location = "East Asia"
# prepare parameter for creating parameter
# $params= Prepare-ClusterCreateParameter -location $location
# create cluster that will be used throughout test
- $cluster = Get-AzHDInsightCluster -ResourceGroupName yuchen-ps-test -ClusterName spark51
+ $cluster = Get-AzHDInsightCluster -ResourceGroupName "group-ps-test" -ClusterName "ps-test-cluster"
Assert-NotNull $cluster
$workspaceName = "ps-la"
@@ -102,7 +102,7 @@ function Test-AzureMonitorAgentRelatedCommands{
Assert-NotNull $workspaceId
Assert-NotNull $primaryKey
- Enable-AzHDInsightAzureMonitorAgent -ClusterName $cluster.Name -ResourceGroup $cluster.ResourceGroup -WorkspaceId $workspaceId -Primary $primaryKey
+ Enable-AzHDInsightAzureMonitorAgent -ClusterName $cluster.Name -ResourceGroup $cluster.ResourceGroup -WorkspaceId $workspaceId -PrimaryKey $primaryKey
$result = Get-AzHDInsightAzureMonitorAgent -ClusterName $cluster.Name -ResourceGroupName $cluster.ResourceGroup
Assert-True {$result.ClusterMonitoringEnabled}
diff --git a/src/HDInsight/HDInsight.Test/ScenarioTests/HDInsightClusterTests.cs b/src/HDInsight/HDInsight.Test/ScenarioTests/HDInsightClusterTests.cs
index c08557dbb43e..5db33ee45b88 100644
--- a/src/HDInsight/HDInsight.Test/ScenarioTests/HDInsightClusterTests.cs
+++ b/src/HDInsight/HDInsight.Test/ScenarioTests/HDInsightClusterTests.cs
@@ -25,6 +25,20 @@ public HDInsightClusterTests(ITestOutputHelper output) : base(output)
{
}
+ [Fact]
+ [Trait(Category.AcceptanceType, Category.CheckIn)]
+ public void TestCreateClusterWithWasbAndMSI()
+ {
+ TestRunner.RunTestScript("Test-CreateClusterWithWasbAndMSI");
+ }
+
+ [Fact]
+ [Trait(Category.AcceptanceType, Category.CheckIn)]
+ public void TestCreateEntraCluster()
+ {
+ TestRunner.RunTestScript("Test-CreateEntraCluster");
+ }
+
[Fact]
[Trait(Category.AcceptanceType, Category.CheckIn)]
public void TestClusterRelatedCommands()
diff --git a/src/HDInsight/HDInsight.Test/ScenarioTests/HDInsightClusterTests.ps1 b/src/HDInsight/HDInsight.Test/ScenarioTests/HDInsightClusterTests.ps1
index c365bdd85c78..0c99608ca0b4 100644
--- a/src/HDInsight/HDInsight.Test/ScenarioTests/HDInsightClusterTests.ps1
+++ b/src/HDInsight/HDInsight.Test/ScenarioTests/HDInsightClusterTests.ps1
@@ -12,6 +12,79 @@
# limitations under the License.
# ----------------------------------------------------------------------------------
+<#
+.SYNOPSIS
+Test Create Azure HDInsight Cluster With WASB Storage And MSI
+#>
+
+function Test-CreateClusterWithWasbAndMSI{
+ try{
+ # prepare parameter for creating parameter
+ $params= Prepare-ClusterCreateParameter
+ $clusterParams = @{
+ ClusterType = $params.clusterType
+ ClusterSizeInNodes = $params.clusterSizeInNodes
+ ResourceGroupName = $params.resourceGroupName
+ ClusterName = $params.clusterName
+ HttpCredential = $params.httpCredential
+ SshCredential = $params.sshCredential
+ Location = $params.location
+ MinSupportedTlsVersion = $params.minSupportedTlsVersion
+ VirtualNetworkId = $params.virtualNetworkId
+ SubnetName = $params.subnet
+ Version = $params.version
+ StorageAccountType = "AzureStorage"
+ StorageContainer = $params.clusterName
+ StorageAccountResourceId = "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/hdi-ps-test/providers/Microsoft.Storage/storageAccounts/hdi-storage-wasb"
+ StorageAccountManagedIdentity = "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/hdi-ps-test/providers/Microsoft.ManagedIdentity/userAssignedIdentities/hdi-test-msi"
+ }
+ # test create cluster
+ $cluster = New-AzHDInsightCluster @clusterParams
+ Assert-NotNull $cluster
+ }
+ finally
+ {
+ # Delete cluster and resource group
+ Remove-AzResourceGroup -ResourceGroupName $params.resourceGroupName
+ }
+}
+
+<#
+.SYNOPSIS
+Test Create Entra HDInsight Cluster
+#>
+
+function Test-CreateEntraCluster{
+ try{
+ $params= Prepare-ClusterCreateParameter
+ $entraUserFullInfo = @(@{ObjectId = "00000000-0000-0000-0000-000000000000"; Upn = "user@microsoft.com"; DisplayName = "DisplayName" },@{ObjectId = "00000000-0000-0000-0000-000000000000"; Upn = "user@microsoft.com"; DisplayName = "DisplayName" })
+ $clusterParams = @{
+ ClusterType = $params.clusterType
+ ClusterSizeInNodes = $params.clusterSizeInNodes
+ ResourceGroupName = $params.resourceGroupName
+ ClusterName = $params.clusterName
+ SshCredential = $params.sshCredential
+ Location = $params.location
+ MinSupportedTlsVersion = $params.minSupportedTlsVersion
+ VirtualNetworkId = $params.virtualNetworkId
+ SubnetName = $params.subnet
+ Version = $params.version
+ StorageContainer = $params.clusterName
+ StorageAccountKey = $params.storageAccountKey
+ StorageAccountResourceId = $params.storageAccountResourceId
+ EntraUserFullInfo = $entraUserFullInfo
+ }
+ $resultCluster = New-AzHDInsightCluster @clusterParams
+ Set-AzHDInsightGatewayCredential -ResourceGroupName $params.resourceGroupName -ClusterName $params.clusterName -EntraUserFullInfo $entraUserFullInfo
+ Assert-NotNull $resultCluster
+ }
+ finally
+ {
+ # Delete cluster and resource group
+ Remove-AzResourceGroup -ResourceGroupName $params.resourceGroupName
+ }
+}
+
<