Merge remote-tracking branch 'upstream/master'

Author: pixia

src/Attestation/Attestation.Test/Attestation.Test.csproj

@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.Management.Attestation" Version="0.9.5-preview" />
+    <PackageReference Include="Microsoft.Azure.Management.Attestation" Version="0.9.6-preview" />
   </ItemGroup>
 
   <ItemGroup>

src/Attestation/Attestation/Attestation.csproj

@@ -12,7 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.Management.Attestation" Version="0.9.5-preview" />
+    <PackageReference Include="Microsoft.Azure.Management.Attestation" Version="0.9.6-preview" />
   </ItemGroup>
 
   <ItemGroup>

src/Attestation/Attestation/ChangeLog.md

@@ -17,5 +17,11 @@
     * Overview of change #1
         - Additional information about change #1
 -->
+
+
 ## Upcoming Release
+* Fix typo in `PSAttestation` type with property `AttestUri`
+* Update .Net SDK with newer version
+
+## Version 0.1.0
 * General availability of `Az.Attestation` module

src/Attestation/Attestation/Models/PSAttestation.cs

@@ -25,7 +25,7 @@ public  PSAttestation(AttestationProvider attestation)
             Id = attestation.Id;
             Type = attestation.Type;
             Status = attestation.Status;
-            AttesUri = attestation.AttestUri;
+            AttestUri = attestation.AttestUri;
 
             ResourceIdentifier identifier = new ResourceIdentifier(attestation.Id);
 
@@ -41,7 +41,7 @@ public  PSAttestation(AttestationProvider attestation)
 
         public string Status { get; protected set; }
 
-        public string AttesUri { get; protected set; }
+        public string AttestUri { get; protected set; }
 
         public string ResourceGroupName { get; protected set; }
 

src/DataBox/DataBox/Az.DataBox.psd1

@@ -15,7 +15,7 @@
 ModuleVersion = '0.1.0'
 
 # Supported PSEditions
-CompatiblePSEditions = 'Core'
+CompatiblePSEditions = 'Core', 'Desktop'
 
 # ID used to uniquely identify this module
 GUID = '39B6B3E6-A15E-48BA-BE20-FE0D441D92B4'
@@ -35,7 +35,7 @@ Description = 'Microsoft Azure PowerShell - DataBox service cmdlets for Azure Re
 For more information on DataBox, please visit the following: https://docs.microsoft.com/azure/databox/'
 
 # Minimum version of the PowerShell engine required by this module
-PowerShellVersion = '5.0'
+PowerShellVersion = '5.1'
 
 # Name of the PowerShell host required by this module
 # PowerShellHostName = ''
@@ -53,7 +53,7 @@ DotNetFrameworkVersion = '4.7.2'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.5.2'; })
+RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.6.0'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = '.\Microsoft.Azure.Management.DataBox.dll'

src/DataBox/DataBox/Properties/AssemblyInfo.cs

@@ -25,5 +25,5 @@
 [assembly: ComVisible(false)]
 [assembly: CLSCompliant(false)]
 [assembly: Guid("d90791a2-8102-47fc-8150-de25ae796eb1")]
-[assembly: AssemblyVersion("1.0.0")]
-[assembly: AssemblyFileVersion("1.0.0")]
+[assembly: AssemblyVersion("0.1.0")]
+[assembly: AssemblyFileVersion("0.1.0")]

src/LogicApp/LogicApp.Test/ScenarioTests/IntegrationAccountMapTests.ps1

@@ -39,7 +39,7 @@ function Test-CreateIntegrationAccountMap
 	$integrationAccountLiquidMapName2 = "Liquid2-" + (getAssetname)
 
 	$integrationAccount = TestSetup-CreateIntegrationAccount $resourceGroup.ResourceGroupName $integrationAccountName
-	
+
 	$integrationAccountMap1 =  New-AzIntegrationAccountMap -ResourceGroupName $resourceGroup.ResourceGroupName -IntegrationAccountName $integrationAccountName -MapName $integrationAccountMapName1 -MapDefinition $xslt1MapContent
 	Assert-AreEqual $integrationAccountMapName1 $integrationAccountMap1.Name
 
@@ -69,10 +69,10 @@ function Test-GetIntegrationAccountMap
 {
 	$mapFilePath = Join-Path (Join-Path $TestOutputRoot "Resources") "SampleXslt1Map.xslt"
 	$mapContent = [IO.File]::ReadAllText($mapFilePath)
-	
+
 	$resourceGroup = TestSetup-CreateResourceGroup
 	$integrationAccountName = "IA-" + (getAssetname)
-	
+
 	$integrationAccountMapName = getAssetname
 
 	$integrationAccount = TestSetup-CreateIntegrationAccount $resourceGroup.ResourceGroupName $integrationAccountName
@@ -148,23 +148,26 @@ Test Get-AzIntegrationAccountMap command : Paging test
 #>
 function Test-ListIntegrationAccountMap
 {
-	$mapFilePath = Join-Path (Join-Path $TestOutputRoot "Resources") "SampleXslt1Map.xslt"
-	$mapContent = [IO.File]::ReadAllText($mapFilePath)
+	$xsltFilePath = Join-Path (Join-Path $TestOutputRoot "Resources") "SampleXslt1Map.xslt"
+	$liquidFilePath = Join-Path (Join-Path $TestOutputRoot "Resources") "SampleLiquidMap.liquid"
+	$xsltContent = [IO.File]::ReadAllText($xsltFilePath)
+	$liquidContent = [IO.File]::ReadAllText($liquidFilePath)
 
 	$resourceGroup = TestSetup-CreateResourceGroup
 	$integrationAccountName = "IA-" + (getAssetname)
 
 	$integrationAccount = TestSetup-CreateIntegrationAccount $resourceGroup.ResourceGroupName $integrationAccountName
 
-	$val=0
-	while($val -ne 1)
-	{
-		$val++ ;
-		$integrationAccountMapName = "XSLT-$val-" + (getAssetname)
-		New-AzIntegrationAccountMap -ResourceGroupName $resourceGroup.ResourceGroupName -IntegrationAccountName $integrationAccountName -MapName $integrationAccountMapName -MapDefinition $mapContent
-	}
+	$xsltMapName = "XSLT-" + (getAssetname)
+	$liquidMapName = "Liquid-" + (getAssetname)
+
+	New-AzIntegrationAccountMap -ResourceGroupName $resourceGroup.ResourceGroupName -IntegrationAccountName $integrationAccountName -MapType "XSLT" -MapName $xsltMapName -MapDefinition $xsltContent
+	New-AzIntegrationAccountMap -ResourceGroupName $resourceGroup.ResourceGroupName -IntegrationAccountName $integrationAccountName -MapType "Liquid" -MapName $liquidMapName -MapDefinition $liquidContent
 
 	$result =  Get-AzIntegrationAccountMap -ResourceGroupName $resourceGroup.ResourceGroupName -IntegrationAccountName $integrationAccountName
+	Assert-True { $result.Count -eq 2 }
+
+	$result =  Get-AzIntegrationAccountMap -ResourceGroupName $resourceGroup.ResourceGroupName -IntegrationAccountName $integrationAccountName -MapType "Xslt"
 	Assert-True { $result.Count -eq 1 }
 
 	Remove-AzIntegrationAccount -ResourceGroupName $resourceGroup.ResourceGroupName -IntegrationAccountName $integrationAccountName -Force

src/LogicApp/LogicApp.Test/SessionRecords/Microsoft.Azure.Commands.LogicApp.Test.ScenarioTests.IntegrationAccountMapTests/TestGetMap.json

@@ -18,6 +18,8 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+* Fix for Get-AzIntegrationAccountMap to list all map types
+	- Added new MapType parameter for filtering
 
 ## Version 1.2.1
 * Fix for ListWorkflows only retrieving the first page of results

src/LogicApp/LogicApp.Test/SessionRecords/Microsoft.Azure.Commands.LogicApp.Test.ScenarioTests.IntegrationAccountMapTests/TestListMap.json

@@ -21,13 +21,12 @@ namespace Microsoft.Azure.Commands.LogicApp.Cmdlets
     using ResourceManager.Common.ArgumentCompleters;
 
     /// <summary>
-    /// Gets the integration account map by name 
+    /// Gets the integration account map
     /// </summary>
     [Cmdlet("Get", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "IntegrationAccountMap")]
     [OutputType(typeof(IntegrationAccountMap))]
     public class GetAzureIntegrationAccountMapCommand : LogicAppBaseCmdlet
     {
-
         #region Input Parameters
 
         [Parameter(Mandatory = false, HelpMessage = "The integration account resource group name.",
@@ -45,6 +44,11 @@ public class GetAzureIntegrationAccountMapCommand : LogicAppBaseCmdlet
         [ValidateNotNullOrEmpty]
         public string MapName { get; set; }
 
+        [Parameter(Mandatory = false, HelpMessage = "The integration account map type.")]
+        [ValidateNotNullOrEmpty]
+        [PSArgumentCompleter("Xslt", "Xslt20", "Xslt30", "Liquid")]
+        public string MapType { get; set; }
+
         #endregion Input Parameters
 
         /// <summary>
@@ -56,7 +60,7 @@ public override void ExecuteCmdlet()
 
             if (string.IsNullOrEmpty(this.MapName))
             {
-                this.WriteObject(IntegrationAccountClient.ListIntegrationAccountMaps(this.ResourceGroupName,this.Name), true);
+                this.WriteObject(IntegrationAccountClient.ListIntegrationAccountMaps(this.ResourceGroupName,this.Name, this.MapType), true);
             }
             else
             {

src/LogicApp/LogicApp/ChangeLog.md

@@ -99,10 +99,18 @@ public IntegrationAccountMap GetIntegrationAccountMap(string resourceGroupName,
         /// </summary>
         /// <param name="resourceGroupName">The integration account resource group name.</param>
         /// <param name="integrationAccountName">The integration account name.</param>
-        /// <returns>List of integration account schemas.</returns>
-        public IPage<IntegrationAccountMap> ListIntegrationAccountMaps(string resourceGroupName, string integrationAccountName)
+        /// <param name="mapType">The map type to filter by.</param>
+        /// <returns>List of integration account maps.</returns>
+        public IPage<IntegrationAccountMap> ListIntegrationAccountMaps(string resourceGroupName, string integrationAccountName, string mapType)
         {
-            return this.LogicManagementClient.IntegrationAccountMaps.List(resourceGroupName, integrationAccountName, "$filter=mapType eq 'Xslt'&$top=1000");
+            var filter = new Rest.Azure.OData.ODataQuery<IntegrationAccountMapFilter>();
+            if(!string.IsNullOrWhiteSpace(mapType))
+            {
+                filter.Filter = $"MapType eq '{mapType}'";
+            }
+            filter.Top = 1000;
+
+            return this.LogicManagementClient.IntegrationAccountMaps.List(resourceGroupName, integrationAccountName, filter);
         }
 
         /// <summary>

src/LogicApp/LogicApp/Cmdlets/IntegrationAccount/GetAzureIntegrationAccountMapCommand.cs

@@ -1,4 +1,4 @@
----
+---
 external help file: Microsoft.Azure.PowerShell.Cmdlets.LogicApp.dll-Help.xml
 Module Name: Az.LogicApp
 ms.assetid: 4F65A8B3-A250-41C1-9AA5-DBEB3193C401
@@ -15,7 +15,7 @@ Gets an integration account map.
 
 ```
 Get-AzIntegrationAccountMap [-ResourceGroupName <String>] [-Name <String>] [-MapName <String>]
- [-DefaultProfile <IAzureContextContainer>] [<CommonParameters>]
+ [-MapType <String>] [-DefaultProfile <IAzureContextContainer>] [<CommonParameters>]
 ```
 
 ## DESCRIPTION
@@ -96,6 +96,22 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -MapType
+The integration account map type.
+
+```yaml
+Type: System.String
+Parameter Sets: (All)
+Aliases:
+Accepted values: Xslt, Xslt20, Xslt30, Liquid
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### -Name
 Specifies the name for the integration account.
 

src/LogicApp/LogicApp/Utilities/IntegrationAccountMapOperations.cs

@@ -136,6 +136,11 @@ function Test-CreateAllKindsOfDataSource
     $customLogRawJson = '{"customLogName":"Validation_CL","description":"test","inputs":[{"location":{"fileSystemLocations":{"linuxFileTypeLogPaths":null,"windowsFileTypeLogPaths":["C:\\e2e\\Evan\\ArubaSECURITY\\*.log"]}},"recordDelimiter":{"regexDelimiter":{"pattern":"\\n","matchIndex":0}}}],"extractions":[{"extractionName":"TimeGenerated","extractionType":"DateTime","extractionProperties":{"dateTimeExtraction":{"regex":"((\\d{2})|(\\d{4}))-([0-1]\\d)-(([0-3]\\d)|(\\d))\\s((\\d)|([0-1]\\d)|(2[0-4])):[0-5][0-9]:[0-5][0-9]","joinStringRegex":null}}}]}'
     $customLogDataSource = New-AzOperationalInsightsCustomLogDataSource -Workspace $workspace -CustomLogRawJson $customLogRawJson -Name "MyCustomLog"
 
+	# customlog, regex null
+    $customLogRawJson1 = '{"customLogName":"Validation_CL1","description":"test","inputs":[{"location":{"fileSystemLocations":{"linuxFileTypeLogPaths":null,"windowsFileTypeLogPaths":["C:\\e2e\\Evan\\ArubaSECURITY\\*.log"]}},"recordDelimiter":{"regexDelimiter":{"pattern":"\\n","matchIndex":0}}}],"extractions":[{"extractionName":"TimeGenerated","extractionType":"DateTime","extractionProperties":{"dateTimeExtraction":{"regex":null,"joinStringRegex":null}}}]}'
+    $customLogDataSource1 = New-AzOperationalInsightsCustomLogDataSource -Workspace $workspace -CustomLogRawJson $customLogRawJson1 -Name "MyCustomLog1"
+	
+
     # customlog
     $customLogRawJson2 = '{"customLogName":"Validation_CL2","description":"test","inputs":[{"location":{"fileSystemLocations":{"linuxFileTypeLogPaths":null,"windowsFileTypeLogPaths":["C:\\e2e\\Evan\\ArubaSECURITY\\*.log"]}},"recordDelimiter":{"regexDelimiter":{"pattern":"\\n","matchIndex":0}}}],"extractions":[{"extractionName":"TimeGenerated","extractionType":"DateTime","extractionProperties":{"dateTimeExtraction":{"regex":[{"matchIndex":0,"numberdGroup":null,"pattern":"((\\d{2})|(\\d{4}))-([0-1]\\d)-(([0-3]\\d)|(\\d))\\s((\\d)|([0-1]\\d)|(2[0-4])):[0-5][0-9]:[0-5][0-9]"}],"joinStringRegex":null}}}]}'
     $customLogDataSource2 = New-AzOperationalInsightsCustomLogDataSource -Workspace $workspace -CustomLogRawJson $customLogRawJson2 -Name "MyCustomLog2"