Skip to content

Commit e0c02ce

Browse files
committed
Merge branch 'release-2018-12-04' of github.com:/azure/azure-powershell into import-fix
2 parents 535e949 + cc45f3a commit e0c02ce

File tree

5,330 files changed

+1083650
-1306183
lines changed

Some content is hidden

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

5,330 files changed

+1083650
-1306183
lines changed

.travis.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ before_install:
2525
# https://github.com/travis-ci/travis-ci/issues/1066#issuecomment-383489298
2626
script:
2727
- sudo dotnet msbuild build.proj /t:BuildNetcore /p:Configuration=$CONFIG || travis_terminate 1
28-
- sudo dotnet src/Package/StaticAnalysis/StaticAnalysis.Netcore.dll -p $TRAVIS_BUILD_DIR/src/Package/$CONFIG -r $TRAVIS_BUILD_DIR/src/Package/StaticAnalysis -u || travis_terminate 1
2928
- sudo pwsh -NonInteractive -NoLogo -NoProfile -File tools/TestModuleLoading.ps1 || travis_terminate 1
3029
- sudo dotnet pack src/TestPrerequisites/Common.TestPrerequisites.sln --configuration $CONFIG || travis_terminate 1
3130
- sudo dotnet test src/Azure.PowerShell.Netcore.Test.sln --filter "AcceptanceType=CheckIn&RunType!=DesktopOnly" --configuration $CONFIG --framework netcoreapp2.0

build.proj

Lines changed: 28 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@
8888
<LocalBuildTasks Include="$(LibraryToolsFolder)\RepoTasks\RepoTasks.sln" Condition="'$(NetCore)' == 'false'" />
8989
<StackSolution Include="$(LibrarySourceFolder)\StackAdmin\Stack.sln" Condition="'$(Scope)' == 'All' or '$(Scope)' == 'Stack'" />
9090
<StaticAnalysis Include=".\tools\StaticAnalysis\StaticAnalysis.sln" />
91+
<StaticAnalysisNetcore Include=".\tools\StaticAnalysis\StaticAnalysisNetcore.sln" />
9192
<LocalBuildTasks Include="$(LibraryToolsFolder)\BuildPackagesTask\Microsoft.Azure.Build.Tasks.sln" />
9293
<LocalBuildTasks Include="$(LibraryToolsFolder)\RepoTasks\RepoTasks.sln" Condition="'$(NetCore)' == 'false'" />
9394
</ItemGroup>
@@ -268,9 +269,9 @@
268269
Condition="'$(Scope)' == 'All' or '$(Scope)' == 'Stack'"
269270
ContinueOnError="false" />
270271

271-
<Exec Command="$(PowerShellCommandPrefix) &quot;$ProgressPreference = 'SilentlyContinue';. $(LibraryToolsFolder)\GenerateHelp.ps1 -ValidateMarkdownHelp -GenerateMamlHelp -BuildConfig $(Configuration) -FilteredModules '@(ModulesChanged)' &quot;"
272+
<!--<Exec Command="$(PowerShellCommandPrefix) &quot;$ProgressPreference = 'SilentlyContinue';. $(LibraryToolsFolder)\GenerateHelp.ps1 -ValidateMarkdownHelp -GenerateMamlHelp -BuildConfig $(Configuration) -FilteredModules '@(ModulesChanged)' &quot;"
272273
Condition="'$(SkipHelp)' == 'false'"
273-
ContinueOnError="false"/>
274+
ContinueOnError="false"/>-->
274275

275276
<Exec Command="$(PowerShellCommandPrefix) &quot;. $(LibraryToolsFolder)\UpdateModules.ps1 -BuildConfig $(Configuration) -Scope $(Scope) &quot;"
276277
Condition="'$(CodeSign)' == 'false'"/>
@@ -281,9 +282,9 @@
281282
Command="&quot;$(PowerShellCommand)&quot; -NonInteractive -NoLogo -NoProfile -Command &quot; . $(LibraryToolsFolder)\NewOutputTypeIndex.ps1 -OutputFile $(PackageDirectory)\outputtypes.json -BuildConfig $(Configuration) &quot;"
282283
Condition="('$(Scope)' == 'All' or '$(Scope)' == 'Latest') and $(CodeSign) == 'true'" />
283284

284-
<Message Importance="high" Text="Running Static Analyser" />
285+
<!--<Message Importance="high" Text="Running Static Analyser" />
285286
<CallTarget targets="DependencyAnalysis" ContinueOnError="ErrorAndContinue" />
286-
<Exec Command="$(PowerShellCommandPrefix) &quot;. $(LibraryToolsFolder)\CheckAssemblies.ps1 -BuildConfig $(Configuration) &quot;" />
287+
<Exec Command="$(PowerShellCommandPrefix) &quot;. $(LibraryToolsFolder)\CheckAssemblies.ps1 -BuildConfig $(Configuration) &quot;" />-->
287288
<Exec Command="$(PowerShellCommandPrefix) &quot;. $(LibraryToolsFolder)\CleanupBuild.ps1 -BuildConfig $(Configuration) &quot;" />
288289

289290
<Exec ContinueOnError="false"
@@ -355,9 +356,12 @@
355356
ContinueOnError="false" />
356357
<!-- Generate the Help -->
357358
<Exec Command="$(PowerShellCoreCommandPrefix) &quot;Set-Variable -Name ProgressPreference -Value 'SilentlyContinue';. $(LibraryToolsFolder)\GenerateHelp.ps1 -ValidateMarkdownHelp -GenerateMamlHelp -BuildConfig $(Configuration) &quot;"
358-
Condition="'$(SkipHelp)' == 'false'"
359+
Condition="'$(SkipHelp)' == 'false' And '$(RunStaticAnalysis)' == 'true'"
359360
ContinueOnError="false"/>
360361

362+
<CallTarget targets="DependencyAnalysisNetcore" ContinueOnError="ErrorAndContinue" Condition="'$(RunStaticAnalysis)' == 'true'" />
363+
<Exec Command="$(PowerShellCommandPrefix) &quot;. $(LibraryToolsFolder)\CheckAssemblies.ps1 -BuildConfig $(Configuration) &quot;" Condition="'$(RunStaticAnalysis)' == 'true'" />
364+
361365
<!-- Cleanup extraneous files. -->
362366
<Exec Command="$(PowerShellCoreCommandPrefix) &quot;. $(LibraryToolsFolder)\CleanupBuild.ps1 -BuildConfig $(Configuration) &quot;" />
363367

@@ -548,6 +552,25 @@
548552
<OnError ExecuteTargets="StaticAnalysisErrorMessage"/>
549553
</Target>
550554

555+
<!-- Run Validation -->
556+
<Target Name="DependencyAnalysisNetcore"
557+
Condition="'$(SkipDependencyAnalysis)' == 'false'">
558+
559+
<MSBuild Projects="@(StaticAnalysisNetcore)"
560+
Targets="Build"
561+
Properties="Configuration=Debug;Platform=Any CPU"
562+
ContinueOnError="false" />
563+
564+
<Message Importance="high" Text="Running dependency analysis..." />
565+
566+
<PropertyGroup>
567+
<SkipHelpValue Condition=" '$(SkipHelp)' == 'true' ">-s</SkipHelpValue>
568+
</PropertyGroup>
569+
<Exec Command="dotnet $(MSBuildProjectDirectory)\src\Package\StaticAnalysis.Netcore.dll -p $(MSBuildProjectDirectory)\src\Package\$(Configuration) -r $(MSBuildProjectDirectory)\src\Package $(SkipHelpValue) -u -m @(ModulesChanged)" />
570+
571+
<OnError ExecuteTargets="StaticAnalysisErrorMessage"/>
572+
</Target>
573+
551574
<Target Name="StaticAnalysisErrorMessage">
552575
<Error Text="StaticAnalysis has failed. Please follow the instructions on this doc: https://github.com/Azure/azure-powershell/blob/preview/documentation/Debugging-StaticAnalysis-Errors.md"/>
553576
</Target>
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
---
2+
Module Name: Az.Aks
3+
Module Guid: a97e0c3e-e389-46a6-b73d-2b9bd6909bdb
4+
Download Help Link: https://docs.microsoft.com/en-us/powershell/module/az.aks
5+
Help Version: 0.0.1.0
6+
Locale: en-US
7+
---
8+
9+
# Az.Aks Module
10+
## Description
11+
Commands to interact with Azure managed Kubernetes clusters.
12+
13+
## Az.Aks Cmdlets
14+
### [Get-AzAks](Get-AzAks.md)
15+
List Kubernetes managed clusters.
16+
17+
### [Import-AzAksCredential](Import-AzAksCredential.md)
18+
Import and merge Kubectl config for a managed Kubernetes Cluster.
19+
20+
### [New-AzAks](New-AzAks.md)
21+
Create a new managed Kubernetes cluster.
22+
23+
### [Remove-AzAks](Remove-AzAks.md)
24+
Delete a managed Kubernetes cluster.
25+
26+
### [Set-AzAks](Set-AzAks.md)
27+
Update or create a managed Kubernetes cluster.
28+
29+
### [Start-AzAksDashboard](Start-AzAksDashboard.md)
30+
Create a Kubectl SSH tunnel to the managed cluster's dashboard.
31+
32+
### [Stop-AzAksDashboard](Stop-AzAksDashboard.md)
33+
Stop the Kubectl SSH tunnel created in Start-AzKubernetesDashboard.
34+

src/ResourceManager/Aks/Commands.Aks/help/AzureRM.Aks.md

Lines changed: 0 additions & 34 deletions
This file was deleted.
Lines changed: 128 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,128 @@
1+
---
2+
external help file: Microsoft.Azure.Commands.Aks.dll-Help.xml
3+
Module Name: Az.Aks
4+
online version: https://docs.microsoft.com/en-us/powershell/module/az.aks/get-azaks
5+
schema: 2.0.0
6+
---
7+
8+
# Get-AzAks
9+
10+
## SYNOPSIS
11+
List Kubernetes managed clusters.
12+
13+
## SYNTAX
14+
15+
### ResourceGroupParameterSet (Default)
16+
```
17+
Get-AzAks [[-ResourceGroupName] <String>] [-DefaultProfile <IAzureContextContainer>] [<CommonParameters>]
18+
```
19+
20+
### IdParameterSet
21+
```
22+
Get-AzAks [-Id] <String> [-DefaultProfile <IAzureContextContainer>] [<CommonParameters>]
23+
```
24+
25+
### NameParameterSet
26+
```
27+
Get-AzAks [-ResourceGroupName] <String> [-Name] <String> [-DefaultProfile <IAzureContextContainer>]
28+
[<CommonParameters>]
29+
```
30+
31+
## DESCRIPTION
32+
List Kubernetes managed clusters.
33+
34+
## EXAMPLES
35+
36+
### List all Kubernetes clusters
37+
```
38+
PS C:\> Get-AzAks
39+
```
40+
41+
## PARAMETERS
42+
43+
### -DefaultProfile
44+
The credentials, account, tenant, and subscription used for communication with Azure.
45+
46+
```yaml
47+
Type: Microsoft.Azure.Commands.Common.Authentication.Abstractions.Core.IAzureContextContainer
48+
Parameter Sets: (All)
49+
Aliases: AzureRmContext, AzureCredential
50+
51+
Required: False
52+
Position: Named
53+
Default value: None
54+
Accept pipeline input: False
55+
Accept wildcard characters: False
56+
```
57+
58+
### -Id
59+
Id of a managed Kubernetes cluster
60+
61+
```yaml
62+
Type: System.String
63+
Parameter Sets: IdParameterSet
64+
Aliases: ResourceId
65+
66+
Required: True
67+
Position: 0
68+
Default value: None
69+
Accept pipeline input: True (ByPropertyName)
70+
Accept wildcard characters: False
71+
```
72+
73+
### -Name
74+
Name of your managed Kubernetes cluster
75+
76+
```yaml
77+
Type: System.String
78+
Parameter Sets: NameParameterSet
79+
Aliases:
80+
81+
Required: True
82+
Position: 1
83+
Default value: None
84+
Accept pipeline input: False
85+
Accept wildcard characters: False
86+
```
87+
88+
### -ResourceGroupName
89+
Resource group name
90+
91+
```yaml
92+
Type: System.String
93+
Parameter Sets: ResourceGroupParameterSet
94+
Aliases:
95+
96+
Required: False
97+
Position: 0
98+
Default value: None
99+
Accept pipeline input: False
100+
Accept wildcard characters: False
101+
```
102+
103+
```yaml
104+
Type: System.String
105+
Parameter Sets: NameParameterSet
106+
Aliases:
107+
108+
Required: True
109+
Position: 0
110+
Default value: None
111+
Accept pipeline input: False
112+
Accept wildcard characters: False
113+
```
114+
115+
### CommonParameters
116+
This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see about_CommonParameters (http://go.microsoft.com/fwlink/?LinkID=113216).
117+
118+
## INPUTS
119+
120+
### System.String
121+
122+
## OUTPUTS
123+
124+
### Microsoft.Azure.Commands.Aks.Models.PSKubernetesCluster
125+
126+
## NOTES
127+
128+
## RELATED LINKS

0 commit comments

Comments
 (0)