Skip to content

Commit 4d794fb

Browse files
[SpringCloud]Updated API version to 2020-07-01. (#13200)
* [SpringCloud]Updated API version to 2020-07-01. * Update Az.SpringCloud.psd1 * Update check-dependencies.ps1 Co-authored-by: Yunchi Wang <[email protected]>
1 parent fc8739d commit 4d794fb

File tree

450 files changed

+16797
-11290
lines changed

Some content is hidden

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

450 files changed

+16797
-11290
lines changed

src/SpringCloud/Az.SpringCloud.format.ps1xml

Lines changed: 276 additions & 158 deletions
Large diffs are not rendered by default.

src/SpringCloud/Az.SpringCloud.psd1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
# Generated by: Microsoft Corporation
55
#
6-
# Generated on: 2020-08-20
6+
# Generated on: 10/13/2020
77
#
88

99
@{
@@ -51,7 +51,7 @@ DotNetFrameworkVersion = '4.7.2'
5151
# ProcessorArchitecture = ''
5252

5353
# Modules that must be imported into the global environment prior to importing this module
54-
# RequiredModules = @()
54+
RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.9.5'; })
5555

5656
# Assemblies that must be loaded prior to importing this module
5757
RequiredAssemblies = './bin/Az.SpringCloud.private.dll'
@@ -115,7 +115,7 @@ PrivateData = @{
115115
# IconUri = ''
116116

117117
# ReleaseNotes of this module
118-
ReleaseNotes = 'First preview release for module Az.SpringCloud.'
118+
ReleaseNotes = 'Updated API version to 2020-07-01.'
119119

120120
# Prerelease string of this module
121121
# Prerelease = ''

src/SpringCloud/Az.SpringCloud.psm1

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,17 @@
2424
}
2525
}
2626
if(-not $accountsModule) {
27-
$hasAdequateVersion = (Get-Module -Name $accountsName -ListAvailable | Where-Object { $_.Version -ge [System.Version]'1.8.1' } | Measure-Object).Count -gt 0
27+
$hasAdequateVersion = (Get-Module -Name $accountsName -ListAvailable | Where-Object { $_.Version -ge [System.Version]'1.7.4' } | Measure-Object).Count -gt 0
2828
if($hasAdequateVersion) {
29-
$accountsModule = Import-Module -Name $accountsName -MinimumVersion 1.8.1 -Scope Global -PassThru
29+
$accountsModule = Import-Module -Name $accountsName -MinimumVersion 1.7.4 -Scope Global -PassThru
3030
}
3131
}
3232
}
3333

3434
if(-not $accountsModule) {
35-
Write-Error "`nThis module requires $accountsName version 1.8.1 or greater. For installation instructions, please see: https://docs.microsoft.com/en-us/powershell/azure/install-az-ps" -ErrorAction Stop
36-
} elseif (($accountsModule.Version -lt [System.Version]'1.8.1') -and (-not $localAccounts)) {
37-
Write-Error "`nThis module requires $accountsName version 1.8.1 or greater. An earlier version of Az.Accounts is imported in the current PowerShell session. If you are running test, please try to remove '.PSSharedModules' in your home directory. Otherwise please open a new PowerShell session and import this module again.`nAdditionally, this error could indicate that multiple incompatible versions of Azure PowerShell modules are installed on your system. For troubleshooting information, please see: https://aka.ms/azps-version-error" -ErrorAction Stop
35+
Write-Error "`nThis module requires $accountsName version 1.7.4 or greater. For installation instructions, please see: https://docs.microsoft.com/en-us/powershell/azure/install-az-ps" -ErrorAction Stop
36+
} elseif (($accountsModule.Version -lt [System.Version]'1.7.4') -and (-not $localAccounts)) {
37+
Write-Error "`nThis module requires $accountsName version 1.7.4 or greater. An earlier version of Az.Accounts is imported in the current PowerShell session. If you are running test, please try to remove '.PSSharedModules' in your home directory. Otherwise please open a new PowerShell session and import this module again.`nAdditionally, this error could indicate that multiple incompatible versions of Azure PowerShell modules are installed on your system. For troubleshooting information, please see: https://aka.ms/azps-version-error" -ErrorAction Stop
3838
}
3939
Write-Information "Loaded Module '$($accountsModule.Name)'"
4040

src/SpringCloud/Changelog.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@
1919
-->
2020
## Upcoming Release
2121

22+
## Version 0.2.0
23+
* Updated API version to 2020-07-01.
24+
2225
## Version 0.1.0
2326
* First preview release for module Az.SpringCloud.
2427

src/SpringCloud/check-dependencies.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ if(Test-Path -Path $localModulesPath) {
4646
$env:PSModulePath = "$localModulesPath$([IO.Path]::PathSeparator)$env:PSModulePath"
4747
}
4848

49-
DownloadModule -predicate ($all -or $Accounts) -path $localModulesPath -moduleName 'Az.Accounts' -versionMinimum '1.8.1'
49+
DownloadModule -predicate ($all -or $Accounts) -path $localModulesPath -moduleName 'Az.Accounts' -versionMinimum '1.9.5'
5050
DownloadModule -predicate ($all -or $Pester) -path $localModulesPath -moduleName 'Pester' -requiredVersion '4.10.1'
5151

5252
$tools = Join-Path $PSScriptRoot 'tools'

src/SpringCloud/custom/Deploy-AzSpringCloudApp.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@ PS C:\> {{ Add code here }}
2828
{{ Add output here }}
2929
3030
.Outputs
31-
Microsoft.Azure.PowerShell.Cmdlets.SpringCloud.Models.Api20190501Preview.IAppResource
31+
Microsoft.Azure.PowerShell.Cmdlets.SpringCloud.Models.Api20200701.IAppResource
3232
.Link
3333
https://docs.microsoft.com/en-us/powershell/module/az.SpringCloud/deploy-azSpringCloudapp
3434
#>
3535
function Deploy-AzSpringCloudApp {
36-
[OutputType([Microsoft.Azure.PowerShell.Cmdlets.SpringCloud.Models.Api20190501Preview.IAppResource])]
36+
[OutputType([Microsoft.Azure.PowerShell.Cmdlets.SpringCloud.Models.Api20200701.IAppResource])]
3737
[CmdletBinding(DefaultParameterSetName='CreateExpanded', PositionalBinding=$false, SupportsShouldProcess, ConfirmImpact='Medium')]
3838
param(
3939
[Parameter(Mandatory)]

src/SpringCloud/custom/Get-AzSpringCloud.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ PS C:\> {{ Add code here }}
3030
.Inputs
3131
Microsoft.Azure.PowerShell.Cmdlets.SpringCloud.Models.ISpringCloudIdentity
3232
.Outputs
33-
Microsoft.Azure.PowerShell.Cmdlets.SpringCloud.Models.Api20190501Preview.IServiceResource
33+
Microsoft.Azure.PowerShell.Cmdlets.SpringCloud.Models.Api20200701.IServiceResource
3434
.Notes
3535
COMPLEX PARAMETER PROPERTIES
3636
@@ -51,7 +51,7 @@ INPUTOBJECT <ISpringCloudIdentity>: Identity Parameter
5151
https://docs.microsoft.com/en-us/powershell/module/az.springcloud/get-azspringcloud
5252
#>
5353
function Get-AzSpringCloud {
54-
[OutputType([Microsoft.Azure.PowerShell.Cmdlets.SpringCloud.Models.Api20190501Preview.IServiceResource])]
54+
[OutputType([Microsoft.Azure.PowerShell.Cmdlets.SpringCloud.Models.Api20200701.IServiceResource])]
5555
[CmdletBinding(DefaultParameterSetName='List', PositionalBinding=$false)]
5656
param(
5757
[Parameter(ParameterSetName='Get', Mandatory)]

src/SpringCloud/custom/New-AzSpringCloud.ps1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ PS C:\> {{ Add code here }}
2828
{{ Add output here }}
2929
3030
.Outputs
31-
Microsoft.Azure.PowerShell.Cmdlets.SpringCloud.Models.Api20190501Preview.IServiceResource
31+
Microsoft.Azure.PowerShell.Cmdlets.SpringCloud.Models.Api20200701.IServiceResource
3232
.Notes
3333
COMPLEX PARAMETER PROPERTIES
3434
@@ -50,7 +50,7 @@ GITPROPERTYREPOSITORY <IGitPatternRepository[]>: Repositories of git.
5050
https://docs.microsoft.com/en-us/powershell/module/az.springcloud/new-azspringcloud
5151
#>
5252
function New-AzSpringCloud {
53-
[OutputType([Microsoft.Azure.PowerShell.Cmdlets.SpringCloud.Models.Api20190501Preview.IServiceResource])]
53+
[OutputType([Microsoft.Azure.PowerShell.Cmdlets.SpringCloud.Models.Api20200701.IServiceResource])]
5454
[CmdletBinding(DefaultParameterSetName='CreateExpanded', PositionalBinding=$false, SupportsShouldProcess, ConfirmImpact='Medium')]
5555
param(
5656
[Parameter(Mandatory)]
@@ -101,7 +101,7 @@ param(
101101

102102
[Parameter()]
103103
[Microsoft.Azure.PowerShell.Cmdlets.SpringCloud.Category('Body')]
104-
[Microsoft.Azure.PowerShell.Cmdlets.SpringCloud.Runtime.Info(PossibleTypes=([Microsoft.Azure.PowerShell.Cmdlets.SpringCloud.Models.Api20190501Preview.ITrackedResourceTags]))]
104+
[Microsoft.Azure.PowerShell.Cmdlets.SpringCloud.Runtime.Info(PossibleTypes=([Microsoft.Azure.PowerShell.Cmdlets.SpringCloud.Models.Api20200701.ITrackedResourceTags]))]
105105
[System.Collections.Hashtable]
106106
# Tags of the service which is a list of key value pairs that describe the resource.
107107
${Tag},

src/SpringCloud/custom/New-AzSpringCloudApp.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@ PS C:\> {{ Add code here }}
2828
{{ Add output here }}
2929
3030
.Outputs
31-
Microsoft.Azure.PowerShell.Cmdlets.SpringCloud.Models.Api20190501Preview.IAppResource
31+
Microsoft.Azure.PowerShell.Cmdlets.SpringCloud.Models.Api20200701.IAppResource
3232
.Link
3333
https://docs.microsoft.com/en-us/powershell/module/az.springcloud/new-azspringcloudapp
3434
#>
3535
function New-AzSpringCloudApp {
36-
[OutputType([Microsoft.Azure.PowerShell.Cmdlets.SpringCloud.Models.Api20190501Preview.IAppResource])]
36+
[OutputType([Microsoft.Azure.PowerShell.Cmdlets.SpringCloud.Models.Api20200701.IAppResource])]
3737
[CmdletBinding(DefaultParameterSetName='CreateExpanded', PositionalBinding=$false, SupportsShouldProcess, ConfirmImpact='Medium')]
3838
param(
3939
[Parameter(Mandatory)]

src/SpringCloud/custom/New-AzSpringCloudAppDeployment.ps1

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@ PS C:\> {{ Add code here }}
2828
{{ Add output here }}
2929
3030
.Outputs
31-
Microsoft.Azure.PowerShell.Cmdlets.SpringCloud.Models.Api20190501Preview.IDeploymentResource
31+
Microsoft.Azure.PowerShell.Cmdlets.SpringCloud.Models.Api20200701.IDeploymentResource
3232
.Link
3333
https://docs.microsoft.com/en-us/powershell/module/az.SpringCloud/new-azSpringCloudappdeployment
3434
#>
3535
function New-AzSpringCloudAppDeployment {
36-
[OutputType([Microsoft.Azure.PowerShell.Cmdlets.SpringCloud.Models.Api20190501Preview.IDeploymentResource])]
36+
[OutputType([Microsoft.Azure.PowerShell.Cmdlets.SpringCloud.Models.Api20200701.IDeploymentResource])]
3737
[CmdletBinding(DefaultParameterSetName='CreateExpanded', PositionalBinding=$false, SupportsShouldProcess, ConfirmImpact='Medium')]
3838
param(
3939
[Parameter(Mandatory)]
@@ -78,17 +78,11 @@ param(
7878

7979
[Parameter()]
8080
[Microsoft.Azure.PowerShell.Cmdlets.SpringCloud.Category('Body')]
81-
[Microsoft.Azure.PowerShell.Cmdlets.SpringCloud.Runtime.Info(PossibleTypes=([Microsoft.Azure.PowerShell.Cmdlets.SpringCloud.Models.Api20190501Preview.IDeploymentSettingsEnvironmentVariables]))]
81+
[Microsoft.Azure.PowerShell.Cmdlets.SpringCloud.Runtime.Info(PossibleTypes=([Microsoft.Azure.PowerShell.Cmdlets.SpringCloud.Models.Api20200701.IDeploymentSettingsEnvironmentVariables]))]
8282
[System.Collections.Hashtable]
8383
# Collection of environment variables
8484
${EnvironmentVariable},
85-
86-
[Parameter()]
87-
[Microsoft.Azure.PowerShell.Cmdlets.SpringCloud.Category('Body')]
88-
[System.Int32]
89-
# Instance count
90-
${InstanceCount},
91-
85+
9286
[Parameter()]
9387
[Microsoft.Azure.PowerShell.Cmdlets.SpringCloud.Category('Body')]
9488
[System.String]
@@ -203,10 +197,6 @@ param(
203197
$PSBoundParameters.Add('DeploymentSettingEnvironmentVariable', $EnvironmentVariable)
204198
$Null = $PSBoundParameters.Remove('EnvironmentVariable')
205199
}
206-
if ($PSBoundParameters.ContainsKey('InstanceCount')) {
207-
$PSBoundParameters.Add('DeploymentSettingInstanceCount', $InstanceCount)
208-
$Null = $PSBoundParameters.Remove('InstanceCount')
209-
}
210200
if ($PSBoundParameters.ContainsKey('JvmOption')) {
211201
$PSBoundParameters.Add('DeploymentSettingJvmOption', $JvmOption)
212202
$Null = $PSBoundParameters.Remove('JvmOption')

0 commit comments

Comments
 (0)