Skip to content

Commit 3bad989

Browse files
shreyakumar3093shreyakumar3093
committed
get conflict file changes from grhuang/azsupport-autorest
1 parent 39253ec commit 3bad989

File tree

4 files changed

+10
-123
lines changed

4 files changed

+10
-123
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
DotNetFrameworkVersion = '4.7.2'
1212
RequiredAssemblies = './bin/Az.Support.private.dll'
1313
FormatsToProcess = './Az.Support.format.ps1xml'
14-
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'
14+
FunctionsToExport = 'Get-AzSupportChatTranscript', 'Get-AzSupportChatTranscriptsNoSubscription', 'Get-AzSupportCommunication', 'Get-AzSupportCommunicationsNoSubscription', 'Get-AzSupportFile', 'Get-AzSupportFilesNoSubscription', 'Get-AzSupportFileWorkspace', 'Get-AzSupportFileWorkspacesNoSubscription', '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'
1515
PrivateData = @{
1616
PSData = @{
1717
Tags = 'Azure', 'ResourceManager', 'ARM', 'PSModule', 'Support'

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

Lines changed: 3 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,8 @@
11
{
2+
"SubscriptionId": "4df09db9-7a7e-450b-8f88-00fb97c277bd",
23
"FileWorkspaceNameSubscription": "test-ps-1c0f34c3-a77f-48f8-92ed-4bc40297b575",
34
"FileWorkspaceNameNoSubscription": "test-ps-c3365113-f08e-4317-936c-3d948a9dc191",
5+
"Tenant": "d71d46f6-114f-4d2a-81c9-8fc86ba8801c",
46
"BillingServiceId": "517f2da6-78fd-0498-4e22-ad26996b1dfc",
5-
"BillingProblemClassificationId": "d0f16bf7-e011-3f3b-1c26-3147f84e0896",
6-
"ContactDetailPreferredTimeZone": "Pacific Standard Time",
7-
"SupportPlanTenant": "Basic support",
8-
"ServiceId": "/providers/Microsoft.Support/services/517f2da6-78fd-0498-4e22-ad26996b1dfc",
9-
"Severity": "minimal",
10-
"ContactDetailLastName": "test",
11-
"AdvancedDiagnosticConsent": "no",
12-
"SubscriptionId": "76cb77fa-8b17-4eab-9493-b65dace99813",
13-
"CommunicationName1": "test1-msg-5dda17d0-a60d-4f4c-82e3-0fe3604c0ed4",
14-
"ContactDetailFirstName": "test",
15-
"Sender": "[email protected]",
16-
"SupportPlanSubscription": "Azure Support Plan - Internal",
17-
"Subject": "this is a test subject",
18-
"ContactDetailPreferredSupportLanguage": "en-US",
19-
"Name": "test-5dda17d0-a60d-4f4c-82e3-0fe3604c0ed4",
20-
"Tenant": "72f988bf-86f1-41af-91ab-2d7cd011db47",
21-
"Description": "test ticket - please ignore and close",
22-
"ContactDetailCountry": "usa",
23-
"ProblemClassificationId": "/providers/Microsoft.Support/services/517f2da6-78fd-0498-4e22-ad26996b1dfc/problemClassifications/3ec1a070-f242-9ecf-5a7c-e1a88ce029ef",
24-
"ContactDetailPrimaryEmailAddress": "[email protected]",
25-
"Name1": "test1-5dda17d0-a60d-4f4c-82e3-0fe3604c0ed4",
26-
"Title": "test ticket - please ignore and close",
27-
"ContactDetailPreferredContactMethod": "email",
28-
"Body": "this is a test body",
29-
"CommunicationName": "test-msg-5dda17d0-a60d-4f4c-82e3-0fe3604c0ed4"
7+
"BillingProblemClassificationId": "d0f16bf7-e011-3f3b-1c26-3147f84e0896"
308
}

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

Lines changed: 3 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,6 @@
11
{
2+
"SubscriptionId": "4df09db9-7a7e-450b-8f88-00fb97c277bd",
3+
"Tenant": "d71d46f6-114f-4d2a-81c9-8fc86ba8801c",
24
"BillingProblemClassificationId": "d0f16bf7-e011-3f3b-1c26-3147f84e0896",
3-
"BillingServiceId": "517f2da6-78fd-0498-4e22-ad26996b1dfc",
4-
"ContactDetailPreferredTimeZone": "Pacific Standard Time",
5-
"Title": "test ticket - please ignore and close",
6-
"Description": "test ticket - please ignore and close",
7-
"Severity": "minimal",
8-
"Name": "test-a31f113b-8f99-4a8d-8016-33aec8165a20",
9-
"Name1": "test1-a31f113b-8f99-4a8d-8016-33aec8165a20",
10-
"ContactDetailCountry": "usa",
11-
"ContactDetailLastName": "test",
12-
"Sender": "[email protected]",
13-
"CommunicationName1": "test1-msg-a31f113b-8f99-4a8d-8016-33aec8165a20",
14-
"ProblemClassificationId": "/providers/Microsoft.Support/services/517f2da6-78fd-0498-4e22-ad26996b1dfc/problemClassifications/3ec1a070-f242-9ecf-5a7c-e1a88ce029ef",
15-
"ContactDetailPreferredContactMethod": "email",
16-
"Subject": "this is a test subject",
17-
"SubscriptionId": "76cb77fa-8b17-4eab-9493-b65dace99813",
18-
"Body": "this is a test body",
19-
"Tenant": "72f988bf-86f1-41af-91ab-2d7cd011db47",
20-
"CommunicationName": "test-msg-a31f113b-8f99-4a8d-8016-33aec8165a20",
21-
"ContactDetailPreferredSupportLanguage": "en-US",
22-
"ServiceId": "/providers/Microsoft.Support/services/517f2da6-78fd-0498-4e22-ad26996b1dfc",
23-
"SupportPlanTenant": "Basic support",
24-
"AdvancedDiagnosticConsent": "no",
25-
"SupportPlanSubscription": "Azure Support Plan - Internal",
26-
"ContactDetailFirstName": "test",
27-
"ContactDetailPrimaryEmailAddress": "[email protected]"
5+
"BillingServiceId": "517f2da6-78fd-0498-4e22-ad26996b1dfc"
286
}

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

Lines changed: 3 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,12 @@ $env | Add-Member -Type ScriptMethod -Value { param( [string]$key, [object]$val,
4141
function setupEnv() {
4242
# Preload subscriptionId and tenant from context, which will be used in test
4343
# as default. You could change them if needed.
44-
$env.SubscriptionId = $sub = (Get-AzContext).Subscription.Id
44+
$env.SubscriptionId = (Get-AzContext).Subscription.Id
4545
$env.Tenant = (Get-AzContext).Tenant.Id
46-
$testGuid = [guid]::NewGuid().ToString()
4746
$env.BillingServiceId = "517f2da6-78fd-0498-4e22-ad26996b1dfc"
4847
$env.BillingProblemClassificationId = "d0f16bf7-e011-3f3b-1c26-3147f84e0896"
48+
# For any resources you created for test, you should add it to $env here.
49+
4950
$env.FileWorkspaceNameSubscription = "test-ps-$(New-Guid)"
5051
$env.FileWorkspaceNameNoSubscription = "test-ps-$(New-Guid)"
5152

@@ -56,76 +57,6 @@ function setupEnv() {
5657
New-AzSupportFileAndUpload -WorkspaceName $env.FileWorkspaceNameSubscription -FilePath $testFilePath
5758
New-AzSupportFileAndUploadNoSubscription -WorkspaceName $env.FileWorkspaceNameNoSubscription -FilePath $testFilePath
5859

59-
$testTicketName = "test-$testGuid"
60-
$advancedDiagnosticConsent = "no"
61-
$contactDetailPrimaryEmailAddress = "[email protected]"
62-
$contactDetailFirstName = "test"
63-
$contactDetailLastName = "test"
64-
$contactDetailPreferredContactMethod = "email"
65-
$contactDetailPreferredTimeZone = "Pacific Standard Time"
66-
$contactDetailPreferredSupportLanguage = "en-US"
67-
$contactDetailCountry = "usa"
68-
$description = "test ticket - please ignore and close"
69-
$severity = "minimal"
70-
$title = "test ticket - please ignore and close"
71-
$serviceId = "/providers/Microsoft.Support/services/517f2da6-78fd-0498-4e22-ad26996b1dfc"
72-
$problemClassificationId = "/providers/Microsoft.Support/services/517f2da6-78fd-0498-4e22-ad26996b1dfc/problemClassifications/3ec1a070-f242-9ecf-5a7c-e1a88ce029ef"
73-
write-host "creating test ticket"
74-
$env.AddWithCache("Name", $testTicketName, $UsePreviousConfigForRecord)
75-
$env.AddWithCache("AdvancedDiagnosticConsent", $advancedDiagnosticConsent, $UsePreviousConfigForRecord)
76-
$env.AddWithCache("ContactDetailPrimaryEmailAddress", $contactDetailPrimaryEmailAddress, $UsePreviousConfigForRecord)
77-
$env.AddWithCache("ContactDetailFirstName", $contactDetailFirstName, $UsePreviousConfigForRecord)
78-
$env.AddWithCache("ContactDetailLastName", $contactDetailLastName, $UsePreviousConfigForRecord)
79-
$env.AddWithCache("ContactDetailPreferredContactMethod", $contactDetailPreferredContactMethod, $UsePreviousConfigForRecord)
80-
$env.AddWithCache("ContactDetailPreferredTimeZone", $contactDetailPreferredTimeZone, $UsePreviousConfigForRecord)
81-
$env.AddWithCache("ContactDetailPreferredSupportLanguage", $contactDetailPreferredSupportLanguage, $UsePreviousConfigForRecord)
82-
$env.AddWithCache("ContactDetailCountry", $contactDetailCountry, $UsePreviousConfigForRecord)
83-
$env.AddWithCache("Description", $description, $UsePreviousConfigForRecord)
84-
$env.AddWithCache("Severity", $severity, $UsePreviousConfigForRecord)
85-
$env.AddWithCache("Title", $title, $UsePreviousConfigForRecord)
86-
$env.AddWithCache("ServiceId", $serviceId, $UsePreviousConfigForRecord)
87-
$env.AddWithCache("ProblemClassificationId", $problemClassificationId, $UsePreviousConfigForRecord)
88-
89-
$testTicketName1 = "test1-$testGuid"
90-
$communicationName = "test-msg-$testGuid"
91-
$communicationName1 = "test1-msg-$testGuid"
92-
$msgSender = "[email protected]"
93-
$subject = "this is a test subject"
94-
$body = "this is a test body"
95-
96-
write-host "creating test message"
97-
$env.AddWithCache("Name1", $testTicketName1, $UsePreviousConfigForRecord)
98-
$env.AddWithCache("CommunicationName", $communicationName, $UsePreviousConfigForRecord)
99-
$env.AddWithCache("CommunicationName1", $communicationName1, $UsePreviousConfigForRecord)
100-
$env.AddWithCache("Sender", $msgSender, $UsePreviousConfigForRecord)
101-
$env.AddWithCache("Subject", $subject, $UsePreviousConfigForRecord)
102-
$env.AddWithCache("Body", $body, $UsePreviousConfigForRecord)
103-
104-
write-host "creating a support ticket request at subscription level"
105-
$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
106-
107-
write-host "adding a message at subscription level"
108-
if($supportTicketSubscription.SupportPlanDisplayName -eq "Basic support" || $supportTicket.SupportPlanDisplayName -eq "Free"){
109-
write-host "cannot create, update support tickets and add communication operations for tickets with free support plan"
110-
}
111-
else{
112-
New-AzSupportCommunication -Name $env.CommunicationName -SupportTicketName $env.Name -Body $env.Body -Sender $env.Sender -Subject $env.Subject
113-
}
114-
write-host "creating a support ticket request at tenant level"
115-
$supportTicketTenant = New-AzSupportTicketsNoSubscription -SupportTicketName $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
116-
117-
write-host "adding a message at tenant level"
118-
if($supportTicketTenant.SupportPlanDisplayName -eq "Basic support" || $supportTicket.SupportPlanDisplayName -eq "Free"){
119-
write-host "cannot create, update support tickets and add communication operations for tickets with free support plan"
120-
}
121-
else{
122-
New-AzSupportCommunicationsNoSubscription -CommunicationName $env.CommunicationName -SupportTicketName $env.Name -Body $env.Body -Sender $env.Sender -Subject $env.Subject
123-
}
124-
125-
$env.AddWithCache("SupportPlanSubscription", $supportTicketSubscription.SupportPlanDisplayName.ToString(), $UsePreviousConfigForRecord)
126-
$env.AddWithCache("SupportPlanTenant", $supportTicketTenant.SupportPlanDisplayName.ToString(), $UsePreviousConfigForRecord)
127-
128-
# For any resources you created for test, you should add it to $env here.
12960
$envFile = 'env.json'
13061
if ($TestMode -eq 'live') {
13162
$envFile = 'localEnv.json'

0 commit comments

Comments
 (0)