Skip to content

[LogicApp] Expose new enum types #8482

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 3 commits into from
Feb 7, 2019
Merged

[LogicApp] Expose new enum types #8482

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2862aa6
Explicitely expose the enums added in the SDK update.
refortie Feb 6, 2019
eeacfb6
SessionRecords and help files
refortie Feb 6, 2019
a1da376
PR Changes
refortie Feb 6, 2019
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
5 changes: 5 additions & 0 deletions src/LogicApp/LogicApp.Test/Resources/SampleLiquidMap.liquid
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{% if user %}
Hello, {{ user.firstname }}
{% else %}
Hello World!
{% endif %}
9 changes: 9 additions & 0 deletions src/LogicApp/LogicApp.Test/Resources/SampleXslt2Map.xslt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<xsl:stylesheet
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
version="2.0">
<xsl:template match="@*|node()">
<xsl:copy>
<xsl:apply-templates select="@*|node()"/>
</xsl:copy>
</xsl:template>
</xsl:stylesheet>
11 changes: 11 additions & 0 deletions src/LogicApp/LogicApp.Test/Resources/SampleXslt3Map.xslt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<xsl:stylesheet version="3.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:xs="http://www.w3.org/2001/XMLSchema">
<xsl:output method="text"/>
<xsl:template match="/">
<xsl:value-of select="company/employee/name"/>
<xsl:variable name="test">
<xsl:text>company/employee/name</xsl:text>
</xsl:variable>
<xsl:evaluate xpath="$test"/>
</xsl:template>
</xsl:stylesheet>
19 changes: 19 additions & 0 deletions src/LogicApp/LogicApp.Test/ScenarioTests/IntegrationAccountMapTests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,24 @@ Test New-AzIntegrationAccountMap command
function Test-CreateIntegrationAccountMap
{
$xslt1FilePath = Join-Path $TestOutputRoot "Resources" "SampleXslt1Map.xslt"
$xslt2FilePath = Join-Path $TestOutputRoot "Resources" "SampleXslt2Map.xslt"
$xslt3FilePath = Join-Path $TestOutputRoot "Resources" "SampleXslt3Map.xslt"
$liquidFilePath = Join-Path $TestOutputRoot "Resources" "SampleLiquidMap.liquid"
$xslt1MapContent = [IO.File]::ReadAllText($xslt1FilePath)
$xslt2MapContent = [IO.File]::ReadAllText($xslt2FilePath)
$xslt3MapContent = [IO.File]::ReadAllText($xslt3FilePath)
$liquidMapContent = [IO.File]::ReadAllText($liquidFilePath)

$resourceGroup = TestSetup-CreateResourceGroup
$integrationAccountName = "IA-" + (getAssetname)

$integrationAccountMapName1 = "XSLT-" + (getAssetname)
$integrationAccountMapName2 = "XSLT-" + (getAssetname)
$integrationAccountMapName3 = "XSLT-" + (getAssetname)
$integrationAccountXslt2MapName = "XSLT2-" + (getAssetname)
$integrationAccountXslt3MapName = "XSLT3-" + (getAssetname)
$integrationAccountLiquidMapName = "Liquid-" + (getAssetname)
$integrationAccountLiquidMapName2 = "Liquid2-" + (getAssetname)

$integrationAccount = TestSetup-CreateIntegrationAccount $resourceGroup.ResourceGroupName $integrationAccountName

Expand All @@ -38,6 +48,15 @@ function Test-CreateIntegrationAccountMap

$integrationAccountMap3 = New-AzIntegrationAccountMap -ResourceGroupName $resourceGroup.ResourceGroupName -IntegrationAccountName $integrationAccountName -MapName $integrationAccountMapName3 -MapFilePath $xslt1FilePath -MapType "Xslt" -ContentType "application/xml"
Assert-AreEqual $integrationAccountMapName3 $integrationAccountMap3.Name

$integrationAccountXslt2Map = New-AzIntegrationAccountMap -ResourceGroupName $resourceGroup.ResourceGroupName -IntegrationAccountName $integrationAccountName -MapName $integrationAccountXslt2MapName -MapDefinition $xslt2MapContent -MapType "Xslt20"
Assert-AreEqual $integrationAccountXslt2MapName $integrationAccountXslt2Map.Name
$integrationAccountXslt3Map = New-AzIntegrationAccountMap -ResourceGroupName $resourceGroup.ResourceGroupName -IntegrationAccountName $integrationAccountName -MapName $integrationAccountXslt3MapName -MapDefinition $xslt3MapContent -MapType "Xslt30"
Assert-AreEqual $integrationAccountXslt3MapName $integrationAccountXslt3Map.Name
$integrationAccountLiquidMap = New-AzIntegrationAccountMap -ResourceGroupName $resourceGroup.ResourceGroupName -IntegrationAccountName $integrationAccountName -MapName $integrationAccountLiquidMapName -MapDefinition $liquidMapContent -MapType "Liquid"
Assert-AreEqual $integrationAccountLiquidMapName $integrationAccountLiquidMap.Name
$integrationAccountLiquidMap2 = New-AzIntegrationAccountMap -ResourceGroupName $resourceGroup.ResourceGroupName -IntegrationAccountName $integrationAccountName -MapName $integrationAccountLiquidMapName2 -MapDefinition $liquidMapContent -MapType "liquid"
Assert-AreEqual $integrationAccountLiquidMapName2 $integrationAccountLiquidMap2.Name

Remove-AzIntegrationAccount -ResourceGroupName $resourceGroup.ResourceGroupName -IntegrationAccountName $integrationAccountName -Force
}
Expand Down
23 changes: 14 additions & 9 deletions src/LogicApp/LogicApp.Test/ScenarioTests/IntegrationAccountTests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,22 @@ function Test-CreateIntegrationAccount
$resourceGroup = TestSetup-CreateResourceGroup
$integrationAccountName = "IA-" + (getAssetname)
$location = Get-Location "Microsoft.Logic" "integrationAccounts"

$integrationAccountNameBasic = "IA-Basic-" + (getAssetname)
$integrationAccount = New-AzIntegrationAccount -ResourceGroupName $resourceGroup.ResourceGroupName -IntegrationAccountName $integrationAccountNameBasic -Location $location -Sku "Basic"
$integrationAccount = New-AzIntegrationAccount -ResourceGroupName $resourceGroup.ResourceGroupName -IntegrationAccountName $integrationAccountNameBasic -Location $location -Sku "Basic"
Assert-AreEqual $integrationAccountNameBasic $integrationAccount.Name

$integrationAccountNameStandard = "IA-Standard-" + (getAssetname)
$integrationAccount = New-AzIntegrationAccount -ResourceGroupName $resourceGroup.ResourceGroupName -IntegrationAccountName $integrationAccountNameStandard -Location $location -Sku "Standard"
$integrationAccount = New-AzIntegrationAccount -ResourceGroupName $resourceGroup.ResourceGroupName -IntegrationAccountName $integrationAccountNameStandard -Location $location -Sku "Standard"
Assert-AreEqual $integrationAccountNameStandard $integrationAccount.Name


$integrationAccountNameStandard2 = "IA-Standard2-" + (getAssetname)
$integrationAccount = New-AzIntegrationAccount -ResourceGroupName $resourceGroup.ResourceGroupName -IntegrationAccountName $integrationAccountNameStandard2 -Location $location -Sku "standard"
Assert-AreEqual $integrationAccountNameStandard2 $integrationAccount.Name

Remove-AzIntegrationAccount -ResourceGroupName $resourceGroup.ResourceGroupName -IntegrationAccountName $integrationAccountNameBasic -Force
Remove-AzIntegrationAccount -ResourceGroupName $resourceGroup.ResourceGroupName -IntegrationAccountName $integrationAccountNameStandard -Force
Remove-AzIntegrationAccount -ResourceGroupName $resourceGroup.ResourceGroupName -IntegrationAccountName $integrationAccountNameStandard2 -Force
}

<#
Expand All @@ -53,7 +58,7 @@ function Test-GetIntegrationAccount
$integrationAccounts = Get-AzIntegrationAccount
Assert-True { $integrationAccounts.Count -gt 0 }

Remove-AzIntegrationAccount -ResourceGroupName $resourceGroup.ResourceGroupName -IntegrationAccountName $integrationAccountName -Force
Remove-AzIntegrationAccount -ResourceGroupName $resourceGroup.ResourceGroupName -IntegrationAccountName $integrationAccountName -Force
}

<#
Expand All @@ -68,7 +73,7 @@ function Test-RemoveIntegrationAccount

$integrationAccount = New-AzIntegrationAccount -ResourceGroupName $resourceGroup.ResourceGroupName -IntegrationAccountName $integrationAccountName -Location $location -Sku "Standard"
Assert-AreEqual $integrationAccountName $integrationAccount.Name

Remove-AzIntegrationAccount -ResourceGroupName $resourceGroup.ResourceGroupName -IntegrationAccountName $integrationAccountName -Force
}

Expand Down Expand Up @@ -97,7 +102,7 @@ function Test-UpdateIntegrationAccount

$updatedIntegrationAccount = Set-AzIntegrationAccount -ResourceGroupName $resourceGroup.ResourceGroupName -IntegrationAccountName $integrationAccountName -Location $location -Force
Assert-AreEqual $updatedIntegrationAccount.Name $integrationAccount.Name

Remove-AzIntegrationAccount -ResourceGroupName $resourceGroup.ResourceGroupName -IntegrationAccountName $integrationAccountName -Force
}

Expand All @@ -122,6 +127,6 @@ function Test-GetIntegrationAccountCallbackUrl

$callbackUrl1 = Get-AzIntegrationAccountCallbackUrl -ResourceGroupName $resourceGroup.ResourceGroupName -IntegrationAccountName $integrationAccountName
Assert-NotNull $callbackUrl1

Remove-AzIntegrationAccount -ResourceGroupName $resourceGroup.ResourceGroupName -IntegrationAccountName $integrationAccountName -Force
}
6 changes: 3 additions & 3 deletions src/LogicApp/LogicApp.Test/ScenarioTests/WorkflowTests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,17 +40,17 @@ function Test-CreateAndRemoveLogicApp
$parameterFilePath = Join-Path $TestOutputRoot "Resources" "TestSimpleWorkflowParameter.json"
$definition = [IO.File]::ReadAllText((Join-Path $TestOutputRoot "Resources" "TestSimpleWorkflowDefinition.json"))

$workflowName = getAssetname
$workflowName = getAssetname
$workflow = New-AzLogicApp -ResourceGroupName $resourceGroup.ResourceGroupName -Name $workflowName -Definition $definition -ParameterFilePath $parameterFilePath -Location $location

Assert-NotNull $workflow
Assert-NotNull $workflow
Assert-NotNull $workflow.Definition
Assert-NotNull $workflow.Parameters
Assert-AreEqual $workflowName $workflow.Name
Remove-AzLogicApp -ResourceGroupName $resourceGroup.ResourceGroupName -Name $WorkflowName -Force

#Case3 : Create using Piped input
$workflowName = getAssetname
$workflowName = getAssetname
$workflow = $resourceGroup | New-AzLogicApp -Name $workflowName -Location $location -DefinitionFilePath $definitionFilePath -ParameterFilePath $parameterFilePath

Assert-NotNull $workflow
Expand Down
Loading