From 86443d5adfa87351627f9f5539c744441684c891 Mon Sep 17 00:00:00 2001 From: Adam Myatt Date: Fri, 5 Sep 2025 09:17:07 -0400 Subject: [PATCH 01/12] Update utils.ps1 Fix typo of Enviornment to Environment --- src/Workloads/Monitors.Autorest/test/utils.ps1 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Workloads/Monitors.Autorest/test/utils.ps1 b/src/Workloads/Monitors.Autorest/test/utils.ps1 index f5acfd3aaa54..ba3b53ead9e1 100644 --- a/src/Workloads/Monitors.Autorest/test/utils.ps1 +++ b/src/Workloads/Monitors.Autorest/test/utils.ps1 @@ -52,8 +52,8 @@ function setupEnv() { $env.SapCentralInstanceName = "ps1ascsvm-0" $env.SapDatabseInstanceName = "PS1" $env.SapProduct = "S4HANA" - $env.EnviornmentNonProd = "NonProd" - $env.EnviornmentProd = "Prod" + $env.EnvironmentNonProd = "NonProd" + $env.EnvironmentProd = "Prod" $env.DatabaseType = "HANA" $env.DbVMSku = "Standard_E32ds_v4" $env.DeploymentType = "SingleServer" @@ -114,4 +114,4 @@ function setupEnv() { } function cleanupEnv() { # Clean resources you create for testing -} \ No newline at end of file +} From 5584464131204fbfbf327cee696be1f2ba47e70c Mon Sep 17 00:00:00 2001 From: Adam Myatt Date: Fri, 5 Sep 2025 09:19:12 -0400 Subject: [PATCH 02/12] Update PostOperationsAzWorkloads.Tests.ps1 Fix typo of Enviornment to Environment --- .../test/PostOperationsAzWorkloads.Tests.ps1 | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Workloads/SapVirtualInstance.Autorest/test/PostOperationsAzWorkloads.Tests.ps1 b/src/Workloads/SapVirtualInstance.Autorest/test/PostOperationsAzWorkloads.Tests.ps1 index f8067205837b..c401be9aa906 100644 --- a/src/Workloads/SapVirtualInstance.Autorest/test/PostOperationsAzWorkloads.Tests.ps1 +++ b/src/Workloads/SapVirtualInstance.Autorest/test/PostOperationsAzWorkloads.Tests.ps1 @@ -16,32 +16,32 @@ if(($null -eq $TestName) -or ($TestName -contains 'PostOperationsAzWorkloads')) Describe 'PostOperationsAzWorkloads' { It 'PostOperationsSapDiskConfiguration' { - $PostOperationsSapDiskConfigurationResponse = Invoke-AzWorkloadsSapDiskConfiguration -SubscriptionId $env.WaaSSubscriptionId -Location $env.Location -AppLocation $env.Location -DatabaseType $env.DatabaseType -DbVMSku $env.DbVMSku -DeploymentType $env.DeploymentType -Environment $env.EnviornmentNonProd -SapProduct $env.SapProduct + $PostOperationsSapDiskConfigurationResponse = Invoke-AzWorkloadsSapDiskConfiguration -SubscriptionId $env.WaaSSubscriptionId -Location $env.Location -AppLocation $env.Location -DatabaseType $env.DatabaseType -DbVMSku $env.DbVMSku -DeploymentType $env.DeploymentType -Environment $env.EnvironmentNonProd -SapProduct $env.SapProduct $PostOperationsSapDiskConfigurationResponse.Count | Should -BeGreaterOrEqual 1 } It 'PostOperationsSapSizingRecommendation' { - $PostOperationsSapSizingRecommendationResponse = Invoke-AzWorkloadsSapSizingRecommendation -SubscriptionId $env.WaaSSubscriptionId -Location $env.Location -AppLocation $env.Location -DatabaseType $env.DatabaseType -DbMemory $env.DbMemory -DeploymentType $env.DeploymentType -Environment $env.EnviornmentNonProd -SapProduct $env.SapProduct -Sap $env.Saps -DbScaleMethod $env.DbScaleMethod + $PostOperationsSapSizingRecommendationResponse = Invoke-AzWorkloadsSapSizingRecommendation -SubscriptionId $env.WaaSSubscriptionId -Location $env.Location -AppLocation $env.Location -DatabaseType $env.DatabaseType -DbMemory $env.DbMemory -DeploymentType $env.DeploymentType -Environment $env.EnvironmentNonProd -SapProduct $env.SapProduct -Sap $env.Saps -DbScaleMethod $env.DbScaleMethod $PostOperationsSapSizingRecommendationResponse.Count | Should -BeGreaterOrEqual 1 } It 'PostOperationsSapSupportedSku' { - $PostOperationsSapSupportedSkuResponse = Invoke-AzWorkloadsSapSupportedSku -SubscriptionId $env.WaaSSubscriptionId -Location $env.Location -AppLocation $env.Location -DatabaseType $env.DatabaseType -DeploymentType $env.DeploymentTypeThreeTier -Environment $env.EnviornmentProd -SapProduct $env.SapProduct + $PostOperationsSapSupportedSkuResponse = Invoke-AzWorkloadsSapSupportedSku -SubscriptionId $env.WaaSSubscriptionId -Location $env.Location -AppLocation $env.Location -DatabaseType $env.DatabaseType -DeploymentType $env.DeploymentTypeThreeTier -Environment $env.EnvironmentProd -SapProduct $env.SapProduct $PostOperationsSapSupportedSkuResponse.Count | Should -BeGreaterOrEqual 1 } It 'PostOperationsSapDiskConfigurationAlias' { - $PostOperationsSapDiskConfigurationAliasResponse = Invoke-AzVISDiskConfiguration -SubscriptionId $env.WaaSSubscriptionId -Location $env.Location -AppLocation $env.Location -DatabaseType $env.DatabaseType -DbVMSku $env.DbVMSku -DeploymentType $env.DeploymentType -Environment $env.EnviornmentNonProd -SapProduct $env.SapProduct + $PostOperationsSapDiskConfigurationAliasResponse = Invoke-AzVISDiskConfiguration -SubscriptionId $env.WaaSSubscriptionId -Location $env.Location -AppLocation $env.Location -DatabaseType $env.DatabaseType -DbVMSku $env.DbVMSku -DeploymentType $env.DeploymentType -Environment $env.EnvironmentNonProd -SapProduct $env.SapProduct $PostOperationsSapDiskConfigurationAliasResponse.Count | Should -BeGreaterOrEqual 1 } It 'PostOperationsSapSizingRecommendationAlias' { - $PostOperationsSapSizingRecommendationAliasResponse = Invoke-AzVISSizingRecommendation -SubscriptionId $env.WaaSSubscriptionId -Location $env.Location -AppLocation $env.Location -DatabaseType $env.DatabaseType -DbMemory $env.DbMemory -DeploymentType $env.DeploymentType -Environment $env.EnviornmentNonProd -SapProduct $env.SapProduct -Sap $env.Saps -DbScaleMethod $env.DbScaleMethod + $PostOperationsSapSizingRecommendationAliasResponse = Invoke-AzVISSizingRecommendation -SubscriptionId $env.WaaSSubscriptionId -Location $env.Location -AppLocation $env.Location -DatabaseType $env.DatabaseType -DbMemory $env.DbMemory -DeploymentType $env.DeploymentType -Environment $env.EnvironmentNonProd -SapProduct $env.SapProduct -Sap $env.Saps -DbScaleMethod $env.DbScaleMethod $PostOperationsSapSizingRecommendationAliasResponse.Count | Should -BeGreaterOrEqual 1 } It 'PostOperationsSapSupportedSkuAlias' { - $PostOperationsSapSupportedSkuAliasResponse = Invoke-AzVISSupportedSKU -SubscriptionId $env.WaaSSubscriptionId -Location $env.Location -AppLocation $env.Location -DatabaseType $env.DatabaseType -DeploymentType $env.DeploymentTypeThreeTier -Environment $env.EnviornmentProd -SapProduct $env.SapProduct + $PostOperationsSapSupportedSkuAliasResponse = Invoke-AzVISSupportedSKU -SubscriptionId $env.WaaSSubscriptionId -Location $env.Location -AppLocation $env.Location -DatabaseType $env.DatabaseType -DeploymentType $env.DeploymentTypeThreeTier -Environment $env.EnvironmentProd -SapProduct $env.SapProduct $PostOperationsSapSupportedSkuAliasResponse.Count | Should -BeGreaterOrEqual 1 } } From 21f3a222abaab055eafb4aed934ead077d0b8973 Mon Sep 17 00:00:00 2001 From: Adam Myatt Date: Fri, 5 Sep 2025 09:20:16 -0400 Subject: [PATCH 03/12] Update env.json Fix typo of Enviornment to Environment --- src/Workloads/Monitors.Autorest/test/env.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Workloads/Monitors.Autorest/test/env.json b/src/Workloads/Monitors.Autorest/test/env.json index f98cc8913368..53410d890beb 100644 --- a/src/Workloads/Monitors.Autorest/test/env.json +++ b/src/Workloads/Monitors.Autorest/test/env.json @@ -2,11 +2,11 @@ "MonitorSubnetRg": "e2e-portal-wlmonitor-do-not-delete", "Location": "eastus", "DatabaseType": "HANA", - "EnviornmentProd": "Prod", + "EnvironmentProd": "Prod", "DeletionVIS": "PS1", "TestType": "TestType", "db2ProviderName": "suha-db2-1", - "EnviornmentNonProd": "NonProd", + "EnvironmentNonProd": "NonProd", "MrgSAName": "acssstoragel46", "DeletionRG": "PS_CLI_TF_RG", "ResourceGroupCreateSVI": "PS_CLI_TF_RG", From 8cf6d86e8e4f300e5d93259f97a4423bdceb9437 Mon Sep 17 00:00:00 2001 From: Adam Myatt Date: Fri, 5 Sep 2025 09:21:47 -0400 Subject: [PATCH 04/12] Update SingleSystemWithNoTrustedAccess.Tests.ps1 Fix typo of Enviornment to Environment --- .../test/SingleSystemWithNoTrustedAccess.Tests.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Workloads/SapVirtualInstance.Autorest/test/SingleSystemWithNoTrustedAccess.Tests.ps1 b/src/Workloads/SapVirtualInstance.Autorest/test/SingleSystemWithNoTrustedAccess.Tests.ps1 index 056c88f4772d..599ef835085d 100644 --- a/src/Workloads/SapVirtualInstance.Autorest/test/SingleSystemWithNoTrustedAccess.Tests.ps1 +++ b/src/Workloads/SapVirtualInstance.Autorest/test/SingleSystemWithNoTrustedAccess.Tests.ps1 @@ -18,7 +18,7 @@ Describe 'SingleSystemWithNoTrustedAccess' { It 'CreateSingleSystemWithNoTrustedAccess' { $MsiIdentityName = @{ $env.IdentityName = @{}} $CreateSingleSystemWithNoTrustedAccessConfig = Join-Path $PSScriptRoot $env.CreateSingleSystemWithNoTrustedAccessConfigPath - $CreateSingleSystemWithNoTrustedAccessResponse = New-AzWorkloadsSapVirtualInstance -SubscriptionId $env.WaaSSubscriptionId -Name $env.CreateSingleSystemWithNoTrustedAccessSID -ResourceGroupName $env.ResourceGroupCreateSVI -Environment $env.EnviornmentNonProd -Location $env.Location -SapProduct $env.SapProduct -Configuration $CreateSingleSystemWithNoTrustedAccessConfig -ManagedResourcesNetworkAccessType $env.MrgNetAccTypPub -IdentityType $env.IdentityType -UserAssignedIdentity $MsiIdentityName + $CreateSingleSystemWithNoTrustedAccessResponse = New-AzWorkloadsSapVirtualInstance -SubscriptionId $env.WaaSSubscriptionId -Name $env.CreateSingleSystemWithNoTrustedAccessSID -ResourceGroupName $env.ResourceGroupCreateSVI -Environment $env.EnvironmentNonProd -Location $env.Location -SapProduct $env.SapProduct -Configuration $CreateSingleSystemWithNoTrustedAccessConfig -ManagedResourcesNetworkAccessType $env.MrgNetAccTypPub -IdentityType $env.IdentityType -UserAssignedIdentity $MsiIdentityName $CreateSingleSystemWithNoTrustedAccessResponse.provisioningState | Should -Be $env.ProvisioningStateSucceeded $CreateSingleSystemWithNoTrustedAccessResponse.managedResourcesNetworkAccessType | Should -Be $env.MrgNetAccTypPub } @@ -30,7 +30,7 @@ Describe 'SingleSystemWithNoTrustedAccess' { It 'CreateSingleSystemWithNoTrustedAccessAlias' { $MsiIdentityName = @{ $env.IdentityName = @{}} $CreateSingleSystemWithNoTrustedAccessAliasConfig = Join-Path $PSScriptRoot $env.CreateSingleSystemWithNoTrustedAccessConfigPath - $CreateSingleSystemWithNoTrustedAccessAliasResponse = New-AzVIS -SubscriptionId $env.WaaSSubscriptionId -Name $env.CreateSingleSystemWithNoTrustedAccessSID -ResourceGroupName $env.ResourceGroupCreateSVI -Environment $env.EnviornmentNonProd -Location $env.Location -SapProduct $env.SapProduct -Configuration $CreateSingleSystemWithNoTrustedAccessAliasConfig -ManagedResourcesNetworkAccessType $env.MrgNetAccTypPub -IdentityType $env.IdentityType -UserAssignedIdentity $MsiIdentityName + $CreateSingleSystemWithNoTrustedAccessAliasResponse = New-AzVIS -SubscriptionId $env.WaaSSubscriptionId -Name $env.CreateSingleSystemWithNoTrustedAccessSID -ResourceGroupName $env.ResourceGroupCreateSVI -Environment $env.EnvironmentNonProd -Location $env.Location -SapProduct $env.SapProduct -Configuration $CreateSingleSystemWithNoTrustedAccessAliasConfig -ManagedResourcesNetworkAccessType $env.MrgNetAccTypPub -IdentityType $env.IdentityType -UserAssignedIdentity $MsiIdentityName $CreateSingleSystemWithNoTrustedAccessAliasResponse.provisioningState | Should -Be $env.ProvisioningStateSucceeded $CreateSingleSystemWithNoTrustedAccessAliasResponse.managedResourcesNetworkAccessType | Should -Be $env.MrgNetAccTypPub } From a1766bc66daf8257f06db11249d607bfa7295961 Mon Sep 17 00:00:00 2001 From: Adam Myatt Date: Fri, 5 Sep 2025 09:22:42 -0400 Subject: [PATCH 05/12] Update SingleSystemWithCustomResourceTrustedAccess.Tests.ps1 Fix typo of Enviornment to Environment --- .../SingleSystemWithCustomResourceTrustedAccess.Tests.ps1 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Workloads/SapVirtualInstance.Autorest/test/SingleSystemWithCustomResourceTrustedAccess.Tests.ps1 b/src/Workloads/SapVirtualInstance.Autorest/test/SingleSystemWithCustomResourceTrustedAccess.Tests.ps1 index b51b91ada573..5e33fd12e040 100644 --- a/src/Workloads/SapVirtualInstance.Autorest/test/SingleSystemWithCustomResourceTrustedAccess.Tests.ps1 +++ b/src/Workloads/SapVirtualInstance.Autorest/test/SingleSystemWithCustomResourceTrustedAccess.Tests.ps1 @@ -19,7 +19,7 @@ Describe 'SingleSystemWithCustomResourceTrustedAccess' { $MsiIdentityName = @{ $env.IdentityName = @{}} $UpdateTags = @{ $env.TestType = $env.TestTypeValue} $CreateSingleSystemWithCustomResourceTrustedAccessConfig = Join-Path $PSScriptRoot $env.CreateSingleSystemWithCustomResourceTrustedAccessConfigPath - $CreateSingleSystemWithCustomResourceTrustedAccessResponse = New-AzWorkloadsSapVirtualInstance -SubscriptionId $env.WaaSSubscriptionId -Name $env.CreateSingleSystemWithCustomResourceTrustedAccessSID -ResourceGroupName $env.ResourceGroupCreateSVI -Environment $env.EnviornmentNonProd -Location $env.Location -SapProduct $env.SapProduct -Configuration $CreateSingleSystemWithCustomResourceTrustedAccessConfig -Tag $UpdateTags -ManagedResourcesNetworkAccessType $env.MrgNetAccTypPrvt -IdentityType $env.IdentityType -UserAssignedIdentity $MsiIdentityName + $CreateSingleSystemWithCustomResourceTrustedAccessResponse = New-AzWorkloadsSapVirtualInstance -SubscriptionId $env.WaaSSubscriptionId -Name $env.CreateSingleSystemWithCustomResourceTrustedAccessSID -ResourceGroupName $env.ResourceGroupCreateSVI -Environment $env.EnvironmentNonProd -Location $env.Location -SapProduct $env.SapProduct -Configuration $CreateSingleSystemWithCustomResourceTrustedAccessConfig -Tag $UpdateTags -ManagedResourcesNetworkAccessType $env.MrgNetAccTypPrvt -IdentityType $env.IdentityType -UserAssignedIdentity $MsiIdentityName $CreateSingleSystemWithCustomResourceTrustedAccessResponse.provisioningState | Should -Be $env.ProvisioningStateSucceeded $CreateSingleSystemWithCustomResourceTrustedAccessResponse.managedResourcesNetworkAccessType | Should -Be $env.MrgNetAccTypPrvt $CreateSingleSystemWithCustomResourceTrustedAccessResponse.Tag.Count | Should -BeGreaterOrEqual 1 @@ -28,7 +28,7 @@ Describe 'SingleSystemWithCustomResourceTrustedAccess' { It 'InstallSingleSystemWithCustomResourceTrustedAccess' { $MsiIdentityName = @{ $env.IdentityName = @{}} $InstallSingleSystemWithCustomResourceTrustedAccessConfig = Join-Path $PSScriptRoot $env.InstallSingleSystemWithCustomResourceTrustedAccessConfigPath - $InstallSingleSystemWithCustomResourceTrustedAccessResponse = New-AzWorkloadsSapVirtualInstance -SubscriptionId $env.WaaSSubscriptionId -Name $env.CreateSingleSystemWithCustomResourceTrustedAccessSID -ResourceGroupName $env.ResourceGroupCreateSVI -Environment $env.EnviornmentNonProd -Location $env.Location -SapProduct $env.SapProduct -Configuration $InstallSingleSystemWithCustomResourceTrustedAccessConfig -ManagedResourcesNetworkAccessType $env.MrgNetAccTypPrvt -IdentityType $env.IdentityType -UserAssignedIdentity $MsiIdentityName + $InstallSingleSystemWithCustomResourceTrustedAccessResponse = New-AzWorkloadsSapVirtualInstance -SubscriptionId $env.WaaSSubscriptionId -Name $env.CreateSingleSystemWithCustomResourceTrustedAccessSID -ResourceGroupName $env.ResourceGroupCreateSVI -Environment $env.EnvironmentNonProd -Location $env.Location -SapProduct $env.SapProduct -Configuration $InstallSingleSystemWithCustomResourceTrustedAccessConfig -ManagedResourcesNetworkAccessType $env.MrgNetAccTypPrvt -IdentityType $env.IdentityType -UserAssignedIdentity $MsiIdentityName $InstallSingleSystemWithCustomResourceTrustedAccessResponse.provisioningState | Should -Be $env.ProvisioningStateSucceeded } @@ -36,7 +36,7 @@ Describe 'SingleSystemWithCustomResourceTrustedAccess' { $MsiIdentityName = @{ $env.IdentityName = @{}} $UpdateTags = @{ $env.TestType = $env.TestTypeValue} $CreateSingleSystemWithCustomResourceTrustedAccessAliasConfig = Join-Path $PSScriptRoot $env.CreateSingleSystemWithCustomResourceTrustedAccessConfigPath - $CreateSingleSystemWithCustomResourceTrustedAccessAliasResponse = New-AzVIS -SubscriptionId $env.WaaSSubscriptionId -Name $env.CreateSingleSystemWithCustomResourceTrustedAccessSID -ResourceGroupName $env.ResourceGroupCreateSVI -Environment $env.EnviornmentNonProd -Location $env.Location -SapProduct $env.SapProduct -Configuration $CreateSingleSystemWithCustomResourceTrustedAccessAliasConfig -Tag $UpdateTags -ManagedResourcesNetworkAccessType $env.MrgNetAccTypPrvt -IdentityType $env.IdentityType -UserAssignedIdentity $MsiIdentityName + $CreateSingleSystemWithCustomResourceTrustedAccessAliasResponse = New-AzVIS -SubscriptionId $env.WaaSSubscriptionId -Name $env.CreateSingleSystemWithCustomResourceTrustedAccessSID -ResourceGroupName $env.ResourceGroupCreateSVI -Environment $env.EnvironmentNonProd -Location $env.Location -SapProduct $env.SapProduct -Configuration $CreateSingleSystemWithCustomResourceTrustedAccessAliasConfig -Tag $UpdateTags -ManagedResourcesNetworkAccessType $env.MrgNetAccTypPrvt -IdentityType $env.IdentityType -UserAssignedIdentity $MsiIdentityName $CreateSingleSystemWithCustomResourceTrustedAccessAliasResponse.provisioningState | Should -Be $env.ProvisioningStateSucceeded $CreateSingleSystemWithCustomResourceTrustedAccessAliasResponse.managedResourcesNetworkAccessType | Should -Be $env.MrgNetAccTypPrvt $CreateSingleSystemWithCustomResourceTrustedAccessAliasResponse.Tag.Count | Should -BeGreaterOrEqual 1 @@ -45,7 +45,7 @@ Describe 'SingleSystemWithCustomResourceTrustedAccess' { It 'InstallSingleSystemWithCustomResourceTrustedAccessAlias' { $MsiIdentityName = @{ $env.IdentityName = @{}} $InstallSingleSystemWithCustomResourceTrustedAccessAliasConfig = Join-Path $PSScriptRoot $env.InstallSingleSystemWithCustomResourceTrustedAccessConfigPath - $InstallSingleSystemWithCustomResourceTrustedAccessAliasResponse = New-AzVIS -SubscriptionId $env.WaaSSubscriptionId -Name $env.CreateSingleSystemWithCustomResourceTrustedAccessSID -ResourceGroupName $env.ResourceGroupCreateSVI -Environment $env.EnviornmentNonProd -Location $env.Location -SapProduct $env.SapProduct -Configuration $InstallSingleSystemWithCustomResourceTrustedAccessAliasConfig -ManagedResourcesNetworkAccessType $env.MrgNetAccTypPrvt -IdentityType $env.IdentityType -UserAssignedIdentity $MsiIdentityName + $InstallSingleSystemWithCustomResourceTrustedAccessAliasResponse = New-AzVIS -SubscriptionId $env.WaaSSubscriptionId -Name $env.CreateSingleSystemWithCustomResourceTrustedAccessSID -ResourceGroupName $env.ResourceGroupCreateSVI -Environment $env.EnvironmentNonProd -Location $env.Location -SapProduct $env.SapProduct -Configuration $InstallSingleSystemWithCustomResourceTrustedAccessAliasConfig -ManagedResourcesNetworkAccessType $env.MrgNetAccTypPrvt -IdentityType $env.IdentityType -UserAssignedIdentity $MsiIdentityName $InstallSingleSystemWithCustomResourceTrustedAccessAliasResponse.provisioningState | Should -Be $env.ProvisioningStateSucceeded } } From 066ff12ea8de24f7dc409c340468bc043b2d70e3 Mon Sep 17 00:00:00 2001 From: Adam Myatt Date: Fri, 5 Sep 2025 09:23:23 -0400 Subject: [PATCH 06/12] Update env.json Fix typo of Enviornment to Environment --- src/Workloads/SapVirtualInstance.Autorest/test/env.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Workloads/SapVirtualInstance.Autorest/test/env.json b/src/Workloads/SapVirtualInstance.Autorest/test/env.json index a883d08d86ee..6e2e15c11199 100644 --- a/src/Workloads/SapVirtualInstance.Autorest/test/env.json +++ b/src/Workloads/SapVirtualInstance.Autorest/test/env.json @@ -31,7 +31,7 @@ "DiscoverSVI": "PS1", "SapCentralInstanceName": "ps6ascsvm-0", "WaaSSubscriptionId": "49d64d54-e966-4c46-a868-1999802b762c", - "EnviornmentProd": "Prod", + "EnvironmentProd": "Prod", "CentralServerVmId": "/subscriptions/49d64d54-e966-4c46-a868-1999802b762c/resourceGroups/PS_CLI_TF_RG/providers/Microsoft.Compute/virtualMachines/ascsvm", "DeletionVIS": "PS6", "SoftStopTimeoutSecond": 100, @@ -54,6 +54,6 @@ "CreateSingleSystemWithCustomResourceTrustedAccessConfigPath": "CreateSingleSystemWithCustomResourceTrustedAccessConfig.json", "SapProduct": "S4HANA", "CreateDistributedHAAvZoneWithCustomResourceTrustedAccessTransShareSID": "PS3", - "EnviornmentNonProd": "NonProd", + "EnvironmentNonProd": "NonProd", "DeploymentType": "SingleServer" } From babff6c2fe662e2374d90f4d300fd19e8fe33057 Mon Sep 17 00:00:00 2001 From: Adam Myatt Date: Fri, 5 Sep 2025 09:24:07 -0400 Subject: [PATCH 07/12] Update localEnv.json Fix typo of Enviornment to Environment --- src/Workloads/SapVirtualInstance.Autorest/test/localEnv.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Workloads/SapVirtualInstance.Autorest/test/localEnv.json b/src/Workloads/SapVirtualInstance.Autorest/test/localEnv.json index e9b11745c405..1d732b986deb 100644 --- a/src/Workloads/SapVirtualInstance.Autorest/test/localEnv.json +++ b/src/Workloads/SapVirtualInstance.Autorest/test/localEnv.json @@ -34,7 +34,7 @@ "SapCentralInstanceName": "ps1ascsvm-0", "WaaSTenantId": "72f988bf-86f1-41af-91ab-2d7cd011db47", "SapIdSub2": "/subscriptions/49d64d54-e966-4c46-a868-1999802b762c/resourceGroups/PS_CLI_TF_RG/providers/Microsoft.Workloads/sapVirtualInstances/PS1", - "EnviornmentProd": "Prod", + "EnvironmentProd": "Prod", "SapDatabseInstanceName": "PS1", "DbScaleMethod": "ScaleUp", "DbVMSku": "Standard_E32ds_v4", @@ -51,5 +51,5 @@ "DeploymentTypeThreeTier": "ThreeTier", "TestType": "TestType", "DbServerIdSub2": "/subscriptions/49d64d54-e966-4c46-a868-1999802b762c/resourceGroups/PS_CLI_TF_RG/providers/Microsoft.Workloads/sapVirtualInstances/PS1/databaseInstances/PS1", - "EnviornmentNonProd": "NonProd" + "EnvironmentNonProd": "NonProd" } From 5b4577569e459670a96955cef5a02c8c55fac4fd Mon Sep 17 00:00:00 2001 From: Adam Myatt Date: Fri, 5 Sep 2025 09:25:00 -0400 Subject: [PATCH 08/12] Update DistributedHAAvSetDiffTransRgShare.Tests.ps1 Fix typo of Enviornment to Environment --- .../test/DistributedHAAvSetDiffTransRgShare.Tests.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Workloads/SapVirtualInstance.Autorest/test/DistributedHAAvSetDiffTransRgShare.Tests.ps1 b/src/Workloads/SapVirtualInstance.Autorest/test/DistributedHAAvSetDiffTransRgShare.Tests.ps1 index 69c63796c632..c94efb56ac20 100644 --- a/src/Workloads/SapVirtualInstance.Autorest/test/DistributedHAAvSetDiffTransRgShare.Tests.ps1 +++ b/src/Workloads/SapVirtualInstance.Autorest/test/DistributedHAAvSetDiffTransRgShare.Tests.ps1 @@ -18,7 +18,7 @@ Describe 'DistributedHAAvSetDiffTransRgShare' { It 'CreateDistributedHAAvSetDiffTransRgShare' { $MsiIdentityName = @{ $env.IdentityName = @{}} $CreateDistributedHAAvSetDiffTransRgShareConfig = Join-Path $PSScriptRoot $env.CreateDistributedHAAvSetDiffTransRgShareConfigPath - $CreateDistributedHAAvSetDiffTransRgShareResponse = New-AzWorkloadsSapVirtualInstance -SubscriptionId $env.WaaSSubscriptionId -Name $env.CreateDistributedHAAvSetDiffTransRgShareSID -ResourceGroupName $env.ResourceGroupCreateSVI -Environment $env.EnviornmentNonProd -Location $env.Location -SapProduct $env.SapProduct -Configuration $CreateDistributedHAAvSetDiffTransRgShareConfig -IdentityType $env.IdentityType -UserAssignedIdentity $MsiIdentityName + $CreateDistributedHAAvSetDiffTransRgShareResponse = New-AzWorkloadsSapVirtualInstance -SubscriptionId $env.WaaSSubscriptionId -Name $env.CreateDistributedHAAvSetDiffTransRgShareSID -ResourceGroupName $env.ResourceGroupCreateSVI -Environment $env.EnvironmentNonProd -Location $env.Location -SapProduct $env.SapProduct -Configuration $CreateDistributedHAAvSetDiffTransRgShareConfig -IdentityType $env.IdentityType -UserAssignedIdentity $MsiIdentityName $CreateDistributedHAAvSetDiffTransRgShareResponse.provisioningState | Should -Be $env.ProvisioningStateSucceeded ($CreateDistributedHAAvSetDiffTransRgShareResponse.Configuration | ConvertFrom-Json).infrastructureConfiguration.storageConfiguration.transportFileShareConfiguration.configurationType | Should -Be $env.MountTransShareConfigType } @@ -30,7 +30,7 @@ Describe 'DistributedHAAvSetDiffTransRgShare' { It 'CreateDistributedHAAvSetDiffTransRgShareAlias' { $MsiIdentityName = @{ $env.IdentityName = @{}} $CreateDistributedHAAvSetDiffTransRgShareAliasConfig = Join-Path $PSScriptRoot $env.CreateDistributedHAAvSetDiffTransRgShareConfigPath - $CreateDistributedHAAvSetDiffTransRgShareAliasResponse = New-AzVIS -SubscriptionId $env.WaaSSubscriptionId -Name $env.CreateDistributedHAAvSetDiffTransRgShareSID -ResourceGroupName $env.ResourceGroupCreateSVI -Environment $env.EnviornmentNonProd -Location $env.Location -SapProduct $env.SapProduct -Configuration $CreateDistributedHAAvSetDiffTransRgShareAliasConfig -IdentityType $env.IdentityType -UserAssignedIdentity $MsiIdentityName + $CreateDistributedHAAvSetDiffTransRgShareAliasResponse = New-AzVIS -SubscriptionId $env.WaaSSubscriptionId -Name $env.CreateDistributedHAAvSetDiffTransRgShareSID -ResourceGroupName $env.ResourceGroupCreateSVI -Environment $env.EnvironmentNonProd -Location $env.Location -SapProduct $env.SapProduct -Configuration $CreateDistributedHAAvSetDiffTransRgShareAliasConfig -IdentityType $env.IdentityType -UserAssignedIdentity $MsiIdentityName $CreateDistributedHAAvSetDiffTransRgShareAliasResponse.provisioningState | Should -Be $env.ProvisioningStateSucceeded ($CreateDistributedHAAvSetDiffTransRgShareAliasResponse.Configuration | ConvertFrom-Json).infrastructureConfiguration.storageConfiguration.transportFileShareConfiguration.configurationType | Should -Be $env.MountTransShareConfigType } From ffe760b2860e65e1702c4ba15c6fcad7854036a3 Mon Sep 17 00:00:00 2001 From: Adam Myatt Date: Fri, 5 Sep 2025 09:26:15 -0400 Subject: [PATCH 09/12] Update DistributedHAAvZoneWithCustomResourceTrustedAccessTransShare.Tests.ps1 Fix typo of Enviornment to Environment --- ...oneWithCustomResourceTrustedAccessTransShare.Tests.ps1 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Workloads/SapVirtualInstance.Autorest/test/DistributedHAAvZoneWithCustomResourceTrustedAccessTransShare.Tests.ps1 b/src/Workloads/SapVirtualInstance.Autorest/test/DistributedHAAvZoneWithCustomResourceTrustedAccessTransShare.Tests.ps1 index d160c78ead71..92b46b998e83 100644 --- a/src/Workloads/SapVirtualInstance.Autorest/test/DistributedHAAvZoneWithCustomResourceTrustedAccessTransShare.Tests.ps1 +++ b/src/Workloads/SapVirtualInstance.Autorest/test/DistributedHAAvZoneWithCustomResourceTrustedAccessTransShare.Tests.ps1 @@ -18,7 +18,7 @@ Describe 'DistributedHAAvZoneWithCustomResourceTrustedAccessTransShare' { It 'CreateDistributedHAAvZoneWithCustomResourceTrustedAccessTransShare' { $MsiIdentityName = @{ $env.IdentityName = @{}} $CreateDistributedHAAvZoneWithCustomResourceTrustedAccessTransShareConfig = Join-Path $PSScriptRoot $env.CreateDistributedHAAvZoneWithCustomResourceTrustedAccessTransShareConfigPath - $CreateDistributedHAAvZoneWithCustomResourceTrustedAccessTransShareResponse = New-AzWorkloadsSapVirtualInstance -SubscriptionId $env.WaaSSubscriptionId -Name $env.CreateDistributedHAAvZoneWithCustomResourceTrustedAccessTransShareSID -ResourceGroupName $env.ResourceGroupCreateSVI -Environment $env.EnviornmentNonProd -Location $env.Location -SapProduct $env.SapProduct -Configuration $CreateDistributedHAAvZoneWithCustomResourceTrustedAccessTransShareConfig -ManagedResourcesNetworkAccessType $env.MrgNetAccTypPrvt -IdentityType $env.IdentityType -UserAssignedIdentity $MsiIdentityName + $CreateDistributedHAAvZoneWithCustomResourceTrustedAccessTransShareResponse = New-AzWorkloadsSapVirtualInstance -SubscriptionId $env.WaaSSubscriptionId -Name $env.CreateDistributedHAAvZoneWithCustomResourceTrustedAccessTransShareSID -ResourceGroupName $env.ResourceGroupCreateSVI -Environment $env.EnvironmentNonProd -Location $env.Location -SapProduct $env.SapProduct -Configuration $CreateDistributedHAAvZoneWithCustomResourceTrustedAccessTransShareConfig -ManagedResourcesNetworkAccessType $env.MrgNetAccTypPrvt -IdentityType $env.IdentityType -UserAssignedIdentity $MsiIdentityName $CreateDistributedHAAvZoneWithCustomResourceTrustedAccessTransShareResponse.provisioningState | Should -Be $env.ProvisioningStateSucceeded $CreateDistributedHAAvZoneWithCustomResourceTrustedAccessTransShareResponse.managedResourcesNetworkAccessType | Should -Be $env.MrgNetAccTypPrvt ($CreateDistributedHAAvZoneWithCustomResourceTrustedAccessTransShareResponse.Configuration | ConvertFrom-Json).infrastructureConfiguration.storageConfiguration.transportFileShareConfiguration.configurationType | Should -Be $env.MountTransShareConfigType @@ -27,14 +27,14 @@ Describe 'DistributedHAAvZoneWithCustomResourceTrustedAccessTransShare' { It 'InstallDistributedHAAvZoneWithCustomResourceTrustedAccessTransShare' { $MsiIdentityName = @{ $env.IdentityName = @{}} $InstallDistributedHAAvZoneWithCustomResourceTrustedAccessTransShareConfig = Join-Path $PSScriptRoot $env.InstallDistributedHAAvZoneWithCustomResourceTrustedAccessTransShareConfigPath - $InstallDistributedHAAvZoneWithCustomResourceTrustedAccessTransShareResponse = New-AzWorkloadsSapVirtualInstance -SubscriptionId $env.WaaSSubscriptionId -Name $env.CreateDistributedHAAvZoneWithCustomResourceTrustedAccessTransShareSID -ResourceGroupName $env.ResourceGroupCreateSVI -Environment $env.EnviornmentNonProd -Location $env.Location -SapProduct $env.SapProduct -Configuration $InstallDistributedHAAvZoneWithCustomResourceTrustedAccessTransShareConfig -ManagedResourcesNetworkAccessType $env.MrgNetAccTypPrvt -IdentityType $env.IdentityType -UserAssignedIdentity $MsiIdentityName + $InstallDistributedHAAvZoneWithCustomResourceTrustedAccessTransShareResponse = New-AzWorkloadsSapVirtualInstance -SubscriptionId $env.WaaSSubscriptionId -Name $env.CreateDistributedHAAvZoneWithCustomResourceTrustedAccessTransShareSID -ResourceGroupName $env.ResourceGroupCreateSVI -Environment $env.EnvironmentNonProd -Location $env.Location -SapProduct $env.SapProduct -Configuration $InstallDistributedHAAvZoneWithCustomResourceTrustedAccessTransShareConfig -ManagedResourcesNetworkAccessType $env.MrgNetAccTypPrvt -IdentityType $env.IdentityType -UserAssignedIdentity $MsiIdentityName $InstallDistributedHAAvZoneWithCustomResourceTrustedAccessTransShareResponse.provisioningState | Should -Be $env.ProvisioningStateSucceeded } It 'CreateDistributedHAAvZoneWithCustomResourceTrustedAccessTransShareAlias' { $MsiIdentityName = @{ $env.IdentityName = @{}} $CreateDistributedHAAvZoneWithCustomResourceTrustedAccessTransShareAliasConfig = Join-Path $PSScriptRoot $env.CreateDistributedHAAvZoneWithCustomResourceTrustedAccessTransShareConfigPath - $CreateDistributedHAAvZoneWithCustomResourceTrustedAccessTransShareAliasResponse = New-AzVIS -SubscriptionId $env.WaaSSubscriptionId -Name $env.CreateDistributedHAAvZoneWithCustomResourceTrustedAccessTransShareSID -ResourceGroupName $env.ResourceGroupCreateSVI -Environment $env.EnviornmentNonProd -Location $env.Location -SapProduct $env.SapProduct -Configuration $CreateDistributedHAAvZoneWithCustomResourceTrustedAccessTransShareAliasConfig -ManagedResourcesNetworkAccessType $env.MrgNetAccTypPrvt -IdentityType $env.IdentityType -UserAssignedIdentity $MsiIdentityName + $CreateDistributedHAAvZoneWithCustomResourceTrustedAccessTransShareAliasResponse = New-AzVIS -SubscriptionId $env.WaaSSubscriptionId -Name $env.CreateDistributedHAAvZoneWithCustomResourceTrustedAccessTransShareSID -ResourceGroupName $env.ResourceGroupCreateSVI -Environment $env.EnvironmentNonProd -Location $env.Location -SapProduct $env.SapProduct -Configuration $CreateDistributedHAAvZoneWithCustomResourceTrustedAccessTransShareAliasConfig -ManagedResourcesNetworkAccessType $env.MrgNetAccTypPrvt -IdentityType $env.IdentityType -UserAssignedIdentity $MsiIdentityName $CreateDistributedHAAvZoneWithCustomResourceTrustedAccessTransShareAliasResponse.provisioningState | Should -Be $env.ProvisioningStateSucceeded $CreateDistributedHAAvZoneWithCustomResourceTrustedAccessTransShareAliasResponse.managedResourcesNetworkAccessType | Should -Be $env.MrgNetAccTypPrvt ($CreateDistributedHAAvZoneWithCustomResourceTrustedAccessTransShareAliasResponse.Configuration | ConvertFrom-Json).infrastructureConfiguration.storageConfiguration.transportFileShareConfiguration.configurationType | Should -Be $env.MountTransShareConfigType @@ -43,7 +43,7 @@ Describe 'DistributedHAAvZoneWithCustomResourceTrustedAccessTransShare' { It 'InstallDistributedHAAvZoneWithCustomResourceTrustedAccessTransShareAlias' { $MsiIdentityName = @{ $env.IdentityName = @{}} $InstallDistributedHAAvZoneWithCustomResourceTrustedAccessTransShareAliasConfig = Join-Path $PSScriptRoot $env.InstallDistributedHAAvZoneWithCustomResourceTrustedAccessTransShareConfigPath - $InstallDistributedHAAvZoneWithCustomResourceTrustedAccessTransShareAliasResponse = New-AzVIS -SubscriptionId $env.WaaSSubscriptionId -Name $env.CreateDistributedHAAvZoneWithCustomResourceTrustedAccessTransShareSID -ResourceGroupName $env.ResourceGroupCreateSVI -Environment $env.EnviornmentNonProd -Location $env.Location -SapProduct $env.SapProduct -Configuration $InstallDistributedHAAvZoneWithCustomResourceTrustedAccessTransShareAliasConfig -ManagedResourcesNetworkAccessType $env.MrgNetAccTypPrvt -IdentityType $env.IdentityType -UserAssignedIdentity $MsiIdentityName + $InstallDistributedHAAvZoneWithCustomResourceTrustedAccessTransShareAliasResponse = New-AzVIS -SubscriptionId $env.WaaSSubscriptionId -Name $env.CreateDistributedHAAvZoneWithCustomResourceTrustedAccessTransShareSID -ResourceGroupName $env.ResourceGroupCreateSVI -Environment $env.EnvironmentNonProd -Location $env.Location -SapProduct $env.SapProduct -Configuration $InstallDistributedHAAvZoneWithCustomResourceTrustedAccessTransShareAliasConfig -ManagedResourcesNetworkAccessType $env.MrgNetAccTypPrvt -IdentityType $env.IdentityType -UserAssignedIdentity $MsiIdentityName $InstallDistributedHAAvZoneWithCustomResourceTrustedAccessTransShareAliasResponse.provisioningState | Should -Be $env.ProvisioningStateSucceeded } } From 08071ee4b86cfd6ec62a161e00a21e511165f2a9 Mon Sep 17 00:00:00 2001 From: Adam Myatt Date: Fri, 5 Sep 2025 09:27:08 -0400 Subject: [PATCH 10/12] Update RegisterWithTrustedAccessCustomSaMrg.Tests.ps1 Fix typo of Enviornment to Environment --- .../test/RegisterWithTrustedAccessCustomSaMrg.Tests.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Workloads/SapVirtualInstance.Autorest/test/RegisterWithTrustedAccessCustomSaMrg.Tests.ps1 b/src/Workloads/SapVirtualInstance.Autorest/test/RegisterWithTrustedAccessCustomSaMrg.Tests.ps1 index 8210b34a157f..f20c4c2ed08e 100644 --- a/src/Workloads/SapVirtualInstance.Autorest/test/RegisterWithTrustedAccessCustomSaMrg.Tests.ps1 +++ b/src/Workloads/SapVirtualInstance.Autorest/test/RegisterWithTrustedAccessCustomSaMrg.Tests.ps1 @@ -18,7 +18,7 @@ Describe 'RegisterWithTrustedAccessCustomSaMrg' { It 'RegisterWithTrustedAccessCustomSaMrg' { $MsiIdentityName = @{ $env.IdentityName = @{}} - $RegisterWithTrustedAccessCustomSaMrgResponse = New-AzWorkloadsSapVirtualInstance -SubscriptionId $env.WaaSSubscriptionId -Name $env.CreateDistributedHAAvZoneWithCustomResourceTrustedAccessTransShareSID -ResourceGroupName $env.ResourceGroupCreateSVI -Environment $env.EnviornmentNonProd -Location $env.Location -SapProduct $env.SapProduct -CentralServerVmId $env.CentralServerVmId -ManagedResourceGroupName $env.MrgRGName -ManagedRgStorageAccountName $env.MrgSAName -ManagedResourcesNetworkAccessType $env.MrgNetAccTypPrvt -IdentityType $env.IdentityType -UserAssignedIdentity $MsiIdentityName + $RegisterWithTrustedAccessCustomSaMrgResponse = New-AzWorkloadsSapVirtualInstance -SubscriptionId $env.WaaSSubscriptionId -Name $env.CreateDistributedHAAvZoneWithCustomResourceTrustedAccessTransShareSID -ResourceGroupName $env.ResourceGroupCreateSVI -Environment $env.EnvironmentNonProd -Location $env.Location -SapProduct $env.SapProduct -CentralServerVmId $env.CentralServerVmId -ManagedResourceGroupName $env.MrgRGName -ManagedRgStorageAccountName $env.MrgSAName -ManagedResourcesNetworkAccessType $env.MrgNetAccTypPrvt -IdentityType $env.IdentityType -UserAssignedIdentity $MsiIdentityName $RegisterWithTrustedAccessCustomSaMrgResponse.provisioningState | Should -Be $env.ProvisioningStateSucceeded $RegisterWithTrustedAccessCustomSaMrgResponse.managedResourcesNetworkAccessType | Should -Be $env.MrgNetAccTypPrvt ($RegisterWithTrustedAccessCustomSaMrgResponse.Configuration | ConvertFrom-Json).managedRgStorageAccountName | Should -Be $env.MrgSAName @@ -27,7 +27,7 @@ Describe 'RegisterWithTrustedAccessCustomSaMrg' { It 'RegisterWithTrustedAccessCustomSaMrgAlias' { $MsiIdentityName = @{ $env.IdentityName = @{}} - $RegisterWithTrustedAccessCustomSaMrgAliasResponse = New-AzVIS -SubscriptionId $env.WaaSSubscriptionId -Name $env.CreateDistributedHAAvZoneWithCustomResourceTrustedAccessTransShareSID -ResourceGroupName $env.ResourceGroupCreateSVI -Environment $env.EnviornmentNonProd -Location $env.Location -SapProduct $env.SapProduct -CentralServerVmId $env.CentralServerVmId -ManagedResourceGroupName $env.MrgRGName -ManagedRgStorageAccountName $env.MrgSAName -ManagedResourcesNetworkAccessType $env.MrgNetAccTypPrvt -IdentityType $env.IdentityType -UserAssignedIdentity $MsiIdentityName + $RegisterWithTrustedAccessCustomSaMrgAliasResponse = New-AzVIS -SubscriptionId $env.WaaSSubscriptionId -Name $env.CreateDistributedHAAvZoneWithCustomResourceTrustedAccessTransShareSID -ResourceGroupName $env.ResourceGroupCreateSVI -Environment $env.EnvironmentNonProd -Location $env.Location -SapProduct $env.SapProduct -CentralServerVmId $env.CentralServerVmId -ManagedResourceGroupName $env.MrgRGName -ManagedRgStorageAccountName $env.MrgSAName -ManagedResourcesNetworkAccessType $env.MrgNetAccTypPrvt -IdentityType $env.IdentityType -UserAssignedIdentity $MsiIdentityName $RegisterWithTrustedAccessCustomSaMrgAliasResponse.provisioningState | Should -Be $env.ProvisioningStateSucceeded $RegisterWithTrustedAccessCustomSaMrgAliasResponse.managedResourcesNetworkAccessType | Should -Be $env.MrgNetAccTypPrvt ($RegisterWithTrustedAccessCustomSaMrgAliasResponse.Configuration | ConvertFrom-Json).managedRgStorageAccountName | Should -Be $env.MrgSAName From 7f2df88ef93ca4bae18829558869f423c3b69953 Mon Sep 17 00:00:00 2001 From: Adam Myatt Date: Fri, 5 Sep 2025 09:27:48 -0400 Subject: [PATCH 11/12] Update DistributedSystemWithTrustedAccessNoTransShare.Tests.ps1 Fix typo of Enviornment to Environment --- .../DistributedSystemWithTrustedAccessNoTransShare.Tests.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Workloads/SapVirtualInstance.Autorest/test/DistributedSystemWithTrustedAccessNoTransShare.Tests.ps1 b/src/Workloads/SapVirtualInstance.Autorest/test/DistributedSystemWithTrustedAccessNoTransShare.Tests.ps1 index c58b48358163..8f6d4e6dd030 100644 --- a/src/Workloads/SapVirtualInstance.Autorest/test/DistributedSystemWithTrustedAccessNoTransShare.Tests.ps1 +++ b/src/Workloads/SapVirtualInstance.Autorest/test/DistributedSystemWithTrustedAccessNoTransShare.Tests.ps1 @@ -18,7 +18,7 @@ Describe 'DistributedSystemWithTrustedAccessNoTransShare' { It 'CreateDistributedSystemWithTrustedAccessNoTransShare' { $MsiIdentityName = @{ $env.IdentityName = @{}} $CreateDistributedSystemWithTrustedAccessNoTransShareConfig = Join-Path $PSScriptRoot $env.CreateDistributedSystemWithTrustedAccessNoTransShareConfigPath - $CreateDistributedSystemWithTrustedAccessNoTransShareResponse = New-AzWorkloadsSapVirtualInstance -SubscriptionId $env.WaaSSubscriptionId -Name $env.CreateDistributedSystemWithTrustedAccessNoTransShareSID -ResourceGroupName $env.ResourceGroupCreateSVI -Environment $env.EnviornmentNonProd -Location $env.Location -SapProduct $env.SapProduct -Configuration $CreateDistributedSystemWithTrustedAccessNoTransShareConfig -ManagedResourcesNetworkAccessType $env.MrgNetAccTypPrvt -IdentityType $env.IdentityType -UserAssignedIdentity $MsiIdentityName + $CreateDistributedSystemWithTrustedAccessNoTransShareResponse = New-AzWorkloadsSapVirtualInstance -SubscriptionId $env.WaaSSubscriptionId -Name $env.CreateDistributedSystemWithTrustedAccessNoTransShareSID -ResourceGroupName $env.ResourceGroupCreateSVI -Environment $env.EnvironmentNonProd -Location $env.Location -SapProduct $env.SapProduct -Configuration $CreateDistributedSystemWithTrustedAccessNoTransShareConfig -ManagedResourcesNetworkAccessType $env.MrgNetAccTypPrvt -IdentityType $env.IdentityType -UserAssignedIdentity $MsiIdentityName $CreateDistributedSystemWithTrustedAccessNoTransShareResponse.provisioningState | Should -Be $env.ProvisioningStateSucceeded $CreateDistributedSystemWithTrustedAccessNoTransShareResponse.managedResourcesNetworkAccessType | Should -Be $env.MrgNetAccTypPrvt ($CreateDistributedSystemWithTrustedAccessNoTransShareResponse.Configuration | ConvertFrom-Json).configuration.infrastructureConfiguration.storageConfiguration.transportFileShareConfiguration.configurationType | Should -Be $null @@ -31,7 +31,7 @@ Describe 'DistributedSystemWithTrustedAccessNoTransShare' { It 'CreateDistributedSystemWithTrustedAccessNoTransShareAlias' { $MsiIdentityName = @{ $env.IdentityName = @{}} $CreateDistributedSystemWithTrustedAccessNoTransShareAliasConfig = Join-Path $PSScriptRoot $env.CreateDistributedSystemWithTrustedAccessNoTransShareConfigPath - $CreateDistributedSystemWithTrustedAccessNoTransShareAliasResponse = New-AzVIS -SubscriptionId $env.WaaSSubscriptionId -Name $env.CreateDistributedSystemWithTrustedAccessNoTransShareSID -ResourceGroupName $env.ResourceGroupCreateSVI -Environment $env.EnviornmentNonProd -Location $env.Location -SapProduct $env.SapProduct -Configuration $CreateDistributedSystemWithTrustedAccessNoTransShareAliasConfig -ManagedResourcesNetworkAccessType $env.MrgNetAccTypPrvt -IdentityType $env.IdentityType -UserAssignedIdentity $MsiIdentityName + $CreateDistributedSystemWithTrustedAccessNoTransShareAliasResponse = New-AzVIS -SubscriptionId $env.WaaSSubscriptionId -Name $env.CreateDistributedSystemWithTrustedAccessNoTransShareSID -ResourceGroupName $env.ResourceGroupCreateSVI -Environment $env.EnvironmentNonProd -Location $env.Location -SapProduct $env.SapProduct -Configuration $CreateDistributedSystemWithTrustedAccessNoTransShareAliasConfig -ManagedResourcesNetworkAccessType $env.MrgNetAccTypPrvt -IdentityType $env.IdentityType -UserAssignedIdentity $MsiIdentityName $CreateDistributedSystemWithTrustedAccessNoTransShareAliasResponse.provisioningState | Should -Be $env.ProvisioningStateSucceeded $CreateDistributedSystemWithTrustedAccessNoTransShareAliasResponse.managedResourcesNetworkAccessType | Should -Be $env.MrgNetAccTypPrvt ($CreateDistributedSystemWithTrustedAccessNoTransShareAliasResponse.Configuration | ConvertFrom-Json).configuration.infrastructureConfiguration.storageConfiguration.transportFileShareConfiguration.configurationType | Should -Be $null From 46cc6a09950589fab784868169f5da7208759f18 Mon Sep 17 00:00:00 2001 From: Adam Myatt Date: Fri, 5 Sep 2025 09:28:19 -0400 Subject: [PATCH 12/12] Update utils.ps1 Fix typo of Enviornment to Environment --- src/Workloads/SapVirtualInstance.Autorest/test/utils.ps1 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Workloads/SapVirtualInstance.Autorest/test/utils.ps1 b/src/Workloads/SapVirtualInstance.Autorest/test/utils.ps1 index 6dce31b17ea7..fbb74c7513e6 100644 --- a/src/Workloads/SapVirtualInstance.Autorest/test/utils.ps1 +++ b/src/Workloads/SapVirtualInstance.Autorest/test/utils.ps1 @@ -53,8 +53,8 @@ function setupEnv() { $env.SapDatabseInstanceName = "PS6" $env.SoftStopTimeoutSecond = 100 $env.SapProduct = "S4HANA" - $env.EnviornmentNonProd = "NonProd" - $env.EnviornmentProd = "Prod" + $env.EnvironmentNonProd = "NonProd" + $env.EnvironmentProd = "Prod" $env.DatabaseType = "HANA" $env.DbVMSku = "Standard_E32ds_v4" $env.DeploymentType = "SingleServer" @@ -107,4 +107,4 @@ function setupEnv() { } function cleanupEnv() { # Clean resources you create for testing -} \ No newline at end of file +}