Skip to content

Commit 5fe65c9

Browse files
markcowlmarkcowl
authored
Merge branch 'release-3.7.0' into dev
2 parents e21093e + 1094854 commit 5fe65c9

File tree

131 files changed

+16965
-4519
lines changed

Some content is hidden

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

131 files changed

+16965
-4519
lines changed

‎src/ResourceManager/LogicApp/AzureRM.LogicApp.psd1

Lines changed: 33 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -72,34 +72,39 @@ NestedModules = @('.\Microsoft.Azure.Commands.LogicApp.dll')
7272
FunctionsToExport = @()
7373

7474
# Cmdlets to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no cmdlets to export.
75-
CmdletsToExport = 'Get-AzureRmIntegrationAccountAgreement',
76-
'Get-AzureRmIntegrationAccountCallbackUrl',
77-
'Get-AzureRmIntegrationAccountCertificate',
78-
'Get-AzureRmIntegrationAccount', 'Get-AzureRmIntegrationAccountMap',
79-
'Get-AzureRmIntegrationAccountPartner',
80-
'Get-AzureRmIntegrationAccountSchema',
81-
'New-AzureRmIntegrationAccountAgreement',
82-
'New-AzureRmIntegrationAccountCertificate',
83-
'New-AzureRmIntegrationAccount', 'New-AzureRmIntegrationAccountMap',
84-
'New-AzureRmIntegrationAccountPartner',
85-
'New-AzureRmIntegrationAccountSchema',
86-
'Remove-AzureRmIntegrationAccountAgreement',
87-
'Remove-AzureRmIntegrationAccountCertificate',
88-
'Remove-AzureRmIntegrationAccount',
89-
'Remove-AzureRmIntegrationAccountMap',
90-
'Remove-AzureRmIntegrationAccountPartner',
91-
'Remove-AzureRmIntegrationAccountSchema',
92-
'Set-AzureRmIntegrationAccountAgreement',
93-
'Set-AzureRmIntegrationAccountCertificate',
94-
'Set-AzureRmIntegrationAccount', 'Set-AzureRmIntegrationAccountMap',
95-
'Set-AzureRmIntegrationAccountPartner',
96-
'Set-AzureRmIntegrationAccountSchema', 'Stop-AzureRmLogicAppRun',
97-
'Get-AzureRmLogicApp', 'Get-AzureRmLogicAppRunAction',
98-
'Get-AzureRmLogicAppRunHistory',
99-
'Get-AzureRmLogicAppTriggerCallbackUrl',
100-
'Get-AzureRmLogicAppTrigger', 'Get-AzureRmLogicAppTriggerHistory',
101-
'Get-AzureRmLogicAppUpgradedDefinition', 'New-AzureRmLogicApp',
102-
'Remove-AzureRmLogicApp', 'Start-AzureRmLogicApp',
75+
CmdletsToExport = 'Get-AzureRmIntegrationAccountAgreement',
76+
'Get-AzureRmIntegrationAccountCallbackUrl',
77+
'Get-AzureRmIntegrationAccountCertificate',
78+
'Get-AzureRmIntegrationAccount', 'Get-AzureRmIntegrationAccountMap',
79+
'Get-AzureRmIntegrationAccountPartner',
80+
'Get-AzureRmIntegrationAccountSchema',
81+
'Get-AzureRmIntegrationAccountGeneratedIcn',
82+
'Get-AzureRmIntegrationAccountReceivedIcn',
83+
'New-AzureRmIntegrationAccountAgreement',
84+
'New-AzureRmIntegrationAccountCertificate',
85+
'New-AzureRmIntegrationAccount', 'New-AzureRmIntegrationAccountMap',
86+
'New-AzureRmIntegrationAccountPartner',
87+
'New-AzureRmIntegrationAccountSchema',
88+
'Remove-AzureRmIntegrationAccountAgreement',
89+
'Remove-AzureRmIntegrationAccountCertificate',
90+
'Remove-AzureRmIntegrationAccount',
91+
'Remove-AzureRmIntegrationAccountMap',
92+
'Remove-AzureRmIntegrationAccountPartner',
93+
'Remove-AzureRmIntegrationAccountSchema',
94+
'Remove-AzureRmIntegrationAccountReceivedIcn',
95+
'Set-AzureRmIntegrationAccountAgreement',
96+
'Set-AzureRmIntegrationAccountCertificate',
97+
'Set-AzureRmIntegrationAccount', 'Set-AzureRmIntegrationAccountMap',
98+
'Set-AzureRmIntegrationAccountPartner',
99+
'Set-AzureRmIntegrationAccountSchema', 'Stop-AzureRmLogicAppRun',
100+
'Set-AzureRmIntegrationAccountGeneratedIcn',
101+
'Set-AzureRmIntegrationAccountReceivedIcn',
102+
'Get-AzureRmLogicApp', 'Get-AzureRmLogicAppRunAction',
103+
'Get-AzureRmLogicAppRunHistory',
104+
'Get-AzureRmLogicAppTriggerCallbackUrl',
105+
'Get-AzureRmLogicAppTrigger', 'Get-AzureRmLogicAppTriggerHistory',
106+
'Get-AzureRmLogicAppUpgradedDefinition', 'New-AzureRmLogicApp',
107+
'Remove-AzureRmLogicApp', 'Start-AzureRmLogicApp',
103108
'Set-AzureRmLogicApp', 'Test-AzureRmLogicApp'
104109

105110
# Variables to export from this module

‎src/ResourceManager/LogicApp/ChangeLog.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,12 @@
1818
- Additional information about change #1
1919
-->
2020
## Current Release
21+
* New cmdlets for X12 Interchange Control Number disaster recovery:
22+
- Get-AzureRmIntegrationAccountGeneratedIcn
23+
- Get-AzureRmIntegrationAccountReceivedIcn
24+
- Remove-AzureRmIntegrationAccountReceivedIcn
25+
- Set-AzureRmIntegrationAccountGeneratedIcn
26+
- Set-AzureRmIntegrationAccountReceivedIcn
2127

2228
## Version 2.6.0
2329

‎src/ResourceManager/LogicApp/Commands.LogicApp.Test/Commands.LogicApp.Test.csproj

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@
6363
<SpecificVersion>False</SpecificVersion>
6464
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.2.0.0\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
6565
</Reference>
66-
<Reference Include="Microsoft.Azure.Management.Logic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
66+
<Reference Include="Microsoft.Azure.Management.Logic, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
6767
<SpecificVersion>False</SpecificVersion>
68-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Logic.2.0.0\lib\net45\Microsoft.Azure.Management.Logic.dll</HintPath>
68+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Logic.2.1.0\lib\net45\Microsoft.Azure.Management.Logic.dll</HintPath>
6969
</Reference>
7070
<Reference Include="Microsoft.Azure.Management.WebSites, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
7171
<SpecificVersion>False</SpecificVersion>
@@ -146,8 +146,10 @@
146146
<Compile Include="Properties\AssemblyInfo.cs" />
147147
<Compile Include="ScenarioTests\IntegrationAccountAgreementTests.cs" />
148148
<Compile Include="ScenarioTests\IntegrationAccountCertificateTests.cs" />
149+
<Compile Include="ScenarioTests\IntegrationAccountGeneratedIcnTests.cs" />
149150
<Compile Include="ScenarioTests\IntegrationAccountMapTests.cs" />
150151
<Compile Include="ScenarioTests\IntegrationAccountPartnerTests.cs" />
152+
<Compile Include="ScenarioTests\IntegrationAccountReceivedIcnTests.cs" />
151153
<Compile Include="ScenarioTests\IntegrationAccountSchemaTests.cs" />
152154
<Compile Include="ScenarioTests\IntegrationAccountTests.cs" />
153155
<Compile Include="ScenarioTests\WorkflowController.cs" />
@@ -205,12 +207,18 @@
205207
<None Include="ScenarioTests\IntegrationAccountCertificateTests.ps1">
206208
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
207209
</None>
210+
<None Include="ScenarioTests\IntegrationAccountGeneratedIcnTests.ps1">
211+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
212+
</None>
208213
<None Include="ScenarioTests\IntegrationAccountMapTests.ps1">
209214
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
210215
</None>
211216
<None Include="ScenarioTests\IntegrationAccountPartnerTests.ps1">
212217
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
213218
</None>
219+
<None Include="ScenarioTests\IntegrationAccountReceivedIcnTests.ps1">
220+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
221+
</None>
214222
<None Include="ScenarioTests\IntegrationAccountSchemaTests.ps1">
215223
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
216224
</None>
@@ -268,6 +276,15 @@
268276
<None Include="SessionRecords\Microsoft.Azure.Commands.LogicApp.Test.ScenarioTests.IntegrationAccountCertificateTests\TestUpdateIntegrationAccountCertificate.json">
269277
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
270278
</None>
279+
<None Include="SessionRecords\Microsoft.Azure.Commands.LogicApp.Test.ScenarioTests.IntegrationAccountGeneratedIcnTests\TestGetIntegrationAccountGeneratedIcn.json">
280+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
281+
</None>
282+
<None Include="SessionRecords\Microsoft.Azure.Commands.LogicApp.Test.ScenarioTests.IntegrationAccountGeneratedIcnTests\TestListIntegrationAccountGeneratedIcn.json">
283+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
284+
</None>
285+
<None Include="SessionRecords\Microsoft.Azure.Commands.LogicApp.Test.ScenarioTests.IntegrationAccountGeneratedIcnTests\TestUpdateIntegrationAccountGeneratedIcn.json">
286+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
287+
</None>
271288
<None Include="SessionRecords\Microsoft.Azure.Commands.LogicApp.Test.ScenarioTests.IntegrationAccountMapTests\TestCreateIntegrationAccountMap.json">
272289
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
273290
</None>
@@ -298,6 +315,15 @@
298315
<None Include="SessionRecords\Microsoft.Azure.Commands.LogicApp.Test.ScenarioTests.IntegrationAccountPartnerTests\TestUpdateIntegrationAccountPartner.json">
299316
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
300317
</None>
318+
<None Include="SessionRecords\Microsoft.Azure.Commands.LogicApp.Test.ScenarioTests.IntegrationAccountReceivedIcnTests\TestGetIntegrationAccountReceivedIcn.json">
319+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
320+
</None>
321+
<None Include="SessionRecords\Microsoft.Azure.Commands.LogicApp.Test.ScenarioTests.IntegrationAccountReceivedIcnTests\TestRemoveIntegrationAccountReceivedIcn.json">
322+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
323+
</None>
324+
<None Include="SessionRecords\Microsoft.Azure.Commands.LogicApp.Test.ScenarioTests.IntegrationAccountReceivedIcnTests\TestUpdateIntegrationAccountReceivedIcn.json">
325+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
326+
</None>
301327
<None Include="SessionRecords\Microsoft.Azure.Commands.LogicApp.Test.ScenarioTests.IntegrationAccountSchemaTests\TestCreateIntegrationAccountSchema.json">
302328
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
303329
</None>

‎src/ResourceManager/LogicApp/Commands.LogicApp.Test/ScenarioTests/IntegrationAccountAgreementTests.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ namespace Microsoft.Azure.Commands.LogicApp.Test.ScenarioTests
2323
/// </summary>
2424
public class IntegrationAccountAgreementTests : RMTestBase
2525
{
26-
2726
/// <summary>
2827
/// Test New-AzureRmIntegrationAccountAgreement command to create a new X12 integration account agreement.
2928
/// </summary>
@@ -96,7 +95,7 @@ public void TestUpdateIntegrationAccountAgreement()
9695
}
9796

9897
/// <summary>
99-
/// Test Get-AzureRmIntegrationAccountAgreement command to get all the integration account agreement.
98+
/// Test Get-AzureRmIntegrationAccountAgreement command to get all the integration account agreements.
10099
/// </summary>
101100
[Fact]
102101
[Trait(Category.AcceptanceType, Category.CheckIn)]

‎src/ResourceManager/LogicApp/Commands.LogicApp.Test/ScenarioTests/IntegrationAccountAgreementTests.ps1

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -254,11 +254,11 @@ function Test-UpdateIntegrationAccountAgreement
254254
Assert-AreEqual $integrationAccountAgreementName $integrationAccountAgreement.Name
255255
Assert-AreEqual "X12" $integrationAccountAgreement.AgreementType
256256

257-
Assert-ThrowsContains {Set-AzureRmIntegrationAccountAgreement -ResourceGroupName $resourceGroup.ResourceGroupName -IntegrationAccountName $integrationAccountName -AgreementName $integrationAccountAgreementName -AgreementType "X12" -GuestPartner $guestPartnerName -HostPartner $hostPartnerName -GuestIdentityQualifier "ZZ" -HostIdentityQualifier "AA" -GuestIdentityQualifierValue "ZZ" -Force} "Either Host business Identity qualifier or qualifier value is not specified."
258-
Assert-ThrowsContains {Set-AzureRmIntegrationAccountAgreement -ResourceGroupName $resourceGroup.ResourceGroupName -IntegrationAccountName $integrationAccountName -AgreementName $integrationAccountAgreementName -AgreementType "X12" -GuestPartner $guestPartnerName -HostPartner $hostPartnerName -GuestIdentityQualifier "ZZ" -HostIdentityQualifierValue "AA" -GuestIdentityQualifierValue "ZZ" -Force} "Either Host business Identity qualifier or qualifier value is not specified."
257+
Assert-ThrowsContains {Set-AzureRmIntegrationAccountAgreement -ResourceGroupName $resourceGroup.ResourceGroupName -IntegrationAccountName $integrationAccountName -AgreementName $integrationAccountAgreementName -AgreementType "X12" -GuestPartner $guestPartnerName -HostPartner $hostPartnerName -GuestIdentityQualifier "ZZ" -HostIdentityQualifier "AA" -GuestIdentityQualifierValue "ZZ" -Force} "Either 'Host' business Identity qualifier or qualifier value is not specified."
258+
Assert-ThrowsContains {Set-AzureRmIntegrationAccountAgreement -ResourceGroupName $resourceGroup.ResourceGroupName -IntegrationAccountName $integrationAccountName -AgreementName $integrationAccountAgreementName -AgreementType "X12" -GuestPartner $guestPartnerName -HostPartner $hostPartnerName -GuestIdentityQualifier "ZZ" -HostIdentityQualifierValue "AA" -GuestIdentityQualifierValue "ZZ" -Force} "Either 'Host' business Identity qualifier or qualifier value is not specified."
259259

260-
Assert-ThrowsContains {Set-AzureRmIntegrationAccountAgreement -ResourceGroupName $resourceGroup.ResourceGroupName -IntegrationAccountName $integrationAccountName -AgreementName $integrationAccountAgreementName -AgreementType "X12" -GuestPartner $guestPartnerName -HostPartner $hostPartnerName -GuestIdentityQualifier "ZZ" -HostIdentityQualifier "AA" -HostIdentityQualifierValue "AA" -Force} "Either Guest business Identity qualifier or qualifier value is not specified."
261-
Assert-ThrowsContains {Set-AzureRmIntegrationAccountAgreement -ResourceGroupName $resourceGroup.ResourceGroupName -IntegrationAccountName $integrationAccountName -AgreementName $integrationAccountAgreementName -AgreementType "X12" -GuestPartner $guestPartnerName -HostPartner $hostPartnerName -GuestIdentityQualifierValue "ZZ" -HostIdentityQualifier "AA" -HostIdentityQualifierValue "AA" -Force} "Either Guest business Identity qualifier or qualifier value is not specified."
260+
Assert-ThrowsContains {Set-AzureRmIntegrationAccountAgreement -ResourceGroupName $resourceGroup.ResourceGroupName -IntegrationAccountName $integrationAccountName -AgreementName $integrationAccountAgreementName -AgreementType "X12" -GuestPartner $guestPartnerName -HostPartner $hostPartnerName -GuestIdentityQualifier "ZZ" -HostIdentityQualifier "AA" -HostIdentityQualifierValue "AA" -Force} "Either 'Guest' business Identity qualifier or qualifier value is not specified."
261+
Assert-ThrowsContains {Set-AzureRmIntegrationAccountAgreement -ResourceGroupName $resourceGroup.ResourceGroupName -IntegrationAccountName $integrationAccountName -AgreementName $integrationAccountAgreementName -AgreementType "X12" -GuestPartner $guestPartnerName -HostPartner $hostPartnerName -GuestIdentityQualifierValue "ZZ" -HostIdentityQualifier "AA" -HostIdentityQualifierValue "AA" -Force} "Either 'Guest' business Identity qualifier or qualifier value is not specified."
262262

263263

264264
$updatedIntegrationAccountAgreement = Set-AzureRmIntegrationAccountAgreement -ResourceGroupName $resourceGroup.ResourceGroupName -IntegrationAccountName $integrationAccountName -AgreementName $integrationAccountAgreementName -AgreementType "AS2" -AgreementContent $agreementAS2Content -Force

‎src/ResourceManager/LogicApp/Commands.LogicApp.Test/ScenarioTests/IntegrationAccountGeneratedIcnTests.cs

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
// ----------------------------------------------------------------------------------
2+
//
3+
// Copyright Microsoft Corporation
4+
// Licensed under the Apache License, Version 2.0 (the "License");
5+
// you may not use this file except in compliance with the License.
6+
// You may obtain a copy of the License at
7+
// http://www.apache.org/licenses/LICENSE-2.0
8+
// Unless required by applicable law or agreed to in writing, software
9+
// distributed under the License is distributed on an "AS IS" BASIS,
10+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
11+
// See the License for the specific language governing permissions and
12+
// limitations under the License.
13+
// ----------------------------------------------------------------------------------
14+
15+
namespace Microsoft.Azure.Commands.LogicApp.Test.ScenarioTests
16+
{
17+
using Microsoft.WindowsAzure.Commands.ScenarioTest;
18+
using Microsoft.WindowsAzure.Commands.Test.Utilities.Common;
19+
using Xunit;
20+
21+
/// <summary>
22+
/// Scenario tests for integration account generated control number commands.
23+
/// </summary>
24+
public class IntegrationAccountGeneratedIcnTests : RMTestBase
25+
{
26+
/// <summary>
27+
/// Test Get-AzureRmIntegrationAccountGeneratedIcn command to get the integration account generated interchange control number.
28+
/// </summary>
29+
[Fact]
30+
[Trait(Category.AcceptanceType, Category.CheckIn)]
31+
public void TestGetIntegrationAccountGeneratedIcn()
32+
{
33+
WorkflowController.NewInstance.RunPowerShellTest("Test-GetIntegrationAccountGeneratedControlNumber");
34+
}
35+
36+
/// <summary>
37+
/// Test Set-AzureRmIntegrationAccountGeneratedIcn command to update the integration account generated interchange control number.
38+
/// </summary>
39+
[Fact]
40+
[Trait(Category.AcceptanceType, Category.CheckIn)]
41+
public void TestUpdateIntegrationAccountGeneratedIcn()
42+
{
43+
WorkflowController.NewInstance.RunPowerShellTest("Test-UpdateIntegrationAccountGenCN");
44+
}
45+
46+
/// <summary>
47+
/// Test Get-AzureRmIntegrationAccountGeneratedIcn command to get all the integration account generated interchange control numbers.
48+
/// </summary>
49+
[Fact]
50+
[Trait(Category.AcceptanceType, Category.CheckIn)]
51+
public void TestListIntegrationAccountGeneratedIcn()
52+
{
53+
WorkflowController.NewInstance.RunPowerShellTest("Test-ListIntegrationAccountGenCN");
54+
}
55+
}
56+
}

0 commit comments

Comments
 (0)