resolve merge conflicts

src/Support/Support.Autorest/Az.Support.psd1

@@ -11,7 +11,7 @@
   DotNetFrameworkVersion = '4.7.2'
   RequiredAssemblies = './bin/Az.Support.private.dll'
   FormatsToProcess = './Az.Support.format.ps1xml'
-  FunctionsToExport = 'Get-AzSupportChatTranscript', 'Get-AzSupportChatTranscriptsNoSubscription', 'Get-AzSupportCommunication', 'Get-AzSupportCommunicationsNoSubscription', 'Get-AzSupportFile', 'Get-AzSupportFilesNoSubscription', 'Get-AzSupportFileWorkspace', 'Get-AzSupportFileWorkspacesNoSubscription', 'Get-AzSupportOperation', 'Get-AzSupportProblemClassification', 'Get-AzSupportService', 'Get-AzSupportTicket', 'Get-AzSupportTicketChatTranscriptsNoSubscription', 'Get-AzSupportTicketCommunicationsNoSubscription', 'Get-AzSupportTicketsNoSubscription', 'Invoke-AzSupportUploadFile', 'Invoke-AzSupportUploadFilesNoSubscription', 'New-AzSupportCommunication', 'New-AzSupportCommunicationsNoSubscription', 'New-AzSupportFile', 'New-AzSupportFilesNoSubscription', 'New-AzSupportTicket', 'New-AzSupportTicketsNoSubscription', 'Test-AzSupportCommunicationNameAvailability', 'Test-AzSupportCommunicationsNoSubscriptionNameAvailability', 'Test-AzSupportTicketNameAvailability', 'Test-AzSupportTicketsNoSubscriptionNameAvailability', 'Update-AzSupportCommunication', 'Update-AzSupportCommunicationsNoSubscription', 'Update-AzSupportFile', 'Update-AzSupportFilesNoSubscription', 'Update-AzSupportTicket', 'Update-AzSupportTicketsNoSubscription'
+  FunctionsToExport = 'Get-AzSupportChatTranscript', 'Get-AzSupportChatTranscriptsNoSubscription', 'Get-AzSupportCommunication', 'Get-AzSupportCommunicationsNoSubscription', 'Get-AzSupportFile', 'Get-AzSupportFilesNoSubscription', 'Get-AzSupportFileWorkspace', 'Get-AzSupportFileWorkspacesNoSubscription', 'Get-AzSupportOperation', 'Get-AzSupportProblemClassification', 'Get-AzSupportService', 'Get-AzSupportTicket', 'Get-AzSupportTicketChatTranscriptsNoSubscription', 'Get-AzSupportTicketCommunicationsNoSubscription', 'Get-AzSupportTicketsNoSubscription', 'New-AzSupportCommunication', 'New-AzSupportCommunicationsNoSubscription', 'New-AzSupportFileAndUpload', 'New-AzSupportFileAndUploadNoSubscription', 'New-AzSupportFileWorkspace', 'New-AzSupportFileWorkspacesNoSubscription', 'New-AzSupportTicket', 'New-AzSupportTicketsNoSubscription', 'Test-AzSupportCommunicationNameAvailability', 'Test-AzSupportCommunicationsNoSubscriptionNameAvailability', 'Test-AzSupportTicketNameAvailability', 'Test-AzSupportTicketsNoSubscriptionNameAvailability', 'Update-AzSupportCommunication', 'Update-AzSupportCommunicationsNoSubscription', 'Update-AzSupportTicket', 'Update-AzSupportTicketsNoSubscription'
   PrivateData = @{
     PSData = @{
       Tags = 'Azure', 'ResourceManager', 'ARM', 'PSModule', 'Support'

src/Support/Support.Autorest/test/env.json

@@ -1,4 +1,8 @@
 {
+  "FileWorkspaceNameSubscription": "test-ps-1c0f34c3-a77f-48f8-92ed-4bc40297b575",
+  "FileWorkspaceNameNoSubscription": "test-ps-c3365113-f08e-4317-936c-3d948a9dc191",
+  "BillingServiceId": "517f2da6-78fd-0498-4e22-ad26996b1dfc",
+  "BillingProblemClassificationId": "d0f16bf7-e011-3f3b-1c26-3147f84e0896",
   "ContactDetailPreferredTimeZone": "Pacific Standard Time",
   "SupportPlanTenant": "Basic support",
   "ServiceId": "/providers/Microsoft.Support/services/517f2da6-78fd-0498-4e22-ad26996b1dfc",

src/Support/Support.Autorest/test/localEnv.json

@@ -1,4 +1,6 @@
 {
+  "BillingProblemClassificationId": "d0f16bf7-e011-3f3b-1c26-3147f84e0896",
+  "BillingServiceId": "517f2da6-78fd-0498-4e22-ad26996b1dfc",
   "ContactDetailPreferredTimeZone": "Pacific Standard Time",
   "Title": "test ticket - please ignore and close",
   "Description": "test ticket - please ignore and close",

src/Support/Support.Autorest/test/utils.ps1

@@ -44,6 +44,18 @@ function setupEnv() {
     $env.SubscriptionId = $sub = (Get-AzContext).Subscription.Id
     $env.Tenant = (Get-AzContext).Tenant.Id
     $testGuid = [guid]::NewGuid().ToString()
+    $env.BillingServiceId = "517f2da6-78fd-0498-4e22-ad26996b1dfc"
+    $env.BillingProblemClassificationId = "d0f16bf7-e011-3f3b-1c26-3147f84e0896"
+    $env.FileWorkspaceNameSubscription = "test-ps-$(New-Guid)"
+    $env.FileWorkspaceNameNoSubscription = "test-ps-$(New-Guid)"
+
+    New-AzSupportFileWorkspace -Name $env.FileWorkspaceNameSubscription
+    New-AzSupportFileWorkspacesNoSubscription -Name $env.FileWorkspaceNameNoSubscription
+
+    $testFilePath = Join-Path $PSScriptRoot files test2.txt
+    New-AzSupportFileAndUpload -WorkspaceName $env.FileWorkspaceNameSubscription -FilePath $testFilePath
+    New-AzSupportFileAndUploadNoSubscription -WorkspaceName $env.FileWorkspaceNameNoSubscription -FilePath $testFilePath
+
     $testTicketName = "test-$testGuid"
     $advancedDiagnosticConsent = "no"
     $contactDetailPrimaryEmailAddress = "[email protected]"