From 62d8095a5196cbea612fecf30722a94a6538a049 Mon Sep 17 00:00:00 2001 From: Alexander Sehr Date: Mon, 28 Aug 2023 14:23:07 +0200 Subject: [PATCH] [Modules] Updated API version of NetApp (#3836) * Updated netapp api * Expanded allowed versions --- modules/net-app/net-app-account/README.md | 6 +- .../net-app-account/capacity-pool/README.md | 5 +- .../net-app-account/capacity-pool/main.bicep | 12 ++- .../net-app-account/capacity-pool/main.json | 48 ++++++++---- .../capacity-pool/volume/README.md | 2 +- .../capacity-pool/volume/main.bicep | 6 +- .../capacity-pool/volume/main.json | 17 +++-- modules/net-app/net-app-account/main.bicep | 4 +- modules/net-app/net-app-account/main.json | 75 ++++++++++++------- .../staticValidation/module.tests.ps1 | 6 +- 10 files changed, 118 insertions(+), 63 deletions(-) diff --git a/modules/net-app/net-app-account/README.md b/modules/net-app/net-app-account/README.md index 47bcbdc2d8..28fb3f81fb 100644 --- a/modules/net-app/net-app-account/README.md +++ b/modules/net-app/net-app-account/README.md @@ -16,9 +16,9 @@ This module deploys an Azure NetApp File. | :-- | :-- | | `Microsoft.Authorization/locks` | [2020-05-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2020-05-01/locks) | | `Microsoft.Authorization/roleAssignments` | [2022-04-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2022-04-01/roleAssignments) | -| `Microsoft.NetApp/netAppAccounts` | [2022-09-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.NetApp/netAppAccounts) | -| `Microsoft.NetApp/netAppAccounts/capacityPools` | [2022-09-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.NetApp/netAppAccounts/capacityPools) | -| `Microsoft.NetApp/netAppAccounts/capacityPools/volumes` | [2022-09-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.NetApp/netAppAccounts/capacityPools/volumes) | +| `Microsoft.NetApp/netAppAccounts` | [2022-11-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.NetApp/netAppAccounts) | +| `Microsoft.NetApp/netAppAccounts/capacityPools` | [2022-11-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.NetApp/netAppAccounts/capacityPools) | +| `Microsoft.NetApp/netAppAccounts/capacityPools/volumes` | [2022-11-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.NetApp/netAppAccounts/capacityPools/volumes) | ## Parameters diff --git a/modules/net-app/net-app-account/capacity-pool/README.md b/modules/net-app/net-app-account/capacity-pool/README.md index aa1143ba4c..b6a7594c8d 100644 --- a/modules/net-app/net-app-account/capacity-pool/README.md +++ b/modules/net-app/net-app-account/capacity-pool/README.md @@ -14,8 +14,8 @@ This module deploys an Azure NetApp Files Capacity Pool. | Resource Type | API Version | | :-- | :-- | | `Microsoft.Authorization/roleAssignments` | [2022-04-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2022-04-01/roleAssignments) | -| `Microsoft.NetApp/netAppAccounts/capacityPools` | [2022-09-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.NetApp/netAppAccounts/capacityPools) | -| `Microsoft.NetApp/netAppAccounts/capacityPools/volumes` | [2022-09-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.NetApp/netAppAccounts/capacityPools/volumes) | +| `Microsoft.NetApp/netAppAccounts/capacityPools` | [2022-11-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.NetApp/netAppAccounts/capacityPools) | +| `Microsoft.NetApp/netAppAccounts/capacityPools/volumes` | [2022-11-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.NetApp/netAppAccounts/capacityPools/volumes) | ## Parameters @@ -38,6 +38,7 @@ This module deploys an Azure NetApp Files Capacity Pool. | :-- | :-- | :-- | :-- | :-- | | `coolAccess` | bool | `False` | | If enabled (true) the pool can contain cool Access enabled volumes. | | `enableDefaultTelemetry` | bool | `True` | | Enable telemetry via a Globally Unique Identifier (GUID). | +| `encryptionType` | string | `'Single'` | `[Double, Single]` | Encryption type of the capacity pool, set encryption type for data at rest for this pool and all volumes in it. This value can only be set when creating new pool. | | `location` | string | `[resourceGroup().location]` | | Location of the pool volume. | | `qosType` | string | `'Auto'` | `[Auto, Manual]` | The qos type of the pool. | | `roleAssignments` | array | `[]` | | Array of role assignment objects that contain the 'roleDefinitionIdOrName' and 'principalId' to define RBAC role assignments on this resource. In the roleDefinitionIdOrName attribute, you can provide either the display name of the role definition, or its fully qualified ID in the following format: '/providers/Microsoft.Authorization/roleDefinitions/c2f4ef07-c644-48eb-af81-4b1b4947fb11'. | diff --git a/modules/net-app/net-app-account/capacity-pool/main.bicep b/modules/net-app/net-app-account/capacity-pool/main.bicep index f050a52612..1743590ca9 100644 --- a/modules/net-app/net-app-account/capacity-pool/main.bicep +++ b/modules/net-app/net-app-account/capacity-pool/main.bicep @@ -42,6 +42,13 @@ param coolAccess bool = false @description('Optional. Array of role assignment objects that contain the \'roleDefinitionIdOrName\' and \'principalId\' to define RBAC role assignments on this resource. In the roleDefinitionIdOrName attribute, you can provide either the display name of the role definition, or its fully qualified ID in the following format: \'/providers/Microsoft.Authorization/roleDefinitions/c2f4ef07-c644-48eb-af81-4b1b4947fb11\'.') param roleAssignments array = [] +@description('Optional. Encryption type of the capacity pool, set encryption type for data at rest for this pool and all volumes in it. This value can only be set when creating new pool.') +@allowed([ + 'Double' + 'Single' +]) +param encryptionType string = 'Single' + @description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).') param enableDefaultTelemetry bool = true @@ -59,11 +66,11 @@ resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (ena } } -resource netAppAccount 'Microsoft.NetApp/netAppAccounts@2022-09-01' existing = { +resource netAppAccount 'Microsoft.NetApp/netAppAccounts@2022-11-01' existing = { name: netAppAccountName } -resource capacityPool 'Microsoft.NetApp/netAppAccounts/capacityPools@2022-09-01' = { +resource capacityPool 'Microsoft.NetApp/netAppAccounts/capacityPools@2022-11-01' = { name: name parent: netAppAccount location: location @@ -73,6 +80,7 @@ resource capacityPool 'Microsoft.NetApp/netAppAccounts/capacityPools@2022-09-01' size: size qosType: qosType coolAccess: coolAccess + encryptionType: encryptionType } } diff --git a/modules/net-app/net-app-account/capacity-pool/main.json b/modules/net-app/net-app-account/capacity-pool/main.json index 1810973d91..0ef41ba698 100644 --- a/modules/net-app/net-app-account/capacity-pool/main.json +++ b/modules/net-app/net-app-account/capacity-pool/main.json @@ -4,9 +4,12 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.19.5.34762", - "templateHash": "5582726599079259116" - } + "version": "0.20.4.51522", + "templateHash": "13333372953499047799" + }, + "name": "Azure NetApp Files Capacity Pools", + "description": "This module deploys an Azure NetApp Files Capacity Pool.", + "owner": "Azure/module-maintainers" }, "parameters": { "netAppAccountName": { @@ -86,6 +89,17 @@ "description": "Optional. Array of role assignment objects that contain the 'roleDefinitionIdOrName' and 'principalId' to define RBAC role assignments on this resource. In the roleDefinitionIdOrName attribute, you can provide either the display name of the role definition, or its fully qualified ID in the following format: '/providers/Microsoft.Authorization/roleDefinitions/c2f4ef07-c644-48eb-af81-4b1b4947fb11'." } }, + "encryptionType": { + "type": "string", + "defaultValue": "Single", + "allowedValues": [ + "Double", + "Single" + ], + "metadata": { + "description": "Optional. Encryption type of the capacity pool, set encryption type for data at rest for this pool and all volumes in it. This value can only be set when creating new pool." + } + }, "enableDefaultTelemetry": { "type": "bool", "defaultValue": true, @@ -114,7 +128,7 @@ }, { "type": "Microsoft.NetApp/netAppAccounts/capacityPools", - "apiVersion": "2022-09-01", + "apiVersion": "2022-11-01", "name": "[format('{0}/{1}', parameters('netAppAccountName'), parameters('name'))]", "location": "[parameters('location')]", "tags": "[parameters('tags')]", @@ -122,7 +136,8 @@ "serviceLevel": "[parameters('serviceLevel')]", "size": "[parameters('size')]", "qosType": "[parameters('qosType')]", - "coolAccess": "[parameters('coolAccess')]" + "coolAccess": "[parameters('coolAccess')]", + "encryptionType": "[parameters('encryptionType')]" } }, { @@ -176,9 +191,12 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.19.5.34762", - "templateHash": "4861424102878838813" - } + "version": "0.20.4.51522", + "templateHash": "5724175752968001086" + }, + "name": "Azure NetApp Files Capacity Pool Volumes", + "description": "This module deploys an Azure NetApp Files Capacity Pool Volume.", + "owner": "Azure/module-maintainers" }, "parameters": { "netAppAccountName": { @@ -284,7 +302,7 @@ }, { "type": "Microsoft.NetApp/netAppAccounts/capacityPools/volumes", - "apiVersion": "2022-09-01", + "apiVersion": "2022-11-01", "name": "[format('{0}/{1}/{2}', parameters('netAppAccountName'), parameters('capacityPoolName'), parameters('name'))]", "location": "[parameters('location')]", "properties": { @@ -330,8 +348,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.19.5.34762", - "templateHash": "2805945634543671808" + "version": "0.20.4.51522", + "templateHash": "6579931820257793193" } }, "parameters": { @@ -472,7 +490,7 @@ "metadata": { "description": "The location the resource was deployed into." }, - "value": "[reference(resourceId('Microsoft.NetApp/netAppAccounts/capacityPools/volumes', parameters('netAppAccountName'), parameters('capacityPoolName'), parameters('name')), '2022-09-01', 'full').location]" + "value": "[reference(resourceId('Microsoft.NetApp/netAppAccounts/capacityPools/volumes', parameters('netAppAccountName'), parameters('capacityPoolName'), parameters('name')), '2022-11-01', 'full').location]" } } } @@ -515,8 +533,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.19.5.34762", - "templateHash": "3662901243445895322" + "version": "0.20.4.51522", + "templateHash": "6567527079478034080" } }, "parameters": { @@ -657,7 +675,7 @@ "metadata": { "description": "The location the resource was deployed into." }, - "value": "[reference(resourceId('Microsoft.NetApp/netAppAccounts/capacityPools', parameters('netAppAccountName'), parameters('name')), '2022-09-01', 'full').location]" + "value": "[reference(resourceId('Microsoft.NetApp/netAppAccounts/capacityPools', parameters('netAppAccountName'), parameters('name')), '2022-11-01', 'full').location]" } } } \ No newline at end of file diff --git a/modules/net-app/net-app-account/capacity-pool/volume/README.md b/modules/net-app/net-app-account/capacity-pool/volume/README.md index 3d3cfe6363..20851da1db 100644 --- a/modules/net-app/net-app-account/capacity-pool/volume/README.md +++ b/modules/net-app/net-app-account/capacity-pool/volume/README.md @@ -14,7 +14,7 @@ This module deploys an Azure NetApp Files Capacity Pool Volume. | Resource Type | API Version | | :-- | :-- | | `Microsoft.Authorization/roleAssignments` | [2022-04-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2022-04-01/roleAssignments) | -| `Microsoft.NetApp/netAppAccounts/capacityPools/volumes` | [2022-09-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.NetApp/netAppAccounts/capacityPools/volumes) | +| `Microsoft.NetApp/netAppAccounts/capacityPools/volumes` | [2022-11-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.NetApp/netAppAccounts/capacityPools/volumes) | ## Parameters diff --git a/modules/net-app/net-app-account/capacity-pool/volume/main.bicep b/modules/net-app/net-app-account/capacity-pool/volume/main.bicep index 50001477ae..f6181b6089 100644 --- a/modules/net-app/net-app-account/capacity-pool/volume/main.bicep +++ b/modules/net-app/net-app-account/capacity-pool/volume/main.bicep @@ -56,15 +56,15 @@ resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (ena } } -resource netAppAccount 'Microsoft.NetApp/netAppAccounts@2022-09-01' existing = { +resource netAppAccount 'Microsoft.NetApp/netAppAccounts@2022-11-01' existing = { name: netAppAccountName - resource capacityPool 'capacityPools@2022-05-01' existing = { + resource capacityPool 'capacityPools@2022-11-01' existing = { name: capacityPoolName } } -resource volume 'Microsoft.NetApp/netAppAccounts/capacityPools/volumes@2022-09-01' = { +resource volume 'Microsoft.NetApp/netAppAccounts/capacityPools/volumes@2022-11-01' = { name: name parent: netAppAccount::capacityPool location: location diff --git a/modules/net-app/net-app-account/capacity-pool/volume/main.json b/modules/net-app/net-app-account/capacity-pool/volume/main.json index 3b2587b27d..49b126bd4d 100644 --- a/modules/net-app/net-app-account/capacity-pool/volume/main.json +++ b/modules/net-app/net-app-account/capacity-pool/volume/main.json @@ -4,9 +4,12 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.19.5.34762", - "templateHash": "4861424102878838813" - } + "version": "0.20.4.51522", + "templateHash": "5724175752968001086" + }, + "name": "Azure NetApp Files Capacity Pool Volumes", + "description": "This module deploys an Azure NetApp Files Capacity Pool Volume.", + "owner": "Azure/module-maintainers" }, "parameters": { "netAppAccountName": { @@ -112,7 +115,7 @@ }, { "type": "Microsoft.NetApp/netAppAccounts/capacityPools/volumes", - "apiVersion": "2022-09-01", + "apiVersion": "2022-11-01", "name": "[format('{0}/{1}/{2}', parameters('netAppAccountName'), parameters('capacityPoolName'), parameters('name'))]", "location": "[parameters('location')]", "properties": { @@ -158,8 +161,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.19.5.34762", - "templateHash": "2805945634543671808" + "version": "0.20.4.51522", + "templateHash": "6579931820257793193" } }, "parameters": { @@ -300,7 +303,7 @@ "metadata": { "description": "The location the resource was deployed into." }, - "value": "[reference(resourceId('Microsoft.NetApp/netAppAccounts/capacityPools/volumes', parameters('netAppAccountName'), parameters('capacityPoolName'), parameters('name')), '2022-09-01', 'full').location]" + "value": "[reference(resourceId('Microsoft.NetApp/netAppAccounts/capacityPools/volumes', parameters('netAppAccountName'), parameters('capacityPoolName'), parameters('name')), '2022-11-01', 'full').location]" } } } \ No newline at end of file diff --git a/modules/net-app/net-app-account/main.bicep b/modules/net-app/net-app-account/main.bicep index 17b0a19f82..12fc192758 100644 --- a/modules/net-app/net-app-account/main.bicep +++ b/modules/net-app/net-app-account/main.bicep @@ -82,7 +82,7 @@ resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (ena } } -resource netAppAccount 'Microsoft.NetApp/netAppAccounts@2022-09-01' = { +resource netAppAccount 'Microsoft.NetApp/netAppAccounts@2022-11-01' = { name: name tags: tags identity: identity @@ -126,6 +126,8 @@ module netAppAccount_capacityPools 'capacity-pool/main.bicep' = [for (capacityPo volumes: contains(capacityPool, 'volumes') ? capacityPool.volumes : [] coolAccess: contains(capacityPool, 'coolAccess') ? capacityPool.coolAccess : false roleAssignments: contains(capacityPool, 'roleAssignments') ? capacityPool.roleAssignments : [] + encryptionType: contains(capacityPool, 'encryptionType') ? capacityPool.encryptionType : 'Single' + tags: contains(capacityPool, 'tags') ? capacityPool.tags : {} enableDefaultTelemetry: enableReferencedModulesTelemetry } }] diff --git a/modules/net-app/net-app-account/main.json b/modules/net-app/net-app-account/main.json index e429de2b0c..1ab6f4ee7a 100644 --- a/modules/net-app/net-app-account/main.json +++ b/modules/net-app/net-app-account/main.json @@ -4,9 +4,12 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.19.5.34762", - "templateHash": "417256104056036730" - } + "version": "0.20.4.51522", + "templateHash": "4504561559399937088" + }, + "name": "Azure NetApp Files", + "description": "This module deploys an Azure NetApp File.", + "owner": "Azure/module-maintainers" }, "parameters": { "name": { @@ -88,14 +91,14 @@ "lock": { "type": "string", "defaultValue": "", - "metadata": { - "description": "Optional. Specify the type of lock." - }, "allowedValues": [ "", "CanNotDelete", "ReadOnly" - ] + ], + "metadata": { + "description": "Optional. Specify the type of lock." + } }, "tags": { "type": "object", @@ -144,7 +147,7 @@ }, { "type": "Microsoft.NetApp/netAppAccounts", - "apiVersion": "2022-09-01", + "apiVersion": "2022-11-01", "name": "[parameters('name')]", "tags": "[parameters('tags')]", "identity": "[variables('identity')]", @@ -201,8 +204,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.19.5.34762", - "templateHash": "18126615230901064847" + "version": "0.20.4.51522", + "templateHash": "4042341328592599874" } }, "parameters": { @@ -346,6 +349,8 @@ "volumes": "[if(contains(parameters('capacityPools')[copyIndex()], 'volumes'), createObject('value', parameters('capacityPools')[copyIndex()].volumes), createObject('value', createArray()))]", "coolAccess": "[if(contains(parameters('capacityPools')[copyIndex()], 'coolAccess'), createObject('value', parameters('capacityPools')[copyIndex()].coolAccess), createObject('value', false()))]", "roleAssignments": "[if(contains(parameters('capacityPools')[copyIndex()], 'roleAssignments'), createObject('value', parameters('capacityPools')[copyIndex()].roleAssignments), createObject('value', createArray()))]", + "encryptionType": "[if(contains(parameters('capacityPools')[copyIndex()], 'encryptionType'), createObject('value', parameters('capacityPools')[copyIndex()].encryptionType), createObject('value', 'Single'))]", + "tags": "[if(contains(parameters('capacityPools')[copyIndex()], 'tags'), createObject('value', parameters('capacityPools')[copyIndex()].tags), createObject('value', createObject()))]", "enableDefaultTelemetry": { "value": "[variables('enableReferencedModulesTelemetry')]" } @@ -356,9 +361,12 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.19.5.34762", - "templateHash": "5582726599079259116" - } + "version": "0.20.4.51522", + "templateHash": "13333372953499047799" + }, + "name": "Azure NetApp Files Capacity Pools", + "description": "This module deploys an Azure NetApp Files Capacity Pool.", + "owner": "Azure/module-maintainers" }, "parameters": { "netAppAccountName": { @@ -438,6 +446,17 @@ "description": "Optional. Array of role assignment objects that contain the 'roleDefinitionIdOrName' and 'principalId' to define RBAC role assignments on this resource. In the roleDefinitionIdOrName attribute, you can provide either the display name of the role definition, or its fully qualified ID in the following format: '/providers/Microsoft.Authorization/roleDefinitions/c2f4ef07-c644-48eb-af81-4b1b4947fb11'." } }, + "encryptionType": { + "type": "string", + "defaultValue": "Single", + "allowedValues": [ + "Double", + "Single" + ], + "metadata": { + "description": "Optional. Encryption type of the capacity pool, set encryption type for data at rest for this pool and all volumes in it. This value can only be set when creating new pool." + } + }, "enableDefaultTelemetry": { "type": "bool", "defaultValue": true, @@ -466,7 +485,7 @@ }, { "type": "Microsoft.NetApp/netAppAccounts/capacityPools", - "apiVersion": "2022-09-01", + "apiVersion": "2022-11-01", "name": "[format('{0}/{1}', parameters('netAppAccountName'), parameters('name'))]", "location": "[parameters('location')]", "tags": "[parameters('tags')]", @@ -474,7 +493,8 @@ "serviceLevel": "[parameters('serviceLevel')]", "size": "[parameters('size')]", "qosType": "[parameters('qosType')]", - "coolAccess": "[parameters('coolAccess')]" + "coolAccess": "[parameters('coolAccess')]", + "encryptionType": "[parameters('encryptionType')]" } }, { @@ -528,9 +548,12 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.19.5.34762", - "templateHash": "4861424102878838813" - } + "version": "0.20.4.51522", + "templateHash": "5724175752968001086" + }, + "name": "Azure NetApp Files Capacity Pool Volumes", + "description": "This module deploys an Azure NetApp Files Capacity Pool Volume.", + "owner": "Azure/module-maintainers" }, "parameters": { "netAppAccountName": { @@ -636,7 +659,7 @@ }, { "type": "Microsoft.NetApp/netAppAccounts/capacityPools/volumes", - "apiVersion": "2022-09-01", + "apiVersion": "2022-11-01", "name": "[format('{0}/{1}/{2}', parameters('netAppAccountName'), parameters('capacityPoolName'), parameters('name'))]", "location": "[parameters('location')]", "properties": { @@ -682,8 +705,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.19.5.34762", - "templateHash": "2805945634543671808" + "version": "0.20.4.51522", + "templateHash": "6579931820257793193" } }, "parameters": { @@ -824,7 +847,7 @@ "metadata": { "description": "The location the resource was deployed into." }, - "value": "[reference(resourceId('Microsoft.NetApp/netAppAccounts/capacityPools/volumes', parameters('netAppAccountName'), parameters('capacityPoolName'), parameters('name')), '2022-09-01', 'full').location]" + "value": "[reference(resourceId('Microsoft.NetApp/netAppAccounts/capacityPools/volumes', parameters('netAppAccountName'), parameters('capacityPoolName'), parameters('name')), '2022-11-01', 'full').location]" } } } @@ -867,8 +890,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.19.5.34762", - "templateHash": "3662901243445895322" + "version": "0.20.4.51522", + "templateHash": "6567527079478034080" } }, "parameters": { @@ -1009,7 +1032,7 @@ "metadata": { "description": "The location the resource was deployed into." }, - "value": "[reference(resourceId('Microsoft.NetApp/netAppAccounts/capacityPools', parameters('netAppAccountName'), parameters('name')), '2022-09-01', 'full').location]" + "value": "[reference(resourceId('Microsoft.NetApp/netAppAccounts/capacityPools', parameters('netAppAccountName'), parameters('name')), '2022-11-01', 'full').location]" } } } @@ -1046,7 +1069,7 @@ "metadata": { "description": "The location the resource was deployed into." }, - "value": "[reference(resourceId('Microsoft.NetApp/netAppAccounts', parameters('name')), '2022-09-01', 'full').location]" + "value": "[reference(resourceId('Microsoft.NetApp/netAppAccounts', parameters('name')), '2022-11-01', 'full').location]" } } } \ No newline at end of file diff --git a/utilities/pipelines/staticValidation/module.tests.ps1 b/utilities/pipelines/staticValidation/module.tests.ps1 index 0e0506ea35..fcb740727c 100644 --- a/utilities/pipelines/staticValidation/module.tests.ps1 +++ b/utilities/pipelines/staticValidation/module.tests.ps1 @@ -1645,10 +1645,10 @@ Describe 'API version tests' -Tag 'ApiCheck' { if ($AllowPreviewVersionsInAPITests) { # We allow the latest 5 including previews (in case somebody wants to use preview), or the latest 3 non-preview $approvedApiVersions += $resourceTypeApiVersions | Select-Object -Last 5 - $approvedApiVersions += $resourceTypeApiVersions | Where-Object { $_ -notlike '*-preview' } | Select-Object -Last 3 + $approvedApiVersions += $resourceTypeApiVersions | Where-Object { $_ -notlike '*-preview' } | Select-Object -Last 5 } else { - # We allow the latest 3 non-preview preview - $approvedApiVersions += $resourceTypeApiVersions | Where-Object { $_ -notlike '*-preview' } | Select-Object -Last 3 + # We allow the latest 5 non-preview preview + $approvedApiVersions += $resourceTypeApiVersions | Where-Object { $_ -notlike '*-preview' } | Select-Object -Last 5 } $approvedApiVersions = $approvedApiVersions | Sort-Object -Unique -Descending