Skip to content

Commit 42bbe9f

Browse files
azure-powershell-botBethanyZhou
azure-powershell-bot
and
BethanyZhou
authored
Migrate StackHCI from generation to main (#22754)
* Move StackHCI to main * Update ChangeLog.md --------- Co-authored-by: Beisi Zhou <[email protected]>
1 parent f2cb01c commit 42bbe9f

File tree

5 files changed

+48
-52
lines changed

5 files changed

+48
-52
lines changed

‎src/StackHCI/Az.StackHCI.psd1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
# Generated by: Microsoft Corporation
55
#
6-
# Generated on: 9/7/2023
6+
# Generated on: 9/8/2023
77
#
88

99
@{

‎src/StackHCI/ChangeLog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
- Additional information about change #1
1919
-->
2020
## Upcoming Release
21+
* Bug fixes for Attestation commands.
2122
* Added support for installing mandatory extensions on HCI OS 22H2 and removed confirmation prompt for consent.
2223
* Added ability to customize the location of logs generated during registration.
2324
- Custom log location can be specified by specifying an optional `-LogsDirectory` parameter in `Register-AzStackHCI`.

‎src/StackHCI/StackHCI.sln

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,19 @@ Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio Version 17
44
VisualStudioVersion = 17.0.31903.59
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Accounts", "..\Accounts\Accounts\Accounts.csproj", "{A47D237A-4ED2-4AE3-AFA0-04D9D1202F05}"
6+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Accounts", "..\Accounts\Accounts\Accounts.csproj", "{BB7C30B9-9D15-42B4-86B3-536D29CF948D}"
77
EndProject
8-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AssemblyLoading", "..\Accounts\AssemblyLoading\AssemblyLoading.csproj", "{57210B07-D0F6-4CB7-AB35-6B2313222EF2}"
8+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AssemblyLoading", "..\Accounts\AssemblyLoading\AssemblyLoading.csproj", "{24AEB287-561F-4F0B-8D13-E328BF3EB99E}"
99
EndProject
10-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Authentication", "..\Accounts\Authentication\Authentication.csproj", "{7FEA2727-EBBA-45AD-B118-EBED8C79C8E3}"
10+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Authentication", "..\Accounts\Authentication\Authentication.csproj", "{68DC74DB-925C-4C86-91CF-B32B8C981385}"
1111
EndProject
12-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Authentication.ResourceManager", "..\Accounts\Authentication.ResourceManager\Authentication.ResourceManager.csproj", "{F3EC80D9-4506-47D2-83AB-1CB16A4C293C}"
12+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Authentication.ResourceManager", "..\Accounts\Authentication.ResourceManager\Authentication.ResourceManager.csproj", "{F363B274-F65B-412A-BB6F-C9631DDFC28E}"
1313
EndProject
14-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AuthenticationAssemblyLoadContext", "..\Accounts\AuthenticationAssemblyLoadContext\AuthenticationAssemblyLoadContext.csproj", "{975317B6-87B1-4183-AAB1-41E062A3D880}"
14+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AuthenticationAssemblyLoadContext", "..\Accounts\AuthenticationAssemblyLoadContext\AuthenticationAssemblyLoadContext.csproj", "{9687E26B-9BB6-4AE9-8654-AC8A87B18A8A}"
1515
EndProject
16-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Authenticators", "..\Accounts\Authenticators\Authenticators.csproj", "{D3557F5E-E621-43B7-A8EF-90EB7A6DBB2E}"
16+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Authenticators", "..\Accounts\Authenticators\Authenticators.csproj", "{0F3C90E2-D216-4159-B560-E5C6FF875CF8}"
1717
EndProject
18-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Az.StackHCI", "Az.StackHCI.csproj", "{D0A7EDA1-FD40-4CB6-9D13-80B816890FDD}"
18+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Az.StackHCI", "Az.StackHCI.csproj", "{7875D7FA-0F39-4935-A4DB-28F310348B1E}"
1919
EndProject
2020
Global
2121
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -26,33 +26,33 @@ Global
2626
HideSolutionNode = FALSE
2727
EndGlobalSection
2828
GlobalSection(ProjectConfigurationPlatforms) = postSolution
29-
{A47D237A-4ED2-4AE3-AFA0-04D9D1202F05}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
30-
{A47D237A-4ED2-4AE3-AFA0-04D9D1202F05}.Debug|Any CPU.Build.0 = Debug|Any CPU
31-
{A47D237A-4ED2-4AE3-AFA0-04D9D1202F05}.Release|Any CPU.ActiveCfg = Release|Any CPU
32-
{A47D237A-4ED2-4AE3-AFA0-04D9D1202F05}.Release|Any CPU.Build.0 = Release|Any CPU
33-
{57210B07-D0F6-4CB7-AB35-6B2313222EF2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
34-
{57210B07-D0F6-4CB7-AB35-6B2313222EF2}.Debug|Any CPU.Build.0 = Debug|Any CPU
35-
{57210B07-D0F6-4CB7-AB35-6B2313222EF2}.Release|Any CPU.ActiveCfg = Release|Any CPU
36-
{57210B07-D0F6-4CB7-AB35-6B2313222EF2}.Release|Any CPU.Build.0 = Release|Any CPU
37-
{7FEA2727-EBBA-45AD-B118-EBED8C79C8E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
38-
{7FEA2727-EBBA-45AD-B118-EBED8C79C8E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
39-
{7FEA2727-EBBA-45AD-B118-EBED8C79C8E3}.Release|Any CPU.ActiveCfg = Release|Any CPU
40-
{7FEA2727-EBBA-45AD-B118-EBED8C79C8E3}.Release|Any CPU.Build.0 = Release|Any CPU
41-
{F3EC80D9-4506-47D2-83AB-1CB16A4C293C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
42-
{F3EC80D9-4506-47D2-83AB-1CB16A4C293C}.Debug|Any CPU.Build.0 = Debug|Any CPU
43-
{F3EC80D9-4506-47D2-83AB-1CB16A4C293C}.Release|Any CPU.ActiveCfg = Release|Any CPU
44-
{F3EC80D9-4506-47D2-83AB-1CB16A4C293C}.Release|Any CPU.Build.0 = Release|Any CPU
45-
{975317B6-87B1-4183-AAB1-41E062A3D880}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
46-
{975317B6-87B1-4183-AAB1-41E062A3D880}.Debug|Any CPU.Build.0 = Debug|Any CPU
47-
{975317B6-87B1-4183-AAB1-41E062A3D880}.Release|Any CPU.ActiveCfg = Release|Any CPU
48-
{975317B6-87B1-4183-AAB1-41E062A3D880}.Release|Any CPU.Build.0 = Release|Any CPU
49-
{D3557F5E-E621-43B7-A8EF-90EB7A6DBB2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
50-
{D3557F5E-E621-43B7-A8EF-90EB7A6DBB2E}.Debug|Any CPU.Build.0 = Debug|Any CPU
51-
{D3557F5E-E621-43B7-A8EF-90EB7A6DBB2E}.Release|Any CPU.ActiveCfg = Release|Any CPU
52-
{D3557F5E-E621-43B7-A8EF-90EB7A6DBB2E}.Release|Any CPU.Build.0 = Release|Any CPU
53-
{D0A7EDA1-FD40-4CB6-9D13-80B816890FDD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
54-
{D0A7EDA1-FD40-4CB6-9D13-80B816890FDD}.Debug|Any CPU.Build.0 = Debug|Any CPU
55-
{D0A7EDA1-FD40-4CB6-9D13-80B816890FDD}.Release|Any CPU.ActiveCfg = Release|Any CPU
56-
{D0A7EDA1-FD40-4CB6-9D13-80B816890FDD}.Release|Any CPU.Build.0 = Release|Any CPU
29+
{BB7C30B9-9D15-42B4-86B3-536D29CF948D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
30+
{BB7C30B9-9D15-42B4-86B3-536D29CF948D}.Debug|Any CPU.Build.0 = Debug|Any CPU
31+
{BB7C30B9-9D15-42B4-86B3-536D29CF948D}.Release|Any CPU.ActiveCfg = Release|Any CPU
32+
{BB7C30B9-9D15-42B4-86B3-536D29CF948D}.Release|Any CPU.Build.0 = Release|Any CPU
33+
{24AEB287-561F-4F0B-8D13-E328BF3EB99E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
34+
{24AEB287-561F-4F0B-8D13-E328BF3EB99E}.Debug|Any CPU.Build.0 = Debug|Any CPU
35+
{24AEB287-561F-4F0B-8D13-E328BF3EB99E}.Release|Any CPU.ActiveCfg = Release|Any CPU
36+
{24AEB287-561F-4F0B-8D13-E328BF3EB99E}.Release|Any CPU.Build.0 = Release|Any CPU
37+
{68DC74DB-925C-4C86-91CF-B32B8C981385}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
38+
{68DC74DB-925C-4C86-91CF-B32B8C981385}.Debug|Any CPU.Build.0 = Debug|Any CPU
39+
{68DC74DB-925C-4C86-91CF-B32B8C981385}.Release|Any CPU.ActiveCfg = Release|Any CPU
40+
{68DC74DB-925C-4C86-91CF-B32B8C981385}.Release|Any CPU.Build.0 = Release|Any CPU
41+
{F363B274-F65B-412A-BB6F-C9631DDFC28E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
42+
{F363B274-F65B-412A-BB6F-C9631DDFC28E}.Debug|Any CPU.Build.0 = Debug|Any CPU
43+
{F363B274-F65B-412A-BB6F-C9631DDFC28E}.Release|Any CPU.ActiveCfg = Release|Any CPU
44+
{F363B274-F65B-412A-BB6F-C9631DDFC28E}.Release|Any CPU.Build.0 = Release|Any CPU
45+
{9687E26B-9BB6-4AE9-8654-AC8A87B18A8A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
46+
{9687E26B-9BB6-4AE9-8654-AC8A87B18A8A}.Debug|Any CPU.Build.0 = Debug|Any CPU
47+
{9687E26B-9BB6-4AE9-8654-AC8A87B18A8A}.Release|Any CPU.ActiveCfg = Release|Any CPU
48+
{9687E26B-9BB6-4AE9-8654-AC8A87B18A8A}.Release|Any CPU.Build.0 = Release|Any CPU
49+
{0F3C90E2-D216-4159-B560-E5C6FF875CF8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
50+
{0F3C90E2-D216-4159-B560-E5C6FF875CF8}.Debug|Any CPU.Build.0 = Debug|Any CPU
51+
{0F3C90E2-D216-4159-B560-E5C6FF875CF8}.Release|Any CPU.ActiveCfg = Release|Any CPU
52+
{0F3C90E2-D216-4159-B560-E5C6FF875CF8}.Release|Any CPU.Build.0 = Release|Any CPU
53+
{7875D7FA-0F39-4935-A4DB-28F310348B1E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
54+
{7875D7FA-0F39-4935-A4DB-28F310348B1E}.Debug|Any CPU.Build.0 = Debug|Any CPU
55+
{7875D7FA-0F39-4935-A4DB-28F310348B1E}.Release|Any CPU.ActiveCfg = Release|Any CPU
56+
{7875D7FA-0F39-4935-A4DB-28F310348B1E}.Release|Any CPU.Build.0 = Release|Any CPU
5757
EndGlobalSection
5858
EndGlobal

‎src/StackHCI/custom/stackhci.ps1

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4957,7 +4957,7 @@ param(
49574957
$IsManagementNode = $True
49584958
}
49594959

4960-
$LogFilePrefix = "EnableAzureStackHCIImds"
4960+
$LogFilePrefix = "EnableAzStackHCIAttestation"
49614961
$DebugEnabled = $DebugPreference -ne "SilentlyContinue"
49624962
$date = Get-Date
49634963
$datestring = "{0}{1:d2}{2:d2}-{3:d2}{4:d2}" -f $date.year,$date.month,$date.day,$date.hour,$date.minute
@@ -4967,7 +4967,6 @@ param(
49674967
$DebugLogFileName = $LogFilePrefix + "_" + "debug"+ "_" +$datestring + ".log"
49684968
Start-Transcript -LiteralPath $DebugLogFileName -Append | Out-Null
49694969
}
4970-
#Show-LatestModuleVersion
49714970

49724971
$percentComplete = 1
49734972
Write-Progress -Id $MainProgressBarId -activity $EnableAzsHciImdsActivity -status $FetchingRegistrationState -percentcomplete $percentComplete
@@ -4983,7 +4982,7 @@ param(
49834982
{
49844983
$SessionParams.Add("ComputerName", $ComputerName)
49854984

4986-
if($Null -eq $Credential)
4985+
if($Null -ne $Credential)
49874986
{
49884987
$SessionParams.Add("Credential", $Credential)
49894988
}
@@ -5014,15 +5013,11 @@ param(
50145013
$ClusterName, $ClusterNodes, $ClusterNodeStateUp = Invoke-Command @SessionParams -ScriptBlock {
50155014
$name = (Get-Cluster).Name
50165015
$nodes = Get-ClusterNode
5017-
$nodeStateUp = "Up"
5016+
$nodeStateUp = "Up" # Using FailoverCluster ClusterNodeState Enum type here will fail on management nodes without cluster RSAT
50185017

50195018
return $name, $nodes, $nodeStateUp
50205019
}
50215020

5022-
if($ClusterNodeStateUp.Value -ne $null) {
5023-
$ClusterNodeStateUp = $ClusterNodeStateUp.Value
5024-
}
5025-
50265021
# Validate Cluster nodes are online
50275022
if (($ClusterNodes | Where {$_.State -ne $ClusterNodeStateUp} | Measure-Object).Count -ne 0)
50285023
{
@@ -5037,7 +5032,7 @@ param(
50375032
}
50385033
catch
50395034
{
5040-
Write-ErrorLog -Message "Exception occurred in Enable-AzueStackHCIImdsAttestation" -Exception $_ -Category OperationStopped -ErrorAction Continue
5035+
Write-ErrorLog -Message "Exception occurred in Enable-AzStackHCIAttestation" -Exception $_ -Category OperationStopped -ErrorAction Continue
50415036
throw
50425037
}
50435038
}
@@ -5249,7 +5244,7 @@ param(
52495244
$IsManagementNode = $True
52505245
}
52515246

5252-
$LogFilePrefix = "DisableAzureStackHCIImds"
5247+
$LogFilePrefix = "DisableAzStackHCIAttestation"
52535248
$DebugEnabled = $DebugPreference -ne "SilentlyContinue"
52545249

52555250
$date = Get-Date
@@ -5272,7 +5267,7 @@ param(
52725267
{
52735268
$SessionParams.Add("ComputerName", $ComputerName)
52745269

5275-
if($Null -eq $Credential)
5270+
if($Null -ne $Credential)
52765271
{
52775272
$SessionParams.Add("Credential", $Credential)
52785273
}
@@ -5330,7 +5325,7 @@ param(
53305325
}
53315326
catch
53325327
{
5333-
Write-ErrorLog ("Exception occurred in Enable-AzueStackHCIImdsAttestation") -Exception $_ -Category OperationStopped -ErrorAction Continue
5328+
Write-ErrorLog ("Exception occurred in Disable-AzStackHCIAttestation") -Exception $_ -Category OperationStopped -ErrorAction Continue
53345329
throw
53355330
}
53365331
}
@@ -5390,7 +5385,7 @@ param(
53905385
}
53915386
catch
53925387
{
5393-
Write-ErrorLog ("Exception occurred in Enable-AzueStackHCIImdsAttestation") -Exception $_ -Category OperationStopped -ErrorAction Continue
5388+
Write-ErrorLog ("Exception occurred in Disable-AzStackHCIAttestation") -Exception $_ -Category OperationStopped -ErrorAction Continue
53945389
throw
53955390
}
53965391
}
@@ -5460,7 +5455,7 @@ param(
54605455

54615456
try
54625457
{
5463-
$LogFilePrefix = "AddAzureStackHCIImds"
5458+
$LogFilePrefix = "AddAzStackHCIVMAttestation"
54645459
$DebugEnabled = $DebugPreference -ne "SilentlyContinue"
54655460
$date = Get-Date
54665461
$datestring = "{0}{1:d2}{2:d2}-{3:d2}{4:d2}" -f $date.year,$date.month,$date.day,$date.hour,$date.minute
@@ -5653,7 +5648,7 @@ param(
56535648

56545649
try
56555650
{
5656-
$LogFilePrefix = "RemoveAzureStackHCIImds"
5651+
$LogFilePrefix = "RemoveAzStackHCIVMAttestation"
56575652
$DebugEnabled = $DebugPreference -ne "SilentlyContinue"
56585653

56595654
$date = Get-Date

‎src/StackHCI/generate-info.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"swagger_commit": "a29126ca8200a6c981a4e908e41fe55730df4cad",
2+
"swagger_commit": "31404aa8b8b05375aa7fb1b438d2cbc43bb95598",
33
"node": "v14.15.5",
44
"autorest": "`-- (empty)",
55
"autorest_core": "3.9.7",

0 commit comments

Comments
 (0)