Skip to content

Commit 354a2e6

Browse files
isra-felisra-fel
authored
Merge branch 'main' into internal/release
2 parents 6f548b8 + 5371cee commit 354a2e6

28 files changed

+1059
-42
lines changed

‎.azure-pipelines/daily-build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# Please don't use ADO UI defined scheduled triggers because it takes precedence over YAML scheduled triggers.
22
# https://docs.microsoft.com/en-us/azure/devops/pipelines/process/scheduled-triggers
33
schedules:
4-
- cron: "0 0 * * *"
5-
displayName: Daily Midnight Build
4+
- cron: "0 18 * * *"
5+
displayName: 2:00 AM (UTC + 8:00) China Daily Build
66
branches:
77
include:
88
- main
@@ -153,4 +153,4 @@ jobs:
153153
inputs:
154154
artifactName: artifacts
155155
targetPath: artifacts
156-
condition: succeededOrFailed()
156+
condition: succeededOrFailed()

‎src/Compute/Compute/help/Add-AzVMSecret.md

Lines changed: 5 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -19,35 +19,19 @@ Add-AzVMSecret [-VM] <PSVirtualMachine> [[-SourceVaultId] <String>] [[-Certifica
1919
```
2020

2121
## DESCRIPTION
22+
2223
The **Add-AzVMSecret** cmdlet adds a secret to a virtual machine.
2324
This value lets you add a certificate to the virtual machine.
2425
The secret must be stored in a Key Vault.
2526
For more information about Key Vault, see [What is Azure Key Vault?](https://azure.microsoft.com/en-us/documentation/articles/key-vault-whatis/).
2627
For more information about the cmdlets, see [Azure Key Vault Cmdlets](/powershell/module/az.keyvault) or the [Set-AzKeyVaultSecret](/powershell/module/az.keyvault/set-azkeyvaultsecret) cmdlet.
2728

28-
## EXAMPLES
29-
30-
### Example 1: Add a secret to a virtual machine using the Azure Key Vault virtul machine extension
31-
To install certificates on a virtual machine it is recommended to use the [Azure Key Vault virtual machine extension for Linux](https://docs.microsoft.com/azure/virtual-machines/extensions/key-vault-linux) or the [Azure Key Vault virtual machine extension for Windows](https://docs.microsoft.com/azure/virtual-machines/extensions/key-vault-windows).
29+
> [!NOTE]
30+
> To install certificates on a virtual machine it is recommended to use the [Azure Key Vault virtual machine extension for Linux](https://docs.microsoft.com/azure/virtual-machines/extensions/key-vault-linux) or the [Azure Key Vault virtual machine extension for Windows](https://docs.microsoft.com/azure/virtual-machines/extensions/key-vault-windows) instead of `Add-AzVMSecret`.
3231
33-
```powershell
34-
# Build settings
35-
PS C:\> $settings = @{
36-
secretsManagementSettings = @{
37-
pollingIntervalInS = "<pollingInterval>"
38-
certificateStoreName = "<certStoreName>"
39-
certificateStoreLocation = "<certStoreLoc>"
40-
observedCertificates = @("<observedCert1>", "<observedCert2>")
41-
}
42-
} | ConvertTo-Json
43-
PS C:\> $extName = "KeyVaultForLinux"
44-
PS C:\> $extPublisher = "Microsoft.Azure.KeyVault"
45-
PS C:\> $extType = "KeyVaultForLinux"
46-
# Start the deployment
47-
PS C:\> Set-AzVmExtension -TypeHandlerVersion "2.0" -ResourceGroupName <ResourceGroupName> -Location <Location> -VMName <VMName> -Name $extName -Publisher $extPublisher -Type $extType -SettingString $settings
48-
```
32+
## EXAMPLES
4933

50-
### Example 2: Add a secret to a virtual machine using Add-AzVMSecret
34+
### Example: Add a secret to a virtual machine using Add-AzVMSecret
5135
```powershell
5236
PS C:\> $VirtualMachine = New-AzVMConfig -VMName "VirtualMachine07" -VMSize "Standard_A1" -AvailabilitySetID $AvailabilitySet.Id
5337
PS C:\> $Credential = Get-Credential

‎src/HDInsight/HDInsight/help/Az.HDInsight.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,13 @@ Adds an Azure Storage key to a cluster configuration object.
3636
Disables Azure Monitor in a specified HDInsight cluster.
3737

3838
### [Disable-AzHDInsightMonitoring](Disable-AzHDInsightMonitoring.md)
39-
Disables monitoring in a HDInsight cluster and relevant logs will stop flowing to the monitoring workspace specified during enable.
39+
Disables the Classic Azure Monitor logs integration on an HDInsight cluster and relevant logs will stop flowing to the monitoring workspace specified during enable.
4040

4141
### [Enable-AzHDInsightAzureMonitor](Enable-AzHDInsightAzureMonitor.md)
4242
Enables Azure Monitor in a specified HDInsight cluster.
4343

4444
### [Enable-AzHDInsightMonitoring](Enable-AzHDInsightMonitoring.md)
45-
Enables monitoring in a HDInsight cluster and relevant logs will be sent to the monitoring workspace specified during enable.
45+
Enables the Classic Azure Monitor logs integration on an HDInsight cluster and relevant logs will be sent to the monitoring workspace specified during enable.
4646

4747
### [Get-AzHDInsightAzureMonitor](Get-AzHDInsightAzureMonitor.md)
4848
Gets the azure monitor status of a specified HDInsight cluster.
@@ -63,7 +63,7 @@ Gets the list of jobs from a cluster and lists them in reverse chronological ord
6363
Gets the log output for a job from the storage account associated with a specified cluster.
6464

6565
### [Get-AzHDInsightMonitoring](Get-AzHDInsightMonitoring.md)
66-
Gets the status of monitoring installation on the cluster.
66+
Gets the status of the Classic Azure Monitor logs integration on an HDInsight cluster.
6767

6868
### [Get-AzHDInsightPersistedScriptAction](Get-AzHDInsightPersistedScriptAction.md)
6969
Gets the persisted script actions for a cluster and lists them in chronological order, or gets details for a specified persisted script action.

‎src/HDInsight/HDInsight/help/Disable-AzHDInsightMonitoring.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ schema: 2.0.0
88
# Disable-AzHDInsightMonitoring
99

1010
## SYNOPSIS
11-
Disables monitoring in a HDInsight cluster and relevant logs will stop flowing to the monitoring workspace specified during enable.
11+
Disables the Classic Azure Monitor logs integration on an HDInsight cluster and relevant logs will stop flowing to the monitoring workspace specified during enable.
1212

1313
## SYNTAX
1414

@@ -18,7 +18,7 @@ Disable-AzHDInsightMonitoring [-Name] <String> [-ResourceGroupName <String>]
1818
```
1919

2020
## DESCRIPTION
21-
The **Disable-AzHDInsightMonitoring** cmdlet disables monitoring in a Azure HDInsight cluster.
21+
The **Disable-AzHDInsightMonitoring** cmdlet disables the Classic Azure Monitor logs integration on an HDInsight cluster.
2222

2323
## EXAMPLES
2424

‎src/HDInsight/HDInsight/help/Enable-AzHDInsightMonitoring.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ schema: 2.0.0
88
# Enable-AzHDInsightMonitoring
99

1010
## SYNOPSIS
11-
Enables monitoring in a HDInsight cluster and relevant logs will be sent to the monitoring workspace specified during enable.
11+
Enables the Classic Azure Monitor logs integration on an HDInsight cluster and relevant logs will be sent to the monitoring workspace specified during enable.
1212

1313
## SYNTAX
1414

@@ -19,7 +19,7 @@ Enable-AzHDInsightMonitoring [-Name] <String> [-WorkspaceId] <String> [-PrimaryK
1919
```
2020

2121
## DESCRIPTION
22-
The **Enable-AzHDInsightMonitoring** cmdlet enables monitoring in a Azure HDInsight cluster.
22+
The **Enable-AzHDInsightMonitoring** cmdlet enables the Classic Azure Monitor logs integration on an HDInsight cluster.
2323

2424
## EXAMPLES
2525

‎src/HDInsight/HDInsight/help/Get-AzHDInsightMonitoring.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ schema: 2.0.0
88
# Get-AzHDInsightMonitoring
99

1010
## SYNOPSIS
11-
Gets the status of monitoring installation on the cluster.
11+
Gets the status of the Classic Azure Monitor logs integration on an HDInsight cluster.
1212

1313
## SYNTAX
1414

@@ -18,7 +18,7 @@ Get-AzHDInsightMonitoring [-Name] <String> [-ResourceGroupName <String>]
1818
```
1919

2020
## DESCRIPTION
21-
The **Get-AzHDInsightMonitoring** cmdlet gets the status of monitoring installation in an Azure HDInsight cluster. If monitoring is enabled then it will also return the log analytics workspace id.
21+
The **Get-AzHDInsightMonitoring** cmdlet gets the status of the Classic Azure Monitor logs integration on an HDInsight cluster. If monitoring is enabled then it will also return the log analytics workspace id.
2222

2323
## EXAMPLES
2424

‎src/Network/Network/help/Add-AzNetworkSecurityRuleConfig.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ Specifies a destination address prefix.
117117
The acceptable values for this parameter are:
118118
- A Classless Interdomain Routing (CIDR) address
119119
- A destination IP address range
120-
- A wildcard character (*) to match any IP address
120+
- A wildcard character (*) to match any IP address.
121121
You can use tags such as VirtualNetwork, AzureLoadBalancer, and Internet.
122122
123123
```yaml

‎src/Network/Network/help/Set-AzNetworkSecurityRuleConfig.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ Specifies a destination address prefix.
113113
The acceptable values for this parameter are:
114114
- A Classless Interdomain Routing (CIDR) address
115115
- A destination IP address range
116-
- A wildcard character (*) to match any IP address
116+
- A wildcard character (*) to match any IP address.
117117
You can use tags such as VirtualNetwork, AzureLoadBalancer, and Internet.
118118
119119
```yaml
@@ -267,7 +267,7 @@ Specifies a source address prefix.
267267
The acceptable values for this parameter are:
268268
- A CIDR
269269
- A source IP range
270-
- A wildcard character (*) to match any IP address
270+
- A wildcard character (*) to match any IP address.
271271
You can also use tags such as VirtualNetwork, AzureLoadBalancer and Internet.
272272
273273
```yaml

‎src/Synapse/Synapse/Az.Synapse.psd1

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,8 @@ RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '2.5.1'; })
5959
RequiredAssemblies = 'Microsoft.Azure.Management.Synapse.dll',
6060
'Azure.Analytics.Synapse.Spark.dll',
6161
'Azure.Analytics.Synapse.AccessControl.dll',
62-
'Azure.Analytics.Synapse.Artifacts.dll'
62+
'Azure.Analytics.Synapse.Artifacts.dll',
63+
'Azure.Analytics.Synapse.ManagedPrivateEndpoints.dll'
6364

6465
# Script files (.ps1) that are run in the caller's environment prior to importing this module.
6566
# ScriptsToProcess = @()
@@ -174,7 +175,10 @@ CmdletsToExport = 'Get-AzSynapseSparkJob', 'Stop-AzSynapseSparkJob',
174175
'Update-AzSynapseManagedVirtualNetworkConfig',
175176
'Get-AzSynapseSparkJobDefinition',
176177
'Remove-AzSynapseSparkJobDefinition',
177-
'Set-AzSynapseSparkJobDefinition'
178+
'Set-AzSynapseSparkJobDefinition',
179+
'Get-AzSynapseManagedPrivateEndpoint',
180+
'New-AzSynapseManagedPrivateEndpoint',
181+
'Remove-AzSynapseManagedPrivateEndpoint'
178182

179183
# Variables to export from this module
180184
# VariablesToExport = @()
@@ -193,7 +197,8 @@ AliasesToExport = 'New-AzSynapsePipeline', 'New-AzSynapseLinkedService',
193197
'Clear-AzSynapseSqlPoolVulnerabilityAssessmentSetting',
194198
'Enable-AzSynapseSqlAdvancedThreatProtection',
195199
'Disable-AzSynapseSqlAdvancedThreatProtection',
196-
'New-AzSynapseSparkJobDefinition'
200+
'New-AzSynapseSparkJobDefinition',
201+
'Set-AzSynapseManagedPrivateEndpoint'
197202

198203
# DSC resources to export from this module
199204
# DscResourcesToExport = @()

‎src/Synapse/Synapse/ChangeLog.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@
1818
- Additional information about change #1
1919
-->
2020
## Upcoming Release
21+
* Added support for Synapse Managed Private Endpoint
22+
- Added `New-AzSynapseManagedPrivateEndpoint` cmdlet
23+
- Added `Get-AzSynapseManagedPrivateEndpoint` cmdlet
24+
- Added `Remove-AzSynapseManagedPrivateEndpoint` cmdlet
2125

2226
## Version 0.14.0
2327
* Added parameter `-ManagedResourceGroupName` for the `New-AzSynapseWorkspace` cmdlet

‎src/Synapse/Synapse/Commands/DataPlaneCommands/ManagedPrivateEndpoints/GetAzureSynapseManagedPrivateEndpoint.cs

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
2+
using Microsoft.Azure.Commands.Synapse.Common;
3+
using Microsoft.Azure.Commands.Synapse.Models;
4+
using Microsoft.WindowsAzure.Commands.Utilities.Common;
5+
using System.Linq;
6+
using System.Management.Automation;
7+
8+
namespace Microsoft.Azure.Commands.Synapse
9+
{
10+
[Cmdlet(VerbsCommon.Get, ResourceManager.Common.AzureRMConstants.AzureRMPrefix + SynapseConstants.SynapsePrefix + SynapseConstants.ManagedPrivateEndpoint,
11+
DefaultParameterSetName = GetByName)]
12+
[OutputType(typeof(PSManagedPrivateEndpointResource))]
13+
public class GetAzureSynapseManagedPrivateEndpoint : SynapseManagedPrivateEndpointsClientCmdletBase
14+
{
15+
private const string GetByName = "GetByName";
16+
private const string GetByObject = "GetByObject";
17+
18+
[Parameter(ValueFromPipelineByPropertyName = false, ParameterSetName = GetByName,
19+
Mandatory = true, HelpMessage = HelpMessages.WorkspaceName)]
20+
[ResourceNameCompleter(ResourceTypes.Workspace, "ResourceGroupName")]
21+
[ValidateNotNullOrEmpty]
22+
public override string WorkspaceName { get; set; }
23+
24+
[Parameter(ValueFromPipeline = true, ParameterSetName = GetByObject,
25+
Mandatory = true, HelpMessage = HelpMessages.WorkspaceObject)]
26+
[ValidateNotNull]
27+
public PSSynapseWorkspace WorkspaceObject { get; set; }
28+
29+
[Parameter(ValueFromPipelineByPropertyName = false, Mandatory = false, HelpMessage = HelpMessages.ManagedPrivateEndpointName)]
30+
[ValidateNotNullOrEmpty]
31+
[Alias("ManagedPrivateEndpointName")]
32+
public string Name { get; set; }
33+
34+
[Parameter(ValueFromPipelineByPropertyName = false, Mandatory = false, HelpMessage = HelpMessages.DefaultVNetName)]
35+
[ValidateNotNullOrEmpty]
36+
[Alias("VNetName")]
37+
[PSDefaultValue(Help = SynapseConstants.DefaultVNetName, Value = SynapseConstants.DefaultVNetName)]
38+
public string VirtualNetworkName { get; set; } = SynapseConstants.DefaultVNetName;
39+
40+
public override void ExecuteCmdlet()
41+
{
42+
if (this.IsParameterBound(c => c.WorkspaceObject))
43+
{
44+
this.WorkspaceName = this.WorkspaceObject.Name;
45+
}
46+
if(this.IsParameterBound(c => this.Name))
47+
{
48+
if (!string.IsNullOrEmpty(Name))
49+
{
50+
WriteObject(new PSManagedPrivateEndpointResource(SynapseManagedPrivateEndpointsClient.GetManagedPrivateEndpoint(this.Name, this.VirtualNetworkName), this.WorkspaceName));
51+
}
52+
}
53+
else
54+
{
55+
var privateEndpoints = SynapseManagedPrivateEndpointsClient.ListManagedPrivateEndpoints(this.VirtualNetworkName)
56+
.Select(element => new PSManagedPrivateEndpointResource(element, this.WorkspaceName));
57+
WriteObject(privateEndpoints, true);
58+
}
59+
}
60+
}
61+
}

‎src/Synapse/Synapse/Commands/DataPlaneCommands/ManagedPrivateEndpoints/NewAzureSynapseManagedPrivateEndpoint.cs

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
2+
using Microsoft.Azure.Commands.Synapse.Common;
3+
using Microsoft.Azure.Commands.Synapse.Models;
4+
using Microsoft.Azure.Commands.Synapse.Properties;
5+
using Microsoft.WindowsAzure.Commands.Utilities.Common;
6+
using System;
7+
using System.Management.Automation;
8+
9+
namespace Microsoft.Azure.Commands.Synapse
10+
{
11+
[Cmdlet(VerbsCommon.New, ResourceManager.Common.AzureRMConstants.AzureRMPrefix + SynapseConstants.SynapsePrefix + SynapseConstants.ManagedPrivateEndpoint,
12+
DefaultParameterSetName = SetByName, SupportsShouldProcess = true)]
13+
[Alias("Set-" + ResourceManager.Common.AzureRMConstants.AzureRMPrefix + SynapseConstants.SynapsePrefix + SynapseConstants.ManagedPrivateEndpoint)]
14+
[OutputType(typeof(PSManagedPrivateEndpointResource))]
15+
public class NewAzureSynapseManagedPrivateEndpoint : SynapseManagedPrivateEndpointsClientCmdletBase
16+
{
17+
private const string SetByName = "SetByName";
18+
private const string SetByObject = "SetByObject";
19+
20+
[Parameter(ValueFromPipelineByPropertyName = false, ParameterSetName = SetByName,
21+
Mandatory = true, HelpMessage = HelpMessages.WorkspaceName)]
22+
[ResourceNameCompleter(ResourceTypes.Workspace, "ResourceGroupName")]
23+
[ValidateNotNullOrEmpty]
24+
public override string WorkspaceName { get; set; }
25+
26+
[Parameter(ValueFromPipeline = true, ParameterSetName = SetByObject,
27+
Mandatory = true, HelpMessage = HelpMessages.WorkspaceObject)]
28+
[ValidateNotNull]
29+
public PSSynapseWorkspace WorkspaceObject { get; set; }
30+
31+
[Parameter(ValueFromPipelineByPropertyName = false, Mandatory = true, HelpMessage = HelpMessages.ManagedPrivateEndpointName)]
32+
[ValidateNotNullOrEmpty]
33+
[Alias("ManagedPrivateEndpointName")]
34+
public string Name { get; set; }
35+
36+
[Parameter(ValueFromPipelineByPropertyName = false, Mandatory = false, HelpMessage = HelpMessages.DefaultVNetName)]
37+
[ValidateNotNullOrEmpty]
38+
[Alias("VNetName")]
39+
[PSDefaultValue(Help = SynapseConstants.DefaultVNetName, Value = SynapseConstants.DefaultVNetName)]
40+
public string VirtualNetworkName { get; set; } = SynapseConstants.DefaultVNetName;
41+
42+
[Parameter(ValueFromPipelineByPropertyName = false, Mandatory = true, HelpMessage = HelpMessages.JsonFilePath)]
43+
[ValidateNotNullOrEmpty]
44+
[Alias("File")]
45+
public string DefinitionFile { get; set; }
46+
47+
[Parameter(Mandatory = false, HelpMessage = HelpMessages.AsJob)]
48+
public SwitchParameter AsJob { get; set; }
49+
50+
public override void ExecuteCmdlet()
51+
{
52+
if (this.IsParameterBound(c => c.WorkspaceObject))
53+
{
54+
this.WorkspaceName = this.WorkspaceObject.Name;
55+
}
56+
57+
if (this.ShouldProcess(this.WorkspaceName, String.Format(Resources.SettingSynapseManagedPrivateEndPoint, this.Name, this.WorkspaceName)))
58+
{
59+
string rawJsonContent = SynapseManagedPrivateEndpointsClient.ReadJsonFileContent(this.TryResolvePath(DefinitionFile));
60+
WriteObject(new PSManagedPrivateEndpointResource(SynapseManagedPrivateEndpointsClient.CreateManagedPrivateEndpoint(this.Name, rawJsonContent, this.VirtualNetworkName), this.WorkspaceName));
61+
}
62+
}
63+
}
64+
}

0 commit comments

Comments
 (0)