Skip to content

Commit abfe591

Browse files
Pan-QiPan-Qi
committed
fix directive
1 parent 1111001 commit abfe591

18 files changed

+107
-397
lines changed

‎src/Websites/Websites.Autorest/Properties/AssemblyInfo.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,3 @@
2424
[assembly: System.Reflection.AssemblyVersionAttribute("3.4.1")]
2525
[assembly: System.Runtime.InteropServices.ComVisibleAttribute(false)]
2626
[assembly: System.CLSCompliantAttribute(false)]
27-

‎src/Websites/Websites.Autorest/README.md‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,8 +199,20 @@ directive:
199199
verb: Unregister
200200
subject: BuildUserProvidedFunctionApp
201201

202+
# Remove variant
203+
# Following is two common directive which are normally required in all the RPs
204+
# 1. Remove the unexpanded parameter set
205+
# 2. For New-* cmdlets, ViaIdentity is not required, so CreateViaIdentityExpanded is removed as well
202206
- where:
203-
variant: ^(Create|Update)(?!.*?(Expanded|JsonFilePath|JsonString))
207+
variant: ^(Create|Update)(?!.*?(Expanded|JsonFilePath|JsonString))|^CreateViaIdentityExpanded$
208+
remove: true
209+
210+
- where:
211+
verb: Test
212+
variant: ^Validate$|^ValidateViaIdentity$
213+
# We got to keep the Create variant of CustomDomain because it's special that it doesn't have a
214+
# CreateExpanded variant, because the only parameters are all in URL rather than request body
215+
subject: CustomDomain
204216
remove: true
205217

206218
- where:

‎src/Websites/Websites.Autorest/docs/New-AzStaticWebAppBuildAppSetting.md‎

Lines changed: 3 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,6 @@ New-AzStaticWebAppBuildAppSetting -EnvironmentName <String> -Name <String> -Reso
1919
[-WhatIf] [<CommonParameters>]
2020
```
2121

22-
### CreateViaIdentityExpanded
23-
```
24-
New-AzStaticWebAppBuildAppSetting -InputObject <IWebsitesIdentity> [-AppSetting <Hashtable>] [-Kind <String>]
25-
[-DefaultProfile <PSObject>] [-Confirm] [-WhatIf] [<CommonParameters>]
26-
```
27-
2822
### CreateViaIdentityStaticSiteExpanded
2923
```
3024
New-AzStaticWebAppBuildAppSetting -EnvironmentName <String> -StaticSiteInputObject <IWebsitesIdentity>
@@ -84,7 +78,7 @@ Settings.
8478

8579
```yaml
8680
Type: System.Collections.Hashtable
87-
Parameter Sets: CreateExpanded, CreateViaIdentityExpanded, CreateViaIdentityStaticSiteExpanded
81+
Parameter Sets: CreateExpanded, CreateViaIdentityStaticSiteExpanded
8882
Aliases:
8983

9084
Required: False
@@ -115,7 +109,7 @@ The stage site identifier.
115109
116110
```yaml
117111
Type: System.String
118-
Parameter Sets: CreateExpanded, CreateViaIdentityStaticSiteExpanded, CreateViaJsonFilePath, CreateViaJsonString
112+
Parameter Sets: (All)
119113
Aliases:
120114

121115
Required: True
@@ -125,21 +119,6 @@ Accept pipeline input: False
125119
Accept wildcard characters: False
126120
```
127121
128-
### -InputObject
129-
Identity Parameter
130-
131-
```yaml
132-
Type: Microsoft.Azure.PowerShell.Cmdlets.Websites.Models.IWebsitesIdentity
133-
Parameter Sets: CreateViaIdentityExpanded
134-
Aliases:
135-
136-
Required: True
137-
Position: Named
138-
Default value: None
139-
Accept pipeline input: True (ByValue)
140-
Accept wildcard characters: False
141-
```
142-
143122
### -JsonFilePath
144123
Path of Json file supplied to the Create operation
145124
@@ -175,7 +154,7 @@ Kind of resource.
175154
176155
```yaml
177156
Type: System.String
178-
Parameter Sets: CreateExpanded, CreateViaIdentityExpanded, CreateViaIdentityStaticSiteExpanded
157+
Parameter Sets: CreateExpanded, CreateViaIdentityStaticSiteExpanded
179158
Aliases:
180159

181160
Required: False

‎src/Websites/Websites.Autorest/docs/New-AzStaticWebAppBuildFunctionAppSetting.md‎

Lines changed: 3 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,6 @@ New-AzStaticWebAppBuildFunctionAppSetting -EnvironmentName <String> -Name <Strin
1919
[-WhatIf] [<CommonParameters>]
2020
```
2121

22-
### CreateViaIdentityExpanded
23-
```
24-
New-AzStaticWebAppBuildFunctionAppSetting -InputObject <IWebsitesIdentity> [-AppSetting <Hashtable>]
25-
[-Kind <String>] [-DefaultProfile <PSObject>] [-Confirm] [-WhatIf] [<CommonParameters>]
26-
```
27-
2822
### CreateViaIdentityStaticSiteExpanded
2923
```
3024
New-AzStaticWebAppBuildFunctionAppSetting -EnvironmentName <String> -StaticSiteInputObject <IWebsitesIdentity>
@@ -84,7 +78,7 @@ Settings.
8478

8579
```yaml
8680
Type: System.Collections.Hashtable
87-
Parameter Sets: CreateExpanded, CreateViaIdentityExpanded, CreateViaIdentityStaticSiteExpanded
81+
Parameter Sets: CreateExpanded, CreateViaIdentityStaticSiteExpanded
8882
Aliases:
8983

9084
Required: False
@@ -115,7 +109,7 @@ The stage site identifier.
115109
116110
```yaml
117111
Type: System.String
118-
Parameter Sets: CreateExpanded, CreateViaIdentityStaticSiteExpanded, CreateViaJsonFilePath, CreateViaJsonString
112+
Parameter Sets: (All)
119113
Aliases:
120114

121115
Required: True
@@ -125,21 +119,6 @@ Accept pipeline input: False
125119
Accept wildcard characters: False
126120
```
127121
128-
### -InputObject
129-
Identity Parameter
130-
131-
```yaml
132-
Type: Microsoft.Azure.PowerShell.Cmdlets.Websites.Models.IWebsitesIdentity
133-
Parameter Sets: CreateViaIdentityExpanded
134-
Aliases:
135-
136-
Required: True
137-
Position: Named
138-
Default value: None
139-
Accept pipeline input: True (ByValue)
140-
Accept wildcard characters: False
141-
```
142-
143122
### -JsonFilePath
144123
Path of Json file supplied to the Create operation
145124
@@ -175,7 +154,7 @@ Kind of resource.
175154
176155
```yaml
177156
Type: System.String
178-
Parameter Sets: CreateExpanded, CreateViaIdentityExpanded, CreateViaIdentityStaticSiteExpanded
157+
Parameter Sets: CreateExpanded, CreateViaIdentityStaticSiteExpanded
179158
Aliases:
180159

181160
Required: False

‎src/Websites/Websites.Autorest/docs/New-AzStaticWebAppCustomDomain.md‎

Lines changed: 3 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,6 @@ New-AzStaticWebAppCustomDomain -DomainName <String> -Name <String> -ResourceGrou
1919
[-AsJob] [-NoWait] [-Confirm] [-WhatIf] [<CommonParameters>]
2020
```
2121

22-
### CreateViaIdentityExpanded
23-
```
24-
New-AzStaticWebAppCustomDomain -InputObject <IWebsitesIdentity> [-Kind <String>] [-ValidationMethod <String>]
25-
[-DefaultProfile <PSObject>] [-AsJob] [-NoWait] [-Confirm] [-WhatIf] [<CommonParameters>]
26-
```
27-
2822
### CreateViaIdentityStaticSiteExpanded
2923
```
3024
New-AzStaticWebAppCustomDomain -DomainName <String> -StaticSiteInputObject <IWebsitesIdentity>
@@ -103,7 +97,7 @@ The custom domain to create.
10397
10498
```yaml
10599
Type: System.String
106-
Parameter Sets: CreateExpanded, CreateViaIdentityStaticSiteExpanded, CreateViaJsonFilePath, CreateViaJsonString
100+
Parameter Sets: (All)
107101
Aliases:
108102

109103
Required: True
@@ -113,21 +107,6 @@ Accept pipeline input: False
113107
Accept wildcard characters: False
114108
```
115109
116-
### -InputObject
117-
Identity Parameter
118-
119-
```yaml
120-
Type: Microsoft.Azure.PowerShell.Cmdlets.Websites.Models.IWebsitesIdentity
121-
Parameter Sets: CreateViaIdentityExpanded
122-
Aliases:
123-
124-
Required: True
125-
Position: Named
126-
Default value: None
127-
Accept pipeline input: True (ByValue)
128-
Accept wildcard characters: False
129-
```
130-
131110
### -JsonFilePath
132111
Path of Json file supplied to the Create operation
133112
@@ -163,7 +142,7 @@ Kind of resource.
163142
164143
```yaml
165144
Type: System.String
166-
Parameter Sets: CreateExpanded, CreateViaIdentityExpanded, CreateViaIdentityStaticSiteExpanded
145+
Parameter Sets: CreateExpanded, CreateViaIdentityStaticSiteExpanded
167146
Aliases:
168147

169148
Required: False
@@ -255,7 +234,7 @@ Validation method for adding a custom domain
255234
256235
```yaml
257236
Type: System.String
258-
Parameter Sets: CreateExpanded, CreateViaIdentityExpanded, CreateViaIdentityStaticSiteExpanded
237+
Parameter Sets: CreateExpanded, CreateViaIdentityStaticSiteExpanded
259238
Aliases:
260239

261240
Required: False

‎src/Websites/Websites.Autorest/docs/New-AzStaticWebAppFunctionAppSetting.md‎

Lines changed: 5 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,6 @@ New-AzStaticWebAppFunctionAppSetting -Name <String> -ResourceGroupName <String>
1919
[<CommonParameters>]
2020
```
2121

22-
### CreateViaIdentityExpanded
23-
```
24-
New-AzStaticWebAppFunctionAppSetting -InputObject <IWebsitesIdentity> [-AppSetting <Hashtable>]
25-
[-Kind <String>] [-DefaultProfile <PSObject>] [-Confirm] [-WhatIf] [<CommonParameters>]
26-
```
27-
2822
### CreateViaJsonFilePath
2923
```
3024
New-AzStaticWebAppFunctionAppSetting -Name <String> -ResourceGroupName <String> -JsonFilePath <String>
@@ -75,7 +69,7 @@ Settings.
7569

7670
```yaml
7771
Type: System.Collections.Hashtable
78-
Parameter Sets: CreateExpanded, CreateViaIdentityExpanded
72+
Parameter Sets: CreateExpanded
7973
Aliases:
8074

8175
Required: False
@@ -101,21 +95,6 @@ Accept pipeline input: False
10195
Accept wildcard characters: False
10296
```
10397
104-
### -InputObject
105-
Identity Parameter
106-
107-
```yaml
108-
Type: Microsoft.Azure.PowerShell.Cmdlets.Websites.Models.IWebsitesIdentity
109-
Parameter Sets: CreateViaIdentityExpanded
110-
Aliases:
111-
112-
Required: True
113-
Position: Named
114-
Default value: None
115-
Accept pipeline input: True (ByValue)
116-
Accept wildcard characters: False
117-
```
118-
11998
### -JsonFilePath
12099
Path of Json file supplied to the Create operation
121100
@@ -151,7 +130,7 @@ Kind of resource.
151130
152131
```yaml
153132
Type: System.String
154-
Parameter Sets: CreateExpanded, CreateViaIdentityExpanded
133+
Parameter Sets: CreateExpanded
155134
Aliases:
156135

157136
Required: False
@@ -166,7 +145,7 @@ Name of the static site.
166145
167146
```yaml
168147
Type: System.String
169-
Parameter Sets: CreateExpanded, CreateViaJsonFilePath, CreateViaJsonString
148+
Parameter Sets: (All)
170149
Aliases:
171150

172151
Required: True
@@ -181,7 +160,7 @@ Name of the resource group to which the resource belongs.
181160
182161
```yaml
183162
Type: System.String
184-
Parameter Sets: CreateExpanded, CreateViaJsonFilePath, CreateViaJsonString
163+
Parameter Sets: (All)
185164
Aliases:
186165

187166
Required: True
@@ -198,7 +177,7 @@ This is a GUID-formatted string (e.g.
198177
199178
```yaml
200179
Type: System.String
201-
Parameter Sets: CreateExpanded, CreateViaJsonFilePath, CreateViaJsonString
180+
Parameter Sets: (All)
202181
Aliases:
203182

204183
Required: False
@@ -244,8 +223,6 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
244223
245224
## INPUTS
246225
247-
### Microsoft.Azure.PowerShell.Cmdlets.Websites.Models.IWebsitesIdentity
248-
249226
## OUTPUTS
250227
251228
### Microsoft.Azure.PowerShell.Cmdlets.Websites.Models.IStringDictionary

‎src/Websites/Websites.Autorest/docs/New-AzStaticWebAppSetting.md‎

Lines changed: 5 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,6 @@ New-AzStaticWebAppSetting -Name <String> -ResourceGroupName <String> [-Subscript
1919
[<CommonParameters>]
2020
```
2121

22-
### CreateViaIdentityExpanded
23-
```
24-
New-AzStaticWebAppSetting -InputObject <IWebsitesIdentity> [-AppSetting <Hashtable>] [-Kind <String>]
25-
[-DefaultProfile <PSObject>] [-Confirm] [-WhatIf] [<CommonParameters>]
26-
```
27-
2822
### CreateViaJsonFilePath
2923
```
3024
New-AzStaticWebAppSetting -Name <String> -ResourceGroupName <String> -JsonFilePath <String>
@@ -75,7 +69,7 @@ Settings.
7569

7670
```yaml
7771
Type: System.Collections.Hashtable
78-
Parameter Sets: CreateExpanded, CreateViaIdentityExpanded
72+
Parameter Sets: CreateExpanded
7973
Aliases:
8074

8175
Required: False
@@ -101,21 +95,6 @@ Accept pipeline input: False
10195
Accept wildcard characters: False
10296
```
10397
104-
### -InputObject
105-
Identity Parameter
106-
107-
```yaml
108-
Type: Microsoft.Azure.PowerShell.Cmdlets.Websites.Models.IWebsitesIdentity
109-
Parameter Sets: CreateViaIdentityExpanded
110-
Aliases:
111-
112-
Required: True
113-
Position: Named
114-
Default value: None
115-
Accept pipeline input: True (ByValue)
116-
Accept wildcard characters: False
117-
```
118-
11998
### -JsonFilePath
12099
Path of Json file supplied to the Create operation
121100
@@ -151,7 +130,7 @@ Kind of resource.
151130
152131
```yaml
153132
Type: System.String
154-
Parameter Sets: CreateExpanded, CreateViaIdentityExpanded
133+
Parameter Sets: CreateExpanded
155134
Aliases:
156135

157136
Required: False
@@ -166,7 +145,7 @@ Name of the static site.
166145
167146
```yaml
168147
Type: System.String
169-
Parameter Sets: CreateExpanded, CreateViaJsonFilePath, CreateViaJsonString
148+
Parameter Sets: (All)
170149
Aliases:
171150

172151
Required: True
@@ -181,7 +160,7 @@ Name of the resource group to which the resource belongs.
181160
182161
```yaml
183162
Type: System.String
184-
Parameter Sets: CreateExpanded, CreateViaJsonFilePath, CreateViaJsonString
163+
Parameter Sets: (All)
185164
Aliases:
186165

187166
Required: True
@@ -198,7 +177,7 @@ This is a GUID-formatted string (e.g.
198177
199178
```yaml
200179
Type: System.String
201-
Parameter Sets: CreateExpanded, CreateViaJsonFilePath, CreateViaJsonString
180+
Parameter Sets: (All)
202181
Aliases:
203182

204183
Required: False
@@ -244,8 +223,6 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
244223
245224
## INPUTS
246225
247-
### Microsoft.Azure.PowerShell.Cmdlets.Websites.Models.IWebsitesIdentity
248-
249226
## OUTPUTS
250227
251228
### Microsoft.Azure.PowerShell.Cmdlets.Websites.Models.IStringDictionary

0 commit comments

Comments
 (0)