Skip to content

Commit 916353b

Browse files
Migrate ConnectedKubernetes from generation to main (Azure#24006)
* Move ConnectedKubernetes to main * Update ChangeLog.md --------- Co-authored-by: Yunchi Wang <[email protected]>
1 parent 932f6eb commit 916353b

37 files changed

+2062
-187
lines changed
Lines changed: 21 additions & 132 deletions
Original file line numberDiff line numberDiff line change
@@ -1,135 +1,24 @@
1-
#
2-
# Module manifest for module 'Az.ConnectedKubernetes'
3-
#
4-
# Generated by: Microsoft Corporation
5-
#
6-
# Generated on: 10/9/2023
7-
#
8-
91
@{
10-
11-
# Script module or binary module file associated with this manifest.
12-
RootModule = './Az.ConnectedKubernetes.psm1'
13-
14-
# Version number of this module.
15-
ModuleVersion = '0.10.0'
16-
17-
# Supported PSEditions
18-
CompatiblePSEditions = 'Core', 'Desktop'
19-
20-
# ID used to uniquely identify this module
21-
GUID = '59df8ab1-442a-41ae-9b55-60b505bae789'
22-
23-
# Author of this module
24-
Author = 'Microsoft Corporation'
25-
26-
# Company or vendor of this module
27-
CompanyName = 'Microsoft Corporation'
28-
29-
# Copyright statement for this module
30-
Copyright = 'Microsoft Corporation. All rights reserved.'
31-
32-
# Description of the functionality provided by this module
33-
Description = 'Microsoft Azure PowerShell: ConnectedKubernetes cmdlets'
34-
35-
# Minimum version of the PowerShell engine required by this module
36-
PowerShellVersion = '5.1'
37-
38-
# Name of the PowerShell host required by this module
39-
# PowerShellHostName = ''
40-
41-
# Minimum version of the PowerShell host required by this module
42-
# PowerShellHostVersion = ''
43-
44-
# Minimum version of Microsoft .NET Framework required by this module. This prerequisite is valid for the PowerShell Desktop edition only.
45-
DotNetFrameworkVersion = '4.7.2'
46-
47-
# Minimum version of the common language runtime (CLR) required by this module. This prerequisite is valid for the PowerShell Desktop edition only.
48-
# ClrVersion = ''
49-
50-
# Processor architecture (None, X86, Amd64) required by this module
51-
# ProcessorArchitecture = ''
52-
53-
# Modules that must be imported into the global environment prior to importing this module
54-
RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '2.13.1'; })
55-
56-
# Assemblies that must be loaded prior to importing this module
57-
RequiredAssemblies = './bin/Az.ConnectedKubernetes.private.dll'
58-
59-
# Script files (.ps1) that are run in the caller's environment prior to importing this module.
60-
# ScriptsToProcess = @()
61-
62-
# Type files (.ps1xml) to be loaded when importing this module
63-
# TypesToProcess = @()
64-
65-
# Format files (.ps1xml) to be loaded when importing this module
66-
FormatsToProcess = './Az.ConnectedKubernetes.format.ps1xml'
67-
68-
# Modules to import as nested modules of the module specified in RootModule/ModuleToProcess
69-
# NestedModules = @()
70-
71-
# Functions to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no functions to export.
72-
FunctionsToExport = 'Get-AzConnectedKubernetes',
73-
'Get-AzConnectedKubernetesUserCredential',
74-
'New-AzConnectedKubernetes', 'Remove-AzConnectedKubernetes',
75-
'Update-AzConnectedKubernetes'
76-
77-
# Cmdlets to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no cmdlets to export.
78-
CmdletsToExport = @()
79-
80-
# Variables to export from this module
81-
# VariablesToExport = @()
82-
83-
# Aliases to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no aliases to export.
84-
AliasesToExport = '*'
85-
86-
# DSC resources to export from this module
87-
# DscResourcesToExport = @()
88-
89-
# List of all modules packaged with this module
90-
# ModuleList = @()
91-
92-
# List of all files packaged with this module
93-
# FileList = @()
94-
95-
# Private data to pass to the module specified in RootModule/ModuleToProcess. This may also contain a PSData hashtable with additional module metadata used by PowerShell.
96-
PrivateData = @{
97-
2+
GUID = 'd3467834-8989-4142-8c05-ab93c4bfa6eb'
3+
RootModule = './Az.ConnectedKubernetes.psm1'
4+
ModuleVersion = '0.1.0'
5+
CompatiblePSEditions = 'Core', 'Desktop'
6+
Author = 'Microsoft Corporation'
7+
CompanyName = 'Microsoft Corporation'
8+
Copyright = 'Microsoft Corporation. All rights reserved.'
9+
Description = 'Microsoft Azure PowerShell: ConnectedKubernetes cmdlets'
10+
PowerShellVersion = '5.1'
11+
DotNetFrameworkVersion = '4.7.2'
12+
RequiredAssemblies = './bin/Az.ConnectedKubernetes.private.dll'
13+
FormatsToProcess = './Az.ConnectedKubernetes.format.ps1xml'
14+
FunctionsToExport = 'Get-AzConnectedKubernetes', 'Get-AzConnectedKubernetesUserCredential', 'New-AzConnectedKubernetes', 'Remove-AzConnectedKubernetes', 'Update-AzConnectedKubernetes', '*'
15+
AliasesToExport = '*'
16+
PrivateData = @{
9817
PSData = @{
99-
100-
# Tags applied to this module. These help with module discovery in online galleries.
101-
Tags = 'Azure','ResourceManager','ARM','PSModule','ConnectedKubernetes'
102-
103-
# A URL to the license for this module.
104-
LicenseUri = 'https://aka.ms/azps-license'
105-
106-
# A URL to the main website for this project.
107-
ProjectUri = 'https://github.com/Azure/azure-powershell'
108-
109-
# A URL to an icon representing this module.
110-
# IconUri = ''
111-
112-
# ReleaseNotes of this module
113-
ReleaseNotes = '* Added support for custom locations id and correlation Id.'
114-
115-
# Prerelease string of this module
116-
# Prerelease = ''
117-
118-
# Flag to indicate whether the module requires explicit user acceptance for install/update/save
119-
# RequireLicenseAcceptance = $false
120-
121-
# External dependent modules of this module
122-
# ExternalModuleDependencies = @()
123-
124-
} # End of PSData hashtable
125-
126-
} # End of PrivateData hashtable
127-
128-
# HelpInfo URI of this module
129-
# HelpInfoURI = ''
130-
131-
# Default prefix for commands exported from this module. Override the default prefix using Import-Module -Prefix.
132-
# DefaultCommandPrefix = ''
133-
18+
Tags = 'Azure', 'ResourceManager', 'ARM', 'PSModule', 'ConnectedKubernetes'
19+
LicenseUri = 'https://aka.ms/azps-license'
20+
ProjectUri = 'https://github.com/Azure/azure-powershell'
21+
ReleaseNotes = ''
22+
}
23+
}
13424
}
135-

src/ConnectedKubernetes/ConnectedKubernetes.Autorest/README.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ In this directory, run AutoRest:
4747
> see https://aka.ms/autorest
4848
4949
``` yaml
50-
branch: ac6324d13863e8157f4b392ef0ceef1e86eea935
50+
commit: ac6324d13863e8157f4b392ef0ceef1e86eea935
5151
require:
52-
- $(this-folder)/../readme.azure.noprofile.md
52+
- $(this-folder)/../../readme.azure.noprofile.md
5353
input-file:
5454
- $(repo)/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2022-10-01-preview/connectedClusters.json
5555

@@ -61,6 +61,10 @@ identity-correction-for-post: true
6161
resourcegroup-append: true
6262
nested-object-to-string: true
6363

64+
# For new modules, please avoid setting 3.x using the use-extension method and instead, use 4.x as the default option
65+
use-extension:
66+
"@autorest/powershell": "3.x"
67+
6468
directive:
6569
- where:
6670
subject: ^ConnectedCluster(.*)

src/ConnectedKubernetes/ConnectedKubernetes.Autorest/build-module.ps1

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,8 @@ if($NoDocs) {
143143
$null = Get-ChildItem -Path $docsFolder -Recurse -Exclude 'README.md' | Remove-Item -Recurse -ErrorAction SilentlyContinue
144144
}
145145
$null = New-Item -ItemType Directory -Force -Path $docsFolder
146-
Export-ProxyCmdlet -ModuleName $moduleName -ModulePath $modulePaths -ExportsFolder $exportsFolder -InternalFolder $internalFolder -ModuleDescription $moduleDescription -DocsFolder $docsFolder -ExamplesFolder $examplesFolder -ModuleGuid $guid
146+
$addComplexInterfaceInfo = ![System.Convert]::ToBoolean('true')
147+
Export-ProxyCmdlet -ModuleName $moduleName -ModulePath $modulePaths -ExportsFolder $exportsFolder -InternalFolder $internalFolder -ModuleDescription $moduleDescription -DocsFolder $docsFolder -ExamplesFolder $examplesFolder -ModuleGuid $guid -AddComplexInterfaceInfo:$addComplexInterfaceInfo
147148
}
148149

149150
Write-Host -ForegroundColor Green 'Creating format.ps1xml...'
@@ -162,4 +163,10 @@ Export-TestStub -ModuleName $moduleName -ExportsFolder $exportsFolder -OutputFol
162163
Write-Host -ForegroundColor Green 'Creating example stubs...'
163164
Export-ExampleStub -ExportsFolder $exportsFolder -OutputFolder $examplesFolder
164165

166+
if (Test-Path (Join-Path $PSScriptRoot 'generate-portal-ux.ps1'))
167+
{
168+
Write-Host -ForegroundColor Green 'Creating ux metadata...'
169+
. (Join-Path $PSScriptRoot 'generate-portal-ux.ps1')
170+
}
171+
165172
Write-Host -ForegroundColor Green '-------------Done-------------'

src/ConnectedKubernetes/ConnectedKubernetes.Autorest/custom/New-AzConnectedKubernetes.ps1

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -492,6 +492,7 @@ function New-AzConnectedKubernetes {
492492
}
493493
if (-not ([string]::IsNullOrEmpty($CustomLocationsOid))) {
494494
$options += " --set systemDefaultValues.customLocations.oid=$CustomLocationsOid"
495+
$options += " --set systemDefaultValues.customLocations.enabled=true"
495496
}
496497
if (!$NoWait) {
497498
$options += " --wait --timeout $OnboardingTimeout"

src/ConnectedKubernetes/ConnectedKubernetes.Autorest/generate-help.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ foreach($directory in $directories)
6666
$docsPath = Join-Path $docsFolder $directory.Name
6767
$null = New-Item -ItemType Directory -Force -Path $docsPath -ErrorAction SilentlyContinue
6868
$examplesPath = Join-Path $examplesFolder $directory.Name
69-
70-
Export-HelpMarkdown -ModuleInfo $moduleInfo -FunctionInfo $cmdletFunctionInfo -HelpInfo $cmdletHelpInfo -DocsFolder $docsPath -ExamplesFolder $examplesPath
69+
$addComplexInterfaceInfo = ![System.Convert]::ToBoolean('true')
70+
Export-HelpMarkdown -ModuleInfo $moduleInfo -FunctionInfo $cmdletFunctionInfo -HelpInfo $cmdletHelpInfo -DocsFolder $docsPath -ExamplesFolder $examplesPath -AddComplexInterfaceInfo:$addComplexInterfaceInfo
7171
Write-Host -ForegroundColor Green "Created documentation in '$docsPath'"
7272
}
7373

0 commit comments

Comments
 (0)