Skip to content

Commit d2f192a

Browse files
Pan-Qijaskisin
andauthored
migrate workloads-monitors to autorest v4 (#27346)
Co-authored-by: Jaskirat Singh <[email protected]>
1 parent ed61c52 commit d2f192a

File tree

94 files changed

+4394
-2469
lines changed

Some content is hidden

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

94 files changed

+4394
-2469
lines changed

src/Workloads/Monitors.Autorest/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
[assembly: System.Reflection.AssemblyCopyrightAttribute("Copyright © Microsoft")]
2121
[assembly: System.Reflection.AssemblyProductAttribute("Microsoft Azure PowerShell")]
2222
[assembly: System.Reflection.AssemblyTitleAttribute("Microsoft Azure PowerShell - Monitors")]
23-
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0")]
24-
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0")]
23+
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.1")]
24+
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.1")]
2525
[assembly: System.Runtime.InteropServices.ComVisibleAttribute(false)]
2626
[assembly: System.CLSCompliantAttribute(false)]

src/Workloads/Monitors.Autorest/README.md

Lines changed: 13 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -45,66 +45,26 @@ root-module-name: $(prefix).Workloads
4545
title: Monitors
4646
subject-prefix: Workloads
4747
namespace: Microsoft.Azure.PowerShell.Cmdlets.Workloads.Monitors
48-
resourcegroup-append: true
49-
identity-correction-for-post: true
50-
nested-object-to-string: true
51-
#add-api-version-in-model-namespace: true
5248
inlining-threshold: 100
5349

54-
# For new modules, please avoid setting 3.x using the use-extension method and instead, use 4.x as the default option
55-
use-extension:
56-
"@autorest/powershell": "3.x"
57-
5850
directive:
59-
# Monitor
60-
- where:
61-
verb: New
62-
subject: ^Monitor$
63-
variant: ^Create$|^CreateViaIdentity$|^CreateViaIdentityExpanded$
64-
remove: true
65-
6651
- where:
67-
verb: Update
68-
subject: ^Monitor$
69-
variant: ^Update$|^UpdateViaIdentity$
52+
variant: ^(Create|Update)(?!.*?(Expanded|JsonFilePath|JsonString))|^CreateViaIdentityExpanded$
7053
remove: true
7154

72-
- where:
73-
subject: ^Monitor$
74-
parameter-name: IdentityUserAssignedIdentity
75-
set:
76-
parameter-name: UserAssignedIdentity
77-
55+
# Monitor
7856
- where:
7957
subject: ^Monitor$
8058
parameter-name: ManagedResourceGroupConfigurationName
8159
set:
8260
parameter-name: ManagedResourceGroupName
8361

84-
# ProviderInstance
85-
- where:
86-
verb: New
87-
subject: ^ProviderInstance$
88-
variant: ^Create$|^CreateViaIdentity$|^CreateViaIdentityExpanded$
89-
remove: true
90-
9162
# SapLandscapeMonitor
92-
- where:
93-
verb: New
94-
subject: ^SapLandscapeMonitor$
95-
variant: ^Create$|^CreateViaIdentity$|^CreateViaIdentityExpanded$
96-
remove: true
97-
9863
- where:
9964
verb: Get
10065
subject: ^SapLandscapeMonitor$
10166
variant: ^List$
10267
remove: true
103-
- where:
104-
verb: Update
105-
subject: ^SapLandscapeMonitor$
106-
variant: ^Update$|^UpdateViaIdentity$
107-
remove: true
10868

10969
# Module Table Formatting
11070
- where:
@@ -145,39 +105,23 @@ directive:
145105
- SAPConfiguration
146106
- ErrorInnerError
147107
- model-cmdlet:
148-
- SapLandscapeMonitorSidMapping
149-
- SapLandscapeMonitorMetricThresholds
108+
- model-name: SapLandscapeMonitorSidMapping
109+
- model-name: SapLandscapeMonitorMetricThresholds
110+
- model-name: PrometheusHaClusterProviderInstanceProperties
111+
cmdlet-name: New-AzWorkloadsProviderPrometheusHaClusterInstanceObject
112+
- model-name: PrometheusOSProviderInstanceProperties
113+
cmdlet-name: New-AzWorkloadsProviderPrometheusOSInstanceObject
114+
- model-name: SapNetWeaverProviderInstanceProperties
115+
cmdlet-name: New-AzWorkloadsProviderSapNetWeaverInstanceObject
150116

151117
# remove System Data in module Monitor, ProviderInstance, SapApplicationServerInstance, SapCentralServerInstance, SapDatabaseInstance, SapLandscapeMonitor, SapVirtualInstance
152118
- from: Monitor.cs
153119
where: $
154-
transform: $ = $.replace('public Microsoft.Azure.PowerShell.Cmdlets.Workloads.Models.Api30.ISystemData SystemData', 'internal Microsoft.Azure.PowerShell.Cmdlets.Workloads.Models.Api30.ISystemData SystemData');
120+
transform: $ = $.replace('public Microsoft.Azure.PowerShell.Cmdlets.Workloads.Models.ISystemData SystemData', 'internal Microsoft.Azure.PowerShell.Cmdlets.Workloads.Models.ISystemData SystemData');
155121
- from: ProviderInstance.cs
156122
where: $
157-
transform: $ = $.replace('public Microsoft.Azure.PowerShell.Cmdlets.Workloads.Models.Api30.ISystemData SystemData', 'internal Microsoft.Azure.PowerShell.Cmdlets.Workloads.Models.Api30.ISystemData SystemData');
123+
transform: $ = $.replace('public Microsoft.Azure.PowerShell.Cmdlets.Workloads.Models.ISystemData SystemData', 'internal Microsoft.Azure.PowerShell.Cmdlets.Workloads.Models.ISystemData SystemData');
158124
- from: SapLandscapeMonitor.cs
159125
where: $
160-
transform: $ = $.replace('public Microsoft.Azure.PowerShell.Cmdlets.Workloads.Models.Api30.ISystemData SystemData', 'internal Microsoft.Azure.PowerShell.Cmdlets.Workloads.Models.Api30.ISystemData SystemData');
161-
162-
- where:
163-
verb: Get|New
164-
subject: Monitor|ProviderInstance|SapLandscapeMonitor
165-
set:
166-
preview-announcement:
167-
preview-message: "*****************************************************************************************\\r\\n* This cmdlet will undergo a breaking change in Az v15.0.0, to be released on November 19th 2025. *\\r\\n* At least one change applies to this cmdlet. *\\r\\n* See all possible breaking changes at https://go.microsoft.com/fwlink/?linkid=2333486 *\\r\\n**************************************************************************************************"
168-
169-
- where:
170-
verb: Remove
171-
subject: Monitor|ProviderInstance
172-
set:
173-
preview-announcement:
174-
preview-message: "*****************************************************************************************\\r\\n* This cmdlet will undergo a breaking change in Az v15.0.0, to be released on November 19th 2025. *\\r\\n* At least one change applies to this cmdlet. *\\r\\n* See all possible breaking changes at https://go.microsoft.com/fwlink/?linkid=2333486 *\\r\\n**************************************************************************************************"
175-
176-
- where:
177-
verb: Update
178-
subject: Monitor|SapLandscapeMonitor
179-
set:
180-
preview-announcement:
181-
preview-message: "*****************************************************************************************\\r\\n* This cmdlet will undergo a breaking change in Az v15.0.0, to be released on November 19th 2025. *\\r\\n* At least one change applies to this cmdlet. *\\r\\n* See all possible breaking changes at https://go.microsoft.com/fwlink/?linkid=2333486 *\\r\\n**************************************************************************************************"
182-
126+
transform: $ = $.replace('public Microsoft.Azure.PowerShell.Cmdlets.Workloads.Models.ISystemData SystemData', 'internal Microsoft.Azure.PowerShell.Cmdlets.Workloads.Models.ISystemData SystemData');
183127
```

src/Workloads/Monitors.Autorest/custom/New-AzWorkloadsProviderDB2InstanceObject.ps1

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,13 @@ Create an in-memory object for DB2ProviderInstanceProperties.
2121
Create an in-memory object for DB2ProviderInstanceProperties.
2222
2323
.Outputs
24-
Microsoft.Azure.PowerShell.Cmdlets.Workloads.Monitors.Models.Api20230401.DB2ProviderInstanceProperties
24+
Microsoft.Azure.PowerShell.Cmdlets.Workloads.Monitors.Models.DB2ProviderInstanceProperties
2525
.Link
2626
https://learn.microsoft.com/powershell/module/az.workloads/new-azworkloadsproviderdb2instanceobject
2727
#>
2828
function New-AzWorkloadsProviderDB2InstanceObject {
29-
[OutputType('Microsoft.Azure.PowerShell.Cmdlets.Workloads.Monitors.Models.Api20230401.DB2ProviderInstanceProperties')]
29+
[Microsoft.Azure.PowerShell.Cmdlets.Workloads.Monitors.ModelCmdletAttribute()]
30+
[OutputType('Microsoft.Azure.PowerShell.Cmdlets.Workloads.Monitors.Models.DB2ProviderInstanceProperties')]
3031
[CmdletBinding(PositionalBinding=$false)]
3132
Param(
3233

@@ -55,13 +56,13 @@ function New-AzWorkloadsProviderDB2InstanceObject {
5556
[string]
5657
$SslCertificateUri,
5758
[Parameter(HelpMessage="Gets or sets certificate preference if secure communication is enabled.")]
58-
[ArgumentCompleter([Microsoft.Azure.PowerShell.Cmdlets.Workloads.Monitors.Support.SslPreference])]
59-
[Microsoft.Azure.PowerShell.Cmdlets.Workloads.Monitors.Support.SslPreference]
59+
[Microsoft.Azure.PowerShell.Cmdlets.Workloads.Monitors.PSArgumentCompleterAttribute("Disabled", "RootCertificate", "ServerCertificate")]
60+
[string]
6061
$SslPreference
6162
)
6263

6364
process {
64-
$Object = [Microsoft.Azure.PowerShell.Cmdlets.Workloads.Monitors.Models.Api20230401.DB2ProviderInstanceProperties]::New()
65+
$Object = [Microsoft.Azure.PowerShell.Cmdlets.Workloads.Monitors.Models.DB2ProviderInstanceProperties]::New()
6566

6667
if ($PSBoundParameters.ContainsKey('Name')) {
6768
$Object.DbName = $Name
@@ -90,8 +91,6 @@ function New-AzWorkloadsProviderDB2InstanceObject {
9091
if ($PSBoundParameters.ContainsKey('SslPreference')) {
9192
$Object.SslPreference = $SslPreference
9293
}
93-
94-
$Object.ProviderType = 'Db2'
9594
return $Object
9695
}
9796
}

src/Workloads/Monitors.Autorest/custom/New-AzWorkloadsProviderHanaDbInstanceObject.ps1

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,13 @@ Create an in-memory object for HanaDbProviderInstanceProperties.
2121
Create an in-memory object for HanaDbProviderInstanceProperties.
2222
2323
.Outputs
24-
Microsoft.Azure.PowerShell.Cmdlets.Workloads.Monitors.Models.Api20230401.HanaDbProviderInstanceProperties
24+
Microsoft.Azure.PowerShell.Cmdlets.Workloads.Monitors.Models.HanaDbProviderInstanceProperties
2525
.Link
2626
https://learn.microsoft.com/powershell/module/az.workloads/new-azworkloadsproviderhanadbinstanceobject
2727
#>
2828
function New-AzWorkloadsProviderHanaDbInstanceObject {
29-
[OutputType('Microsoft.Azure.PowerShell.Cmdlets.Workloads.Monitors.Models.Api20230401.HanaDbProviderInstanceProperties')]
29+
[Microsoft.Azure.PowerShell.Cmdlets.Workloads.Monitors.ModelCmdletAttribute()]
30+
[OutputType('Microsoft.Azure.PowerShell.Cmdlets.Workloads.Monitors.Models.HanaDbProviderInstanceProperties')]
3031
[CmdletBinding(PositionalBinding=$false)]
3132
Param(
3233

@@ -61,13 +62,13 @@ function New-AzWorkloadsProviderHanaDbInstanceObject {
6162
[string]
6263
$SslHostNameInCertificate,
6364
[Parameter(HelpMessage="Gets or sets certificate preference if secure communication is enabled.")]
64-
[ArgumentCompleter([Microsoft.Azure.PowerShell.Cmdlets.Workloads.Monitors.Support.SslPreference])]
65-
[Microsoft.Azure.PowerShell.Cmdlets.Workloads.Monitors.Support.SslPreference]
65+
[Microsoft.Azure.PowerShell.Cmdlets.Workloads.Monitors.PSArgumentCompleterAttribute("Disabled", "RootCertificate", "ServerCertificate")]
66+
[string]
6667
$SslPreference
6768
)
6869

6970
process {
70-
$Object = [Microsoft.Azure.PowerShell.Cmdlets.Workloads.Monitors.Models.Api20230401.HanaDbProviderInstanceProperties]::New()
71+
$Object = [Microsoft.Azure.PowerShell.Cmdlets.Workloads.Monitors.Models.HanaDbProviderInstanceProperties]::New()
7172

7273
if ($PSBoundParameters.ContainsKey('Name')) {
7374
$Object.DbName = $Name
@@ -102,7 +103,6 @@ function New-AzWorkloadsProviderHanaDbInstanceObject {
102103
if ($PSBoundParameters.ContainsKey('SslPreference')) {
103104
$Object.SslPreference = $SslPreference
104105
}
105-
$Object.ProviderType = 'SapHana'
106106
return $Object
107107
}
108108
}

src/Workloads/Monitors.Autorest/custom/New-AzWorkloadsProviderSqlServerInstanceObject.ps1

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,13 @@ Create an in-memory object for MsSqlServerProviderInstanceProperties.
2121
Create an in-memory object for MsSqlServerProviderInstanceProperties.
2222
2323
.Outputs
24-
Microsoft.Azure.PowerShell.Cmdlets.Workloads.Monitors.Models.Api20230401.MsSqlServerProviderInstanceProperties
24+
Microsoft.Azure.PowerShell.Cmdlets.Workloads.Monitors.Models.MsSqlServerProviderInstanceProperties
2525
.Link
2626
https://learn.microsoft.com/powershell/module/az.workloads/new-azworkloadsprovidersqlserverinstanceobject
2727
#>
2828
function New-AzWorkloadsProviderSqlServerInstanceObject {
29-
[OutputType('Microsoft.Azure.PowerShell.Cmdlets.Workloads.Monitors.Models.Api20230401.MsSqlServerProviderInstanceProperties')]
29+
[Microsoft.Azure.PowerShell.Cmdlets.Workloads.Monitors.ModelCmdletAttribute()]
30+
[OutputType('Microsoft.Azure.PowerShell.Cmdlets.Workloads.Monitors.Models.MsSqlServerProviderInstanceProperties')]
3031
[CmdletBinding(PositionalBinding=$false)]
3132
Param(
3233

@@ -52,13 +53,13 @@ function New-AzWorkloadsProviderSqlServerInstanceObject {
5253
[string]
5354
$SslCertificateUri,
5455
[Parameter(HelpMessage="Gets or sets certificate preference if secure communication is enabled.")]
55-
[ArgumentCompleter([Microsoft.Azure.PowerShell.Cmdlets.Workloads.Monitors.Support.SslPreference])]
56-
[Microsoft.Azure.PowerShell.Cmdlets.Workloads.Monitors.Support.SslPreference]
56+
[Microsoft.Azure.PowerShell.Cmdlets.Workloads.Monitors.PSArgumentCompleterAttribute("Disabled", "RootCertificate", "ServerCertificate")]
57+
[string]
5758
$SslPreference
5859
)
5960

6061
process {
61-
$Object = [Microsoft.Azure.PowerShell.Cmdlets.Workloads.Monitors.Models.Api20230401.MsSqlServerProviderInstanceProperties]::New()
62+
$Object = [Microsoft.Azure.PowerShell.Cmdlets.Workloads.Monitors.Models.MsSqlServerProviderInstanceProperties]::New()
6263

6364
if ($PSBoundParameters.ContainsKey('Password')) {
6465
$Object.DbPassword = $Password
@@ -84,7 +85,6 @@ function New-AzWorkloadsProviderSqlServerInstanceObject {
8485
if ($PSBoundParameters.ContainsKey('SslPreference')) {
8586
$Object.SslPreference = $SslPreference
8687
}
87-
$Object.ProviderType = 'MsSqlServer'
8888
return $Object
8989
}
9090
}

src/Workloads/Monitors.Autorest/custom/New-AzWorkloadsProviderPrometheusHaClusterInstanceObject.ps1 renamed to src/Workloads/Monitors.Autorest/custom/autogen-model-cmdlets/New-AzWorkloadsProviderPrometheusHaClusterInstanceObject.ps1

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,13 @@ Create an in-memory object for PrometheusHaClusterProviderInstanceProperties.
2121
Create an in-memory object for PrometheusHaClusterProviderInstanceProperties.
2222
2323
.Outputs
24-
Microsoft.Azure.PowerShell.Cmdlets.Workloads.Monitors.Models.Api20230401.PrometheusHaClusterProviderInstanceProperties
24+
Microsoft.Azure.PowerShell.Cmdlets.Workloads.Monitors.Models.PrometheusHaClusterProviderInstanceProperties
2525
.Link
26-
https://learn.microsoft.com/powershell/module/az.workloads/new-azworkloadsproviderprometheushaclusterinstanceobject
26+
https://learn.microsoft.com/powershell/module/Az.Workloads/new-azworkloadsproviderprometheushaclusterinstanceobject
2727
#>
2828
function New-AzWorkloadsProviderPrometheusHaClusterInstanceObject {
29-
[OutputType('Microsoft.Azure.PowerShell.Cmdlets.Workloads.Monitors.Models.Api20230401.PrometheusHaClusterProviderInstanceProperties')]
29+
[Microsoft.Azure.PowerShell.Cmdlets.Workloads.Monitors.ModelCmdletAttribute()]
30+
[OutputType('Microsoft.Azure.PowerShell.Cmdlets.Workloads.Monitors.Models.PrometheusHaClusterProviderInstanceProperties')]
3031
[CmdletBinding(PositionalBinding=$false)]
3132
Param(
3233

@@ -46,13 +47,13 @@ function New-AzWorkloadsProviderPrometheusHaClusterInstanceObject {
4647
[string]
4748
$SslCertificateUri,
4849
[Parameter(HelpMessage="Gets or sets certificate preference if secure communication is enabled.")]
49-
[ArgumentCompleter([Microsoft.Azure.PowerShell.Cmdlets.Workloads.Monitors.Support.SslPreference])]
50-
[Microsoft.Azure.PowerShell.Cmdlets.Workloads.Monitors.Support.SslPreference]
50+
[Microsoft.Azure.PowerShell.Cmdlets.Workloads.Monitors.PSArgumentCompleterAttribute("Disabled", "RootCertificate", "ServerCertificate")]
51+
[string]
5152
$SslPreference
5253
)
5354

5455
process {
55-
$Object = [Microsoft.Azure.PowerShell.Cmdlets.Workloads.Monitors.Models.Api20230401.PrometheusHaClusterProviderInstanceProperties]::New()
56+
$Object = [Microsoft.Azure.PowerShell.Cmdlets.Workloads.Monitors.Models.PrometheusHaClusterProviderInstanceProperties]::New()
5657

5758
if ($PSBoundParameters.ContainsKey('ClusterName')) {
5859
$Object.ClusterName = $ClusterName
@@ -69,12 +70,9 @@ function New-AzWorkloadsProviderPrometheusHaClusterInstanceObject {
6970
if ($PSBoundParameters.ContainsKey('SslCertificateUri')) {
7071
$Object.SslCertificateUri = $SslCertificateUri
7172
}
72-
7373
if ($PSBoundParameters.ContainsKey('SslPreference')) {
7474
$Object.SslPreference = $SslPreference
7575
}
76-
77-
$Object.ProviderType = 'PrometheusHaCluster'
7876
return $Object
7977
}
8078
}

src/Workloads/Monitors.Autorest/custom/New-AzWorkloadsProviderPrometheusOSInstanceObject.ps1 renamed to src/Workloads/Monitors.Autorest/custom/autogen-model-cmdlets/New-AzWorkloadsProviderPrometheusOSInstanceObject.ps1

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,13 @@ Create an in-memory object for PrometheusOSProviderInstanceProperties.
2121
Create an in-memory object for PrometheusOSProviderInstanceProperties.
2222
2323
.Outputs
24-
Microsoft.Azure.PowerShell.Cmdlets.Workloads.Monitors.Models.Api20230401.PrometheusOSProviderInstanceProperties
24+
Microsoft.Azure.PowerShell.Cmdlets.Workloads.Monitors.Models.PrometheusOSProviderInstanceProperties
2525
.Link
26-
https://learn.microsoft.com/powershell/module/az.workloads/new-azworkloadsproviderprometheusosinstanceobject
26+
https://learn.microsoft.com/powershell/module/Az.Workloads/new-azworkloadsproviderprometheusosinstanceobject
2727
#>
2828
function New-AzWorkloadsProviderPrometheusOSInstanceObject {
29-
[OutputType('Microsoft.Azure.PowerShell.Cmdlets.Workloads.Monitors.Models.Api20230401.PrometheusOSProviderInstanceProperties')]
29+
[Microsoft.Azure.PowerShell.Cmdlets.Workloads.Monitors.ModelCmdletAttribute()]
30+
[OutputType('Microsoft.Azure.PowerShell.Cmdlets.Workloads.Monitors.Models.PrometheusOSProviderInstanceProperties')]
3031
[CmdletBinding(PositionalBinding=$false)]
3132
Param(
3233

@@ -40,13 +41,13 @@ function New-AzWorkloadsProviderPrometheusOSInstanceObject {
4041
[string]
4142
$SslCertificateUri,
4243
[Parameter(HelpMessage="Gets or sets certificate preference if secure communication is enabled.")]
43-
[ArgumentCompleter([Microsoft.Azure.PowerShell.Cmdlets.Workloads.Monitors.Support.SslPreference])]
44-
[Microsoft.Azure.PowerShell.Cmdlets.Workloads.Monitors.Support.SslPreference]
44+
[Microsoft.Azure.PowerShell.Cmdlets.Workloads.Monitors.PSArgumentCompleterAttribute("Disabled", "RootCertificate", "ServerCertificate")]
45+
[string]
4546
$SslPreference
4647
)
4748

4849
process {
49-
$Object = [Microsoft.Azure.PowerShell.Cmdlets.Workloads.Monitors.Models.Api20230401.PrometheusOSProviderInstanceProperties]::New()
50+
$Object = [Microsoft.Azure.PowerShell.Cmdlets.Workloads.Monitors.Models.PrometheusOSProviderInstanceProperties]::New()
5051

5152
if ($PSBoundParameters.ContainsKey('PrometheusUrl')) {
5253
$Object.PrometheusUrl = $PrometheusUrl
@@ -60,7 +61,6 @@ function New-AzWorkloadsProviderPrometheusOSInstanceObject {
6061
if ($PSBoundParameters.ContainsKey('SslPreference')) {
6162
$Object.SslPreference = $SslPreference
6263
}
63-
$Object.ProviderType = 'PrometheusOS'
6464
return $Object
6565
}
6666
}

0 commit comments

Comments
 (0)