Skip to content

Commit fb3f826

Browse files
committed
Merge branch 'preview' of https://github.com/Azure/azure-powershell into release50ShouldProcOutChange
# Conflicts: # src/ResourceManager/Insights/Commands.Insights/help/Add-AzureRmAutoscaleSetting.md # src/ResourceManager/Insights/Commands.Insights/help/Add-AzureRmLogAlertRule.md # src/ResourceManager/Insights/Commands.Insights/help/Add-AzureRmLogProfile.md # src/ResourceManager/Insights/Commands.Insights/help/Add-AzureRmMetricAlertRule.md # src/ResourceManager/Insights/Commands.Insights/help/Add-AzureRmWebtestAlertRule.md # src/ResourceManager/Insights/Commands.Insights/help/Get-AzureRmAlertRule.md # src/ResourceManager/Insights/Commands.Insights/help/Get-AzureRmAutoscaleSetting.md # src/ResourceManager/Insights/Commands.Insights/help/Get-AzureRmLog.md # src/ResourceManager/Insights/Commands.Insights/help/Get-AzureRmMetric.md # src/ResourceManager/Insights/Commands.Insights/help/Get-AzureRmMetricDefinition.md # src/ResourceManager/Insights/Commands.Insights/help/Get-AzureRmUsage.md # src/ResourceManager/Insights/Commands.Insights/help/New-AzureRmAlertRuleEmail.md # src/ResourceManager/Insights/Commands.Insights/help/New-AzureRmAlertRuleWebhook.md # src/ResourceManager/Insights/Commands.Insights/help/New-AzureRmAutoscaleNotification.md # src/ResourceManager/Insights/Commands.Insights/help/New-AzureRmAutoscaleProfile.md # src/ResourceManager/Insights/Commands.Insights/help/New-AzureRmAutoscaleWebhook.md # src/ResourceManager/Insights/Commands.Insights/help/Remove-AzureRmAlertRule.md # src/ResourceManager/Insights/Commands.Insights/help/Remove-AzureRmAutoscaleSetting.md # tools/StaticAnalysis/Exceptions/BreakingChangeIssues.csv
2 parents aa9cd90 + e35fdf3 commit fb3f826

File tree

1,137 files changed

+382049
-90787
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,137 files changed

+382049
-90787
lines changed

src/Common/Commands.Common.Authentication.Abstractions/AzureEnvironment.cs

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ public class AzureEnvironment : IAzureEnvironment
5353
AzureDataLakeStoreFileSystemEndpointSuffix = AzureEnvironmentConstants.AzureDataLakeStoreFileSystemEndpointSuffix,
5454
GraphEndpointResourceId = AzureEnvironmentConstants.AzureGraphEndpoint,
5555
DataLakeEndpointResourceId = AzureEnvironmentConstants.AzureDataLakeServiceEndpointResourceId,
56+
BatchEndpointResourceId = AzureEnvironmentConstants.BatchEndpointResourceId,
5657
AdTenant = "Common"
5758
}
5859
},
@@ -77,6 +78,7 @@ public class AzureEnvironment : IAzureEnvironment
7778
AzureDataLakeAnalyticsCatalogAndJobEndpointSuffix = null,
7879
AzureDataLakeStoreFileSystemEndpointSuffix = null,
7980
GraphEndpointResourceId = AzureEnvironmentConstants.ChinaGraphEndpoint,
81+
BatchEndpointResourceId = AzureEnvironmentConstants.ChinaBatchEndpointResourceId,
8082
AdTenant = "Common"
8183
}
8284
},
@@ -101,6 +103,7 @@ public class AzureEnvironment : IAzureEnvironment
101103
AzureDataLakeAnalyticsCatalogAndJobEndpointSuffix = null,
102104
AzureDataLakeStoreFileSystemEndpointSuffix = null,
103105
GraphEndpointResourceId = AzureEnvironmentConstants.USGovernmentGraphEndpoint,
106+
BatchEndpointResourceId = AzureEnvironmentConstants.USGovernmentBatchEndpointResourceId,
104107
AdTenant = "Common"
105108
}
106109
},
@@ -125,6 +128,7 @@ public class AzureEnvironment : IAzureEnvironment
125128
AzureDataLakeAnalyticsCatalogAndJobEndpointSuffix = null,
126129
AzureDataLakeStoreFileSystemEndpointSuffix = null,
127130
GraphEndpointResourceId = AzureEnvironmentConstants.GermanGraphEndpoint,
131+
BatchEndpointResourceId = AzureEnvironmentConstants.GermanBatchEndpointResourceId,
128132
AdTenant = "Common"
129133
}
130134
}
@@ -228,6 +232,11 @@ public AzureEnvironment(IAzureEnvironment other)
228232
/// </summary>
229233
public string DataLakeEndpointResourceId { get; set; }
230234

235+
/// <summary>
236+
/// The token audience required for communicating with the Batch service in this enviornment
237+
/// </summary>
238+
public string BatchEndpointResourceId { get; set; }
239+
231240
/// <summary>
232241
/// The domain name suffix for Azure DataLake Catalog and Job services created in this environment
233242
/// </summary>
@@ -275,7 +284,8 @@ public static class Endpoint
275284
ManagementPortalUrl = "ManagementPortalUrl",
276285
AzureDataLakeAnalyticsCatalogAndJobEndpointSuffix = "AzureDataLakeAnalyticsCatalogAndJobEndpointSuffix",
277286
AzureDataLakeStoreFileSystemEndpointSuffix = "AzureDataLakeStoreFileSystemEndpointSuffix",
278-
DataLakeEndpointResourceId = "DataLakeEndpointResourceId";
287+
DataLakeEndpointResourceId = "DataLakeEndpointResourceId",
288+
BatchEndpointResourceId = "BatchEndpointResourceId";
279289

280290
}
281291
}

src/Common/Commands.Common.Authentication.Abstractions/AzureEnvironmentConstants.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,5 +125,10 @@ public static class AzureEnvironmentConstants
125125
/// The token audience for authorizing DataLake requests
126126
/// </summary>
127127
public const string AzureDataLakeServiceEndpointResourceId = "https://datalake.azure.net";
128+
129+
public const string BatchEndpointResourceId = "https://batch.core.windows.net/";
130+
public const string ChinaBatchEndpointResourceId = "https://batch.chinacloudapi.cn/";
131+
public const string USGovernmentBatchEndpointResourceId = "https://batch.core.usgovcloudapi.net/";
132+
public const string GermanBatchEndpointResourceId = "https://batch.cloudapi.de/";
128133
}
129134
}

src/Common/Commands.Common.Authentication.Abstractions/Extensions/AzureEnvironmentExtensions.cs

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,9 @@ public static bool TryGetEndpointUrl(this IAzureEnvironment environment, string
6565
case AzureEnvironment.Endpoint.DataLakeEndpointResourceId:
6666
endpoint = new Uri(environment.DataLakeEndpointResourceId);
6767
break;
68+
case AzureEnvironment.Endpoint.BatchEndpointResourceId:
69+
endpoint = new Uri(environment.BatchEndpointResourceId);
70+
break;
6871
default:
6972
result = false;
7073
break;
@@ -138,6 +141,9 @@ public static bool TryGetEndpointString(this IAzureEnvironment environment, stri
138141
case AzureEnvironment.Endpoint.ServiceManagement:
139142
propertyValue = environment.ServiceManagementUrl;
140143
break;
144+
case AzureEnvironment.Endpoint.BatchEndpointResourceId:
145+
propertyValue = environment.BatchEndpointResourceId;
146+
break;
141147
default:
142148
break;
143149
}
@@ -226,6 +232,9 @@ public static void SetEndpoint(this IAzureEnvironment environment, string endpoi
226232
case AzureEnvironment.Endpoint.DataLakeEndpointResourceId:
227233
environment.DataLakeEndpointResourceId = propertyValue;
228234
break;
235+
case AzureEnvironment.Endpoint.BatchEndpointResourceId:
236+
environment.BatchEndpointResourceId = propertyValue;
237+
break;
229238
case AzureEnvironment.Endpoint.ActiveDirectory:
230239
environment.ActiveDirectoryAuthority = propertyValue;
231240
break;
@@ -440,6 +449,10 @@ public static void CopyFrom(this IAzureEnvironment environment, IAzureEnvironmen
440449
environment.AzureKeyVaultServiceEndpointResourceId =
441450
other.AzureKeyVaultServiceEndpointResourceId;
442451
}
452+
if (other.IsEndpointSet(AzureEnvironment.Endpoint.BatchEndpointResourceId))
453+
{
454+
environment.BatchEndpointResourceId = other.BatchEndpointResourceId;
455+
}
443456

444457
environment.VersionProfiles.Clear();
445458
foreach (var profile in other.VersionProfiles)

src/Common/Commands.Common.Authentication.Abstractions/Interfaces/IAzureEnvironment.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,11 @@ public interface IAzureEnvironment : IExtensibleModel
107107
/// </summary>
108108
string DataLakeEndpointResourceId { get; set; }
109109

110+
/// <summary>
111+
/// The token audience required to authenticate with the Azure Batch service
112+
/// </summary>
113+
string BatchEndpointResourceId { get; set; }
114+
110115
/// <summary>
111116
/// The domain name suffix for Azure DataLake Catalog and Job services
112117
/// </summary>

src/ResourceManager/AnalysisServices/Commands.AnalysisServices/help/Get-AzureRmAnalysisServicesServer.md

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
---
22
external help file: Microsoft.Azure.Commands.AnalysisServices.dll-Help.xml
3+
Module Name: AzureRM.AnalysisServices
34
online version:
45
schema: 2.0.0
56
---
@@ -12,7 +13,8 @@ Gets the details of an Analysis Services server.
1213
## SYNTAX
1314

1415
```
15-
Get-AzureRmAnalysisServicesServer [[-ResourceGroupName] <String>] [[-Name] <String>] [<CommonParameters>]
16+
Get-AzureRmAnalysisServicesServer [[-ResourceGroupName] <String>] [[-Name] <String>]
17+
[-DefaultProfile <IAzureContextContainer>] [<CommonParameters>]
1618
```
1719

1820
## DESCRIPTION
@@ -36,6 +38,21 @@ This command gets the Azure Analysis Services server named testserver in the res
3638

3739
## PARAMETERS
3840

41+
### -DefaultProfile
42+
The credentials, account, tenant, and subscription used for communication with azure.
43+
44+
```yaml
45+
Type: IAzureContextContainer
46+
Parameter Sets: (All)
47+
Aliases: AzureRmContext, AzureCredential
48+
49+
Required: False
50+
Position: Named
51+
Default value: None
52+
Accept pipeline input: False
53+
Accept wildcard characters: False
54+
```
55+
3956
### -Name
4057
Name of the Analysis Services server
4158

src/ResourceManager/AnalysisServices/Commands.AnalysisServices/help/New-AzureRmAnalysisServicesServer.md

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
---
22
external help file: Microsoft.Azure.Commands.AnalysisServices.dll-Help.xml
3+
Module Name: AzureRM.AnalysisServices
34
online version:
45
schema: 2.0.0
56
---
@@ -14,7 +15,7 @@ Creates a new Analysis Services server
1415
```
1516
New-AzureRmAnalysisServicesServer [-ResourceGroupName] <String> [-Name] <String> [-Location] <String>
1617
[-Sku] <String> [[-Tag] <Hashtable>] [[-Administrator] <String>] [[-BackupBlobContainerUri] <String>]
17-
[-WhatIf] [-Confirm] [<CommonParameters>]
18+
[-DefaultProfile <IAzureContextContainer>] [-WhatIf] [-Confirm] [<CommonParameters>]
1819
```
1920

2021
## DESCRIPTION
@@ -61,6 +62,21 @@ Accept pipeline input: True (ByPropertyName)
6162
Accept wildcard characters: False
6263
```
6364
65+
### -DefaultProfile
66+
The credentials, account, tenant, and subscription used for communication with azure.
67+
68+
```yaml
69+
Type: IAzureContextContainer
70+
Parameter Sets: (All)
71+
Aliases: AzureRmContext, AzureCredential
72+
73+
Required: False
74+
Position: Named
75+
Default value: None
76+
Accept pipeline input: False
77+
Accept wildcard characters: False
78+
```
79+
6480
### -Location
6581
The Azure region where the Analysis Services server is hosted
6682

src/ResourceManager/AnalysisServices/Commands.AnalysisServices/help/Remove-AzureRmAnalysisServicesServer.md

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
---
22
external help file: Microsoft.Azure.Commands.AnalysisServices.dll-Help.xml
3+
Module Name: AzureRM.AnalysisServices
34
online version:
45
schema: 2.0.0
56
---
@@ -12,8 +13,8 @@ Deletes an instance of Analysis Services server
1213
## SYNTAX
1314

1415
```
15-
Remove-AzureRmAnalysisServicesServer [-Name] <String> [[-ResourceGroupName] <String>] [-PassThru] [-WhatIf]
16-
[-Confirm] [<CommonParameters>]
16+
Remove-AzureRmAnalysisServicesServer [-Name] <String> [[-ResourceGroupName] <String>] [-PassThru]
17+
[-DefaultProfile <IAzureContextContainer>] [-WhatIf] [-Confirm] [<CommonParameters>]
1718
```
1819

1920
## DESCRIPTION
@@ -30,6 +31,21 @@ This command will remove the server named testserver in the resourcegroup testgr
3031

3132
## PARAMETERS
3233

34+
### -DefaultProfile
35+
The credentials, account, tenant, and subscription used for communication with azure.
36+
37+
```yaml
38+
Type: IAzureContextContainer
39+
Parameter Sets: (All)
40+
Aliases: AzureRmContext, AzureCredential
41+
42+
Required: False
43+
Position: Named
44+
Default value: None
45+
Accept pipeline input: False
46+
Accept wildcard characters: False
47+
```
48+
3349
### -Name
3450
Name of the Analysis Services server
3551

src/ResourceManager/AnalysisServices/Commands.AnalysisServices/help/Resume-AzureRmAnalysisServicesServer.md

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
---
22
external help file: Microsoft.Azure.Commands.AnalysisServices.dll-Help.xml
3+
Module Name: AzureRM.AnalysisServices
34
online version:
45
schema: 2.0.0
56
---
@@ -12,8 +13,8 @@ Resumes an instance of Analysis Services server
1213
## SYNTAX
1314

1415
```
15-
Resume-AzureRmAnalysisServicesServer [[-ResourceGroupName] <String>] [-Name] <String> [-PassThru] [-WhatIf]
16-
[-Confirm] [<CommonParameters>]
16+
Resume-AzureRmAnalysisServicesServer [[-ResourceGroupName] <String>] [-Name] <String> [-PassThru]
17+
[-DefaultProfile <IAzureContextContainer>] [-WhatIf] [-Confirm] [<CommonParameters>]
1718
```
1819

1920
## DESCRIPTION
@@ -30,6 +31,21 @@ This command will resume a paused server named testserver in the resourcegroup t
3031

3132
## PARAMETERS
3233

34+
### -DefaultProfile
35+
The credentials, account, tenant, and subscription used for communication with azure.
36+
37+
```yaml
38+
Type: IAzureContextContainer
39+
Parameter Sets: (All)
40+
Aliases: AzureRmContext, AzureCredential
41+
42+
Required: False
43+
Position: Named
44+
Default value: None
45+
Accept pipeline input: False
46+
Accept wildcard characters: False
47+
```
48+
3349
### -Name
3450
Name of the Analysis Services server
3551

src/ResourceManager/AnalysisServices/Commands.AnalysisServices/help/Set-AzureRmAnalysisServicesServer.md

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
---
22
external help file: Microsoft.Azure.Commands.AnalysisServices.dll-Help.xml
3+
Module Name: AzureRM.AnalysisServices
34
online version:
45
schema: 2.0.0
56
---
@@ -14,15 +15,15 @@ Modifies an instance of Analysis Services server
1415
### Default (Default)
1516
```
1617
Set-AzureRmAnalysisServicesServer [-Name] <String> [[-ResourceGroupName] <String>] [[-Sku] <String>]
17-
[[-Tag] <Hashtable>] [[-Administrator] <String>] [[-BackupBlobContainerUri] <String>] [-PassThru] [-WhatIf]
18-
[-Confirm] [<CommonParameters>]
18+
[[-Tag] <Hashtable>] [[-Administrator] <String>] [[-BackupBlobContainerUri] <String>] [-PassThru]
19+
[-DefaultProfile <IAzureContextContainer>] [-WhatIf] [-Confirm] [<CommonParameters>]
1920
```
2021

2122
### Disable Backup
2223
```
2324
Set-AzureRmAnalysisServicesServer [-Name] <String> [[-ResourceGroupName] <String>] [[-Sku] <String>]
24-
[[-Tag] <Hashtable>] [[-Administrator] <String>] [-PassThru] [-DisableBackup] [-WhatIf] [-Confirm]
25-
[<CommonParameters>]
25+
[[-Tag] <Hashtable>] [[-Administrator] <String>] [-PassThru] [-DisableBackup]
26+
[-DefaultProfile <IAzureContextContainer>] [-WhatIf] [-Confirm] [<CommonParameters>]
2627
```
2728

2829
## DESCRIPTION
@@ -71,6 +72,21 @@ Accept pipeline input: True (ByPropertyName)
7172
Accept wildcard characters: False
7273
```
7374
75+
### -DefaultProfile
76+
The credentials, account, tenant, and subscription used for communication with azure.
77+
78+
```yaml
79+
Type: IAzureContextContainer
80+
Parameter Sets: (All)
81+
Aliases: AzureRmContext, AzureCredential
82+
83+
Required: False
84+
Position: Named
85+
Default value: None
86+
Accept pipeline input: False
87+
Accept wildcard characters: False
88+
```
89+
7490
### -DisableBackup
7591
The switch to disable backup blob container.
7692
To re-enable the backup blob container, please provide the backup blob container Uri as -BackupBlobContainerUri.

src/ResourceManager/AnalysisServices/Commands.AnalysisServices/help/Suspend-AzureRmAnalysisServicesServer.md

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
---
22
external help file: Microsoft.Azure.Commands.AnalysisServices.dll-Help.xml
3+
Module Name: AzureRM.AnalysisServices
34
online version:
45
schema: 2.0.0
56
---
@@ -12,8 +13,8 @@ Suspends an instance of Analysis Services server
1213
## SYNTAX
1314

1415
```
15-
Suspend-AzureRmAnalysisServicesServer [[-ResourceGroupName] <String>] [-Name] <String> [-PassThru] [-WhatIf]
16-
[-Confirm] [<CommonParameters>]
16+
Suspend-AzureRmAnalysisServicesServer [[-ResourceGroupName] <String>] [-Name] <String> [-PassThru]
17+
[-DefaultProfile <IAzureContextContainer>] [-WhatIf] [-Confirm] [<CommonParameters>]
1718
```
1819

1920
## DESCRIPTION
@@ -30,6 +31,21 @@ This command will suspend an active server named testserver in the resourcegroup
3031

3132
## PARAMETERS
3233

34+
### -DefaultProfile
35+
The credentials, account, tenant, and subscription used for communication with azure.
36+
37+
```yaml
38+
Type: IAzureContextContainer
39+
Parameter Sets: (All)
40+
Aliases: AzureRmContext, AzureCredential
41+
42+
Required: False
43+
Position: Named
44+
Default value: None
45+
Accept pipeline input: False
46+
Accept wildcard characters: False
47+
```
48+
3349
### -Name
3450
Name of the Analysis Services server
3551

0 commit comments

Comments
 (0)