Skip to content

Add parameter ManagedResourceGroupName for command New-AzSynapseWorkspace #15377

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.

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 2 commits into from
Jul 1, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
50 changes: 30 additions & 20 deletions src/Synapse/Synapse.Test/ScenarioTests/WorkspaceTests.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ function Test-SynapseWorkspace
$storageGen2AccountName = $params.storageAccountName
$storageFileSystemName = $params.fileSystemName
$location = $params.location
$managedResourceGroupName = $params.managedresourcegroupName

try
{
Expand All @@ -22,6 +23,7 @@ function Test-SynapseWorkspace
Assert-AreEqual $workspaceName $workspaceCreated.Name
Assert-AreEqual $location $workspaceCreated.Location
Assert-AreEqual "Microsoft.Synapse/Workspaces" $workspaceCreated.Type
Assert-AreEqual $managedResourceGroupName $workspaceCreated.ManagedResourceGroupName
Assert-True {$workspaceCreated.Id -like "*$resourceGroupName*"}

# In loop to check if workspace exists
Expand All @@ -33,6 +35,7 @@ function Test-SynapseWorkspace
Assert-AreEqual $workspaceName $workspaceGet[0].Name
Assert-AreEqual $location $workspaceGet[0].Location
Assert-AreEqual "Microsoft.Synapse/workspaces" $workspaceGet[0].Type
Assert-AreEqual $managedResourceGroupName $workspaceCreated.ManagedResourceGroupName
Assert-True {$workspaceCreated.Id -like "*$resourceGroupName*"}
break
}
Expand All @@ -52,6 +55,7 @@ function Test-SynapseWorkspace
Assert-AreEqual $workspaceName $workspaceUpdated.Name
Assert-AreEqual $location $workspaceUpdated.Location
Assert-AreEqual "Microsoft.Synapse/workspaces" $workspaceUpdated.Type
Assert-AreEqual $managedResourceGroupName $workspaceCreated.ManagedResourceGroupName
Assert-True {$workspaceUpdated.Id -like "*$resourceGroupName*"}

Assert-NotNull $workspaceUpdated.Tags "Tags do not exists"
Expand All @@ -65,6 +69,7 @@ function Test-SynapseWorkspace
Assert-AreEqual $workspaceName $workspaceUpdated.Name
Assert-AreEqual $location $workspaceUpdated.Location
Assert-AreEqual "Microsoft.Synapse/workspaces" $workspaceUpdated.Type
Assert-AreEqual $managedResourceGroupName $workspaceCreated.ManagedResourceGroupName
Assert-True {$workspaceUpdated.Id -like "*$resourceGroupName*"}
Assert-AreEqual "Succeeded" $workspaceUpdated.ProvisioningState

Expand All @@ -86,24 +91,28 @@ function Test-SynapseWorkspace
}
Assert-True {$found -eq 1} "Workspace created earlier is not found when listing all in resource group: $resourceGroupName."

# Unable to deserialize results in `Get-AzSynapseWorkspace`
# TODO: Update test after SDK upgrade

# List all Workspaces in subscription
[array]$workspacesInSubscription = Get-AzSynapseWorkspace
Assert-True {$workspacesInSubscription.Count -ge 1}
Assert-True {$workspacesInSubscription.Count -ge $workspacesInResourceGroup.Count}

$found = 0
for ($i = 0; $i -lt $workspacesInSubscription.Count; $i++)
{
if ($workspacesInSubscription[$i].Name -eq $workspaceName)
{
$found = 1
Assert-AreEqual $location $workspacesInSubscription[$i].Location
Assert-AreEqual "Microsoft.Synapse/workspaces" $workspacesInSubscription[$i].Type
Assert-True {$workspacesInSubscription[$i].Id -like "*$resourceGroupName*"}
break
}
}
Assert-True {$found -eq 1} "Workspace created earlier is not found when listing all in subscription."

# [array]$workspacesInSubscription = Get-AzSynapseWorkspace
# Assert-True {$workspacesInSubscription.Count -ge 1}
# Assert-True {$workspacesInSubscription.Count -ge $workspacesInResourceGroup.Count}
#
# $found = 0
# for ($i = 0; $i -lt $workspacesInSubscription.Count; $i++)
# {
# if ($workspacesInSubscription[$i].Name -eq $workspaceName)
# {
# $found = 1
# Assert-AreEqual $location $workspacesInSubscription[$i].Location
# Assert-AreEqual "Microsoft.Synapse/workspaces" $workspacesInSubscription[$i].Type
# Assert-True {$workspacesInSubscription[$i].Id -like "*$resourceGroupName*"}
# break
# }
# }
# Assert-True {$found -eq 1} "Workspace created earlier is not found when listing all in subscription."

# Delete workspace
Assert-True {Remove-AzSynapseWorkspace -ResourceGroupName $resourceGroupName -Name $workspaceName -PassThru -Force} "Remove Workspace failed."
Expand Down Expand Up @@ -461,7 +470,7 @@ function Get-WorkspaceEncryptionTestEnvironmentParameters ($testSuffix)
fileSystemName = "wscmdletfs" + $testSuffix;
loginName = "testlogin";
pwd = "testp@ssMakingIt1007Longer";
location = "westcentralus";
location = "eastus2euap";
encryptionKeyIdentifier = "<your-encryptionKeyIdentifier>";
}
}
Expand Down Expand Up @@ -513,7 +522,7 @@ function Create-WorkspaceTestEnvironmentWithParams ($params, $location, $denyAsN
$workspaceLogin = $params.loginName
$workspacePassword = $params.pwd
$credentials = new-object System.Management.Automation.PSCredential($workspaceLogin, ($workspacePassword | ConvertTo-SecureString -asPlainText -Force))
New-AzSynapseWorkspace -ResourceGroupName $params.rgname -WorkspaceName $params.workspaceName -Location $location -SqlAdministratorLoginCredential $credentials -DefaultDataLakeStorageAccountName $params.storageAccountName -DefaultDataLakeStorageFilesystem $params.fileSystemName
New-AzSynapseWorkspace -ResourceGroupName $params.rgname -WorkspaceName $params.workspaceName -Location $location -SqlAdministratorLoginCredential $credentials -DefaultDataLakeStorageAccountName $params.storageAccountName -DefaultDataLakeStorageFilesystem $params.fileSystemName -ManagedResourceGroupName $params.managedresourcegroupName
Wait-Seconds 10
}

Expand All @@ -525,11 +534,12 @@ function Get-WorkspaceTestEnvironmentParameters ($testSuffix)
{
return @{ rgname = "ws-cmdlet-test-rg" +$testSuffix;
workspaceName = "ws" +$testSuffix;
managedresourcegroupName = "mrg" + $testSuffix;
storageAccountName = "wsstorage" + $testSuffix;
fileSystemName = "wscmdletfs" + $testSuffix;
loginName = "testlogin";
pwd = "testp@ssMakingIt1007Longer";
location = "westcentralus";
location = "eastus2euap";
}
}

Expand Down
Loading