Skip to content

Commit d8e1403

Browse files
authored
Merge branch 'preview' into feature/aks
2 parents 2b763f9 + 8adad30 commit d8e1403

File tree

375 files changed

+23009
-161556
lines changed

Some content is hidden

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

375 files changed

+23009
-161556
lines changed

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

Lines changed: 122 additions & 103 deletions
Large diffs are not rendered by default.

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,16 @@ public static class AzureEnvironmentConstants
115115
public const string USGovernmentKeyVaultServiceEndpointResourceId = "https://vault.usgovcloudapi.net";
116116
public const string GermanAzureKeyVaultServiceEndpointResourceId = "https://vault.microsoftazure.de";
117117

118+
/// <summary>
119+
/// The token audience for Log Analytics Queries
120+
/// </summary>
121+
public const string AzureOperationalInsightsEndpointResourceId = "https://api.loganalytics.io";
122+
123+
/// <summary>
124+
/// The endpoint URI for Log Analytics Queries
125+
/// </summary>
126+
public const string AzureOperationalInsightsEndpoint = "https://api.loganalytics.io/v1";
127+
118128
/// <summary>
119129
/// The domain name suffix for Azure DataLake services
120130
/// </summary>

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

Lines changed: 34 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,11 @@ public static bool TryGetEndpointUrl(this IAzureEnvironment environment, string
6969
endpoint = new Uri(environment.BatchEndpointResourceId);
7070
break;
7171
default:
72-
result = false;
72+
result = environment.IsPropertySet(endpointName);
73+
if (result)
74+
{
75+
endpoint = new Uri(environment.GetProperty(endpointName));
76+
}
7377
break;
7478
}
7579

@@ -148,6 +152,8 @@ public static bool TryGetEndpointString(this IAzureEnvironment environment, stri
148152
propertyValue = environment.BatchEndpointResourceId;
149153
break;
150154
default:
155+
// get property from the extended properties of the environment
156+
propertyValue = environment.GetProperty(endpointName);
151157
break;
152158
}
153159
}
@@ -259,6 +265,12 @@ public static void SetEndpoint(this IAzureEnvironment environment, string endpoi
259265
case AzureEnvironment.Endpoint.ServiceManagement:
260266
environment.ServiceManagementUrl = propertyValue;
261267
break;
268+
case AzureEnvironment.ExtendedEndpoint.OperationalInsightsEndpointResourceId:
269+
environment.SetProperty(AzureEnvironment.ExtendedEndpoint.OperationalInsightsEndpointResourceId, propertyValue);
270+
break;
271+
case AzureEnvironment.ExtendedEndpoint.OperationalInsightsEndpoint:
272+
environment.SetProperty(AzureEnvironment.ExtendedEndpoint.OperationalInsightsEndpoint, propertyValue);
273+
break;
262274
}
263275
}
264276
}
@@ -271,16 +283,28 @@ public static void SetEndpoint(this IAzureEnvironment environment, string endpoi
271283
/// <returns>The correct token audience for tokens bound for the given endpoint.</returns>
272284
public static string GetTokenAudience(this IAzureEnvironment environment, string targetEndpoint)
273285
{
274-
string resource = AzureEnvironment.Endpoint.ActiveDirectoryServiceEndpointResourceId;
275-
if (targetEndpoint == AzureEnvironment.Endpoint.Graph)
286+
string resource;
287+
switch (targetEndpoint)
276288
{
277-
resource = AzureEnvironment.Endpoint.GraphEndpointResourceId;
278-
}
279-
else if (targetEndpoint == AzureEnvironment.Endpoint.AzureDataLakeAnalyticsCatalogAndJobEndpointSuffix ||
280-
targetEndpoint == AzureEnvironment.Endpoint.AzureDataLakeStoreFileSystemEndpointSuffix ||
281-
targetEndpoint == AzureEnvironment.Endpoint.DataLakeEndpointResourceId)
282-
{
283-
resource = AzureEnvironment.Endpoint.DataLakeEndpointResourceId;
289+
case AzureEnvironment.Endpoint.Graph:
290+
resource = AzureEnvironment.Endpoint.GraphEndpointResourceId;
291+
break;
292+
case AzureEnvironment.Endpoint.AzureDataLakeAnalyticsCatalogAndJobEndpointSuffix:
293+
case AzureEnvironment.Endpoint.AzureDataLakeStoreFileSystemEndpointSuffix:
294+
case AzureEnvironment.Endpoint.DataLakeEndpointResourceId:
295+
resource = AzureEnvironment.Endpoint.DataLakeEndpointResourceId;
296+
break;
297+
case AzureEnvironment.Endpoint.AzureKeyVaultDnsSuffix:
298+
case AzureEnvironment.Endpoint.AzureKeyVaultServiceEndpointResourceId:
299+
resource = AzureEnvironment.Endpoint.AzureKeyVaultServiceEndpointResourceId;
300+
break;
301+
case AzureEnvironment.ExtendedEndpoint.OperationalInsightsEndpoint:
302+
case AzureEnvironment.ExtendedEndpoint.OperationalInsightsEndpointResourceId:
303+
resource = AzureEnvironment.ExtendedEndpoint.OperationalInsightsEndpointResourceId;
304+
break;
305+
default:
306+
resource = AzureEnvironment.Endpoint.ActiveDirectoryServiceEndpointResourceId;
307+
break;
284308
}
285309

286310
return resource;

src/ResourceManager/AnalysisServices/Commands.AnalysisServices.Dataplane/help/Sync-AzureAnalysisServicesInstance.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,17 @@ schema: 2.0.0
66

77
# Sync-AzureAnalysisServicesInstance
88

9-
## SYNOPSIS
9+
## SYNOPSIS
1010

1111
Synchronizes a specified database on the specified instance of Analysis Services server to all the query scaleout instances in the currently logged in Environment as specified in Add-AzureAnalysisServicesAccount command
1212

13-
## SYNTAX
13+
## SYNTAX
1414

1515
```
1616
Sync-AzureAnalysisServicesInstance [-Instance] <String> [-Database] <String> [-Passthru]
1717
```
1818

19-
## DESCRIPTION
19+
## DESCRIPTION
2020

2121
The Sync-AzureAnalysisServicesInstance cmdlet synchronizes a specified database on the specified instance of Analysis Services server to all the query scaleout instances in the currently logged in Environment as specified in Add-AzureAnalysisServicesAccount command
2222

src/ResourceManager/ApiManagement/Commands.ApiManagement/help/Add-AzureRmApiManagementProductToGroup.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ Accept wildcard characters: False
5252
### -DefaultProfile
5353
The credentials, account, tenant, and subscription used for communication with azure.
5454
55-
```yaml
55+
```yaml
5656
Type: IAzureContextContainer
5757
Parameter Sets: (All)
5858
Aliases: AzureRmContext, AzureCredential

src/ResourceManager/ApiManagement/Commands.ApiManagement/help/Add-AzureRmApiManagementRegion.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ Accept wildcard characters: False
7474
### -DefaultProfile
7575
The credentials, account, tenant, and subscription used for communication with azure.
7676
77-
```yaml
77+
```yaml
7878
Type: IAzureContextContainer
7979
Parameter Sets: (All)
8080
Aliases: AzureRmContext, AzureCredential

src/ResourceManager/ApiManagement/Commands.ApiManagement/help/Add-AzureRmApiManagementUserToGroup.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ Accept wildcard characters: False
5151
### -DefaultProfile
5252
The credentials, account, tenant, and subscription used for communication with azure.
5353
54-
```yaml
54+
```yaml
5555
Type: IAzureContextContainer
5656
Parameter Sets: (All)
5757
Aliases: AzureRmContext, AzureCredential

src/ResourceManager/ApiManagement/Commands.ApiManagement/help/Backup-AzureRmApiManagement.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ This command backs up an API Management service to a Storage blob.
3939
### -DefaultProfile
4040
The credentials, account, tenant, and subscription used for communication with azure.
4141

42-
```yaml
42+
```yaml
4343
Type: IAzureContextContainer
4444
Parameter Sets: (All)
4545
Aliases: AzureRmContext, AzureCredential

src/ResourceManager/ApiManagement/Commands.ApiManagement/help/Export-AzureRmApiManagementApi.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ Accept wildcard characters: False
7575
### -DefaultProfile
7676
The credentials, account, tenant, and subscription used for communication with azure.
7777
78-
```yaml
78+
```yaml
7979
Type: IAzureContextContainer
8080
Parameter Sets: (All)
8181
Aliases: AzureRmContext, AzureCredential

src/ResourceManager/ApiManagement/Commands.ApiManagement/help/Get-AzureRmApiManagement.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ This command gets all API Management service by name.
5454
### -DefaultProfile
5555
The credentials, account, tenant, and subscription used for communication with azure.
5656

57-
```yaml
57+
```yaml
5858
Type: IAzureContextContainer
5959
Parameter Sets: (All)
6060
Aliases: AzureRmContext, AzureCredential

src/ResourceManager/ApiManagement/Commands.ApiManagement/help/Get-AzureRmApiManagementApi.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ Accept wildcard characters: False
101101
### -DefaultProfile
102102
The credentials, account, tenant, and subscription used for communication with azure.
103103
104-
```yaml
104+
```yaml
105105
Type: IAzureContextContainer
106106
Parameter Sets: (All)
107107
Aliases: AzureRmContext, AzureCredential

src/ResourceManager/ApiManagement/Commands.ApiManagement/help/Get-AzureRmApiManagementAuthorizationServer.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ Accept wildcard characters: False
6464
### -DefaultProfile
6565
The credentials, account, tenant, and subscription used for communication with azure.
6666
67-
```yaml
67+
```yaml
6868
Type: IAzureContextContainer
6969
Parameter Sets: (All)
7070
Aliases: AzureRmContext, AzureCredential

src/ResourceManager/ApiManagement/Commands.ApiManagement/help/Get-AzureRmApiManagementBackend.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ Accept wildcard characters: False
8383
### -DefaultProfile
8484
The credentials, account, tenant, and subscription used for communication with azure.
8585
86-
```yaml
86+
```yaml
8787
Type: IAzureContextContainer
8888
Parameter Sets: (All)
8989
Aliases: AzureRmContext, AzureCredential

src/ResourceManager/ApiManagement/Commands.ApiManagement/help/Get-AzureRmApiManagementCertificate.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ Accept wildcard characters: False
8181
### -DefaultProfile
8282
The credentials, account, tenant, and subscription used for communication with azure.
8383
84-
```yaml
84+
```yaml
8585
Type: IAzureContextContainer
8686
Parameter Sets: (All)
8787
Aliases: AzureRmContext, AzureCredential

src/ResourceManager/ApiManagement/Commands.ApiManagement/help/Get-AzureRmApiManagementGroup.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ Accept wildcard characters: False
9494
### -DefaultProfile
9595
The credentials, account, tenant, and subscription used for communication with azure.
9696
97-
```yaml
97+
```yaml
9898
Type: IAzureContextContainer
9999
Parameter Sets: (All)
100100
Aliases: AzureRmContext, AzureCredential

src/ResourceManager/ApiManagement/Commands.ApiManagement/help/Get-AzureRmApiManagementIdentityProvider.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ Accept wildcard characters: False
6666
### -DefaultProfile
6767
The credentials, account, tenant, and subscription used for communication with azure.
6868
69-
```yaml
69+
```yaml
7070
Type: IAzureContextContainer
7171
Parameter Sets: (All)
7272
Aliases: AzureRmContext, AzureCredential

src/ResourceManager/ApiManagement/Commands.ApiManagement/help/Get-AzureRmApiManagementLogger.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ Accept wildcard characters: False
6666
### -DefaultProfile
6767
The credentials, account, tenant, and subscription used for communication with azure.
6868
69-
```yaml
69+
```yaml
7070
Type: IAzureContextContainer
7171
Parameter Sets: (All)
7272
Aliases: AzureRmContext, AzureCredential

src/ResourceManager/ApiManagement/Commands.ApiManagement/help/Get-AzureRmApiManagementOpenIdConnectProvider.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ Accept wildcard characters: False
8080
### -DefaultProfile
8181
The credentials, account, tenant, and subscription used for communication with azure.
8282
83-
```yaml
83+
```yaml
8484
Type: IAzureContextContainer
8585
Parameter Sets: (All)
8686
Aliases: AzureRmContext, AzureCredential

src/ResourceManager/ApiManagement/Commands.ApiManagement/help/Get-AzureRmApiManagementOperation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ Accept wildcard characters: False
8181
### -DefaultProfile
8282
The credentials, account, tenant, and subscription used for communication with azure.
8383
84-
```yaml
84+
```yaml
8585
Type: IAzureContextContainer
8686
Parameter Sets: (All)
8787
Aliases: AzureRmContext, AzureCredential

src/ResourceManager/ApiManagement/Commands.ApiManagement/help/Get-AzureRmApiManagementPolicy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ Accept wildcard characters: False
112112
### -DefaultProfile
113113
The credentials, account, tenant, and subscription used for communication with azure.
114114
115-
```yaml
115+
```yaml
116116
Type: IAzureContextContainer
117117
Parameter Sets: (All)
118118
Aliases: AzureRmContext, AzureCredential

src/ResourceManager/ApiManagement/Commands.ApiManagement/help/Get-AzureRmApiManagementProduct.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ Accept wildcard characters: False
7272
### -DefaultProfile
7373
The credentials, account, tenant, and subscription used for communication with azure.
7474
75-
```yaml
75+
```yaml
7676
Type: IAzureContextContainer
7777
Parameter Sets: (All)
7878
Aliases: AzureRmContext, AzureCredential

src/ResourceManager/ApiManagement/Commands.ApiManagement/help/Get-AzureRmApiManagementProperty.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ Accept wildcard characters: False
6464
### -DefaultProfile
6565
The credentials, account, tenant, and subscription used for communication with azure.
6666
67-
```yaml
67+
```yaml
6868
Type: IAzureContextContainer
6969
Parameter Sets: (All)
7070
Aliases: AzureRmContext, AzureCredential

src/ResourceManager/ApiManagement/Commands.ApiManagement/help/Get-AzureRmApiManagementSsoToken.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ This command gets the SSO token of an API Management service.
3434
### -DefaultProfile
3535
The credentials, account, tenant, and subscription used for communication with azure.
3636

37-
```yaml
37+
```yaml
3838
Type: IAzureContextContainer
3939
Parameter Sets: (All)
4040
Aliases: AzureRmContext, AzureCredential

src/ResourceManager/ApiManagement/Commands.ApiManagement/help/Get-AzureRmApiManagementSubscription.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ Accept wildcard characters: False
9494
### -DefaultProfile
9595
The credentials, account, tenant, and subscription used for communication with azure.
9696
97-
```yaml
97+
```yaml
9898
Type: IAzureContextContainer
9999
Parameter Sets: (All)
100100
Aliases: AzureRmContext, AzureCredential

src/ResourceManager/ApiManagement/Commands.ApiManagement/help/Get-AzureRmApiManagementTenantAccess.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ Accept wildcard characters: False
5050
### -DefaultProfile
5151
The credentials, account, tenant, and subscription used for communication with azure.
5252
53-
```yaml
53+
```yaml
5454
Type: IAzureContextContainer
5555
Parameter Sets: (All)
5656
Aliases: AzureRmContext, AzureCredential

src/ResourceManager/ApiManagement/Commands.ApiManagement/help/Get-AzureRmApiManagementTenantGitAccess.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ Accept wildcard characters: False
5050
### -DefaultProfile
5151
The credentials, account, tenant, and subscription used for communication with azure.
5252
53-
```yaml
53+
```yaml
5454
Type: IAzureContextContainer
5555
Parameter Sets: (All)
5656
Aliases: AzureRmContext, AzureCredential

src/ResourceManager/ApiManagement/Commands.ApiManagement/help/Get-AzureRmApiManagementTenantSyncState.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ Accept wildcard characters: False
5050
### -DefaultProfile
5151
The credentials, account, tenant, and subscription used for communication with azure.
5252
53-
```yaml
53+
```yaml
5454
Type: IAzureContextContainer
5555
Parameter Sets: (All)
5656
Aliases: AzureRmContext, AzureCredential

src/ResourceManager/ApiManagement/Commands.ApiManagement/help/Import-AzureRmApiManagementApi.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ Accept wildcard characters: False
110110
### -DefaultProfile
111111
The credentials, account, tenant, and subscription used for communication with azure.
112112
113-
```yaml
113+
```yaml
114114
Type: IAzureContextContainer
115115
Parameter Sets: (All)
116116
Aliases: AzureRmContext, AzureCredential

src/ResourceManager/ApiManagement/Commands.ApiManagement/help/Import-AzureRmApiManagementHostnameCertificate.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ This command imports a certificate for a proxy custom hostname.
3636
### -DefaultProfile
3737
The credentials, account, tenant, and subscription used for communication with azure.
3838

39-
```yaml
39+
```yaml
4040
Type: IAzureContextContainer
4141
Parameter Sets: (All)
4242
Aliases: AzureRmContext, AzureCredential

src/ResourceManager/ApiManagement/Commands.ApiManagement/help/New-AzureRmApiManagement.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ Accept wildcard characters: False
110110
### -DefaultProfile
111111
The credentials, account, tenant, and subscription used for communication with azure.
112112
113-
```yaml
113+
```yaml
114114
Type: IAzureContextContainer
115115
Parameter Sets: (All)
116116
Aliases: AzureRmContext, AzureCredential

src/ResourceManager/ApiManagement/Commands.ApiManagement/help/New-AzureRmApiManagementApi.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ Accept wildcard characters: False
102102
### -DefaultProfile
103103
The credentials, account, tenant, and subscription used for communication with azure.
104104
105-
```yaml
105+
```yaml
106106
Type: IAzureContextContainer
107107
Parameter Sets: (All)
108108
Aliases: AzureRmContext, AzureCredential

src/ResourceManager/ApiManagement/Commands.ApiManagement/help/New-AzureRmApiManagementAuthorizationServer.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ Accept wildcard characters: False
169169
### -DefaultProfile
170170
The credentials, account, tenant, and subscription used for communication with azure.
171171
172-
```yaml
172+
```yaml
173173
Type: IAzureContextContainer
174174
Parameter Sets: (All)
175175
Aliases: AzureRmContext, AzureCredential

src/ResourceManager/ApiManagement/Commands.ApiManagement/help/New-AzureRmApiManagementBackend.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ Accept wildcard characters: False
8888
### -DefaultProfile
8989
The credentials, account, tenant, and subscription used for communication with azure.
9090
91-
```yaml
91+
```yaml
9292
Type: IAzureContextContainer
9393
Parameter Sets: (All)
9494
Aliases: AzureRmContext, AzureCredential

src/ResourceManager/ApiManagement/Commands.ApiManagement/help/New-AzureRmApiManagementBackendCredential.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ Accept wildcard characters: False
8282
### -DefaultProfile
8383
The credentials, account, tenant, and subscription used for communication with azure.
8484
85-
```yaml
85+
```yaml
8686
Type: IAzureContextContainer
8787
Parameter Sets: (All)
8888
Aliases: AzureRmContext, AzureCredential

src/ResourceManager/ApiManagement/Commands.ApiManagement/help/New-AzureRmApiManagementBackendProxy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Creates a Backend Proxy Object
3535
### -DefaultProfile
3636
The credentials, account, tenant, and subscription used for communication with azure.
3737

38-
```yaml
38+
```yaml
3939
Type: IAzureContextContainer
4040
Parameter Sets: (All)
4141
Aliases: AzureRmContext, AzureCredential

src/ResourceManager/ApiManagement/Commands.ApiManagement/help/New-AzureRmApiManagementCertificate.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ Accept wildcard characters: False
7474
### -DefaultProfile
7575
The credentials, account, tenant, and subscription used for communication with azure.
7676
77-
```yaml
77+
```yaml
7878
Type: IAzureContextContainer
7979
Parameter Sets: (All)
8080
Aliases: AzureRmContext, AzureCredential

0 commit comments

Comments
 (0)