Skip to content

[LogicApp] Update LA SDK version #8452

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.

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 5 commits into from
Feb 5, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/LogicApp/LogicApp.Test/LogicApp.Test.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Azure.Management.Logic" Version="3.0.1" />
<PackageReference Include="Microsoft.Azure.Management.Logic" Version="4.1.0" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,45 +1,25 @@
{
"$schema":"http://schema.management.azure.com/providers/Microsoft.Logic/schemas/2014-12-01-preview/workflowdefinition.json#",
"contentVersion":"1.0.0.0",
"parameters":{
"runworkflowmanually":{
"defaultValue":true,
"type":"bool"
},
"subscription":{
"defaultValue":"1a66ce04-b633-4a0b-b2bc-a912ec8986a6",
"type":"string"
},
"resourceGroup":{
"defaultValue":"logicapps-e2e",
"type":"string"
},
"authentication":{
"defaultValue":{
"type":"ActiveDirectoryOAuth",
"audience":"https://management.azure.com/",
"tenant":"72f988bf-86f1-41af-91ab-2d7cd011db47",
"clientId":"64011f29-3932-4168-b73d-adc835a56732",
"secret":"q8Wf7SwoM4iSVgaHZdghScLX8xDxMMUATWvRalclJjo="
},
"type":"object"
}
},
"triggers":{
},
"actions":{
"listWorkflows":{
"type":"Http",
"inputs":{
"method":"GET",
"uri":"someUri",
"authentication":"@parameters('authentication')"
},
"conditions":[

]
}
},
"outputs":{
"$schema": "https://schema.management.azure.com/providers/Microsoft.Logic/schemas/2015-08-01-preview/workflowdefinition.json#",
"actions": {
"HTTP": {
"conditions": [],
"inputs": {
"method": "GET",
"uri": "http://www.bing.com"
},
"type": "Http"
}
},
"contentVersion": "1.0.0.0",
"outputs": {},
"parameters": {},
"triggers": {
"Recurrence": {
"recurrence": {
"frequency": "Minute",
"interval": 3
},
"type": "Recurrence"
}
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"destinationUri": {
"value": "http://requestb.in/1kj7g8e1"
}
"destinationUri": {
"value": "http://requestb.in/1kj7g8e1"
}
}
29 changes: 4 additions & 25 deletions src/LogicApp/LogicApp.Test/ScenarioTests/Common.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -92,33 +92,12 @@ function TestSetup-CreateNamedResourceGroup([string]$resourceGroupName)
return $resourceGroup
}

<#
.SYNOPSIS
Creates an App Service Plan
#>
function TestSetup-CreateAppServicePlan ([string]$resourceGroupName, [string]$AppServicePlan)
{
if(Test-Path Env:AZURE_TEST_MODE)
{
$AZURE_TEST_MODE = Get-ChildItem Env:AZURE_TEST_MODE
if($AZURE_TEST_MODE.Value.ToLowerInvariant() -eq 'record')
{
$PropertiesObject = @{}
$Sku = @{Name='S1'; Tier='Standard'; Size='S1'; Family='S'; Capacity=1}
$Plan = New-AzResource -Name $AppServicePlan -Location "West US" -ResourceGroupName $resourceGroupName -ResourceType "Microsoft.Web/serverfarms" -ApiVersion 2015-08-01 -SkuObject $Sku -PropertyObject $PropertiesObject -Force
return $Plan
}
}
return $null
}


<#
.SYNOPSIS
Creates a new Integration account
#>
function TestSetup-CreateIntegrationAccount ([string]$resourceGroupName, [string]$integrationAccountName)
{
{
$location = Get-LocationName
$integrationAccount = New-AzIntegrationAccount -ResourceGroupName $resourceGroupName -IntegrationAccountName $integrationAccountName -Location $location -Sku "Standard"
return $integrationAccount
Expand All @@ -129,7 +108,7 @@ function TestSetup-CreateIntegrationAccount ([string]$resourceGroupName, [string
Creates a new workflow
#>
function TestSetup-CreateWorkflow ([string]$resourceGroupName, [string]$workflowName, [string]$AppServicePlan)
{
{
$rglocation = Get-ProviderLocation "North Europe"
$resourceGroup = New-AzResourceGroup -Name $resourceGroupName -location $rglocation -Force

Expand All @@ -149,7 +128,7 @@ function SleepInRecordMode ([int]$SleepIntervalInMillisec)
{
$mode = $env:AZURE_TEST_MODE
if ( $mode -ne $null -and $mode.ToUpperInvariant() -eq "RECORD")
{
{
Sleep -Milliseconds $SleepIntervalInMillisec
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Test New-AzIntegrationAccountAgreement command
#>
function Test-CreateIntegrationAccountAgreementX12
{
$agreementX12FilePath = Join-Path $TestOutputRoot "\Resources\IntegrationAccountX12AgreementContent.json"
$agreementX12FilePath = Join-Path $TestOutputRoot "Resources" "IntegrationAccountX12AgreementContent.json"
$agreementX12Content = [IO.File]::ReadAllText($agreementX12FilePath)

$resourceGroupName = getAssetname
Expand Down Expand Up @@ -66,7 +66,7 @@ Test New-AzIntegrationAccountAgreement command
#>
function Test-CreateIntegrationAccountAgreementAS2
{
$agreementAS2FilePath = Join-Path $TestOutputRoot "\Resources\IntegrationAccountAS2AgreementContent.json"
$agreementAS2FilePath = Join-Path $TestOutputRoot "Resources" "IntegrationAccountAS2AgreementContent.json"
$agreementAS2Content = [IO.File]::ReadAllText($agreementAS2FilePath)

$resourceGroupName = getAssetname
Expand Down Expand Up @@ -100,7 +100,7 @@ Test New-AzIntegrationAccountAgreement command
#>
function Test-CreateIntegrationAccountAgreementEdifact
{
$agreementEdifactFilePath = Join-Path $TestOutputRoot "\Resources\IntegrationAccountEdifactAgreementContent.json"
$agreementEdifactFilePath = Join-Path $TestOutputRoot "Resources" "IntegrationAccountEdifactAgreementContent.json"
$agreementEdifactContent = [IO.File]::ReadAllText($agreementEdifactFilePath)

$resourceGroupName = getAssetname
Expand Down Expand Up @@ -135,7 +135,7 @@ Test New-AzIntegrationAccountAgreement command with negative scenario.
#>
function Test-CreateIntegrationAccountAgreementWithFailure
{
$agreementX12FilePath = Join-Path $TestOutputRoot "\Resources\IntegrationAccountX12AgreementContent.json"
$agreementX12FilePath = Join-Path $TestOutputRoot "Resources" "IntegrationAccountX12AgreementContent.json"
$agreementX12Content = [IO.File]::ReadAllText($agreementX12FilePath)

$resourceGroupName = getAssetname
Expand Down Expand Up @@ -170,7 +170,7 @@ Test Get-AzIntegrationAccountAgreement command
#>
function Test-GetIntegrationAccountAgreement
{
$agreementX12FilePath = Join-Path $TestOutputRoot "\Resources\IntegrationAccountX12AgreementContent.json"
$agreementX12FilePath = Join-Path $TestOutputRoot "Resources" "IntegrationAccountX12AgreementContent.json"
$agreementX12Content = [IO.File]::ReadAllText($agreementX12FilePath)

Assert-ThrowsContains { Get-AzIntegrationAccountAgreement -ResourceGroupName "Random83da135" -IntegrationAccountName "DoesNotMatter" -AgreementName "DoesNotMatter" } "Resource group 'Random83da135' could not be found."
Expand Down Expand Up @@ -207,7 +207,7 @@ Test Remove-AzIntegrationAccountAgreement command
#>
function Test-RemoveIntegrationAccountAgreement
{
$agreementX12FilePath = Join-Path $TestOutputRoot "\Resources\IntegrationAccountX12AgreementContent.json"
$agreementX12FilePath = Join-Path $TestOutputRoot "Resources" "IntegrationAccountX12AgreementContent.json"
$agreementX12Content = [IO.File]::ReadAllText($agreementX12FilePath)

$resourceGroupName = getAssetname
Expand Down Expand Up @@ -238,10 +238,10 @@ Test Set-AzIntegrationAccountAgreement command
#>
function Test-UpdateIntegrationAccountAgreement
{
$agreementX12FilePath = Join-Path $TestOutputRoot "\Resources\IntegrationAccountX12AgreementContent.json"
$agreementX12FilePath = Join-Path $TestOutputRoot "Resources" "IntegrationAccountX12AgreementContent.json"
$agreementX12Content = [IO.File]::ReadAllText($agreementX12FilePath)

$agreementAS2FilePath = Join-Path $TestOutputRoot "\Resources\IntegrationAccountAS2AgreementContent.json"
$agreementAS2FilePath = Join-Path $TestOutputRoot "Resources" "IntegrationAccountAS2AgreementContent.json"
$agreementAS2Content = [IO.File]::ReadAllText($agreementAS2FilePath)

$resourceGroupName = getAssetname
Expand Down Expand Up @@ -324,7 +324,7 @@ Test Get-AzIntegrationAccountAgreement command : paging test
#>
function Test-ListIntegrationAccountAgreement
{
$agreementX12FilePath = Join-Path $TestOutputRoot "\Resources\IntegrationAccountX12AgreementContent.json"
$agreementX12FilePath = Join-Path $TestOutputRoot "Resources" "IntegrationAccountX12AgreementContent.json"
$agreementX12Content = [IO.File]::ReadAllText($agreementX12FilePath)

$resourceGroupName = getAssetname
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ function Test-CreateIntegrationAccountCertificate

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

$certFilePath = Join-Path $TestOutputRoot "\Resources\IntegrationAccountCertificate.cer"
$certFilePath = Join-Path $TestOutputRoot "Resources" "IntegrationAccountCertificate.cer"

$integrationAccountCertificate = New-AzIntegrationAccountCertificate -ResourceGroupName $resourceGroup.ResourceGroupName -IntegrationAccountName $integrationAccountName -CertificateName $integrationAccountCertificateName -KeyName "PRIVATEKEY" -KeyVersion "b8f8974776c7430b9f9f33ddc031b7e4" -KeyVaultId "/subscriptions/9e223dbe-3399-4e19-88eb-0975f02ac87f/resourceGroups/maddie1/providers/Microsoft.KeyVault/vaults/mvault4" -PublicCertificateFilePath $certFilePath
$integrationAccountCertificate = New-AzIntegrationAccountCertificate -ResourceGroupName $resourceGroup.ResourceGroupName -IntegrationAccountName $integrationAccountName -CertificateName $integrationAccountCertificateName -KeyName "PRIVATEKEY" -KeyVersion "273ab4059bd84b81bbb8308df706379a" -KeyVaultId "/subscriptions/f34b22a3-2202-4fb1-b040-1332bd928c84/resourcegroups/DONOTDELETE-IntegrationAccountPsCmdletTest/providers/microsoft.keyvault/vaults/IntegrationAccountVault1" -PublicCertificateFilePath $certFilePath
Assert-AreEqual $integrationAccountCertificateName $integrationAccountCertificate.Name

Remove-AzIntegrationAccount -ResourceGroupName $resourceGroup.ResourceGroupName -IntegrationAccountName $integrationAccountName -Force
Expand All @@ -46,7 +46,7 @@ function Test-CreateIntegrationAccountCertificatePrivateKey

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

$integrationAccountCertificate = New-AzIntegrationAccountCertificate -ResourceGroupName $resourceGroup.ResourceGroupName -IntegrationAccountName $integrationAccountName -CertificateName $integrationAccountCertificateName -KeyName "PRIVATEKEY" -KeyVersion "b8f8974776c7430b9f9f33ddc031b7e4" -KeyVaultId "/subscriptions/9e223dbe-3399-4e19-88eb-0975f02ac87f/resourceGroups/maddie1/providers/Microsoft.KeyVault/vaults/mvault4"
$integrationAccountCertificate = New-AzIntegrationAccountCertificate -ResourceGroupName $resourceGroup.ResourceGroupName -IntegrationAccountName $integrationAccountName -CertificateName $integrationAccountCertificateName -KeyName "PRIVATEKEY" -KeyVersion "273ab4059bd84b81bbb8308df706379a" -KeyVaultId "/subscriptions/f34b22a3-2202-4fb1-b040-1332bd928c84/resourcegroups/DONOTDELETE-IntegrationAccountPsCmdletTest/providers/microsoft.keyvault/vaults/IntegrationAccountVault1"
Assert-AreEqual $integrationAccountCertificateName $integrationAccountCertificate.Name

Remove-AzIntegrationAccount -ResourceGroupName $resourceGroup.ResourceGroupName -IntegrationAccountName $integrationAccountName -Force
Expand All @@ -65,7 +65,7 @@ function Test-CreateIntegrationAccountCertificatePublicKey

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

$certFilePath = Join-Path $TestOutputRoot "\Resources\IntegrationAccountCertificate.cer"
$certFilePath = Join-Path $TestOutputRoot "Resources" "IntegrationAccountCertificate.cer"

$integrationAccountCertificate = New-AzIntegrationAccountCertificate -ResourceGroupName $resourceGroup.ResourceGroupName -IntegrationAccountName $integrationAccountName -CertificateName $integrationAccountCertificateName -PublicCertificateFilePath $certFilePath
Assert-AreEqual $integrationAccountCertificateName $integrationAccountCertificate.Name
Expand All @@ -87,22 +87,23 @@ function Test-UpdateIntegrationAccountCertificate

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

$certFilePath = Join-Path $TestOutputRoot "\Resources\IntegrationAccountCertificate.cer"
$certFilePath = Join-Path $TestOutputRoot "Resources" "IntegrationAccountCertificate.cer"

$integrationAccountCertificate = New-AzIntegrationAccountCertificate -ResourceGroupName $resourceGroup.ResourceGroupName -IntegrationAccountName $integrationAccountName -CertificateName $integrationAccountCertificateName -KeyName "PRIVATEKEY" -KeyVersion "b8f8974776c7430b9f9f33ddc031b7e4" -KeyVaultId "/subscriptions/9e223dbe-3399-4e19-88eb-0975f02ac87f/resourceGroups/maddie1/providers/Microsoft.KeyVault/vaults/mvault4" -PublicCertificateFilePath $certFilePath
$integrationAccountCertificate = New-AzIntegrationAccountCertificate -ResourceGroupName $resourceGroup.ResourceGroupName -IntegrationAccountName $integrationAccountName -CertificateName $integrationAccountCertificateName -KeyName "PRIVATEKEY" -KeyVersion "273ab4059bd84b81bbb8308df706379a" -KeyVaultId "/subscriptions/f34b22a3-2202-4fb1-b040-1332bd928c84/resourcegroups/DONOTDELETE-IntegrationAccountPsCmdletTest/providers/microsoft.keyvault/vaults/IntegrationAccountVault1" -PublicCertificateFilePath $certFilePath
Assert-AreEqual $integrationAccountCertificateName $integrationAccountCertificate.Name

$integrationAccountCertificateUpdated = Set-AzIntegrationAccountCertificate -ResourceGroupName $resourceGroup.ResourceGroupName -IntegrationAccountName $integrationAccountName -CertificateName $integrationAccountCertificateName -KeyName "PRIVATEKEY" -Force
Assert-AreEqual $integrationAccountCertificateName $integrationAccountCertificateUpdated.Name
Assert-AreEqual "PRIVATEKEY" $integrationAccountCertificateUpdated.Key.KeyName

$integrationAccountCertificateUpdated = Set-AzIntegrationAccountCertificate -ResourceGroupName $resourceGroup.ResourceGroupName -IntegrationAccountName $integrationAccountName -CertificateName $integrationAccountCertificateName -KeyVersion "b8f8974776c7430b9f9f33ddc031b7e4" -Force
$integrationAccountCertificateUpdated = Set-AzIntegrationAccountCertificate -ResourceGroupName $resourceGroup.ResourceGroupName -IntegrationAccountName $integrationAccountName -CertificateName $integrationAccountCertificateName -KeyVersion "273ab4059bd84b81bbb8308df706379a" -Force
Assert-AreEqual $integrationAccountCertificateName $integrationAccountCertificateUpdated.Name
Assert-AreEqual "b8f8974776c7430b9f9f33ddc031b7e4" $integrationAccountCertificateUpdated.Key.KeyVersion
Assert-AreEqual "273ab4059bd84b81bbb8308df706379a" $integrationAccountCertificateUpdated.Key.KeyVersion

$integrationAccountCertificateUpdated = Set-AzIntegrationAccountCertificate -ResourceGroupName $resourceGroup.ResourceGroupName -IntegrationAccountName $integrationAccountName -CertificateName $integrationAccountCertificateName -KeyVaultId "/subscriptions/9e223dbe-3399-4e19-88eb-0975f02ac87f/resourceGroups/maddie1/providers/Microsoft.KeyVault/vaults/mvault4" -Force
$integrationAccountCertificateUpdated = Set-AzIntegrationAccountCertificate -ResourceGroupName $resourceGroup.ResourceGroupName -IntegrationAccountName $integrationAccountName -CertificateName $integrationAccountCertificateName -KeyVaultId "/subscriptions/f34b22a3-2202-4fb1-b040-1332bd928c84/resourcegroups/DONOTDELETE-IntegrationAccountPsCmdletTest/providers/microsoft.keyvault/vaults/IntegrationAccountVault1" -Force
Assert-AreEqual $integrationAccountCertificateName $integrationAccountCertificateUpdated.Name
Assert-AreEqual "/subscriptions/9e223dbe-3399-4e19-88eb-0975f02ac87f/resourceGroups/maddie1/providers/Microsoft.KeyVault/vaults/mvault4" $integrationAccountCertificateUpdated.Key.KeyVault.Id
Assert-AreEqual "/subscriptions/f34b22a3-2202-4fb1-b040-1332bd928c84/resourcegroups/DONOTDELETE-IntegrationAccountPsCmdletTest/providers/microsoft.keyvault/vaults/IntegrationAccountVault1" $integrationAccountCertificateUpdated.Key.KeyVault.Id


Remove-AzIntegrationAccount -ResourceGroupName $resourceGroup.ResourceGroupName -IntegrationAccountName $integrationAccountName -Force
}
Expand All @@ -121,11 +122,11 @@ function Test-GetIntegrationAccountCertificate

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

$certFilePath = Join-Path $TestOutputRoot "\Resources\IntegrationAccountCertificate.cer"
$certFilePath = Join-Path $TestOutputRoot "Resources" "IntegrationAccountCertificate.cer"

New-AzIntegrationAccountCertificate -ResourceGroupName $resourceGroup.ResourceGroupName -IntegrationAccountName $integrationAccountName -CertificateName $integrationAccountCertificateName -KeyName "PRIVATEKEY" -KeyVersion "b8f8974776c7430b9f9f33ddc031b7e4" -KeyVaultId "/subscriptions/9e223dbe-3399-4e19-88eb-0975f02ac87f/resourceGroups/maddie1/providers/Microsoft.KeyVault/vaults/mvault4" -PublicCertificateFilePath $certFilePath
New-AzIntegrationAccountCertificate -ResourceGroupName $resourceGroup.ResourceGroupName -IntegrationAccountName $integrationAccountName -CertificateName $integrationAccountCertificateName -KeyName "PRIVATEKEY" -KeyVersion "273ab4059bd84b81bbb8308df706379a" -KeyVaultId "/subscriptions/f34b22a3-2202-4fb1-b040-1332bd928c84/resourcegroups/DONOTDELETE-IntegrationAccountPsCmdletTest/providers/microsoft.keyvault/vaults/IntegrationAccountVault1" -PublicCertificateFilePath $certFilePath

$result = Get-AzIntegrationAccountCertificate -ResourceGroupName $resourceGroup.ResourceGroupName -IntegrationAccountName $integrationAccountName -CertificateName $integrationAccountCertificateName
$result = Get-AzIntegrationAccountCertificate -ResourceGroupName $resourceGroup.ResourceGroupName -IntegrationAccountName $integrationAccountName -CertificateName $integrationAccountCertificateName
Assert-AreEqual $integrationAccountCertificateName $result.Name

$result1 = Get-AzIntegrationAccountCertificate -ResourceGroupName $resourceGroup.ResourceGroupName -IntegrationAccountName $integrationAccountName
Expand All @@ -148,12 +149,11 @@ function Test-RemoveIntegrationAccountCertificate

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

$certFilePath = Join-Path $TestOutputRoot "\Resources\IntegrationAccountCertificate.cer"
$certFilePath = Join-Path $TestOutputRoot "Resources" "IntegrationAccountCertificate.cer"

New-AzIntegrationAccountCertificate -ResourceGroupName $resourceGroup.ResourceGroupName -IntegrationAccountName $integrationAccountName -CertificateName $integrationAccountCertificateName -KeyName "PRIVATEKEY" -KeyVersion "b8f8974776c7430b9f9f33ddc031b7e4" -KeyVaultId "/subscriptions/9e223dbe-3399-4e19-88eb-0975f02ac87f/resourceGroups/maddie1/providers/Microsoft.KeyVault/vaults/mvault4" -PublicCertificateFilePath $certFilePath
New-AzIntegrationAccountCertificate -ResourceGroupName $resourceGroup.ResourceGroupName -IntegrationAccountName $integrationAccountName -CertificateName $integrationAccountCertificateName -KeyName "PRIVATEKEY" -KeyVersion "273ab4059bd84b81bbb8308df706379a" -KeyVaultId "/subscriptions/f34b22a3-2202-4fb1-b040-1332bd928c84/resourcegroups/DONOTDELETE-IntegrationAccountPsCmdletTest/providers/microsoft.keyvault/vaults/IntegrationAccountVault1" -PublicCertificateFilePath $certFilePath

Remove-AzIntegrationAccountCertificate -ResourceGroupName $resourceGroup.ResourceGroupName -IntegrationAccountName $integrationAccountName -CertificateName $integrationAccountCertificateName -Force
Remove-AzIntegrationAccountCertificate -ResourceGroupName $resourceGroup.ResourceGroupName -IntegrationAccountName $integrationAccountName -CertificateName $integrationAccountCertificateName -Force

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

}
Loading