Merge branch 'master' into master

Author: cormacpayne

src/ResourceManager/DataFactories/Commands.DataFactories/Az.DataFactories.psd1

@@ -80,7 +80,6 @@ CmdletsToExport = 'Remove-AzDataFactory', 'Get-AzDataFactoryRun',
     'Set-AzDataFactorySliceStatus', 
     'New-AzDataFactoryEncryptValue', 
     'Get-AzDataFactoryGateway', 'New-AzDataFactoryGateway', 
-    'New-AzDataFactoryGatewayKey', 
     'Get-AzDataFactoryGatewayAuthkey', 
     'New-AzDataFactoryGatewayAuthkey', 
     'Remove-AzDataFactoryGateway', 'Set-AzDataFactoryGateway', 

src/ResourceManager/DataFactories/Commands.DataFactories/ChangeLog.md

@@ -17,4 +17,6 @@
     * Overview of change #1
         - Additional information about change #1
 -->
-## Current Release
+## Current Release
+* -GatewayName parameter has become mandatory in the New-AzDataFactoryEncryptValue
+* Removed New-AzDataFactoryGatewayKey cmdlet

src/ResourceManager/DataFactories/Commands.DataFactories/Commands.DataFactories.csproj

@@ -89,7 +89,6 @@
     <Compile Include="Gateway\GetAzureDataFactoryGatewayCommand.cs" />
     <Compile Include="Gateway\NewAzureDataFactoryGatewayAuthKeyCommand.cs" />
     <Compile Include="Gateway\NewAzureDataFactoryGatewayCommand.cs" />
-    <Compile Include="Gateway\NewAzureDataFactoryGatewayKeyCommand.cs" />
     <Compile Include="Gateway\RemoveAzureDataFactoryGatewayCommand.cs" />
     <Compile Include="Gateway\SetAzureDataFactoryGatewayCommand.cs" />
     <Compile Include="Hubs\GetAzureDataFactoryHubCommand.cs" />

src/ResourceManager/DataFactories/Commands.DataFactories/Encrypt/NewAzureDataFactoryEncryptValueCommand.cs

@@ -38,8 +38,8 @@ public class NewAzureDataFactoryEncryptValueCommand : DataFactoryBaseCmdlet
         [Parameter(ParameterSetName = ByFactoryName, Position = 2, Mandatory = false, HelpMessage = "The value to encrypt.")]
         public SecureString Value { get; set; }
 
-        [Parameter(ParameterSetName = ByFactoryObject, Position = 2, Mandatory = false, HelpMessage = "The gateway group name.")]
-        [Parameter(ParameterSetName = ByFactoryName, Position = 3, Mandatory = false, HelpMessage = "The gateway group name.")]
+        [Parameter(ParameterSetName = ByFactoryObject, Position = 2, Mandatory = true, HelpMessage = "The gateway group name.")]
+        [Parameter(ParameterSetName = ByFactoryName, Position = 3, Mandatory = true, HelpMessage = "The gateway group name.")]
         public string GatewayName { get; set; }
 
         [Parameter(ParameterSetName = ByFactoryObject, Position = 3, Mandatory = false, HelpMessage = "The windows authentication credential.")]
@@ -90,17 +90,9 @@ public override void ExecuteCmdlet()
 
             string encryptedValue = String.Empty;
 
-            if (String.IsNullOrWhiteSpace(GatewayName))
-            {
-                // Cloud encryption without Gateway
-                WriteWarning("Cloud encryption has already been deprecated. Please run get-help new-Azdatafactoryencryptvalue to see other option of this command");
-            }
-            else
-            {
-                // On-premises encryption with Gateway
-                encryptedValue = DataFactoryClient.OnPremisesEncryptString(Value, ResourceGroupName, DataFactoryName,
-                    GatewayName, Credential, Type, NonCredentialValue, AuthenticationType, Server, Database);
-            }
+            // On-premises encryption with Gateway
+            encryptedValue = DataFactoryClient.OnPremisesEncryptString(Value, ResourceGroupName, DataFactoryName,
+                GatewayName, Credential, Type, NonCredentialValue, AuthenticationType, Server, Database);
 
             WriteObject(encryptedValue);
         }

src/ResourceManager/DataFactories/Commands.DataFactories/Gateway/NewAzureDataFactoryGatewayKeyCommand.cs

@@ -16,15 +16,15 @@ Encrypts sensitive data.
 ### ByFactoryName (Default)
 ```
 New-AzDataFactoryEncryptValue [-DataFactoryName] <String> [[-Value] <SecureString>]
- [[-GatewayName] <String>] [[-Credential] <PSCredential>] [[-Type] <String>] [[-NonCredentialValue] <String>]
+ [-GatewayName] <String> [[-Credential] <PSCredential>] [[-Type] <String>] [[-NonCredentialValue] <String>]
  [[-AuthenticationType] <String>] [[-Server] <String>] [[-Database] <String>] [-ResourceGroupName] <String>
  [-DefaultProfile <IAzureContextContainer>] [<CommonParameters>]
 ```
 
 ### ByFactoryObject
 ```
 New-AzDataFactoryEncryptValue [-DataFactory] <PSDataFactory> [[-Value] <SecureString>]
- [[-GatewayName] <String>] [[-Credential] <PSCredential>] [[-Type] <String>] [[-NonCredentialValue] <String>]
+ [-GatewayName] <String> [[-Credential] <PSCredential>] [[-Type] <String>] [[-NonCredentialValue] <String>]
  [[-AuthenticationType] <String>] [[-Server] <String>] [[-Database] <String>]
  [-DefaultProfile <IAzureContextContainer>] [<CommonParameters>]
 ```
@@ -199,7 +199,7 @@ Type: System.String
 Parameter Sets: (All)
 Aliases:
 
-Required: False
+Required: True
 Position: 2
 Default value: None
 Accept pipeline input: False

src/ResourceManager/DataFactories/Commands.DataFactories/help/New-AzDataFactoryEncryptValue.md

@@ -18,4 +18,5 @@
         - Additional information about change #1
 -->
 
-## Current Release
+## Current Release
+* Removed -LinkedServiceName parameter from Get-AzDataFactoryV2ActivityRun

src/ResourceManager/DataFactories/Commands.DataFactories/help/New-AzDataFactoryGatewayKey.md

@@ -27,7 +27,5 @@ public class ActivityRunFilterOptions : DataFactoryFilterOptions
         public string ActivityName { get; set; }
 
         public string Status { get; set; }
-
-        public string LinkedServiceName { get; set; }
     }
 }

src/ResourceManager/DataFactoryV2/Commands.DataFactoryV2/Changelog.md

@@ -59,14 +59,6 @@ public class GetAzureDataFactoryActivityRunCommand : DataFactoryContextBaseCmdle
         [ValidateNotNullOrEmpty]
         public string Status { get; set; }
 
-        [CmdletParameterBreakingChange("LinkedServiceName", ChangeDescription = Constants.DeprecatingParameter)]
-        [Parameter(ParameterSetName = ParameterSetNames.ByFactoryObject, Position = 6, Mandatory = false,
-            HelpMessage = Constants.HelpLinkedServiceName)]
-        [Parameter(ParameterSetName = ParameterSetNames.ByFactoryName, Position = 7, Mandatory = false,
-            HelpMessage = Constants.HelpLinkedServiceName)]
-        [ValidateNotNullOrEmpty]
-        public string LinkedServiceName { get; set; }
-
         public override void ExecuteCmdlet()
         {
             ByFactoryObject();
@@ -79,7 +71,6 @@ public override void ExecuteCmdlet()
                 RunStartedAfter = RunStartedAfter,
                 RunStartedBefore = RunStartedBefore,
                 ActivityName = ActivityName,
-                LinkedServiceName = LinkedServiceName,
                 Status = Status
             };
             WriteObject(DataFactoryClient.ListActivityRuns(activityRunFilter));

src/ResourceManager/DataFactoryV2/Commands.DataFactoryV2/Models/ActivityRunFilterOptions.cs

@@ -15,16 +15,16 @@ Gets information about activity runs for a pipeline run.
 ### ByFactoryName (Default)
 ```
 Get-AzDataFactoryV2ActivityRun [-PipelineRunId] <String> [-RunStartedAfter] <DateTime>
- [-RunStartedBefore] <DateTime> [[-ActivityName] <String>] [[-Status] <String>] [[-LinkedServiceName] <String>]
- [-ResourceGroupName] <String> [-DataFactoryName] <String> [-DefaultProfile <IAzureContextContainer>]
+ [-RunStartedBefore] <DateTime> [[-ActivityName] <String>] [[-Status] <String>] [-ResourceGroupName] <String>
+ [-DataFactoryName] <String> [-DefaultProfile <IAzureContextContainer>]
  [<CommonParameters>]
 ```
 
 ### ByFactoryObject
 ```
 Get-AzDataFactoryV2ActivityRun [-PipelineRunId] <String> [-RunStartedAfter] <DateTime>
- [-RunStartedBefore] <DateTime> [[-ActivityName] <String>] [[-Status] <String>] [[-LinkedServiceName] <String>]
- [-DataFactory] <PSDataFactory> [-DefaultProfile <IAzureContextContainer>] [<CommonParameters>]
+ [-RunStartedBefore] <DateTime> [[-ActivityName] <String>] [[-Status] <String>] [-DataFactory] <PSDataFactory>
+ [-DefaultProfile <IAzureContextContainer>] [<CommonParameters>]
 ```
 
 ## DESCRIPTION
@@ -43,7 +43,6 @@ PS C:\> Get-AzDataFactoryV2ActivityRun -ResourceGroupName "ADF" -DataFactoryName
     PipelineName      : DPUncyclosample
     Input             : {method, url, headers, body...}
     Output            : {operationstatus}
-    LinkedServiceName :
     ActivityRunStart  : 9/14/2017 12:20:57 AM
     ActivityRunEnd    : 9/14/2017 12:21:00 AM
     DurationInMs      : 2768
@@ -115,21 +114,6 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
-### -LinkedServiceName
-The linked service name.
-
-```yaml
-Type: System.String
-Parameter Sets: (All)
-Aliases:
-
-Required: False
-Position: 6
-Default value: None
-Accept pipeline input: False
-Accept wildcard characters: False
-```
-
 ### -PipelineRunId
 The Run ID of the pipeline.
 

src/ResourceManager/DataFactoryV2/Commands.DataFactoryV2/Runs/GetAzureDataFactoryActivityRunCommand.cs

@@ -17,4 +17,5 @@
     * Overview of change #1
         - Additional information about change #1
 -->
-## Current Release
+## Current Release
+* Default parameter set for Get-AzOperationalInsightsDataSource is removed, and ByWorkspaceNameByKind has become the default parameter set