Skip to content

Commit b3ef87c

Browse files
authored
Merge branch 'main' into feature/diskConfigParameter
2 parents 5e4f557 + 1d9ec0c commit b3ef87c

File tree

2,515 files changed

+317454
-56822
lines changed

Some content is hidden

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

2,515 files changed

+317454
-56822
lines changed

.github/policies/resourceManagement.yml

Lines changed: 78 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -727,6 +727,22 @@ configuration:
727727
- us6193
728728
replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
729729
assignMentionees: False
730+
- if:
731+
- or:
732+
- labelAdded:
733+
label: Service Attention
734+
- labelAdded:
735+
label: Blob Storage SFTP
736+
- hasLabel:
737+
label: Service Attention
738+
- hasLabel:
739+
label: Blob Storage SFTP
740+
then:
741+
- mentionUsers:
742+
mentionees:
743+
- greeshma-microsoft
744+
replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
745+
assignMentionees: False
730746
- if:
731747
- or:
732748
- labelAdded:
@@ -1862,7 +1878,7 @@ configuration:
18621878
then:
18631879
- mentionUsers:
18641880
mentionees:
1865-
- rgreenMSFT
1881+
- amarjeetkr
18661882
replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
18671883
assignMentionees: False
18681884
- if:
@@ -2020,6 +2036,26 @@ configuration:
20202036
- nberdy
20212037
replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
20222038
assignMentionees: False
2039+
- if:
2040+
- or:
2041+
- labelAdded:
2042+
label: Service Attention
2043+
- labelAdded:
2044+
label: Device Registry
2045+
- hasLabel:
2046+
label: Service Attention
2047+
- hasLabel:
2048+
label: Device Registry
2049+
then:
2050+
- mentionUsers:
2051+
mentionees:
2052+
- rohankhandelwal
2053+
- mryanlo
2054+
- atastrophic
2055+
- c-ryan-k
2056+
- digimaun
2057+
replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
2058+
assignMentionees: False
20232059
- if:
20242060
- or:
20252061
- labelAdded:
@@ -2051,7 +2087,6 @@ configuration:
20512087
- mentionUsers:
20522088
mentionees:
20532089
- anishtrakru
2054-
- derekbekoe
20552090
replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
20562091
assignMentionees: False
20572092
- if:
@@ -2067,7 +2102,7 @@ configuration:
20672102
then:
20682103
- mentionUsers:
20692104
mentionees:
2070-
- sourabhguha
2105+
- YingXue
20712106
replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
20722107
assignMentionees: False
20732108
- if:
@@ -2137,6 +2172,22 @@ configuration:
21372172
- Saglodha
21382173
replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
21392174
assignMentionees: False
2175+
- if:
2176+
- or:
2177+
- labelAdded:
2178+
label: Service Attention
2179+
- labelAdded:
2180+
label: Fabric
2181+
- hasLabel:
2182+
label: Service Attention
2183+
- hasLabel:
2184+
label: Fabric
2185+
then:
2186+
- mentionUsers:
2187+
mentionees:
2188+
- xinzhizou
2189+
replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
2190+
assignMentionees: False
21402191
- if:
21412192
- or:
21422193
- labelAdded:
@@ -2290,40 +2341,6 @@ configuration:
22902341
- Azure/azure-iot-cli-triage
22912342
replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
22922343
assignMentionees: False
2293-
- if:
2294-
- or:
2295-
- labelAdded:
2296-
label: Service Attention
2297-
- labelAdded:
2298-
label: IotCentral
2299-
- hasLabel:
2300-
label: Service Attention
2301-
- hasLabel:
2302-
label: IotCentral
2303-
then:
2304-
- mentionUsers:
2305-
mentionees:
2306-
- iluican
2307-
- jlian
2308-
replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
2309-
assignMentionees: False
2310-
- if:
2311-
- or:
2312-
- labelAdded:
2313-
label: Service Attention
2314-
- labelAdded:
2315-
label: IotDPS
2316-
- hasLabel:
2317-
label: Service Attention
2318-
- hasLabel:
2319-
label: IotDPS
2320-
then:
2321-
- mentionUsers:
2322-
mentionees:
2323-
- iluican
2324-
- jlian
2325-
replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
2326-
assignMentionees: False
23272344
- if:
23282345
- or:
23292346
- labelAdded:
@@ -3687,8 +3704,11 @@ configuration:
36873704
then:
36883705
- mentionUsers:
36893706
mentionees:
3690-
- shariq-mcs
3691-
- MSFTeegarden
3707+
- abhijitch_microsoft
3708+
- yuvalm_microsoft
3709+
- nikitagarg_microsoft
3710+
- sanar_microsoft
3711+
- cawa_microsoft
36923712
replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
36933713
assignMentionees: False
36943714
- if:
@@ -4171,6 +4191,25 @@ configuration:
41714191
- S-J-M
41724192
replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
41734193
assignMentionees: False
4194+
- if:
4195+
- or:
4196+
- labelAdded:
4197+
label: Service Attention
4198+
- labelAdded:
4199+
label: StorageDiscovery
4200+
- hasLabel:
4201+
label: Service Attention
4202+
- hasLabel:
4203+
label: StorageDiscovery
4204+
then:
4205+
- mentionUsers:
4206+
mentionees:
4207+
- shanefujs
4208+
- apurv2304
4209+
- skallurk
4210+
- vdziunms
4211+
replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
4212+
assignMentionees: False
41744213
- if:
41754214
- or:
41764215
- labelAdded:

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,7 @@ launchSettings.json
233233
/tools/Modules/tmp
234234
/tools/Az/Az.psm1
235235
/tools/AzPreview/AzPreview.psm1
236+
/tools/Mcp/.logs
236237
/Azure.PowerShell.sln
237238

238239
# Added due to scan

NuGet.Config

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -11,37 +11,3 @@
1111
<clear />
1212
</disabledPackageSources>
1313
</configuration>
14-
15-
16-
17-
18-
19-
20-
21-
22-
23-
24-
25-
26-
27-
28-
29-
30-
31-
32-
33-
34-
35-
36-
37-
38-
39-
40-
41-
42-
43-
44-
45-
46-
47-

eng/emitter-package.json

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,20 @@
33
"version": "0.1.0",
44
"type": "module",
55
"dependencies": {
6-
"@typespec/compiler": "1.3.0",
6+
"@typespec/compiler": "1.5.0",
77
"@azure-tools/typespec-powershell": "0.0.x",
8-
"@azure-tools/typespec-autorest": "0.59.0",
9-
"@azure-tools/typespec-azure-core": "0.59.0",
10-
"@azure-tools/typespec-azure-resource-manager": "0.59.0",
11-
"@azure-tools/typespec-client-generator-core": "0.59.0",
12-
"@azure-tools/typespec-azure-rulesets": "0.59.0",
13-
"@typespec/http": "1.3.0",
14-
"@typespec/openapi": "1.3.0",
15-
"@typespec/rest": "0.73.0",
16-
"@typespec/streams": "0.73.0",
17-
"@typespec/versioning": "0.73.0",
18-
"@typespec/xml": "0.73.0",
19-
"@azure-tools/typespec-liftr-base": "0.8.0"
8+
"@azure-tools/typespec-autorest": "0.61.0",
9+
"@azure-tools/typespec-azure-core": "0.61.0",
10+
"@azure-tools/typespec-azure-resource-manager": "0.61.0",
11+
"@azure-tools/typespec-client-generator-core": "0.61.0",
12+
"@azure-tools/typespec-azure-rulesets": "0.61.0",
13+
"@typespec/http": "1.5.0",
14+
"@typespec/openapi": "1.5.0",
15+
"@typespec/rest": "0.75.0",
16+
"@typespec/streams": "0.75.0",
17+
"@typespec/versioning": "0.75.0",
18+
"@typespec/xml": "0.75.0",
19+
"@azure-tools/typespec-liftr-base": "0.10.0"
2020
},
2121
"private": true
2222
}
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
// Copyright (c) Microsoft Corporation. All rights reserved.
2+
// Licensed under the Apache License, Version 2.0 (the ""License"");
3+
// you may not use this file except in compliance with the License.
4+
// You may obtain a copy of the License at
5+
// http://www.apache.org/licenses/LICENSE-2.0
6+
// Unless required by applicable law or agreed to in writing, software
7+
// distributed under the License is distributed on an ""AS IS"" BASIS,
8+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
9+
// See the License for the specific language governing permissions and
10+
// limitations under the License.
11+
// Code generated by Microsoft (R) AutoRest Code Generator.Changes may cause incorrect behavior and will be lost if the code
12+
// is regenerated.
13+
14+
using System;
15+
using System.Reflection;
16+
using System.Runtime.CompilerServices;
17+
using System.Runtime.InteropServices;
18+
19+
[assembly: System.Reflection.AssemblyCompanyAttribute("Microsoft")]
20+
[assembly: System.Reflection.AssemblyCopyrightAttribute("Copyright © Microsoft")]
21+
[assembly: System.Reflection.AssemblyProductAttribute("Microsoft Azure PowerShell")]
22+
[assembly: System.Reflection.AssemblyTitleAttribute("Microsoft Azure PowerShell - AksArc")]
23+
[assembly: System.Reflection.AssemblyFileVersionAttribute("0.1.4")]
24+
[assembly: System.Reflection.AssemblyVersionAttribute("0.1.4")]
25+
[assembly: System.Runtime.InteropServices.ComVisibleAttribute(false)]
26+
[assembly: System.CLSCompliantAttribute(false)]

generated/AksArc/AksArc.Autorest/exports/Get-AzAksArcCluster.ps1

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,15 @@ begin {
107107
$PSBoundParameters['OutBuffer'] = 1
108108
}
109109
$parameterSet = $PSCmdlet.ParameterSetName
110+
111+
$testPlayback = $false
112+
$PSBoundParameters['HttpPipelinePrepend'] | Foreach-Object { if ($_) { $testPlayback = $testPlayback -or ('Microsoft.Azure.PowerShell.Cmdlets.AksArc.Runtime.PipelineMock' -eq $_.Target.GetType().FullName -and 'Playback' -eq $_.Target.Mode) } }
113+
114+
$context = Get-AzContext
115+
if (-not $context -and -not $testPlayback) {
116+
Write-Error "No Azure login detected. Please run 'Connect-AzAccount' to log in."
117+
exit
118+
}
110119

111120
if ($null -eq [Microsoft.WindowsAzure.Commands.Utilities.Common.AzurePSCmdlet]::PowerShellVersion) {
112121
[Microsoft.WindowsAzure.Commands.Utilities.Common.AzurePSCmdlet]::PowerShellVersion = $PSVersionTable.PSVersion.ToString()
@@ -129,8 +138,6 @@ begin {
129138
Get = 'Az.AksArc.custom\Get-AzAksArcCluster';
130139
}
131140
if (('Get') -contains $parameterSet -and -not $PSBoundParameters.ContainsKey('SubscriptionId') ) {
132-
$testPlayback = $false
133-
$PSBoundParameters['HttpPipelinePrepend'] | Foreach-Object { if ($_) { $testPlayback = $testPlayback -or ('Microsoft.Azure.PowerShell.Cmdlets.AksArc.Runtime.PipelineMock' -eq $_.Target.GetType().FullName -and 'Playback' -eq $_.Target.Mode) } }
134141
if ($testPlayback) {
135142
$PSBoundParameters['SubscriptionId'] = . (Join-Path $PSScriptRoot '..' 'utils' 'Get-SubscriptionIdTestSafe.ps1')
136143
} else {
@@ -144,6 +151,9 @@ begin {
144151
[Microsoft.WindowsAzure.Commands.Utilities.Common.AzurePSCmdlet]::PromptedPreviewMessageCmdlets.Enqueue($MyInvocation.MyCommand.Name)
145152
}
146153
$wrappedCmd = $ExecutionContext.InvokeCommand.GetCommand(($mapping[$parameterSet]), [System.Management.Automation.CommandTypes]::Cmdlet)
154+
if ($wrappedCmd -eq $null) {
155+
$wrappedCmd = $ExecutionContext.InvokeCommand.GetCommand(($mapping[$parameterSet]), [System.Management.Automation.CommandTypes]::Function)
156+
}
147157
$scriptCmd = {& $wrappedCmd @PSBoundParameters}
148158
$steppablePipeline = $scriptCmd.GetSteppablePipeline($MyInvocation.CommandOrigin)
149159
$steppablePipeline.Begin($PSCmdlet)

generated/AksArc/AksArc.Autorest/exports/Get-AzAksArcClusterAdminKubeconfig.ps1

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,15 @@ begin {
118118
$PSBoundParameters['OutBuffer'] = 1
119119
}
120120
$parameterSet = $PSCmdlet.ParameterSetName
121+
122+
$testPlayback = $false
123+
$PSBoundParameters['HttpPipelinePrepend'] | Foreach-Object { if ($_) { $testPlayback = $testPlayback -or ('Microsoft.Azure.PowerShell.Cmdlets.AksArc.Runtime.PipelineMock' -eq $_.Target.GetType().FullName -and 'Playback' -eq $_.Target.Mode) } }
124+
125+
$context = Get-AzContext
126+
if (-not $context -and -not $testPlayback) {
127+
Write-Error "No Azure login detected. Please run 'Connect-AzAccount' to log in."
128+
exit
129+
}
121130

122131
if ($null -eq [Microsoft.WindowsAzure.Commands.Utilities.Common.AzurePSCmdlet]::PowerShellVersion) {
123132
[Microsoft.WindowsAzure.Commands.Utilities.Common.AzurePSCmdlet]::PowerShellVersion = $PSVersionTable.PSVersion.ToString()
@@ -140,8 +149,6 @@ begin {
140149
List = 'Az.AksArc.custom\Get-AzAksArcClusterAdminKubeconfig';
141150
}
142151
if (('List') -contains $parameterSet -and -not $PSBoundParameters.ContainsKey('SubscriptionId') ) {
143-
$testPlayback = $false
144-
$PSBoundParameters['HttpPipelinePrepend'] | Foreach-Object { if ($_) { $testPlayback = $testPlayback -or ('Microsoft.Azure.PowerShell.Cmdlets.AksArc.Runtime.PipelineMock' -eq $_.Target.GetType().FullName -and 'Playback' -eq $_.Target.Mode) } }
145152
if ($testPlayback) {
146153
$PSBoundParameters['SubscriptionId'] = . (Join-Path $PSScriptRoot '..' 'utils' 'Get-SubscriptionIdTestSafe.ps1')
147154
} else {
@@ -155,6 +162,9 @@ begin {
155162
[Microsoft.WindowsAzure.Commands.Utilities.Common.AzurePSCmdlet]::PromptedPreviewMessageCmdlets.Enqueue($MyInvocation.MyCommand.Name)
156163
}
157164
$wrappedCmd = $ExecutionContext.InvokeCommand.GetCommand(($mapping[$parameterSet]), [System.Management.Automation.CommandTypes]::Cmdlet)
165+
if ($wrappedCmd -eq $null) {
166+
$wrappedCmd = $ExecutionContext.InvokeCommand.GetCommand(($mapping[$parameterSet]), [System.Management.Automation.CommandTypes]::Function)
167+
}
158168
$scriptCmd = {& $wrappedCmd @PSBoundParameters}
159169
$steppablePipeline = $scriptCmd.GetSteppablePipeline($MyInvocation.CommandOrigin)
160170
$steppablePipeline.Begin($PSCmdlet)

generated/AksArc/AksArc.Autorest/exports/Get-AzAksArcClusterUpgrade.ps1

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,15 @@ begin {
9898
$PSBoundParameters['OutBuffer'] = 1
9999
}
100100
$parameterSet = $PSCmdlet.ParameterSetName
101+
102+
$testPlayback = $false
103+
$PSBoundParameters['HttpPipelinePrepend'] | Foreach-Object { if ($_) { $testPlayback = $testPlayback -or ('Microsoft.Azure.PowerShell.Cmdlets.AksArc.Runtime.PipelineMock' -eq $_.Target.GetType().FullName -and 'Playback' -eq $_.Target.Mode) } }
104+
105+
$context = Get-AzContext
106+
if (-not $context -and -not $testPlayback) {
107+
Write-Error "No Azure login detected. Please run 'Connect-AzAccount' to log in."
108+
exit
109+
}
101110

102111
if ($null -eq [Microsoft.WindowsAzure.Commands.Utilities.Common.AzurePSCmdlet]::PowerShellVersion) {
103112
[Microsoft.WindowsAzure.Commands.Utilities.Common.AzurePSCmdlet]::PowerShellVersion = $PSVersionTable.PSVersion.ToString()
@@ -120,8 +129,6 @@ begin {
120129
Get = 'Az.AksArc.custom\Get-AzAksArcClusterUpgrade';
121130
}
122131
if (('Get') -contains $parameterSet -and -not $PSBoundParameters.ContainsKey('SubscriptionId') ) {
123-
$testPlayback = $false
124-
$PSBoundParameters['HttpPipelinePrepend'] | Foreach-Object { if ($_) { $testPlayback = $testPlayback -or ('Microsoft.Azure.PowerShell.Cmdlets.AksArc.Runtime.PipelineMock' -eq $_.Target.GetType().FullName -and 'Playback' -eq $_.Target.Mode) } }
125132
if ($testPlayback) {
126133
$PSBoundParameters['SubscriptionId'] = . (Join-Path $PSScriptRoot '..' 'utils' 'Get-SubscriptionIdTestSafe.ps1')
127134
} else {
@@ -135,6 +142,9 @@ begin {
135142
[Microsoft.WindowsAzure.Commands.Utilities.Common.AzurePSCmdlet]::PromptedPreviewMessageCmdlets.Enqueue($MyInvocation.MyCommand.Name)
136143
}
137144
$wrappedCmd = $ExecutionContext.InvokeCommand.GetCommand(($mapping[$parameterSet]), [System.Management.Automation.CommandTypes]::Cmdlet)
145+
if ($wrappedCmd -eq $null) {
146+
$wrappedCmd = $ExecutionContext.InvokeCommand.GetCommand(($mapping[$parameterSet]), [System.Management.Automation.CommandTypes]::Function)
147+
}
138148
$scriptCmd = {& $wrappedCmd @PSBoundParameters}
139149
$steppablePipeline = $scriptCmd.GetSteppablePipeline($MyInvocation.CommandOrigin)
140150
$steppablePipeline.Begin($PSCmdlet)

0 commit comments

Comments
 (0)