Skip to content

Commit d642ba0

Browse files
jamesfan1azure-powershell-bot
authored andcommitted
cherry-pick 9619ee2 from generation
1 parent 4756c2a commit d642ba0

File tree

90 files changed

+2454
-4120
lines changed

Some content is hidden

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

90 files changed

+2454
-4120
lines changed

generated/Nginx/Nginx.Autorest/Az.Nginx.psd1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
DotNetFrameworkVersion = '4.7.2'
1212
RequiredAssemblies = './bin/Az.Nginx.private.dll'
1313
FormatsToProcess = './Az.Nginx.format.ps1xml'
14-
FunctionsToExport = 'Get-AzNginxCertificate', 'Get-AzNginxConfiguration', 'Get-AzNginxDeployment', 'New-AzNginxCertificate', 'New-AzNginxConfiguration', 'New-AzNginxConfigurationFileObject', 'New-AzNginxDeployment', 'New-AzNginxNetworkProfileObject', 'New-AzNginxPrivateIPAddressObject', 'New-AzNginxPublicIPAddressObject', 'Remove-AzNginxCertificate', 'Remove-AzNginxConfiguration', 'Remove-AzNginxDeployment', 'Update-AzNginxDeployment', '*'
14+
FunctionsToExport = 'Get-AzNginxCertificate', 'Get-AzNginxConfiguration', 'Get-AzNginxDeployment', 'Invoke-AzNginxAnalysisConfiguration', 'New-AzNginxCertificate', 'New-AzNginxConfiguration', 'New-AzNginxConfigurationFileObject', 'New-AzNginxDeployment', 'New-AzNginxNetworkProfileObject', 'New-AzNginxPrivateIPAddressObject', 'New-AzNginxPublicIPAddressObject', 'Remove-AzNginxCertificate', 'Remove-AzNginxConfiguration', 'Remove-AzNginxDeployment', 'Update-AzNginxDeployment', '*'
1515
AliasesToExport = '*'
1616
PrivateData = @{
1717
PSData = @{
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* text=auto
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
bin
2+
obj
3+
.vs
4+
generated
5+
internal
6+
exports
7+
tools
8+
custom/*.psm1
9+
custom/autogen-model-cmdlets
10+
test/*-TestResults.xml
11+
/*.ps1
12+
/*.ps1xml
13+
/*.psm1
14+
/*.snk
15+
/*.csproj
16+
/*.nuspec
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
@{
2+
GUID = '81a564f0-1cf8-4d7b-ad75-8ecab8bfadc1'
3+
RootModule = './Az.Nginx.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: Nginx cmdlets'
10+
PowerShellVersion = '5.1'
11+
DotNetFrameworkVersion = '4.7.2'
12+
RequiredAssemblies = './bin/Az.Nginx.private.dll'
13+
FormatsToProcess = './Az.Nginx.format.ps1xml'
14+
FunctionsToExport = 'Get-AzNginxCertificate', 'Get-AzNginxConfiguration', 'Get-AzNginxDeployment', 'Invoke-AzNginxAnalysisConfiguration', 'New-AzNginxCertificate', 'New-AzNginxConfiguration', 'New-AzNginxConfigurationFileObject', 'New-AzNginxDeployment', 'New-AzNginxNetworkProfileObject', 'New-AzNginxPrivateIPAddressObject', 'New-AzNginxPublicIPAddressObject', 'Remove-AzNginxCertificate', 'Remove-AzNginxConfiguration', 'Remove-AzNginxDeployment', 'Update-AzNginxDeployment', '*'
15+
AliasesToExport = '*'
16+
PrivateData = @{
17+
PSData = @{
18+
Tags = 'Azure', 'ResourceManager', 'ARM', 'PSModule', 'Nginx'
19+
LicenseUri = 'https://aka.ms/azps-license'
20+
ProjectUri = 'https://github.com/Azure/azure-powershell'
21+
ReleaseNotes = ''
22+
}
23+
}
24+
}

src/Nginx/Nginx.Autorest/Properties/AssemblyInfo.cs

Lines changed: 0 additions & 28 deletions
This file was deleted.

src/Nginx/Nginx.Autorest/README.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,14 @@ For information on how to develop for `Az.Nginx`, see [how-to.md](how-to.md).
2626
### AutoRest Configuration
2727
> see https://aka.ms/autorest
2828
``` yaml
29-
commit: e38e7dd462571865266d320bd7cec9804c67f70b
30-
tag: package-2023-04-01
29+
commit: d1027c6d6d0994ef3a656a561b0cce8378ac58a4
30+
tag: package-2024-01-01-preview
3131
require:
3232
# readme.azure.noprofile.md is the common configuration file
3333
- $(this-folder)/../../readme.azure.noprofile.md
3434
input-file:
3535
# You need to specify your swagger files here.
36-
- $(repo)/specification/nginx/resource-manager/NGINX.NGINXPLUS/stable/2023-04-01/swagger.json
37-
36+
- $(repo)/specification/nginx/resource-manager/NGINX.NGINXPLUS/preview/2024-01-01-preview/swagger.json
3837
root-module-name: $(prefix).Nginx
3938
title: Nginx
4039
module-version: 0.1.0

src/Nginx/Nginx.Autorest/UX/Nginx.NginxPlus/nginxDeployments-certificates.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"resourceType": "nginxDeployments/certificates",
3-
"apiVersion": "2023-04-01",
3+
"apiVersion": "2024-01-01-preview",
44
"learnMore": {
55
"url": "https://learn.microsoft.com/powershell/module/az.nginx"
66
},

src/Nginx/Nginx.Autorest/UX/Nginx.NginxPlus/nginxDeployments-configurations.json

Lines changed: 44 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"resourceType": "nginxDeployments/configurations",
3-
"apiVersion": "2023-04-01",
3+
"apiVersion": "2024-01-01-preview",
44
"learnMore": {
55
"url": "https://learn.microsoft.com/powershell/module/az.nginx"
66
},
@@ -48,6 +48,49 @@
4848
}
4949
]
5050
},
51+
{
52+
"name": "Invoke-AzNginxAnalysisConfiguration",
53+
"description": "Analyze an NGINX configuration without applying it to the NGINXaaS deployment",
54+
"path": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Nginx.NginxPlus/nginxDeployments/{deploymentName}/configurations/{configurationName}/analyze",
55+
"help": {
56+
"learnMore": {
57+
"url": "https://learn.microsoft.com/powershell/module/az.nginx/invoke-aznginxanalysisconfiguration"
58+
},
59+
"parameterSets": [
60+
{
61+
"parameters": [
62+
"-ConfigurationName <String>",
63+
"-DeploymentName <String>",
64+
"-ResourceGroupName <String>",
65+
"[-SubscriptionId <String>]"
66+
]
67+
}
68+
]
69+
},
70+
"examples": [
71+
{
72+
"description": "Analyze an NGINX configuration without applying it to the NGINXaaS deployment",
73+
"parameters": [
74+
{
75+
"name": "-ConfigurationName",
76+
"value": "[Path.configurationName]"
77+
},
78+
{
79+
"name": "-DeploymentName",
80+
"value": "[Path.deploymentName]"
81+
},
82+
{
83+
"name": "-ResourceGroupName",
84+
"value": "[Path.resourceGroupName]"
85+
},
86+
{
87+
"name": "-SubscriptionId",
88+
"value": "[Path.subscriptionId]"
89+
}
90+
]
91+
}
92+
]
93+
},
5194
{
5295
"name": "Remove-AzNginxConfiguration",
5396
"description": "Reset the NGINX configuration of given NGINX deployment to default",

src/Nginx/Nginx.Autorest/UX/Nginx.NginxPlus/nginxDeployments.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"resourceType": "nginxDeployments",
3-
"apiVersion": "2023-04-01",
3+
"apiVersion": "2024-01-01-preview",
44
"learnMore": {
55
"url": "https://learn.microsoft.com/powershell/module/az.nginx"
66
},

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

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# Code generated by Microsoft (R) AutoRest Code Generator.Changes may cause incorrect behavior and will be lost if the code
1313
# is regenerated.
1414
# ----------------------------------------------------------------------------------
15-
param([switch]$Isolated, [switch]$Run, [switch]$Test, [switch]$Docs, [switch]$Pack, [switch]$Code, [switch]$Release, [switch]$Debugger, [switch]$NoDocs)
15+
param([switch]$Isolated, [switch]$Run, [switch]$Test, [switch]$Docs, [switch]$Pack, [switch]$Code, [switch]$Release, [switch]$Debugger, [switch]$NoDocs, [Switch]$DisableAfterBuildTasks)
1616
$ErrorActionPreference = 'Stop'
1717

1818
if($PSEdition -ne 'Core') {
@@ -89,7 +89,7 @@ if(-not $Debugger) {
8989
$null = Remove-Item -Recurse -ErrorAction SilentlyContinue -Path (Join-Path $binFolder 'Debug'), (Join-Path $binFolder 'Release')
9090
}
9191

92-
$dll = Join-Path $PSScriptRoot 'bin\Az.Nginx.private.dll'
92+
$dll = Join-Path $PSScriptRoot 'bin/Az.Nginx.private.dll'
9393
if(-not (Test-Path $dll)) {
9494
Write-Error "Unable to find output assembly in '$binFolder'."
9595
}
@@ -98,7 +98,7 @@ if(-not (Test-Path $dll)) {
9898
$null = Import-Module -Name $dll
9999

100100
$modulePaths = $dll
101-
$customPsm1 = Join-Path $PSScriptRoot 'custom\Az.Nginx.custom.psm1'
101+
$customPsm1 = Join-Path $PSScriptRoot 'custom/Az.Nginx.custom.psm1'
102102
if(Test-Path $customPsm1) {
103103
$modulePaths = @($dll, $customPsm1)
104104
}
@@ -169,4 +169,14 @@ if (Test-Path (Join-Path $PSScriptRoot 'generate-portal-ux.ps1'))
169169
. (Join-Path $PSScriptRoot 'generate-portal-ux.ps1')
170170
}
171171

172+
if (-not $DisableAfterBuildTasks){
173+
$afterBuildTasksPath = Join-Path $PSScriptRoot '../../../tools/BuildScripts/AdaptAutorestModule.ps1'
174+
$afterBuildTasksArgs = ConvertFrom-Json '{"SubModuleName":"Nginx","ModuleRootName":"Az.Nginx"}' -AsHashtable
175+
if(Test-Path -Path $afterBuildTasksPath -PathType leaf){
176+
Write-Host -ForegroundColor Green 'Running after build tasks...'
177+
. $afterBuildTasksPath @afterBuildTasksArgs
178+
}
179+
}
180+
181+
172182
Write-Host -ForegroundColor Green '-------------Done-------------'

0 commit comments

Comments
 (0)