Merge remote-tracking branch 'upstream/master' into removeDatabaseSecureConnectionPolicyCmdlet

Author: ayeletshpigelman

.azure-pipelines/powershell-core.yml

@@ -1,8 +1,8 @@
 variables:
   WindowsName: windows
-  WindowsImage: VS2017-Win2016
+  WindowsImage: vs2017-win2016
   LinuxName: linux
-  LinuxImage: Ubuntu-18.04
+  LinuxImage: ubuntu-18.04
   MacOSName: macOS
   MacOSImage: macOS-10.13
   TestFramework: netcoreapp2.1

.azure-pipelines/util/test-steps.yml

@@ -16,6 +16,11 @@ steps:
     custom: msbuild
     arguments: 'build.proj /t:${{ parameters.testTarget }} /p:Configuration=${{ parameters.configuration }};TestFramework=${{ parameters.testFramework }};PullRequestNumber=$(System.PullRequest.PullRequestNumber)'
 
+- task: PublishTestResults@2
+  inputs:
+    testRunner: VSTest
+    testResultsFiles: '**/*.trx'
+
 - template: publish-artifacts-steps.yml
   parameters:
     artifactName: test-${{ parameters.osName }}

.github/PULL_REQUEST_TEMPLATE.md

@@ -6,13 +6,13 @@
 
 ## Checklist
 
-- [ ] I have read the [_Submitting Changes_](../CONTRIBUTING.md#submitting-changes) section of [`CONTRIBUTING.md`](../CONTRIBUTING.md)
+- [ ] I have read the [_Submitting Changes_](../blob/master/CONTRIBUTING.md#submitting-changes) section of [`CONTRIBUTING.md`](../blob/master/CONTRIBUTING.md)
 - [ ] The title of the PR is clear and informative
 - [ ] The appropriate `ChangeLog.md` file(s) has been updated:
     - For any service, the `ChangeLog.md` file can be found at `src/{{SERVICE}}/{{SERVICE}}/ChangeLog.md`
     - A snippet outlining the change(s) made in the PR should be written under the `## Upcoming Release` header -- no new version header should be added
-- [ ] The PR does not introduce [breaking changes](../documentation/breaking-changes/breaking-changes-definition.md)
+- [ ] The PR does not introduce [breaking changes](../blob/master/documentation/breaking-changes/breaking-changes-definition.md)
 - [ ] If applicable, the changes made in the PR have proper test coverage
 - [ ] For public API changes to cmdlets:
     - [ ] a cmdlet design review was approved for the changes in [this repository](https://github.com/Azure/azure-powershell-cmdlet-review-pr) (_Microsoft internal only_)
-    - [ ] the markdown help files have been regenerated using the commands listed [here](../documentation/development-docs/help-generation.md#updating-all-markdown-files-in-a-module)
+    - [ ] the markdown help files have been regenerated using the commands listed [here](../blob/master/documentation/development-docs/help-generation.md#updating-all-markdown-files-in-a-module)

src/Cdn/Cdn.Test/Cdn.Test.csproj

@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.Management.Cdn" Version="4.2.2-preview" />
+    <PackageReference Include="Microsoft.Azure.Management.Cdn" Version="4.2.4-preview" />
   </ItemGroup>
 
 </Project>

src/Cdn/Cdn.Test/ScenarioTests/EndpointTests.cs

@@ -35,6 +35,13 @@ public void TestEndpointCrudAndAction()
             TestController.NewInstance.RunPowerShellTest(_logger, "Test-EndpointCrudAndAction");
         }
 
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestEndpointCreateWithRulesEngine()
+        {
+            TestController.NewInstance.RunPowerShellTest(_logger, "Test-EndpointCreateWithRulesEngine");
+        }
+
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestEndpointCrudAndActionWithPiping()

src/Cdn/Cdn.Test/ScenarioTests/EndpointTests.ps1

@@ -70,6 +70,53 @@ function Test-EndpointCrudAndAction
     Remove-AzResourceGroup -Name $resourceGroup.ResourceGroupName -Force
 }
 
+<#
+.SYNOPSIS
+Create ENdpoint with RulesEngine config
+#>
+function Test-EndpointCreateWithRulesEngine
+{
+    $profileName = getAssetName
+    $resourceGroup = TestSetup-CreateResourceGroup
+    $resourceLocation = "EastUS"
+    $profileSku = "Standard_Microsoft"
+    $createdProfile = New-AzCdnProfile -ProfileName $profileName -ResourceGroupName $resourceGroup.ResourceGroupName -Location $resourceLocation -Sku $profileSku
+
+    $endpointName = getAssetName
+    $originName = getAssetName
+    $originHostName = "www.microsoft.com"
+
+    $nameAvailability = Get-AzCdnEndpointNameAvailability -EndpointName $endpointName
+    Assert-True{$nameAvailability.NameAvailable}
+
+	$description = 'Sample delivery policy'
+    $cond1 = New-AzCdnDeliveryRuleCondition -MatchVariable IsDevice -Operator Equal -MatchValue "Desktop"
+    $action1 = New-AzCdnDeliveryRuleAction -SourcePattern "/abc" -Destination "/def" -PreservePath
+    $action2 = New-AzCdnDeliveryRuleAction -QueryStringBehavior ExcludeAll -QueryParameter "abc","def"
+    $action3 = New-AzCdnDeliveryRuleAction -QueryStringBehavior IncludeAll
+    $redirect = New-AzCdnDeliveryRuleAction -RedirectType Found -DestinationProtocol MatchRequest
+    $rule0 = New-AzCdnDeliveryRule -Name "EmptyCondition" -Order 0 -Action $redirect,$action3
+    $rule1 = New-AzCdnDeliveryRule -Name "Rule1" -Order 1 -Condition $cond1 -Action $action1,$action2
+    $deliverypolicy = New-AzCdnDeliveryPolicy -Description $description -Rule $rule0,$rule1
+
+    $createdEndpoint = New-AzCdnEndpoint -EndpointName $endpointName -ProfileName $profileName -ResourceGroupName $resourceGroup.ResourceGroupName -Location $resourceLocation -OriginName $originName -OriginHostName $originHostName -DeliveryPolicy $deliveryPolicy
+	Assert-AreEqual $description $createdEndpoint.DeliveryPolicy.Description
+    Assert-AreEqual $endpointName $createdEndpoint.Name
+    Assert-AreEqual $deliverypolicy.Count $createdEndpoint.DeliveryPolicy.Count
+    Assert-AreEqual $profileName $createdEndpoint.ProfileName
+    Assert-AreEqual $resourceGroup.ResourceGroupName $createdEndpoint.ResourceGroupName
+    Assert-AreEqual $originName $createdEndpoint.Origins[0].Name
+    Assert-AreEqual $originHostName $createdEndpoint.Origins[0].HostName
+
+    $endpointRemoved = Remove-AzCdnEndpoint -EndpointName $endpointName -ProfileName $profileName -ResourceGroupName $resourceGroup.ResourceGroupName -PassThru -Force
+    Assert-True{$endpointRemoved}
+
+    Assert-ThrowsContains { Get-AzCdnEndpoint -EndpointName $endpointName -ProfileName $profileName -ResourceGroupName $resourceGroup.ResourceGroupName } "NotFound"
+
+    Remove-AzResourceGroup -Name $resourceGroup.ResourceGroupName -Force
+}
+
+
 <#
 .SYNOPSIS
 Endpoint cycle with piping