Skip to content

Commit 7247176

Browse files
ahamad-MSAshraf Hamad
ahamad-MS
and
Ashraf Hamad
authored
AzureEventGrid: Add Powershell cmdlets for 2020-06-01 API Version (#12314)
* initial support for GA functionalities/properties * Add support for webhook batching * Add support for webhook AAD support * Add support for ipfiltering for domain and topic * Regenerate help * Re-Record the tests and remove secrets * fix statical analysis issues * Remove key1/key2 from test recordings * Remove key1 secret info from test recording and remove unused test recording files * handle CR comment to revert module version * Address more CR comments * fix static analysis issue * fix static analysis * additional fix for static analysis * fix static analysis * fix static analysis * comment tests due to recording nature Co-authored-by: Ashraf Hamad <[email protected]>
1 parent 9d46506 commit 7247176

File tree

80 files changed

+46660
-4078
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+46660
-4078
lines changed

‎artifacts/StaticAnalysis/Exceptions/Az.EventGrid/SignatureIssues.csv‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
"AssemblyFileName","ClassName","Target","Severity","ProblemId","Description","Remediation"
2+
"Microsoft.Azure.PowerShell.Cmdlets.EventGrid.dll","Microsoft.Azure.Commands.EventGrid.NewAzureEventGridSubscription","New-AzEventGridSubscription","1","8420","Parameter set 'ResourceIdEventSubscriptionParameterSet' of cmdlet 'New-AzEventGridSubscription' contains at least one parameter with a position larger than four, which is discouraged.","Limit the number of positional parameters in a single parameter set to four or fewer."
3+
"Microsoft.Azure.PowerShell.Cmdlets.EventGrid.dll","Microsoft.Azure.Commands.EventGrid.NewAzureEventGridSubscription","New-AzEventGridSubscription","1","8420","Parameter set 'EventSubscriptionInputObjectSet' of cmdlet 'New-AzEventGridSubscription' contains at least one parameter with a position larger than four, which is discouraged.","Limit the number of positional parameters in a single parameter set to four or fewer."
4+
"Microsoft.Azure.PowerShell.Cmdlets.EventGrid.dll","Microsoft.Azure.Commands.EventGrid.NewAzureEventGridSubscription","New-AzEventGridSubscription","1","8420","Parameter set 'CustomTopicEventSubscriptionParameterSet' of cmdlet 'New-AzEventGridSubscription' contains at least one parameter with a position larger than four, which is discouraged.","Limit the number of positional parameters in a single parameter set to four or fewer."
5+
"Microsoft.Azure.PowerShell.Cmdlets.EventGrid.dll","Microsoft.Azure.Commands.EventGrid.NewAzureEventGridSubscription","New-AzEventGridSubscription","1","8420","Parameter set 'ResourceGroupNameParameterSet' of cmdlet 'New-AzEventGridSubscription' contains at least one parameter with a position larger than four, which is discouraged.","Limit the number of positional parameters in a single parameter set to four or fewer."
6+
"Microsoft.Azure.PowerShell.Cmdlets.EventGrid.dll","Microsoft.Azure.Commands.EventGrid.NewAzureEventGridSubscription","New-AzEventGridSubscription","1","8420","Parameter set 'EventSubscriptionCustomTopicInputObjectParameterSet' of cmdlet 'New-AzEventGridSubscription' contains at least one parameter with a position larger than four, which is discouraged.","Limit the number of positional parameters in a single parameter set to four or fewer".
7+
"Microsoft.Azure.PowerShell.Cmdlets.EventGrid.dll","Microsoft.Azure.Commands.EventGrid.NewAzureEventGridSubscription","New-AzEventGridSubscription","1","8420","Parameter set 'DomainEventSubscriptionParameterSet' of cmdlet 'New-AzEventGridSubscription' contains at least one parameter with a position larger than four, which is discouraged.","Limit the number of positional parameters in a single parameter set to four or fewer."
8+
"Microsoft.Azure.PowerShell.Cmdlets.EventGrid.dll","Microsoft.Azure.Commands.EventGrid.SetAzureEventGridTopic","Set-AzEventGridTopic","1","8420","Parameter set 'TopicNameParameterSet' of cmdlet 'Set-AzEventGridTopic' contains at least one parameter with a position larger than four, which is discouraged.","Limit the number of positional parameters in a single parameter set to four or fewer."

‎src/EventGrid/EventGrid.Test/EventGrid.Test.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Microsoft.Azure.Management.EventGrid" Version="5.0.0" />
14+
<PackageReference Include="Microsoft.Azure.Management.EventGrid" Version="6.0.0" />
1515
<PackageReference Include="Microsoft.Azure.Management.EventHub" Version="2.7.0" />
1616
<PackageReference Include="Microsoft.Azure.Management.Relay" Version="2.0.2" />
1717
<PackageReference Include="Microsoft.Azure.Management.ServiceBus" Version="2.1.0" />

‎src/EventGrid/EventGrid.Test/ScenarioTests/Common.ps1‎

Lines changed: 100 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,15 @@ function Get-EventSubscriptionName
6060
return "EventSubscription-" + (getAssetName)
6161
}
6262

63+
<#
64+
.SYNOPSIS
65+
Get EventSubscription Azure Function Endpoint
66+
#>
67+
function Get-EventSubscriptionAzureFunctionEndpoint
68+
{
69+
return "/subscriptions/5b4b650e-28b9-4790-b3ab-ddbd88d727c4/resourceGroups/DevExpRg/providers/Microsoft.Web/sites/eventgridclitestapp/functions/EventGridTrigger1"
70+
}
71+
6372
<#
6473
.SYNOPSIS
6574
Get EventSubscription Webhook Endpoint
@@ -78,6 +87,24 @@ function Get-EventSubscriptionWebhookBaseEndpoint
7887
return "https://devexpfuncappdestination.azurewebsites.net/runtime/webhooks/EventGrid"
7988
}
8089

90+
<#
91+
.SYNOPSIS
92+
Get EventSubscription Webhook Endpoint With Cloud Event
93+
#>
94+
function Get-EventSubscriptionWebhookEndpointWithCloudEvent
95+
{
96+
return "https://eventgridclitestapp.azurewebsites.net/api/cloudeventfunc?code=<HIDDEN>"
97+
}
98+
99+
<#
100+
.SYNOPSIS
101+
Get EventSubscription Webhook Endpoint With Cloud Event
102+
#>
103+
function Get-EventSubscriptionWebhookBaseEndpointWithCloudEvent
104+
{
105+
return "https://eventgridclitestapp.azurewebsites.net/api/cloudeventfunc"
106+
}
107+
81108
<#
82109
.SYNOPSIS
83110
Get location
@@ -159,11 +186,20 @@ function Get-ServiceBusNameSpaceName
159186

160187
<#
161188
.SYNOPSIS
162-
Get ServiceBus Name
189+
Get ServiceBus Queue Name
190+
#>
191+
function Get-ServiceBusQueueName
192+
{
193+
return "sbqueuename-" + (getAssetName)
194+
}
195+
196+
<#
197+
.SYNOPSIS
198+
Get ServiceBus Topic Name
163199
#>
164-
function Get-ServiceBusName
200+
function Get-ServiceBusTopicName
165201
{
166-
return "sbname-" + (getAssetName)
202+
return "sbtopicname-" + (getAssetName)
167203
}
168204

169205
<#
@@ -182,8 +218,6 @@ Create new ServiceBus Queue
182218
#>
183219
function New-ServiceBusQueue($ResourceGroupName, $NamespaceName, $QueueName, $Location)
184220
{
185-
Write-Debug "Creating ServiceBus namespace $NamespaceName in resource group $ResourceGroupName and location $Location"
186-
New-AzServiceBusNamespace -ResourceGroupName $ResourceGroupName -Name $NamespaceName -Location $Location
187221
$DefaultMessageTimeToLiveTimeSpan = New-TimeSpan -Minute 1
188222
Write-Debug "Creating ServiceBus queue $QueueName in Namespace $NamespaceName in resource group $ResourceGroupName and location $Location"
189223
New-AzServiceBusQueue -ResourceGroupName $ResourceGroupName -Namespace $NamespaceName -Name $QueueName -RequiresSession $False -EnablePartitioning $True -DefaultMessageTimeToLive $DefaultMessageTimeToLiveTimeSpan
@@ -193,14 +227,62 @@ function New-ServiceBusQueue($ResourceGroupName, $NamespaceName, $QueueName, $Lo
193227
.SYNOPSIS
194228
Remove ServiceBus Queue
195229
#>
196-
function Remove-ServiceBusResources($ResourceGroupName, $NamespaceName, $QueueName)
230+
function Remove-ServiceBusQueueResources($ResourceGroupName, $NamespaceName, $QueueName)
197231
{
198232
Write-Debug "Deleting ServiceBus queue $QueueName in Namespace $NamespaceName in resource group $ResourceGroupName"
199233
Remove-AzServiceBusQueue -ResourceGroupName $ResourceGroupName -Namespace $NamespaceName -Name $QueueName
234+
}
235+
236+
<#
237+
.SYNOPSIS
238+
Get ServiceBus Topic ResourceId
239+
#>
240+
function Get-ServiceBusTopicResourceId($ResourceGroupName, $NamespaceName, $TopicName)
241+
{
242+
$subId = Get-SubscriptionID
243+
return "/subscriptions/$subId/resourceGroups/$ResourceGroupName/providers/Microsoft.ServiceBus/namespaces/$NamespaceName/topics/$TopicName"
244+
}
245+
246+
<#
247+
.SYNOPSIS
248+
Create new ServiceBus Namespace
249+
#>
250+
function New-ServiceBusNamespace($ResourceGroupName, $NamespaceName, $Location)
251+
{
252+
Write-Debug "Creating ServiceBus namespace $NamespaceName in resource group $ResourceGroupName and location $Location"
253+
New-AzServiceBusNamespace -ResourceGroupName $ResourceGroupName -Name $NamespaceName -Location $Location
254+
}
255+
256+
<#
257+
.SYNOPSIS
258+
Remove ServiceBus Topic
259+
#>
260+
function Remove-ServiceBusTopicResources($ResourceGroupName, $NamespaceName, $TopicName)
261+
{
262+
Write-Debug "Deleting ServiceBus topic $TopicName in Namespace $NamespaceName in resource group $ResourceGroupName"
263+
Remove-AzServiceBusTopic -ResourceGroupName $ResourceGroupName -NamespaceName $NamespaceName -TopicName $TopicName
264+
}
265+
266+
<#
267+
.SYNOPSIS
268+
Remove ServiceBus Namespace
269+
#>
270+
function Remove-ServiceBusNamespaceResources($ResourceGroupName, $NamespaceName)
271+
{
200272
Write-Debug "Deleting ServiceBus namespace $NamespaceName in resource group $ResourceGroupName"
201273
Remove-AzServiceBusNamespace -ResourceGroupName $ResourceGroupName -Name $NamespaceName
202274
}
203275

276+
<#
277+
.SYNOPSIS
278+
Create new ServiceBus Topic
279+
#>
280+
function New-ServiceBusTopic($ResourceGroupName, $NamespaceName, $TopicName)
281+
{
282+
Write-Debug "Creating ServiceBus topic $TopicName in Namespace $NamespaceName in resource group $ResourceGroupName"
283+
New-AzServiceBusTopic -ResourceGroup $ResourceGroupName -NamespaceName $NamespaceName -TopicName $TopicName -EnablePartitioning $True
284+
}
285+
204286
<#
205287
.SYNOPSIS
206288
Get Storage Account Name
@@ -240,9 +322,9 @@ function New-StorageQueue($ResourceGroupName, $StorageAccountName, $QueueName, $
240322
$StorageAccount = New-AzStorageAccount -Name $StorageAccountName -ResourceGroupName $ResourceGroupName -SkuName Standard_LRS -Location $Location -Kind StorageV2 -AccessTier Hot
241323
$storageAccountKeyValue = $(Get-AzStorageAccountKey -ResourceGroupName $ResourceGroupName -Name $StorageAccountName)[0].Value
242324
$cxt = New-AzStorageContext -StorageAccountName $StorageAccountName -StorageAccountKey $storageAccountKeyValue
243-
244-
# Uncomment when live recording
245-
# New-AzStorageQueue -Name $StorageQueueName -Context $cxt
325+
326+
# NOTE: Uncomment when live recording
327+
#### New-AzStorageQueue -Name $StorageQueueName -Context $cxt
246328
}
247329

248330
<#
@@ -255,8 +337,10 @@ function Remove-StorageResources($ResourceGroupName, $StorageAccountName, $Queue
255337
$StorageAccount = Get-AzStorageAccount -ResourceGroupName $ResourceGroupName -AccountName $StorageAccountName
256338
$storageAccountKeyValue = $(Get-AzStorageAccountKey -ResourceGroupName $ResourceGroupName -Name $StorageAccountName)[0].Value
257339
$cxt = New-AzStorageContext -StorageAccountName $StorageAccountName -StorageAccountKey $storageAccountKeyValue
258-
# Uncomment when live recording
259-
# Remove-AzStorageQueue -Name $QueueName -Context $cxt -Force
340+
341+
# NOTE: Uncomment when live recording
342+
#### Remove-AzStorageQueue -Name $QueueName -Context $cxt -Force
343+
260344
Write-Debug "Deleting storage account $StorageAccount in resource group $ResourceGroupName"
261345
Remove-AzStorageAccount -ResourceGroupName $ResourceGroupName -Name $StorageAccountName -Force
262346
}
@@ -290,8 +374,9 @@ function New-StorageBlob($ResourceGroupName, $StorageAccountName, $ContainerName
290374
$storageAccount = New-AzStorageAccount -Name $StorageAccountName -ResourceGroupName $ResourceGroupName -SkuName Standard_LRS -Location $Location
291375
$storageAccountKeyValue = $(Get-AzStorageAccountKey -ResourceGroupName $ResourceGroupName -Name $StorageAccountName)[0].Value
292376
$cxt = New-AzStorageContext -StorageAccountName $storageAccountName -StorageAccountKey $storageAccountKeyValue
293-
# Uncomment when live recording
294-
# New-AzStoragecontainer -Name $ContainerName -Context $cxt
377+
378+
# NOTE: Uncomment when live recording
379+
#### New-AzStoragecontainer -Name $ContainerName -Context $cxt
295380
}
296381

297382
<#
@@ -304,8 +389,8 @@ function Remove-StorageContainerResources($ResourceGroupName, $StorageAccountNam
304389
$StorageAccount = Get-AzStorageAccount -ResourceGroupName $ResourceGroupName -AccountName $StorageAccountName
305390
$storageAccountKeyValue = $(Get-AzStorageAccountKey -ResourceGroupName $ResourceGroupName -Name $StorageAccountName)[0].Value
306391
$cxt = New-AzStorageContext -StorageAccountName $StorageAccountName -StorageAccountKey $storageAccountKeyValue
307-
# Uncomment when live recording
308-
# Remove-AzStorageContainer -Name $ContainerName -Context $cxt
392+
# NOTE: Uncomment when live recording
393+
#### Remove-AzStorageContainer -Name $ContainerName -Context $cxt
309394
Write-Debug "Deleting storage account $StorageAccount in resource group $ResourceGroupName"
310395
Remove-AzStorageAccount -ResourceGroupName $ResourceGroupName -Name $StorageAccountName -Force
311396
}

‎src/EventGrid/EventGrid.Test/ScenarioTests/DomainTests.cs‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,13 @@ public void EventGrid_DomainsNewKey()
5252
EventGridController.NewInstance.RunPsTest(_logger, "DomainNewKeyTests");
5353
}
5454

55+
[Fact]
56+
[Trait(Category.AcceptanceType, Category.CheckIn)]
57+
public void EventGrid_DomainsInputMappingCreateGetAndDelete()
58+
{
59+
EventGridController.NewInstance.RunPsTest(_logger, "DomainInputMappingTests");
60+
}
61+
5562
[Fact]
5663
[Trait(Category.AcceptanceType, Category.CheckIn)]
5764
public void EventGrid_DomainTopics()

0 commit comments

Comments
 (0)