Skip to content

Commit 7643b1c

Browse files
grhuangmsftgrhuangmsft
committed
changes to not create new resources in playback
1 parent eec230e commit 7643b1c

File tree

3 files changed

+38
-24
lines changed

3 files changed

+38
-24
lines changed

‎src/Support/Support.Autorest/test/New-AzSupportFileWorkspacesNoSubscription.Recording.json‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
{
2-
"New-AzSupportFileWorkspacesNoSubscription+[NoContext]+Create+$PUT+https://management.azure.com/providers/Microsoft.Support/fileWorkspaces/test-ps-a169629b-d263-4ba1-872a-0d79019ca2d3?api-version=2022-09-01-preview+1": {
2+
"New-AzSupportFileWorkspacesNoSubscription+[NoContext]+Create+$PUT+https://management.azure.com/providers/Microsoft.Support/fileWorkspaces/test-ps-5ebdcaf4-0742-4dfd-9e49-73e13b88283e?api-version=2022-09-01-preview+1": {
33
"Request": {
44
"Method": "PUT",
5-
"RequestUri": "https://management.azure.com/providers/Microsoft.Support/fileWorkspaces/test-ps-a169629b-d263-4ba1-872a-0d79019ca2d3?api-version=2022-09-01-preview",
5+
"RequestUri": "https://management.azure.com/providers/Microsoft.Support/fileWorkspaces/test-ps-5ebdcaf4-0742-4dfd-9e49-73e13b88283e?api-version=2022-09-01-preview",
66
"Content": null,
77
"isContentBase64": false,
88
"Headers": {
9-
"x-ms-unique-id": [ "1" ],
10-
"x-ms-client-request-id": [ "6003c6f3-0370-42db-9fb6-2e20da8b2a7b" ],
9+
"x-ms-unique-id": [ "10" ],
10+
"x-ms-client-request-id": [ "3e831bb8-b203-46a3-a841-dbb8481273fe" ],
1111
"CommandName": [ "New-AzSupportFileWorkspacesNoSubscription" ],
1212
"FullCommandName": [ "New-AzSupportFileWorkspacesNoSubscription_Create" ],
1313
"ParameterSetName": [ "__AllParameterSets" ],
14-
"User-Agent": [ "AzurePowershell/v11.2.0", "PSVersion/v7.3.11", "Az.Support/0.1.0" ],
14+
"User-Agent": [ "AzurePowershell/v11.2.0", "PSVersion/v7.4.1", "Az.Support/0.1.0" ],
1515
"Authorization": [ "[Filtered]" ]
1616
},
1717
"ContentHeaders": {
@@ -22,22 +22,23 @@
2222
"Headers": {
2323
"Cache-Control": [ "no-cache" ],
2424
"Pragma": [ "no-cache" ],
25-
"Location": [ "https://management.azure.com/providers/Microsoft.Support/fileWorkspaces/test-ps-a169629b-d263-4ba1-872a-0d79019ca2d3?api-version=2022-09-01-preview" ],
25+
"Location": [ "https://management.azure.com/providers/Microsoft.Support/fileWorkspaces/test-ps-5ebdcaf4-0742-4dfd-9e49-73e13b88283e?api-version=2022-09-01-preview" ],
2626
"X-Content-Type-Options": [ "nosniff" ],
2727
"Strict-Transport-Security": [ "max-age=31536000; includeSubDomains" ],
28-
"Server": [ "Kestrel" ],
2928
"x-ms-ratelimit-remaining-tenant-writes": [ "1199" ],
30-
"x-ms-request-id": [ "14af729f-4c8b-487d-a086-58b16d9d19f8" ],
31-
"x-ms-correlation-request-id": [ "14af729f-4c8b-487d-a086-58b16d9d19f8" ],
32-
"x-ms-routing-request-id": [ "EASTUS:20240129T212541Z:14af729f-4c8b-487d-a086-58b16d9d19f8" ],
33-
"Date": [ "Mon, 29 Jan 2024 21:25:40 GMT" ]
29+
"x-ms-request-id": [ "982c5b6f-47ed-4933-a0d6-ff4260e462e5" ],
30+
"x-ms-correlation-request-id": [ "982c5b6f-47ed-4933-a0d6-ff4260e462e5" ],
31+
"x-ms-routing-request-id": [ "EASTUS2:20240307T190932Z:982c5b6f-47ed-4933-a0d6-ff4260e462e5" ],
32+
"X-Cache": [ "CONFIG_NOCACHE" ],
33+
"X-MSEdge-Ref": [ "Ref A: 25702B615D874BAAAB6D194868D0922F Ref B: BL2AA2010205017 Ref C: 2024-03-07T19:09:31Z" ],
34+
"Date": [ "Thu, 07 Mar 2024 19:09:32 GMT" ]
3435
},
3536
"ContentHeaders": {
3637
"Content-Length": [ "283" ],
3738
"Content-Type": [ "application/json; charset=utf-8" ],
3839
"Expires": [ "-1" ]
3940
},
40-
"Content": "{\"id\":\"/providers/Microsoft.Support/fileWorkspaces/test-ps-a169629b-d263-4ba1-872a-0d79019ca2d3\",\"name\":\"test-ps-a169629b-d263-4ba1-872a-0d79019ca2d3\",\"type\":\"Microsoft.Support/fileWorkspaces\",\"properties\":{\"expirationTime\":\"2024-01-30T21:25:41Z\",\"createdOn\":\"2024-01-29T21:25:41Z\"}}",
41+
"Content": "{\"id\":\"/providers/Microsoft.Support/fileWorkspaces/test-ps-5ebdcaf4-0742-4dfd-9e49-73e13b88283e\",\"name\":\"test-ps-5ebdcaf4-0742-4dfd-9e49-73e13b88283e\",\"type\":\"Microsoft.Support/fileWorkspaces\",\"properties\":{\"expirationTime\":\"2024-03-08T19:09:32Z\",\"createdOn\":\"2024-03-07T19:09:32Z\"}}",
4142
"isContentBase64": false
4243
}
4344
}

‎src/Support/Support.Autorest/test/New-AzSupportFileWorkspacesNoSubscription.Tests.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ if(($null -eq $TestName) -or ($TestName -contains 'New-AzSupportFileWorkspacesNo
1616

1717
Describe 'New-AzSupportFileWorkspacesNoSubscription' {
1818
It 'Create' {
19-
$fileWorkspaceName = "test-ps-$(New-Guid)"
19+
$fileWorkspaceName = $env.fileWorkspaceNameNoSubscription2
2020
$fileWorkspace = New-AzSupportFileWorkspacesNoSubscription -Name $fileWorkspaceName
2121
$fileWorkspace.Name | Should -Be $fileWorkspaceName
2222
}

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

Lines changed: 24 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -54,18 +54,29 @@ function setupEnv() {
5454
$testGuid = [guid]::NewGuid().ToString()
5555
$env.BillingServiceId = "517f2da6-78fd-0498-4e22-ad26996b1dfc"
5656
$env.BillingProblemClassificationId = "d0f16bf7-e011-3f3b-1c26-3147f84e0896"
57-
$env.FileWorkspaceNameSubscription = "test-ps-$(New-Guid)"
58-
$env.FileWorkspaceNameNoSubscription = "test-ps-$(New-Guid)"
57+
$fileWorkspaceNameSubscription = "test-ps-$(New-Guid)"
58+
$fileWorkspaceNameNoSubscription = "test-ps-$(New-Guid)"
59+
$fileWorkspaceNameSubscription2 = "test-ps-$(New-Guid)"
60+
$fileWorkspaceNameNoSubscription2 = "test-ps-$(New-Guid)"
61+
$env.AddWithCache("FileWorkspaceNameSubscription", $fileWorkspaceNameSubscription, $UsePreviousConfigForRecord)
62+
$env.AddWithCache("FileWorkspaceNameNoSubscription", $fileWorkspaceNameNoSubscription, $UsePreviousConfigForRecord)
63+
$env.AddWithCache("FileWorkspaceNameSubscription2", $fileWorkspaceNameSubscription2, $UsePreviousConfigForRecord)
64+
$env.AddWithCache("FileWorkspaceNameNoSubscription2", $fileWorkspaceNameNoSubscription2, $UsePreviousConfigForRecord)
65+
# $env.FileWorkspaceNameSubscription = "test-ps-$(New-Guid)"
66+
# $env.FileWorkspaceNameNoSubscription = "test-ps-$(New-Guid)"
5967

6068
$testFilePath = Join-Path $PSScriptRoot files test2.txt
61-
if($env.HasSubscription){
62-
New-AzSupportFileWorkspace -Name $env.FileWorkspaceNameSubscription
63-
New-AzSupportFileAndUpload -WorkspaceName $env.FileWorkspaceNameSubscription -FilePath $testFilePath
64-
}
65-
else{
66-
New-AzSupportFileWorkspacesNoSubscription -Name $env.FileWorkspaceNameNoSubscription
67-
New-AzSupportFileAndUploadNoSubscription -WorkspaceName $env.FileWorkspaceNameNoSubscription -FilePath $testFilePath
69+
if($TestMode -ne 'playback'){
70+
if($env.HasSubscription){
71+
New-AzSupportFileWorkspace -Name $env.FileWorkspaceNameSubscription
72+
New-AzSupportFileAndUpload -WorkspaceName $env.FileWorkspaceNameSubscription -FilePath $testFilePath
73+
}
74+
else{
75+
New-AzSupportFileWorkspacesNoSubscription -Name $env.FileWorkspaceNameNoSubscription
76+
New-AzSupportFileAndUploadNoSubscription -WorkspaceName $env.FileWorkspaceNameNoSubscription -FilePath $testFilePath
77+
}
6878
}
79+
6980

7081
$testTicketName = "test-$testGuid"
7182
$advancedDiagnosticConsent = "no"
@@ -111,8 +122,8 @@ function setupEnv() {
111122
$env.AddWithCache("Sender", $msgSender, $UsePreviousConfigForRecord)
112123
$env.AddWithCache("Subject", $subject, $UsePreviousConfigForRecord)
113124
$env.AddWithCache("Body", $body, $UsePreviousConfigForRecord)
114-
115-
if($env.HasSubscription){
125+
if($TestMode -ne 'playback'){
126+
if($env.HasSubscription){
116127
write-host "creating a support ticket request at subscription level"
117128
$supportTicketSubscription = New-AzSupportTicket -Name $env.Name -AdvancedDiagnosticConsent $env.AdvancedDiagnosticConsent -ContactDetailCountry $env.ContactDetailCountry -ContactDetailFirstName $env.ContactDetailFirstName -ContactDetailLastName $env.ContactDetailLastName -ContactDetailPreferredContactMethod $env.ContactDetailPreferredContactMethod -ContactDetailPreferredSupportLanguage $env.ContactDetailPreferredSupportLanguage -ContactDetailPreferredTimeZone $env.ContactDetailPreferredTimeZone -ContactDetailPrimaryEmailAddress $env.ContactDetailPrimaryEmailAddress -Description $env.Description -ProblemClassificationId $env.ProblemClassificationId -ServiceId $env.ServiceId -Severity $env.Severity -Title $env.Title
118129
write-host "adding a message at subscription level"
@@ -136,6 +147,8 @@ function setupEnv() {
136147
# }
137148
$env.AddWithCache("SupportPlanTenant", $supportTicketTenant.SupportPlanDisplayName.ToString(), $UsePreviousConfigForRecord)
138149
}
150+
}
151+
139152

140153

141154
# For any resources you created for test, you should add it to $env here.

0 commit comments

Comments
 (0)