Merge pull request #5061 from kalyanaj/preview

Azure EventGrid: Adding cmdlets for updating topics and event subscriptions

Author: markcowl

src/ResourceManager/EventGrid/AzureRM.EventGrid.psd1

@@ -3,7 +3,7 @@
 #
 # Generated by: Microsoft Corporation
 #
-# Generated on: 11/3/2017
+# Generated on: 12/15/2017
 #
 
 @{
@@ -12,7 +12,7 @@
 # RootModule = ''
 
 # Version number of this module.
-ModuleVersion = '0.2.0'
+ModuleVersion = '0.3.0'
 
 # Supported PSEditions
 # CompatiblePSEditions = @()
@@ -76,6 +76,7 @@ CmdletsToExport = 'New-AzureRmEventGridTopic', 'Get-AzureRmEventGridTopic',
                'Set-AzureRmEventGridTopic', 'New-AzureRmEventGridTopicKey', 
                'Get-AzureRmEventGridTopicKey', 'Remove-AzureRmEventGridTopic', 
                'New-AzureRmEventGridSubscription', 
+               'Update-AzureRmEventGridSubscription', 
                'Remove-AzureRmEventGridSubscription', 
                'Get-AzureRmEventGridSubscription', 'Get-AzureRmEventGridTopicType'
 
@@ -112,11 +113,18 @@ PrivateData = @{
         # IconUri = ''
 
         # ReleaseNotes of this module
-        ReleaseNotes = '* Add support for online help
-    - Run Get-Help with the -Online parameter to open the online help in your default Internet browser'
+        ReleaseNotes = '* Added the following new cmdlet:
+    - Update-AzureRmEventGridSubscription
+        - Update the properties of an Event Grid event subscription.'
+
+        # Prerelease string of this module
+        # Prerelease = ''
+
+        # Flag to indicate whether the module requires explicit user acceptance for install/update
+        # RequireLicenseAcceptance = $false
 
         # External dependent modules of this module
-        # ExternalModuleDependencies = ''
+        # ExternalModuleDependencies = @()
 
     } # End of PSData hashtable
 

src/ResourceManager/EventGrid/ChangeLog.md

@@ -1,4 +1,4 @@
-<!--
+<!--
     Please leave this section at the top of the change log.
 
     Changes for the current release should go under the section titled "Current Release", and should adhere to the following format:
@@ -19,6 +19,12 @@
 -->
 ## Current Release
 
+## Version 0.3.0
+* Added the following new cmdlet:
+    - Update-AzureRmEventGridSubscription
+        - Update the properties of an Event Grid event subscription.
+
+
 ## Version 0.2.0
 * Add support for online help
     - Run Get-Help with the -Online parameter to open the online help in your default Internet browser
@@ -47,4 +53,4 @@
     - Remove-AzureRmEventGridSubscription
         - Removes an Azure Event Grid event subscription.
     - Get-AzureRmEventGridTopicType
-        - Gets the details about the topic types supported by Azure Event Grid.
+        - Gets the details about the topic types supported by Azure Event Grid.

src/ResourceManager/EventGrid/Commands.EventGrid.Test/Commands.EventGrid.Test.csproj

@@ -56,9 +56,8 @@
       <HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.2.0.0\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.Azure.Management.EventGrid, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Microsoft.Azure.Management.EventGrid.1.0.0-preview\lib\net452\Microsoft.Azure.Management.EventGrid.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Microsoft.Azure.Management.EventGrid">
+      <HintPath>..\..\..\packages\Microsoft.Azure.Management.EventGrid.1.1.0-preview\lib\net452\Microsoft.Azure.Management.EventGrid.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Azure.Management.EventHub">
       <HintPath>..\..\..\packages\Microsoft.Azure.Management.EventHub.2.0.0\lib\net452\Microsoft.Azure.Management.EventHub.dll</HintPath>
@@ -202,7 +201,7 @@
     <None Include="SessionRecords\Microsoft.Azure.Commands.EventGrid.Tests.ScenarioTests.TopicTests\EventGrid_TopicsNewKey.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="SessionRecords\Microsoft.Azure.Commands.EventGrid.Tests.ScenarioTests.TopicTests\EventGrid_TopicsUpdate.json">
+    <None Include="SessionRecords\Microsoft.Azure.Commands.EventGrid.Tests.ScenarioTests.TopicTests\EventGrid_TopicsSet.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Include="SessionRecords\Microsoft.Azure.Commands.EventGrid.Tests.ScenarioTests.TopicTypeTests\EventGrid_TopicTypes.json">

src/ResourceManager/EventGrid/Commands.EventGrid.Test/ScenarioTests/EventSubscriptionTests.ps1

@@ -51,6 +51,12 @@ function EventSubscriptionTests_CustomTopic {
     $result = Get-AzureRmEventGridTopic -ResourceGroup $resourceGroupName -TopicName $topicName | Get-AzureRmEventGridSubscription -EventSubscriptionName $eventSubscriptionName -IncludeFullEndpointUrl
     Assert-True {$result.EventSubscriptionName -eq $eventSubscriptionName}
 
+    Write-Debug "Updating eventSubscription $eventSubscriptionName to topic $topicName in resource group $resourceGroupName"
+    $result = Update-AzureRmEventGridSubscription -ResourceGroup $resourceGroupName -TopicName $topicName -Endpoint https://requestb.in/1kxxoui1 -EventSubscriptionName $eventSubscriptionName
+    Assert-True {$result.ProvisioningState -eq "Succeeded"}
+    $webHookDestination = $result.Destination -as [Microsoft.Azure.Management.EventGrid.Models.WebHookEventSubscriptionDestination]
+    Assert-AreEqual $webHookDestination.EndpointBaseUrl "https://requestb.in/1kxxoui1"
+
     Write-Debug "Listing all the event subscriptions created for $topicName in the resourceGroup $resourceGroup"
     $allCreatedSubscriptions = Get-AzureRmEventGridSubscription -ResourceGroup $resourceGroupName -TopicName $topicName -IncludeFullEndpointUrl
     Assert-True {$allCreatedSubscriptions.Count -eq 2 } "#1. Event Subscriptions created earlier are not found in the list"
@@ -100,6 +106,13 @@ function EventSubscriptionTests_CustomTopic2 {
     $result = Get-AzureRmEventGridSubscription -ResourceGroupName $resourceGroupName -TopicName $topicName -EventSubscriptionName $eventSubscriptionName -IncludeFullEndpointUrl
     Assert-True {$result.EventSubscriptionName -eq $eventSubscriptionName}
 
+    Write-Debug "Updating eventSubscription $eventSubscriptionName to topic $topicName in resource group $resourceGroupName"
+    $updateResult = $result | Update-AzureRmEventGridSubscription -Endpoint https://requestb.in/1kxxoui1 -SubjectEndsWith "NewSuffix"
+    Assert-True {$updateResult.ProvisioningState -eq "Succeeded"}
+	$webHookDestination = $updateResult.Destination -as [Microsoft.Azure.Management.EventGrid.Models.WebHookEventSubscriptionDestination]
+    Assert-AreEqual $webHookDestination.EndpointBaseUrl "https://requestb.in/1kxxoui1"
+    Assert-True {$updateResult.Filter.SubjectEndsWith -eq "NewSuffix"}
+
     Write-Debug " Deleting event subscription $eventSubscriptionName"
     Get-AzureRmEventGridTopic -ResourceGroupName $resourceGroupName -Name $topicName | Remove-AzureRmEventGridSubscription -EventSubscriptionName $eventSubscriptionName
 
@@ -140,6 +153,16 @@ function EventSubscriptionTests_ResourceGroup {
     $result = Get-AzureRmEventGridSubscription -ResourceId "/subscriptions/$subscriptionId/resourceGroups/$resourceGroupName" -EventSubscriptionName $eventSubscriptionName -IncludeFullEndpointUrl
     Assert-True {$result.EventSubscriptionName -eq $eventSubscriptionName}
 
+    Write-Debug "Updating eventSubscription $eventSubscriptionName to resource group $resourceGroupName"
+    $newLabels = "Marketing", "Sales"
+    $updateResult = Update-AzureRmEventGridSubscription -ResourceGroup $resourceGroupName -EventSubscriptionName $eventSubscriptionName -SubjectEndsWith "NewSuffix" -Label $newLabels
+    Assert-True {$updateResult.ProvisioningState -eq "Succeeded"}
+    Assert-True {$updateResult.Filter.SubjectEndsWith -eq "NewSuffix"}
+	$updatedLabels = $updateResult.Labels
+	Assert-AreEqual 2 $updatedLabels.Count;
+    Assert-AreEqual "Marketing" $updatedLabels[0];
+    Assert-AreEqual "Sales" $updatedLabels[1];
+
     Write-Debug "Listing all the event subscriptions created for resourceGroup $resourceGroup"
     $allCreatedSubscriptions = Get-AzureRmEventGridSubscription -ResourceId "/subscriptions/$subscriptionId/resourceGroups/$resourceGroupName"
 
@@ -187,6 +210,13 @@ function EventSubscriptionTests_Subscription {
     $result = Get-AzureRmEventGridSubscription -ResourceId "/subscriptions/$subscriptionId" -EventSubscriptionName $eventSubscriptionName -IncludeFullEndpointUrl
     Assert-True {$result.EventSubscriptionName -eq $eventSubscriptionName}
 
+    Write-Debug "Updating eventSubscription $eventSubscriptionName to Azure subscription $subscriptionId"
+    $updateResult = Update-AzureRmEventGridSubscription -ResourceId "/subscriptions/$subscriptionId" -EventSubscriptionName $eventSubscriptionName -SubjectEndsWith "NewSuffix" -Endpoint https://requestb.in/1kxxoui1
+    Assert-True {$updateResult.ProvisioningState -eq "Succeeded"}
+    Assert-True {$updateResult.Filter.SubjectEndsWith -eq "NewSuffix"}
+	$webHookDestination = $updateResult.Destination -as [Microsoft.Azure.Management.EventGrid.Models.WebHookEventSubscriptionDestination]
+    Assert-AreEqual $webHookDestination.EndpointBaseUrl "https://requestb.in/1kxxoui1"
+
     Write-Debug "Listing all the event subscriptions created for subscription $subscriptionId"
     $allCreatedEventSubscriptions = Get-AzureRmEventGridSubscription -ResourceId "/subscriptions/$subscriptionId"
 
@@ -235,6 +265,13 @@ function EventSubscriptionTests_Resource {
     $result = Get-AzureRmEventGridSubscription -ResourceId "/subscriptions/$subscriptionId/resourceGroups/$resourceGroupName/providers/Microsoft.EventHub/namespaces/$namespaceName" -EventSubscriptionName $eventSubscriptionName
     Assert-True {$result.EventSubscriptionName -eq $eventSubscriptionName}
 
+    Write-Debug "Updating eventSubscription $eventSubscriptionName to Azure resource $subscriptionId"
+    $updateResult = Update-AzureRmEventGridSubscription -ResourceId "/subscriptions/$subscriptionId/resourceGroups/$resourceGroupName/providers/Microsoft.EventHub/namespaces/$namespaceName" -EventSubscriptionName $eventSubscriptionName -SubjectEndsWith "NewSuffix" -Endpoint https://requestb.in/1kxxoui1
+    Assert-True {$updateResult.ProvisioningState -eq "Succeeded"}
+    Assert-True {$updateResult.Filter.SubjectEndsWith -eq "NewSuffix"}
+	$webHookDestination = $updateResult.Destination -as [Microsoft.Azure.Management.EventGrid.Models.WebHookEventSubscriptionDestination]
+    Assert-AreEqual $webHookDestination.EndpointBaseUrl "https://requestb.in/1kxxoui1"
+
     Write-Debug "Getting the created event subscription $eventSubscriptionName with full endpoint URL"
     $result = Get-AzureRmEventGridSubscription -ResourceId "/subscriptions/$subscriptionId/resourceGroups/$resourceGroupName/providers/Microsoft.EventHub/namespaces/$namespaceName" -EventSubscriptionName $eventSubscriptionName -IncludeFullEndpointUrl
     Assert-True {$result.EventSubscriptionName -eq $eventSubscriptionName}

src/ResourceManager/EventGrid/Commands.EventGrid.Test/ScenarioTests/TopicTests.cs

@@ -37,9 +37,9 @@ public void EventGrid_TopicsCreateGetAndDelete()
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
-        public void EventGrid_TopicsUpdate()
+        public void EventGrid_TopicsSet()
         {
-            EventGridController.NewInstance.RunPsTest("TopicUpdateTests");
+            EventGridController.NewInstance.RunPsTest("TopicSetTests");
         }
 
         [Fact]

src/ResourceManager/EventGrid/Commands.EventGrid.Test/ScenarioTests/TopicTests.ps1

@@ -100,9 +100,9 @@ function TopicTests {
 
 <#
 .SYNOPSIS
-Tests EventGrid Topic Update operations.
+Tests EventGrid Topic Set operations.
 #>
-function TopicUpdateTests {
+function TopicSetTests {
     # Setup
     $location = Get-LocationForEventGrid
     $topicName = Get-TopicName
@@ -119,23 +119,32 @@ function TopicUpdateTests {
     Assert-True {$result.ProvisioningState -eq "Succeeded"}
 
     Write-Debug "Calling Set-AzureRmEventGridTopic on the created topic $topicName"
-    $updatedTopic = Set-AzureRmEventGridTopic -ResourceGroup $resourceGroupName -Name $topicName -Tag @{ Dept = "IT2"; Environment = "Test2" }
-    Assert-True {$updatedTopic.Count -eq 1}
-    Assert-True {$updatedTopic.TopicName -eq $topicName} "Topic updated earlier is not found."
+	$tags1 = @{test1 = "testval1"; test2 = "testval2" };
+    $replacedTopic1 = Set-AzureRmEventGridTopic -ResourceGroup $resourceGroupName -Name $topicName -Tag $tags1
+    Assert-True {$replacedTopic1.Count -eq 1}
+    Assert-True {$replacedTopic1.TopicName -eq $topicName} "Topic updated earlier is not found."
 
     Write-Debug "Calling Set-AzureRmEventGridTopic on the created topic $topicName"
-    $updatedTopic = Set-AzureRmEventGridTopic -ResourceId "/subscriptions/$subscriptionId/resourceGroups/$resourceGroupName/providers/Microsoft.EventGrid/topics/$topicName" -Tag @{ Dept = "IT3"; Environment = "Test3" }
-    Assert-True {$updatedTopic.Count -eq 1}
-    Assert-True {$updatedTopic.TopicName -eq $topicName} "Topic updated earlier is not found."
+	$tags2 = @{test1 = "testval1"; test2 = "testval2" };
+    $replacedTopic2 = Set-AzureRmEventGridTopic -ResourceId "/subscriptions/$subscriptionId/resourceGroups/$resourceGroupName/providers/Microsoft.EventGrid/topics/$topicName" -Tag $tags2
+    Assert-True {$replacedTopic2.Count -eq 1}
+    Assert-True {$replacedTopic2.TopicName -eq $topicName} "Topic updated earlier is not found."
+    $returned_tags2 = $replacedTopic2.Tags;
+    Assert-AreEqual 2 $returned_tags2.Count;
+    Assert-AreEqual $tags2["test1"] $returned_tags2["test1"];
+    Assert-AreEqual $tags2["test2"] $returned_tags2["test2"];
 
     Write-Debug "Calling Set-AzureRmEventGridTopic on the created topic $topicName"
-    $updatedTopic = Get-AzureRmEventGridTopic -ResourceGroup $resourceGroupName -Name $topicName | Set-AzureRmEventGridTopic -Tag @{ Dept="IT4"; Environment="Test4" }
-    Assert-True {$updatedTopic.Count -eq 1}
-    Assert-True {$updatedTopic.TopicName -eq $topicName} "Topic updated earlier is not found."
-
-    # TODO: Verify updated tags after service side issue is fixed.
-
-    Write-Debug " Deleting topic: $topicName"
+	$tags3 = @{test1 = "testval10"; test2 = "testval20" };
+    $replacedTopic3 = Get-AzureRmEventGridTopic -ResourceGroup $resourceGroupName -Name $topicName | Set-AzureRmEventGridTopic -Tag $tags3
+    Assert-True {$replacedTopic3.Count -eq 1}
+    Assert-True {$replacedTopic3.TopicName -eq $topicName} "Topic updated earlier is not found."
+    $returned_tags3 = $replacedTopic3.Tags;
+    Assert-AreEqual 2 $returned_tags3.Count;
+    Assert-AreEqual $tags3["test1"] $returned_tags3["test1"];
+    Assert-AreEqual $tags3["test2"] $returned_tags3["test2"];
+
+	Write-Debug " Deleting topic: $topicName"
     Remove-AzureRmEventGridTopic -ResourceGroup $resourceGroupName -Name $topicName
 
     Write-Debug " Deleting resourcegroup $resourceGroupName"