Skip to content

EventGrid: Updated to use the latest version of the .NET SDK #5367

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Jan 31, 2018
Merged

EventGrid: Updated to use the latest version of the .NET SDK #5367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
bc7dee6
Updated to use the 1.2.0-preview version of the EventGrid Management …
kalyanaj Jan 24, 2018
f081465
Re-recorded the tests.
kalyanaj Jan 25, 2018
03aa72f
Reverted the module version number updates.
kalyanaj Jan 25, 2018
5584981
Merge branch 'preview' into preview
cormacpayne Jan 29, 2018
2c24733
Re-recorded the tests to include the Update scenario.
kalyanaj Jan 30, 2018
6cfdc4f
Merge branch 'preview' of https://github.com/azure/azure-powershell i…
kalyanaj Jan 30, 2018
209856d
Fixed a merge issue in changelog.md.
kalyanaj Jan 30, 2018
6b92c2e
Merge branch 'preview' of https://github.com/kalyanaj/azure-powershel…
kalyanaj Jan 30, 2018
cde0c4e
Re-recorded the tests (had missed binplacing the PS test before recor…
kalyanaj Jan 30, 2018
2c0c0c9
Merge branch 'preview' into preview
cormacpayne Jan 30, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/ResourceManager/EventGrid/ChangeLog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
- Additional information about change #1
-->
## Current Release
* Updated to use the 2018-01-01 API version.

## Version 0.3.0
* Added the following new cmdlet:
Expand Down
2 changes: 1 addition & 1 deletion src/ResourceManager/EventGrid/Commands.EventGrid.Test/Commands.EventGrid.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Azure.Management.EventGrid">
<HintPath>..\..\..\packages\Microsoft.Azure.Management.EventGrid.1.1.0-preview\lib\net452\Microsoft.Azure.Management.EventGrid.dll</HintPath>
<HintPath>..\..\..\packages\Microsoft.Azure.Management.EventGrid.1.2.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.3\lib\net452\Microsoft.Azure.Management.EventHub.dll</HintPath>
Expand Down
4 changes: 2 additions & 2 deletions ...esourceManager/EventGrid/Commands.EventGrid.Test/ScenarioTests/EventSubscriptionTests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,8 +158,8 @@ function EventSubscriptionTests_ResourceGroup {
$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;
$updatedLabels = $updateResult.Labels
Assert-AreEqual 2 $updatedLabels.Count;
Assert-AreEqual "Marketing" $updatedLabels[0];
Assert-AreEqual "Sales" $updatedLabels[1];

Expand Down
692 changes: 511 additions & 181 deletions ....ScenarioTests.EventSubscriptionTests/EventGrid_EventSubscriptionToAzureSubscription.json
View file
Open in desktop

Large diffs are not rendered by default.

432 changes: 327 additions & 105 deletions ...ScenarioTests.EventSubscriptionTests/EventGrid_EventSubscriptionToAzureSubscription2.json
View file
Open in desktop

Large diffs are not rendered by default.

1,538 changes: 1,069 additions & 469 deletions ...Tests.ScenarioTests.EventSubscriptionTests/EventGrid_EventSubscriptionToCustomTopics.json
View file
Open in desktop

Large diffs are not rendered by default.

631 changes: 425 additions & 206 deletions ...ests.ScenarioTests.EventSubscriptionTests/EventGrid_EventSubscriptionToCustomTopics2.json
View file
Open in desktop

Large diffs are not rendered by default.

980 changes: 547 additions & 433 deletions ...Tests.ScenarioTests.EventSubscriptionTests/EventGrid_EventSubscriptionToResourceCRUD.json
View file
Open in desktop

Large diffs are not rendered by default.

868 changes: 653 additions & 215 deletions ...ests.ScenarioTests.EventSubscriptionTests/EventGrid_EventSubscriptionToResourceGroup.json
View file
Open in desktop

Large diffs are not rendered by default.

546 changes: 384 additions & 162 deletions ...sts.ScenarioTests.EventSubscriptionTests/EventGrid_EventSubscriptionToResourceGroup2.json
View file
Open in desktop

Large diffs are not rendered by default.

749 changes: 402 additions & 347 deletions ...Commands.EventGrid.Tests.ScenarioTests.TopicTests/EventGrid_TopicsCreateGetAndDelete.json
View file
Open in desktop

Large diffs are not rendered by default.

260 changes: 130 additions & 130 deletions ...osoft.Azure.Commands.EventGrid.Tests.ScenarioTests.TopicTests/EventGrid_TopicsGetKey.json
View file
Open in desktop

Large diffs are not rendered by default.

268 changes: 134 additions & 134 deletions ...osoft.Azure.Commands.EventGrid.Tests.ScenarioTests.TopicTests/EventGrid_TopicsNewKey.json
View file
Open in desktop

Large diffs are not rendered by default.

418 changes: 209 additions & 209 deletions ...icrosoft.Azure.Commands.EventGrid.Tests.ScenarioTests.TopicTests/EventGrid_TopicsSet.json
View file
Open in desktop

Large diffs are not rendered by default.

80 changes: 40 additions & 40 deletions ...oft.Azure.Commands.EventGrid.Tests.ScenarioTests.TopicTypeTests/EventGrid_TopicTypes.json
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions src/ResourceManager/EventGrid/Commands.EventGrid/Commands.EventGrid.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.Azure.Management.EventGrid, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Reference Include="Microsoft.Azure.Management.EventGrid, Version=1.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\packages\Microsoft.Azure.Management.EventGrid.1.1.0-preview\lib\net452\Microsoft.Azure.Management.EventGrid.dll</HintPath>
<HintPath>..\..\..\packages\Microsoft.Azure.Management.EventGrid.1.2.0-preview\lib\net452\Microsoft.Azure.Management.EventGrid.dll</HintPath>
</Reference>
<Reference Include="System.Management.Automation, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/ResourceManager/EventGrid/Commands.EventGrid/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System.Reflection;
using System.Reflection;
using System.Runtime.InteropServices;

[assembly: AssemblyTitle("Commands.EventGrid")]
Expand Down
2 changes: 1 addition & 1 deletion src/ResourceManager/EventGrid/Commands.EventGrid/Utilities/EventGridClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ public EventSubscription CreateEventSubscription(
eventSubscription.Labels = new List<string>(labels);
}

return this.Client.EventSubscriptions.Create(scope, eventSubscriptionName, eventSubscription);
return this.Client.EventSubscriptions.CreateOrUpdate(scope, eventSubscriptionName, eventSubscription);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kalyanaj does this affect when users should decide between New-AzureRmEventGridSubscription vs Update-AzureRmEventGridSubscription?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, it shouldn't. Update-AzureRmEventGridSubscription maps to a PATCH request and can be used to perform a partial update of the resource (e.g. in the case of event subscriptions, I want to update only the "filter" and not the "destination"). New-AzureRmEventGridSubscription maps to a PUT request which either creates or replaces the resource.

}

public EventSubscription UpdateEventSubscription(
Expand Down
2 changes: 1 addition & 1 deletion src/ResourceManager/EventGrid/Commands.EventGrid/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.Azure.Management.EventGrid" version="1.1.0-preview" targetFramework="net452" />
<package id="Microsoft.Azure.Management.EventGrid" version="1.2.0-preview" targetFramework="net452" />
</packages>