From 6c122920df0a215ed5986f3c27d2cfef2ad5879b Mon Sep 17 00:00:00 2001 From: sarna Date: Wed, 21 Aug 2024 09:32:51 -0700 Subject: [PATCH 1/4] Document new SKU on NGINXaaS --- website/docs/r/nginx_deployment.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/nginx_deployment.html.markdown b/website/docs/r/nginx_deployment.html.markdown index d0a63a046532..9d9a61b20c73 100644 --- a/website/docs/r/nginx_deployment.html.markdown +++ b/website/docs/r/nginx_deployment.html.markdown @@ -86,7 +86,7 @@ The following arguments are supported: * `location` - (Required) The Azure Region where the NGINX Deployment should exist. Changing this forces a new NGINX Deployment to be created. -* `sku` - (Required) Specifies the NGINX Deployment SKU. Possible values are `standard_Monthly` and `basic_Monthly`. Changing this forces a new resource to be created. +* `sku` - (Required) Specifies the NGINX Deployment SKU. Possible values are `standardv2_Monthly`, `standard_Monthly`, `basic_Monthly`. Changing this forces a new resource to be created. -> **NOTE:** If you are setting the `sku` to `basic_Monthly`, you cannot specify a `capacity` or `auto_scale_profile`; basic plans do not support scaling. Other `sku`s require either `capacity` or `auto_scale_profile`. If you're using `basic_Monthly` with deployments created before v4.0, you may need to use [Terraform's `ignore_changes` functionality](https://www.terraform.io/language/meta-arguments/lifecycle#ignore_changes) to ignore changes to the `capacity` field. From ab90090b8e7c008587525125d202f544b6a5ce69 Mon Sep 17 00:00:00 2001 From: sarna Date: Fri, 13 Sep 2024 18:14:08 -0700 Subject: [PATCH 2/4] Change NGINXaaS SKU to standardv2_Monthly NGINXaaS now supports a newer SKU `standardv2_Monthly` and the `standard_Monthly` SKU has been deprecated. This change updates the acceptance tests to use the new SKU. --- .../nginx/nginx_certificate_resource_test.go | 2 +- .../nginx/nginx_configuration_resource_test.go | 2 +- .../services/nginx/nginx_deployment_resource_test.go | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/internal/services/nginx/nginx_certificate_resource_test.go b/internal/services/nginx/nginx_certificate_resource_test.go index 56beb097007f..425815d8f66d 100644 --- a/internal/services/nginx/nginx_certificate_resource_test.go +++ b/internal/services/nginx/nginx_certificate_resource_test.go @@ -225,7 +225,7 @@ resource "azurerm_user_assigned_identity" "test" { resource "azurerm_nginx_deployment" "test" { name = "acctest-%[1]d" resource_group_name = azurerm_resource_group.test.name - sku = "standard_Monthly" + sku = "standardv2_Monthly" capacity = 10 location = azurerm_resource_group.test.location diagnose_support_enabled = false diff --git a/internal/services/nginx/nginx_configuration_resource_test.go b/internal/services/nginx/nginx_configuration_resource_test.go index e1eec62fe9cd..e35bcea23845 100644 --- a/internal/services/nginx/nginx_configuration_resource_test.go +++ b/internal/services/nginx/nginx_configuration_resource_test.go @@ -285,7 +285,7 @@ resource "azurerm_subnet" "test" { resource "azurerm_nginx_deployment" "test" { name = "acctest-%[1]d" resource_group_name = azurerm_resource_group.test.name - sku = "standard_Monthly" + sku = "standardv2_Monthly" capacity = 10 location = azurerm_resource_group.test.location diff --git a/internal/services/nginx/nginx_deployment_resource_test.go b/internal/services/nginx/nginx_deployment_resource_test.go index 97212217f1a0..2272935729d5 100644 --- a/internal/services/nginx/nginx_deployment_resource_test.go +++ b/internal/services/nginx/nginx_deployment_resource_test.go @@ -105,7 +105,7 @@ func (a DeploymentResource) basic(data acceptance.TestData) string { resource "azurerm_nginx_deployment" "test" { name = "acctest-%[2]d" resource_group_name = azurerm_resource_group.test.name - sku = "standard_Monthly" + sku = "standardv2_Monthly" location = azurerm_resource_group.test.location diagnose_support_enabled = false automatic_upgrade_channel = "stable" @@ -138,7 +138,7 @@ func (a DeploymentResource) basicAutoscaling(data acceptance.TestData) string { resource "azurerm_nginx_deployment" "test" { name = "acctest-%[2]d" resource_group_name = azurerm_resource_group.test.name - sku = "standard_Monthly" + sku = "standardv2_Monthly" location = azurerm_resource_group.test.location diagnose_support_enabled = false automatic_upgrade_channel = "stable" @@ -181,7 +181,7 @@ func (a DeploymentResource) basicAutoscaling_update(data acceptance.TestData) st resource "azurerm_nginx_deployment" "test" { name = "acctest-%[2]d" resource_group_name = azurerm_resource_group.test.name - sku = "standard_Monthly" + sku = "standardv2_Monthly" location = azurerm_resource_group.test.location diagnose_support_enabled = false automatic_upgrade_channel = "stable" @@ -224,7 +224,7 @@ func (a DeploymentResource) update(data acceptance.TestData) string { resource "azurerm_nginx_deployment" "test" { name = "acctest-%[2]d" resource_group_name = azurerm_resource_group.test.name - sku = "standard_Monthly" + sku = "standardv2_Monthly" location = azurerm_resource_group.test.location diagnose_support_enabled = false @@ -256,7 +256,7 @@ func (a DeploymentResource) systemAssignedIdentity(data acceptance.TestData) str resource "azurerm_nginx_deployment" "test" { name = "acctest-%[2]d" resource_group_name = azurerm_resource_group.test.name - sku = "standard_Monthly" + sku = "standardv2_Monthly" location = azurerm_resource_group.test.location identity { @@ -293,7 +293,7 @@ resource "azurerm_user_assigned_identity" "test" { resource "azurerm_nginx_deployment" "test" { name = "acctest-%[2]d" resource_group_name = azurerm_resource_group.test.name - sku = "standard_Monthly" + sku = "standardv2_Monthly" location = azurerm_resource_group.test.location identity { From 420ae0d8fcb5b459a7c033adc60ddf9186c91063 Mon Sep 17 00:00:00 2001 From: sarna Date: Fri, 13 Sep 2024 18:19:23 -0700 Subject: [PATCH 3/4] Drop possible SKU value fron NGINXaaS datasource The data source documentation does not need to tell the user for the possible values of a field as it is not an input and the user will see the value once they run the datasource itself. --- website/docs/d/nginx_deployment.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/d/nginx_deployment.html.markdown b/website/docs/d/nginx_deployment.html.markdown index bf8d68812b6c..4b8d11f8bb4e 100644 --- a/website/docs/d/nginx_deployment.html.markdown +++ b/website/docs/d/nginx_deployment.html.markdown @@ -63,7 +63,7 @@ In addition to the Arguments listed above - the following Attributes are exporte * `nginx_version` - NGINX version of the Deployment. -* `sku` - The NGINX Deployment SKU. Possible values include `standard_Monthly`. +* `sku` - The NGINX Deployment SKU. * `automatic_upgrade_channel` - The automatic upgrade channel for this NGINX deployment. From 7538a1ff0923ca44aa3c78f7615198cd1907afe0 Mon Sep 17 00:00:00 2001 From: sarna Date: Fri, 13 Sep 2024 18:21:05 -0700 Subject: [PATCH 4/4] Update docs with new NGINXaaS SKU With the deprecation of standard_Monthly SKU, we want users to start using the new `standardv2_Monthly` SKU while we work on retiring the old one. With that in mind, we'd like our users to see just latest supported SKUs. --- website/docs/r/nginx_deployment.html.markdown | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/website/docs/r/nginx_deployment.html.markdown b/website/docs/r/nginx_deployment.html.markdown index 9d9a61b20c73..ba645f469acb 100644 --- a/website/docs/r/nginx_deployment.html.markdown +++ b/website/docs/r/nginx_deployment.html.markdown @@ -57,7 +57,7 @@ resource "azurerm_subnet" "example" { resource "azurerm_nginx_deployment" "example" { name = "example-nginx" resource_group_name = azurerm_resource_group.example.name - sku = "standard_Monthly" + sku = "standardv2_Monthly" location = azurerm_resource_group.example.location managed_resource_group = "example" diagnose_support_enabled = true @@ -86,7 +86,7 @@ The following arguments are supported: * `location` - (Required) The Azure Region where the NGINX Deployment should exist. Changing this forces a new NGINX Deployment to be created. -* `sku` - (Required) Specifies the NGINX Deployment SKU. Possible values are `standardv2_Monthly`, `standard_Monthly`, `basic_Monthly`. Changing this forces a new resource to be created. +* `sku` - (Required) Specifies the NGINX Deployment SKU. Possible values are `standardv2_Monthly`, `basic_Monthly`. Changing this forces a new resource to be created. -> **NOTE:** If you are setting the `sku` to `basic_Monthly`, you cannot specify a `capacity` or `auto_scale_profile`; basic plans do not support scaling. Other `sku`s require either `capacity` or `auto_scale_profile`. If you're using `basic_Monthly` with deployments created before v4.0, you may need to use [Terraform's `ignore_changes` functionality](https://www.terraform.io/language/meta-arguments/lifecycle#ignore_changes) to ignore changes to the `capacity` field.