Skip to content

Commit b0b61c9

Browse files
authored
Add saved query cmdlets (#13422)
* Draft hybrid version of resource graph * Fix some issues during the building of hybrid module * Remove readme.md not needed * Check in the autogen part of ResourceGraph * Update change log for resourcegraph * Skip psm1 in GetModuleMetadata * Remove etag support for resourcegraph * Remove unused generated psd1 * Remove modules folder that is not required * change the suffix to txt * Fixed some issues found in code review * Fixed some other issues found in code review
1 parent 86ac7cc commit b0b61c9

File tree

251 files changed

+29840
-17
lines changed

Some content is hidden

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

251 files changed

+29840
-17
lines changed

src/Az.autorest.hybrid.props

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
<Project>
2+
3+
<Import Project="$(MSBuildThisFileDirectory)..\Repo.props" />
4+
<Import Project="$(RepoTools)Common.Netcore.Dependencies.targets" />
5+
<Import Project="$(MSBuildThisFileDirectory)Az.Shared.props" />
6+
7+
<!-- Build -->
8+
<PropertyGroup>
9+
<LangVersion>7.1</LangVersion>
10+
<TargetFramework>netstandard2.0</TargetFramework>
11+
<AssemblyName>Az.$(PsModuleName).private</AssemblyName>
12+
<RootNamespace>$(AzAssemblyPrefix)$(PsModuleName)</RootNamespace>
13+
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
14+
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
15+
<OutputPath>$(RepoArtifacts)$(Configuration)\Az.$(PsModuleName)\$(PsModuleName).Autorest\bin</OutputPath>
16+
<PublishDir>$(OutputPath)</PublishDir>
17+
<!-- Some methods are marked async and don't have an await in them -->
18+
<NoWarn>1998</NoWarn>
19+
</PropertyGroup>
20+
21+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
22+
<DelaySign>false</DelaySign>
23+
<DefineConstants>TRACE;DEBUG;NETSTANDARD</DefineConstants>
24+
</PropertyGroup>
25+
26+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
27+
<SignAssembly>true</SignAssembly>
28+
<DelaySign>true</DelaySign>
29+
<AssemblyOriginatorKeyFile>$(RepoSrc)MSSharedLibKey.snk</AssemblyOriginatorKeyFile>
30+
<DefineConstants>TRACE;RELEASE;NETSTANDARD;SIGN</DefineConstants>
31+
</PropertyGroup>
32+
33+
<!-- Resources -->
34+
<ItemGroup>
35+
<Compile Update="Properties\Resources.Designer.cs">
36+
<DesignTime>true</DesignTime>
37+
<AutoGen>true</AutoGen>
38+
<DependentUpon>Resources.resx</DependentUpon>
39+
</Compile>
40+
</ItemGroup>
41+
42+
<ItemGroup>
43+
<EmbeddedResource Update="Properties\Resources.resx">
44+
<Generator>ResXFileCodeGenerator</Generator>
45+
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
46+
</EmbeddedResource>
47+
</ItemGroup>
48+
49+
<!-- Assets -->
50+
<ItemGroup>
51+
<PackageReference Include="PowerShellStandard.Library" Version="5.1.0" />
52+
<PackageReference Include="Microsoft.CSharp" Version="4.4.1" />
53+
</ItemGroup>
54+
55+
<ItemGroup>
56+
<ModuleCustomFiles Include="$(MSBuildThisFileDirectory)$(PsModuleName)\$(PsModuleName).Autorest\custom\**\*.*"/>
57+
<ModuleHelpFiles Include="$(MSBuildThisFileDirectory)$(PsModuleName)\$(PsModuleName).Autorest\help\**\*.*"/>
58+
<ModuleGeneratedFiles Include="$(MSBuildThisFileDirectory)$(PsModuleName)\$(PsModuleName).Autorest\generated\**\*.*"/>
59+
<ModuleTestFiles Include="$(MSBuildThisFileDirectory)$(PsModuleName)\$(PsModuleName).Autorest\test\**\*.*"/>
60+
<UtilsFiles Include="$(MSBuildThisFileDirectory)$(PsModuleName)\$(PsModuleName).Autorest\utils\**\*.*"/>
61+
</ItemGroup>
62+
63+
<Target Name="CopyFiles" AfterTargets="Build">
64+
<Copy SourceFiles="Az.$(PsModuleName).psm1" DestinationFolder="$(RepoArtifacts)$(Configuration)\Az.$(PsModuleName)\$(PsModuleName).Autorest" />
65+
<Copy SourceFiles="Az.$(PsModuleName).format.ps1xml" DestinationFolder="$(RepoArtifacts)$(Configuration)\Az.$(PsModuleName)\$(PsModuleName).Autorest" />
66+
<Copy SourceFiles="check-dependencies.ps1" DestinationFolder="$(RepoArtifacts)$(Configuration)\Az.$(PsModuleName)\$(PsModuleName).Autorest" Condition="'$(Configuration)'=='Debug'"/>
67+
<Copy SourceFiles="test-module.ps1" DestinationFolder="$(RepoArtifacts)$(Configuration)\Az.$(PsModuleName)\$(PsModuleName).Autorest" Condition="'$(Configuration)'=='Debug'"/>
68+
<Copy SourceFiles="@(ModuleCustomFiles)" DestinationFiles="@(ModuleCustomFiles->'$(RepoArtifacts)$(Configuration)\Az.$(PsModuleName)\$(PsModuleName).Autorest\custom\%(RecursiveDir)%(Filename)%(Extension)')" />
69+
<Copy SourceFiles="@(ModuleHelpFiles)" DestinationFiles="@(ModuleHelpFiles->'$(RepoArtifacts)$(Configuration)\Az.$(PsModuleName)\$(PsModuleName).Autorest\help\%(RecursiveDir)%(Filename)%(Extension)')" />
70+
<Copy SourceFiles="@(ModuleGeneratedFiles)" DestinationFiles="@(ModuleGeneratedFiles->'$(RepoArtifacts)$(Configuration)\Az.$(PsModuleName)\$(PsModuleName).Autorest\generated\%(RecursiveDir)%(Filename)%(Extension)')" Condition="'$(Configuration)'=='Debug'"/>
71+
<Copy SourceFiles="@(ModuleTestFiles)" DestinationFiles="@(ModuleTestFiles->'$(RepoArtifacts)$(Configuration)\Az.$(PsModuleName)\$(PsModuleName).Autorest\test\%(RecursiveDir)%(Filename)%(Extension)')" Condition="'$(Configuration)'=='Debug'"/>
72+
<Copy SourceFiles="exports\ProxyCmdletDefinitions.ps1" DestinationFolder="$(RepoArtifacts)$(Configuration)\Az.$(PsModuleName)\$(PsModuleName).Autorest\exports" />
73+
<Copy SourceFiles="internal\ProxyCmdletDefinitions.ps1" DestinationFolder="$(RepoArtifacts)$(Configuration)\Az.$(PsModuleName)\$(PsModuleName).Autorest\internal" Condition="Exists('internal\ProxyCmdletDefinitions.ps1')" />
74+
<Copy SourceFiles="internal\Az.$(PsModuleName).internal.psm1" DestinationFolder="$(RepoArtifacts)$(Configuration)\Az.$(PsModuleName)\$(PsModuleName).Autorest\internal" />
75+
<Copy SourceFiles="@(UtilsFiles)" DestinationFiles="@(UtilsFiles->'$(RepoArtifacts)$(Configuration)\Az.$(PsModuleName)\$(PsModuleName).Autorest\utils\%(RecursiveDir)%(Filename)%(Extension)')" Condition="Exists('utils')"/>
76+
</Target>
77+
78+
</Project>
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
<PropertyGroup>
3+
<PsModuleName>ResourceGraph</PsModuleName>
4+
</PropertyGroup>
5+
6+
<Import Project="$(MSBuildThisFileDirectory)..\..\Az.autorest.hybrid.props" />
7+
</Project>
Lines changed: 303 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,303 @@
1+
<?xml version="1.0" encoding="utf-16"?>
2+
<Configuration>
3+
<ViewDefinitions>
4+
<View>
5+
<Name>Microsoft.Azure.PowerShell.Cmdlets.ResourceGraph.Models.ResourceGraphIdentity</Name>
6+
<ViewSelectedBy>
7+
<TypeName>Microsoft.Azure.PowerShell.Cmdlets.ResourceGraph.Models.ResourceGraphIdentity</TypeName>
8+
</ViewSelectedBy>
9+
<TableControl>
10+
<TableHeaders>
11+
<TableColumnHeader>
12+
<Label>ResourceGroupName</Label>
13+
</TableColumnHeader>
14+
<TableColumnHeader>
15+
<Label>ResourceName</Label>
16+
</TableColumnHeader>
17+
<TableColumnHeader>
18+
<Label>SubscriptionId</Label>
19+
</TableColumnHeader>
20+
</TableHeaders>
21+
<TableRowEntries>
22+
<TableRowEntry>
23+
<TableColumnItems>
24+
<TableColumnItem>
25+
<PropertyName>ResourceGroupName</PropertyName>
26+
</TableColumnItem>
27+
<TableColumnItem>
28+
<PropertyName>ResourceName</PropertyName>
29+
</TableColumnItem>
30+
<TableColumnItem>
31+
<PropertyName>SubscriptionId</PropertyName>
32+
</TableColumnItem>
33+
</TableColumnItems>
34+
</TableRowEntry>
35+
</TableRowEntries>
36+
</TableControl>
37+
</View>
38+
<View>
39+
<Name>Microsoft.Azure.PowerShell.Cmdlets.ResourceGraph.Models.Api20180901Preview.ErrorFieldContract</Name>
40+
<ViewSelectedBy>
41+
<TypeName>Microsoft.Azure.PowerShell.Cmdlets.ResourceGraph.Models.Api20180901Preview.ErrorFieldContract</TypeName>
42+
</ViewSelectedBy>
43+
<TableControl>
44+
<TableHeaders>
45+
<TableColumnHeader>
46+
<Label>Code</Label>
47+
</TableColumnHeader>
48+
<TableColumnHeader>
49+
<Label>Message</Label>
50+
</TableColumnHeader>
51+
<TableColumnHeader>
52+
<Label>Target</Label>
53+
</TableColumnHeader>
54+
</TableHeaders>
55+
<TableRowEntries>
56+
<TableRowEntry>
57+
<TableColumnItems>
58+
<TableColumnItem>
59+
<PropertyName>Code</PropertyName>
60+
</TableColumnItem>
61+
<TableColumnItem>
62+
<PropertyName>Message</PropertyName>
63+
</TableColumnItem>
64+
<TableColumnItem>
65+
<PropertyName>Target</PropertyName>
66+
</TableColumnItem>
67+
</TableColumnItems>
68+
</TableRowEntry>
69+
</TableRowEntries>
70+
</TableControl>
71+
</View>
72+
<View>
73+
<Name>Microsoft.Azure.PowerShell.Cmdlets.ResourceGraph.Models.Api20180901Preview.GraphQueryError</Name>
74+
<ViewSelectedBy>
75+
<TypeName>Microsoft.Azure.PowerShell.Cmdlets.ResourceGraph.Models.Api20180901Preview.GraphQueryError</TypeName>
76+
</ViewSelectedBy>
77+
<TableControl>
78+
<TableHeaders>
79+
<TableColumnHeader>
80+
<Label>Code</Label>
81+
</TableColumnHeader>
82+
<TableColumnHeader>
83+
<Label>Message</Label>
84+
</TableColumnHeader>
85+
</TableHeaders>
86+
<TableRowEntries>
87+
<TableRowEntry>
88+
<TableColumnItems>
89+
<TableColumnItem>
90+
<PropertyName>Code</PropertyName>
91+
</TableColumnItem>
92+
<TableColumnItem>
93+
<PropertyName>Message</PropertyName>
94+
</TableColumnItem>
95+
</TableColumnItems>
96+
</TableRowEntry>
97+
</TableRowEntries>
98+
</TableControl>
99+
</View>
100+
<View>
101+
<Name>Microsoft.Azure.PowerShell.Cmdlets.ResourceGraph.Models.Api20180901Preview.GraphQueryListResult</Name>
102+
<ViewSelectedBy>
103+
<TypeName>Microsoft.Azure.PowerShell.Cmdlets.ResourceGraph.Models.Api20180901Preview.GraphQueryListResult</TypeName>
104+
</ViewSelectedBy>
105+
<TableControl>
106+
<TableHeaders>
107+
<TableColumnHeader>
108+
<Label>NextLink</Label>
109+
</TableColumnHeader>
110+
</TableHeaders>
111+
<TableRowEntries>
112+
<TableRowEntry>
113+
<TableColumnItems>
114+
<TableColumnItem>
115+
<PropertyName>NextLink</PropertyName>
116+
</TableColumnItem>
117+
</TableColumnItems>
118+
</TableRowEntry>
119+
</TableRowEntries>
120+
</TableControl>
121+
</View>
122+
<View>
123+
<Name>Microsoft.Azure.PowerShell.Cmdlets.ResourceGraph.Models.Api20180901Preview.GraphQueryProperties</Name>
124+
<ViewSelectedBy>
125+
<TypeName>Microsoft.Azure.PowerShell.Cmdlets.ResourceGraph.Models.Api20180901Preview.GraphQueryProperties</TypeName>
126+
</ViewSelectedBy>
127+
<TableControl>
128+
<TableHeaders>
129+
<TableColumnHeader>
130+
<Label>Description</Label>
131+
</TableColumnHeader>
132+
<TableColumnHeader>
133+
<Label>Query</Label>
134+
</TableColumnHeader>
135+
<TableColumnHeader>
136+
<Label>ResultKind</Label>
137+
</TableColumnHeader>
138+
<TableColumnHeader>
139+
<Label>TimeModified</Label>
140+
</TableColumnHeader>
141+
</TableHeaders>
142+
<TableRowEntries>
143+
<TableRowEntry>
144+
<TableColumnItems>
145+
<TableColumnItem>
146+
<PropertyName>Description</PropertyName>
147+
</TableColumnItem>
148+
<TableColumnItem>
149+
<PropertyName>Query</PropertyName>
150+
</TableColumnItem>
151+
<TableColumnItem>
152+
<PropertyName>ResultKind</PropertyName>
153+
</TableColumnItem>
154+
<TableColumnItem>
155+
<PropertyName>TimeModified</PropertyName>
156+
</TableColumnItem>
157+
</TableColumnItems>
158+
</TableRowEntry>
159+
</TableRowEntries>
160+
</TableControl>
161+
</View>
162+
<View>
163+
<Name>Microsoft.Azure.PowerShell.Cmdlets.ResourceGraph.Models.Api20180901Preview.GraphQueryPropertiesUpdateParameters</Name>
164+
<ViewSelectedBy>
165+
<TypeName>Microsoft.Azure.PowerShell.Cmdlets.ResourceGraph.Models.Api20180901Preview.GraphQueryPropertiesUpdateParameters</TypeName>
166+
</ViewSelectedBy>
167+
<TableControl>
168+
<TableHeaders>
169+
<TableColumnHeader>
170+
<Label>Description</Label>
171+
</TableColumnHeader>
172+
<TableColumnHeader>
173+
<Label>Query</Label>
174+
</TableColumnHeader>
175+
</TableHeaders>
176+
<TableRowEntries>
177+
<TableRowEntry>
178+
<TableColumnItems>
179+
<TableColumnItem>
180+
<PropertyName>Description</PropertyName>
181+
</TableColumnItem>
182+
<TableColumnItem>
183+
<PropertyName>Query</PropertyName>
184+
</TableColumnItem>
185+
</TableColumnItems>
186+
</TableRowEntry>
187+
</TableRowEntries>
188+
</TableControl>
189+
</View>
190+
<View>
191+
<Name>Microsoft.Azure.PowerShell.Cmdlets.ResourceGraph.Models.Api20180901Preview.GraphQueryResource</Name>
192+
<ViewSelectedBy>
193+
<TypeName>Microsoft.Azure.PowerShell.Cmdlets.ResourceGraph.Models.Api20180901Preview.GraphQueryResource</TypeName>
194+
</ViewSelectedBy>
195+
<TableControl>
196+
<TableHeaders>
197+
<TableColumnHeader>
198+
<Label>Location</Label>
199+
</TableColumnHeader>
200+
<TableColumnHeader>
201+
<Label>Name</Label>
202+
</TableColumnHeader>
203+
<TableColumnHeader>
204+
<Label>Type</Label>
205+
</TableColumnHeader>
206+
</TableHeaders>
207+
<TableRowEntries>
208+
<TableRowEntry>
209+
<TableColumnItems>
210+
<TableColumnItem>
211+
<PropertyName>Location</PropertyName>
212+
</TableColumnItem>
213+
<TableColumnItem>
214+
<PropertyName>Name</PropertyName>
215+
</TableColumnItem>
216+
<TableColumnItem>
217+
<PropertyName>Type</PropertyName>
218+
</TableColumnItem>
219+
</TableColumnItems>
220+
</TableRowEntry>
221+
</TableRowEntries>
222+
</TableControl>
223+
</View>
224+
<View>
225+
<Name>Microsoft.Azure.PowerShell.Cmdlets.ResourceGraph.Models.Api20180901Preview.GraphQueryUpdateParametersTags</Name>
226+
<ViewSelectedBy>
227+
<TypeName>Microsoft.Azure.PowerShell.Cmdlets.ResourceGraph.Models.Api20180901Preview.GraphQueryUpdateParametersTags</TypeName>
228+
</ViewSelectedBy>
229+
<TableControl>
230+
<TableHeaders>
231+
<TableColumnHeader>
232+
<Label>Item</Label>
233+
</TableColumnHeader>
234+
</TableHeaders>
235+
<TableRowEntries>
236+
<TableRowEntry>
237+
<TableColumnItems>
238+
<TableColumnItem>
239+
<PropertyName>Item</PropertyName>
240+
</TableColumnItem>
241+
</TableColumnItems>
242+
</TableRowEntry>
243+
</TableRowEntries>
244+
</TableControl>
245+
</View>
246+
<View>
247+
<Name>Microsoft.Azure.PowerShell.Cmdlets.ResourceGraph.Models.Api20180901Preview.Resource</Name>
248+
<ViewSelectedBy>
249+
<TypeName>Microsoft.Azure.PowerShell.Cmdlets.ResourceGraph.Models.Api20180901Preview.Resource</TypeName>
250+
</ViewSelectedBy>
251+
<TableControl>
252+
<TableHeaders>
253+
<TableColumnHeader>
254+
<Label>Location</Label>
255+
</TableColumnHeader>
256+
<TableColumnHeader>
257+
<Label>Name</Label>
258+
</TableColumnHeader>
259+
<TableColumnHeader>
260+
<Label>Type</Label>
261+
</TableColumnHeader>
262+
</TableHeaders>
263+
<TableRowEntries>
264+
<TableRowEntry>
265+
<TableColumnItems>
266+
<TableColumnItem>
267+
<PropertyName>Location</PropertyName>
268+
</TableColumnItem>
269+
<TableColumnItem>
270+
<PropertyName>Name</PropertyName>
271+
</TableColumnItem>
272+
<TableColumnItem>
273+
<PropertyName>Type</PropertyName>
274+
</TableColumnItem>
275+
</TableColumnItems>
276+
</TableRowEntry>
277+
</TableRowEntries>
278+
</TableControl>
279+
</View>
280+
<View>
281+
<Name>Microsoft.Azure.PowerShell.Cmdlets.ResourceGraph.Models.Api20180901Preview.ResourceTags</Name>
282+
<ViewSelectedBy>
283+
<TypeName>Microsoft.Azure.PowerShell.Cmdlets.ResourceGraph.Models.Api20180901Preview.ResourceTags</TypeName>
284+
</ViewSelectedBy>
285+
<TableControl>
286+
<TableHeaders>
287+
<TableColumnHeader>
288+
<Label>Item</Label>
289+
</TableColumnHeader>
290+
</TableHeaders>
291+
<TableRowEntries>
292+
<TableRowEntry>
293+
<TableColumnItems>
294+
<TableColumnItem>
295+
<PropertyName>Item</PropertyName>
296+
</TableColumnItem>
297+
</TableColumnItems>
298+
</TableRowEntry>
299+
</TableRowEntries>
300+
</TableControl>
301+
</View>
302+
</ViewDefinitions>
303+
</Configuration>

0 commit comments

Comments
 (0)