Skip to content

[HDInsight] Support customers specify min TLS version when creating cluster #11344

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 1 commit into from
Mar 20, 2020
Merged

[HDInsight] Support customers specify min TLS version when creating cluster #11344

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion src/HDInsight/HDInsight.Test/HDInsight.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Azure.Management.HDInsight" Version="5.1.0" />
<PackageReference Include="Microsoft.Azure.Management.HDInsight" Version="5.3.0" />
<PackageReference Include="Microsoft.Azure.Management.HDInsight.Job" Version="2.0.7" />
<PackageReference Include="Microsoft.Azure.Management.OperationalInsights" Version="0.19.0-preview" />
</ItemGroup>
Expand All @@ -20,4 +20,8 @@
<ProjectReference Include="..\HDInsight\HDInsight.csproj" />
</ItemGroup>

<ItemGroup>
<Folder Include="SessionRecords\Commands.HDInsight.Test.ScenarioTests.HDInsightClusterTests\" />
</ItemGroup>

</Project>
5 changes: 3 additions & 2 deletions src/HDInsight/HDInsight.Test/ScenarioTests/Common.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ function Create-Cluster{
[string] $location="West US",
[string] $resourceGroupName="group-ps-test",
[string] $clusterType="Spark",
[string] $storageAccountName="storagepstest"
[string] $storageAccountName="storagepstest",
[string] $minSupportedTlsVersion="1.2"
)

$clusterName=Generate-Name($clusterName)
Expand All @@ -65,7 +66,7 @@ function Create-Cluster{

$cluster=New-AzHDInsightCluster -Location $location -ResourceGroupName $resourceGroup.ResourceGroupName -ClusterName $clusterName `
-ClusterSizeInNodes $clusterSizeInNodes -ClusterType $clusterType -DefaultStorageAccountName $storageAccountName `
-DefaultStorageAccountKey $storageAccountKey -HttpCredential $httpCredential -SshCredential $sshCredential
-DefaultStorageAccountKey $storageAccountKey -HttpCredential $httpCredential -SshCredential $sshCredential -MinSupportedTlsVersion $minSupportedTlsVersion

return $cluster
}
Expand Down
1,974 changes: 911 additions & 1,063 deletions ...mmands.HDInsight.Test.ScenarioTests.HDInsightClusterTests/TestClusterRelatedCommands.json
View file
Open in desktop

Large diffs are not rendered by default.

20 changes: 10 additions & 10 deletions src/HDInsight/HDInsight.Test/UnitTests/NewClusterTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ public void CanCreateNewHDInsightCluster()
parameters.Location == Location &&
parameters.UserName == _httpCred.UserName &&
parameters.Password == _httpCred.Password.ConvertToString() &&
parameters.ClusterType == ClusterType)))
parameters.ClusterType == ClusterType), It.IsAny<string>()))
.Returns(cluster)
.Verifiable();

Expand Down Expand Up @@ -317,7 +317,7 @@ private void CreateNewHDInsightCluster(
parameters.SshUserName == _sshCred.UserName &&
parameters.SshPassword == _sshCred.Password.ConvertToString() &&
((!setEdgeNodeVmSize && parameters.EdgeNodeSize == null) || (setEdgeNodeVmSize && parameters.EdgeNodeSize == "edgeNodeVmSizeSetTest")) &&
(workerNodeDataDisks == 0) || (workerNodeDataDisks > 0 && parameters.WorkerNodeDataDisksGroups.First().DisksPerNode == workerNodeDataDisks))))
(workerNodeDataDisks == 0) || (workerNodeDataDisks > 0 && parameters.WorkerNodeDataDisksGroups.First().DisksPerNode == workerNodeDataDisks)), It.IsAny<string>()))
.Returns(cluster)
.Verifiable();

Expand Down Expand Up @@ -416,7 +416,7 @@ public void CanCreateNewHDInsightCluster_LinuxComponentVersion()
parameters.ClusterType == sparkClusterType &&
parameters.SshUserName == _sshCred.UserName &&
parameters.SshPassword == _sshCred.Password.ConvertToString() &&
parameters.ComponentVersion["Spark"] == componentVersion["Spark"])))
parameters.ComponentVersion["Spark"] == componentVersion["Spark"]), It.IsAny<string>()))
.Returns(cluster)
.Verifiable();
hdinsightManagementMock.Setup(
Expand All @@ -431,7 +431,7 @@ public void CanCreateNewHDInsightCluster_LinuxComponentVersion()
parameters.Password == _httpCred.Password.ConvertToString() &&
parameters.ClusterType == ClusterType &&
parameters.SshUserName == _sshCred.UserName &&
parameters.SshPassword == _sshCred.Password.ConvertToString())))
parameters.SshPassword == _sshCred.Password.ConvertToString()), It.IsAny<string>()))
.Returns(cluster)
.Verifiable();

Expand Down Expand Up @@ -474,7 +474,7 @@ public void TestStorageAccountTypeDefaultsToAzureStorage()
cmdlet.DefaultStorageAccountKey = StorageKey;
cmdlet.ClusterType = ClusterType;

hdinsightManagementMock.Setup(c => c.CreateNewCluster(ResourceGroupName, ClusterName, OSType.Linux, It.IsAny<ClusterCreateParameters>()));
hdinsightManagementMock.Setup(c => c.CreateNewCluster(ResourceGroupName, ClusterName, OSType.Linux, It.IsAny<ClusterCreateParameters>(), It.IsAny<string>()));

cmdlet.ExecuteCmdlet();

Expand All @@ -487,7 +487,7 @@ public void TestStorageAccountTypeDefaultsToAzureStorage()
parameters.Location == Location &&
parameters.UserName == _httpCred.UserName &&
parameters.Password == _httpCred.Password.ConvertToString() &&
parameters.ClusterType == ClusterType)),
parameters.ClusterType == ClusterType), It.IsAny<string>()),
Times.Once);
}

Expand All @@ -505,7 +505,7 @@ public void TestStorageAccountTypeAzureStorage()
cmdlet.ClusterType = ClusterType;
cmdlet.DefaultStorageAccountType = StorageType.AzureStorage;

hdinsightManagementMock.Setup(c => c.CreateNewCluster(ResourceGroupName, ClusterName, OSType.Linux, It.IsAny<ClusterCreateParameters>()));
hdinsightManagementMock.Setup(c => c.CreateNewCluster(ResourceGroupName, ClusterName, OSType.Linux, It.IsAny<ClusterCreateParameters>(), It.IsAny<string>()));

cmdlet.ExecuteCmdlet();

Expand All @@ -518,7 +518,7 @@ public void TestStorageAccountTypeAzureStorage()
parameters.Location == Location &&
parameters.UserName == _httpCred.UserName &&
parameters.Password == _httpCred.Password.ConvertToString() &&
parameters.ClusterType == ClusterType)),
parameters.ClusterType == ClusterType), It.IsAny<string>()),
Times.Once);
}

Expand All @@ -537,7 +537,7 @@ public void TestStorageAccountTypeAzureDataLakeStore()
cmdlet.ClusterType = ClusterType;
cmdlet.DefaultStorageAccountType = StorageType.AzureDataLakeStore;

hdinsightManagementMock.Setup(c => c.CreateNewCluster(ResourceGroupName, ClusterName, OSType.Linux, It.IsAny<ClusterCreateParameters>()));
hdinsightManagementMock.Setup(c => c.CreateNewCluster(ResourceGroupName, ClusterName, OSType.Linux, It.IsAny<ClusterCreateParameters>(), It.IsAny<string>()));

cmdlet.ExecuteCmdlet();

Expand All @@ -550,7 +550,7 @@ public void TestStorageAccountTypeAzureDataLakeStore()
parameters.Location == Location &&
parameters.UserName == _httpCred.UserName &&
parameters.Password == _httpCred.Password.ConvertToString() &&
parameters.ClusterType == ClusterType)),
parameters.ClusterType == ClusterType), It.IsAny<string>()),
Times.Once);
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/HDInsight/HDInsight.Test/UnitTests/PremiumClusterTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ public void CanCreateNewPremiumHDInsightCluster()
parameters.SshUserName == _httpCred.UserName &&
parameters.SshPassword == _httpCred.Password.ConvertToString() &&
parameters.ClusterType == ClusterType &&
parameters.ClusterTier == Tier.Premium)))
parameters.ClusterTier == Tier.Premium), It.IsAny<string>()))
.Returns(cluster)
.Verifiable();

Expand Down
1 change: 1 addition & 0 deletions src/HDInsight/HDInsight/ChangeLog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
- Additional information about change #1
-->
## Upcoming Release
Supported specifying minimal supported TLS version when creating cluster.

## Version 3.0.3
* Fix document error of New-AzHDInsightCluster.
Expand Down
2 changes: 1 addition & 1 deletion src/HDInsight/HDInsight/HDInsight.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Azure.Management.HDInsight" Version="5.1.0" />
<PackageReference Include="Microsoft.Azure.Management.HDInsight" Version="5.3.0" />
<PackageReference Include="Microsoft.Azure.Management.HDInsight.Job" Version="2.0.7" />
<PackageReference Include="WindowsAzure.Storage" Version="9.3.0" />
</ItemGroup>
Expand Down
9 changes: 7 additions & 2 deletions src/HDInsight/HDInsight/ManagementCommands/NewAzureHDInsightClusterCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,8 @@ public AzureHDInsightConfig Config
CertificateFilePath = CertificateFilePath,
CertificatePassword = CertificatePassword,
SecurityProfile = SecurityProfile,
DisksPerWorkerNode = DisksPerWorkerNode
DisksPerWorkerNode = DisksPerWorkerNode,
MinSupportedTlsVersion = MinSupportedTlsVersion
};
foreach (
var storageAccount in
Expand Down Expand Up @@ -190,6 +191,7 @@ var storageAccount in
CertificatePassword = value.CertificatePassword;
SecurityProfile = value.SecurityProfile;
DisksPerWorkerNode = value.DisksPerWorkerNode;
MinSupportedTlsVersion = value.MinSupportedTlsVersion;

foreach (
var storageAccount in
Expand Down Expand Up @@ -353,6 +355,9 @@ public DateTime RdpAccessExpiry
[Parameter(HelpMessage = "Gets or sets the number of disks for worker node role in the cluster.")]
public int DisksPerWorkerNode { get; set; }

[Parameter(HelpMessage = "Gets or sets the minimal supported TLS version.")]
public string MinSupportedTlsVersion { get; set; }

#endregion


Expand Down Expand Up @@ -473,7 +478,7 @@ var storageAccount in
};
}

var cluster = HDInsightManagementClient.CreateNewCluster(ResourceGroupName, ClusterName, OSType, parameters);
var cluster = HDInsightManagementClient.CreateNewCluster(ResourceGroupName, ClusterName, OSType, parameters, MinSupportedTlsVersion);

if (cluster != null)
{
Expand Down
7 changes: 7 additions & 0 deletions src/HDInsight/HDInsight/ManagementCommands/NewAzureHDInsightClusterConfigCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,13 @@ public Guid AadTenantId
set { _config.AADTenantId = value; }
}

[Parameter(HelpMessage = "Gets or sets the minimal supported TLS version.")]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The help doc for this cmdlet needs to be regenerated

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The help doc for this cmdlet needs to be regenerated

Updated

public string MinSupportedTlsVersion
{
get { return _config.MinSupportedTlsVersion; }
set { _config.MinSupportedTlsVersion = value; }
}

#endregion

public NewAzureHDInsightClusterConfigCommand()
Expand Down
7 changes: 7 additions & 0 deletions src/HDInsight/HDInsight/Models/Management/AzureHDInsightCluster.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,8 @@ public AzureHDInsightCluster(Cluster cluster)
LdapsUrls = clusterSecurityProfile.LdapsUrls != null ? clusterSecurityProfile.LdapsUrls.ToArray() : null,
ClusterUsersGroupDNs = clusterSecurityProfile.ClusterUsersGroupDNs != null ? clusterSecurityProfile.ClusterUsersGroupDNs.ToArray() : null,
} : null;

MinSupportedTlsVersion = cluster.Properties.MinSupportedTlsVersion;
}

public AzureHDInsightCluster(Cluster cluster, IDictionary<string, string> clusterConfiguration, IDictionary<string, string> clusterIdentity)
Expand Down Expand Up @@ -201,5 +203,10 @@ public AzureHDInsightCluster(Cluster cluster, IDictionary<string, string> cluste
/// The security profile.
/// </value>
public AzureHDInsightSecurityProfile SecurityProfile { get; set; }

/// <summary>
/// Gets or sets the minimal supported TLS version.
/// </summary>
public string MinSupportedTlsVersion { get; set; }
}
}
5 changes: 5 additions & 0 deletions src/HDInsight/HDInsight/Models/Management/AzureHDInsightConfig.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,11 @@ public class AzureHDInsightConfig
/// </summary>
public int DisksPerWorkerNode { get; set; }

/// <summary>
/// Gets or sets the minimal supported TLS version.
/// </summary>
public string MinSupportedTlsVersion { get; set; }

public AzureHDInsightConfig()
{
ClusterType = Constants.Hadoop;
Expand Down
3 changes: 2 additions & 1 deletion src/HDInsight/HDInsight/Models/Management/AzureHdInsightManagementClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,11 @@ public AzureHdInsightManagementClient() { }

private IHDInsightManagementClient HdInsightManagementClient { get; set; }

public virtual Cluster CreateNewCluster(string resourceGroupName, string clusterName, OSType osType, ClusterCreateParameters parameters)
public virtual Cluster CreateNewCluster(string resourceGroupName, string clusterName, OSType osType, ClusterCreateParameters parameters, string minSupportedTlsVersion=default(string))
{
var createParams = CreateParametersConverter.GetExtendedClusterCreateParameters(clusterName, parameters);
createParams.Properties.OsType = osType;
createParams.Properties.MinSupportedTlsVersion = minSupportedTlsVersion;
return HdInsightManagementClient.Clusters.Create(resourceGroupName, clusterName, createParams);
}

Expand Down
Loading