Restore azurerm_nginx_configuration resource and data source #25773

valyria257 · 2024-04-26T15:54:42Z

There are a couple of things here:

The default configuration/import error issue was resolved. See changelog from March 13, 2024
This is a breaking change from a product use-case perspective as it breaks our HTTPS use-case where in the workflow is:
1. Create deployment.
2. Create certificate.
3. Create configuration.

With configuration now being inline, the use workflow breaks as 1 and 3 cannot be separated.

certificates should also not be inline since different roles may mange deployments, certificates, and configurations separately

To fix this, the change to remove the azurerm_nginx_configuration is reverted, and the field that was added to replace it is deprecated.

puneetsarna · 2024-04-30T15:07:07Z

internal/services/nginx/nginx_deployment_resource.go

+		"tags": commonschema.Tags(),
+	}
+
+	if !features.FourPointOhBeta() {


is this how features are deprecated in TF? I have not looked at this function but I vaguely remember that this was for breaking changes when the provider gets a 4.0 bumped.

Good question! I got that from this contributing guide: https://github.com/hashicorp/terraform-provider-azurerm/blob/main/contributing/topics/guide-new-fields-to-resource.md#renaming-and-deprecating-a-property, but could use some direction here if there's a different way.

Thanks for sharing this 👍

internal/services/nginx/nginx_configuration_resource_test.go

stephybun

Thanks for this PR @valyria257! Overall this looks fine, the tests are running. I left a few very minor comments around consistency and formatting, would you mind fixing those up? Once that's done and the tests are green this should be good to go!

internal/services/nginx/nginx_deployment_resource.go

internal/services/nginx/nginx_configuration_resource_test.go

website/docs/r/nginx_configuration.html.markdown

stephybun

Thanks @valyria257. Quite a lot of the tests have been failing for a while with the same error message which prevents us from validating the changes made in this PR. Would you be able to take a look at this?

------- Stdout: -------
=== RUN   TestAccConfiguration_basic
=== PAUSE TestAccConfiguration_basic
=== CONT  TestAccConfiguration_basic
    testcase.go:113: Step 1/2 error: Error running apply: exit status 1
        Error: creating Nginx Deployment (Subscription: "*******"
        Resource Group Name: "acctestRG-auto-240530144011976922"
        Nginx Deployment Name: "acctest-240530144011976922"): polling after DeploymentsCreateOrUpdate: polling failed: the Azure API returned the following error:
        Status: "Failed"
        Code: "MissingManagedIdentity"
        Message: "The NGINXaaS deployment is missing a managed identity. Add a managed identity and try again. If you want to contact F5 NGINX support please open a request at https://my.f5.com/manage/s/
        Activity Id: ""

…ashicorp#24276)" This reverts commit 7a1f9f7.

The NGINXaaS API now requires a managed identity to be added to the depoyment if metrics are enabled. This updates tests which do not have an identity to set diagnose_support_enabled to false.

Now that the NGINXaaS API does not provide a default config, we need to ensure the resource gets created before referencing the data source, so we don't get config not found errors.

valyria257 · 2024-06-03T18:32:39Z

@stephybun the nginx acceptance tests should now all pass. Please let me know if you see any other errors, thanks!

stephybun

Thanks @valyria257 LGTM 👍

<Actions> <action id="f410411e63aff4bb73a81c2aec1d373cf8a903e63b30dee2006b0030d8a94cc8"> <h3>Bump Terraform `azurerm` provider version</h3> <details id="1d9343c012f5434ac9fe8a98135bae3667b399259be16d9b14302ea3bd424a24"> <summary>Update Terraform lock file</summary> <p>changes detected:
	"hashicorp/azurerm" updated from "3.104.2" to "3.107.0" in file ".terraform.lock.hcl"</p> <details> <summary>3.107.0</summary> <pre>Changelog retrieved from:
	https://github.com/hashicorp/terraform-provider-azurerm/releases/tag/v3.107.0
FEATURES:

* **New Resource:** `azurerm_data_protection_backup_policy_postgresql_flexible_server` ([#26024](https://github.com/hashicorp/terraform-provider-azurerm/issues/26024))

ENHANCEMENTS:

* dependencies: updating to `v0.20240604.1114748` of `github.com/hashicorp/go-azure-sdk` ([#26216](https://github.com/hashicorp/terraform-provider-azurerm/issues/26216))
* `advisor`: update API version to `2023-01-01` ([#26205](https://github.com/hashicorp/terraform-provider-azurerm/issues/26205))
* `keyvault`: handling the Resources API returning Key Vaults that have been deleted when populating the cache ([#26199](https://github.com/hashicorp/terraform-provider-azurerm/issues/26199))
* `machinelearning`: update API version to `2024-04-01` ([#26168](https://github.com/hashicorp/terraform-provider-azurerm/issues/26168))
* `network/privatelinkservices` - update to use `hashicorp/go-azure-sdk` ([#26212](https://github.com/hashicorp/terraform-provider-azurerm/issues/26212))
* `network/serviceendpointpolicies` - update to use `hashicorp/go-azure-sdk` ([#26196](https://github.com/hashicorp/terraform-provider-azurerm/issues/26196))
* `network/virtualnetworks` - update to use `hashicorp/go-azure-sdk` ([#26217](https://github.com/hashicorp/terraform-provider-azurerm/issues/26217))
* `network/virtualwans`: update route resources to use `hashicorp/go-azure-sdk` ([#26189](https://github.com/hashicorp/terraform-provider-azurerm/issues/26189))
* `azurerm_container_app_job` - support for the `key_vault_secret_id` and `identity` properties in the `secret` block ([#25969](https://github.com/hashicorp/terraform-provider-azurerm/issues/25969))
* `azurerm_kubernetes_cluster` - support forthe `dns_zone_ids` popperty in the `web_app_routing` block ([#26117](https://github.com/hashicorp/terraform-provider-azurerm/issues/26117))
* `azurerm_notification_hub_authorization_rule` - support for the `primary_connection_string` and `secondary_connection_string` properties ([#26188](https://github.com/hashicorp/terraform-provider-azurerm/issues/26188))
* `azurerm_subnet` - support for the `default_outbound_access_enabled` property ([#25259](https://github.com/hashicorp/terraform-provider-azurerm/issues/25259))

BUG FIXES:

* `azurerm_api_management_named_value` - will now enforce setting the `secret` property when setting the `value_from_key_vault` property ([#26150](https://github.com/hashicorp/terraform-provider-azurerm/issues/26150))
* `azurerm_storage_sync_server_endpoint` - improve pooling to work around api inconsistencies ([#26204](https://github.com/hashicorp/terraform-provider-azurerm/issues/26204))
* `azurerm_virtual_network` - split create and update function to fix lifecycle - ignore ([#26246](https://github.com/hashicorp/terraform-provider-azurerm/issues/26246))
* `azurerm_vpn_server_configuration` - split create and update function to fix lifecycle - ignore ([#26175](https://github.com/hashicorp/terraform-provider-azurerm/issues/26175))
* `azurerm_vpn_server_configuration_policy_group` - split create and update function to fix lifecycle - ignore ([#26207](https://github.com/hashicorp/terraform-provider-azurerm/issues/26207))
* `azurerm_vpn_site` - split create and update function to fix lifecycle - ignore changes ([#26163](https://github.com/hashicorp/terraform-provider-azurerm/issues/26163))

DEPRECATIONS:

* `azurerm_kubernetes_cluster` - the property `dns_zone_id` has been superseded by the property `dns_zone_ids` in the `web_app_routing` block ([#26117](https://github.com/hashicorp/terraform-provider-azurerm/issues/26117))
* `azurerm_nginx_deployment` - the block `configuration` has been deprecated and superseded by the resource `azurerm_nginx_configuration` ([#25773](https://github.com/hashicorp/terraform-provider-azurerm/issues/25773))


</pre> </details> </details> <a href="https://infra.ci.jenkins.io/job/updatecli/job/azure/job/main/229/">Jenkins pipeline link</a> </action> </Actions> --- <table> <tr> <td width="77"> <img src="https://www.updatecli.io/images/updatecli.png" alt="Updatecli logo" width="50" height="50"> </td> <td> <p> Created automatically by <a href="https://www.updatecli.io/">Updatecli</a> </p> <details><summary>Options:</summary> <br /> <p>Most of Updatecli configuration is done via <a href="https://www.updatecli.io/docs/prologue/quick-start/">its manifest(s)</a>.</p> <ul> <li>If you close this pull request, Updatecli will automatically reopen it, the next time it runs.</li> <li>If you close this pull request and delete the base branch, Updatecli will automatically recreate it, erasing all previous commits made.</li> </ul> <p> Feel free to report any issues at <a href="https://github.com/updatecli/updatecli/issues">github.com/updatecli/updatecli</a>.<br /> If you find this tool useful, do not hesitate to star <a href="https://github.com/updatecli/updatecli/stargazers">our GitHub repository</a> as a sign of appreciation, and/or to tell us directly on our <a href="https://matrix.to/#/#Updatecli_community:gitter.im">chat</a>! </p> </details> </td> </tr> </table> --------- Signed-off-by: Damien Duportal <damien.duportal@gmail.com> Co-authored-by: Jenkins Infra Bot (updatecli) <60776566+jenkins-infra-bot@users.noreply.github.com> Co-authored-by: Damien Duportal <damien.duportal@gmail.com>

github-actions bot added documentation service/nginx size/XL labels Apr 26, 2024

valyria257 mentioned this pull request Apr 26, 2024

Restore azurerm_nginx_configuration resource and data source #25740

Closed

github-actions bot added the waiting-response label Apr 29, 2024

puneetsarna reviewed Apr 30, 2024

View reviewed changes

valyria257 force-pushed the nlb-4727-revert-config branch from b90c439 to 8c26599 Compare April 30, 2024 16:04

github-actions bot removed the waiting-response label Apr 30, 2024

valyria257 marked this pull request as ready for review April 30, 2024 16:34

github-actions bot added the waiting-response label May 6, 2024

valyria257 force-pushed the nlb-4727-revert-config branch from 8c26599 to 10fad15 Compare May 20, 2024 20:23

github-actions bot removed the waiting-response label May 20, 2024

valyria257 force-pushed the nlb-4727-revert-config branch from 10fad15 to d939f29 Compare May 22, 2024 19:40

github-actions bot added the waiting-response label May 23, 2024

puneetsarna reviewed May 23, 2024

View reviewed changes

internal/services/nginx/nginx_configuration_resource_test.go Outdated Show resolved Hide resolved

valyria257 force-pushed the nlb-4727-revert-config branch from d939f29 to 689cb09 Compare May 23, 2024 23:59

github-actions bot removed the waiting-response label May 23, 2024

valyria257 force-pushed the nlb-4727-revert-config branch from 689cb09 to b7fe1e9 Compare May 24, 2024 21:18

stephybun requested changes May 30, 2024

View reviewed changes

github-actions bot added the waiting-response label May 30, 2024

valyria257 force-pushed the nlb-4727-revert-config branch from b7fe1e9 to 9b79a7f Compare May 30, 2024 16:27

github-actions bot removed the waiting-response label May 30, 2024

valyria257 requested a review from stephybun May 30, 2024 16:34

stephybun reviewed May 31, 2024

View reviewed changes

github-actions bot added the waiting-response label May 31, 2024

valyria257 added 5 commits June 3, 2024 11:30

Revert "Nginx: embed nginx configuration into deployment resource (h…

e5587de

…ashicorp#24276)" This reverts commit 7a1f9f7.

deprecate configuration field in deployment resource

3fa1a6e

add https use case test with certs and config and fix lint

164a237

fix MissingManagedIdentity error in nginx tests

4833e4c

The NGINXaaS API now requires a managed identity to be added to the depoyment if metrics are enabled. This updates tests which do not have an identity to set diagnose_support_enabled to false.

fix azurerm_nginx_configuration data source test

b0a5c31

Now that the NGINXaaS API does not provide a default config, we need to ensure the resource gets created before referencing the data source, so we don't get config not found errors.

valyria257 force-pushed the nlb-4727-revert-config branch from 9b79a7f to b0a5c31 Compare June 3, 2024 18:30

github-actions bot removed the waiting-response label Jun 3, 2024

stephybun added deprecation enhancement labels Jun 4, 2024

stephybun approved these changes Jun 4, 2024

View reviewed changes

stephybun merged commit 4508704 into hashicorp:main Jun 4, 2024
33 checks passed

github-actions bot added this to the v3.107.0 milestone Jun 4, 2024

stephybun added a commit that referenced this pull request Jun 6, 2024

Update for #25773 #26117 #26212 #26217 #26196 #26189

6c924c5

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Restore azurerm_nginx_configuration resource and data source #25773

Restore azurerm_nginx_configuration resource and data source #25773

valyria257 commented Apr 26, 2024

puneetsarna Apr 30, 2024

valyria257 Apr 30, 2024

puneetsarna May 23, 2024

stephybun left a comment

stephybun left a comment

valyria257 commented Jun 3, 2024

stephybun left a comment

Restore azurerm_nginx_configuration resource and data source #25773

Restore azurerm_nginx_configuration resource and data source #25773

Conversation

valyria257 commented Apr 26, 2024

puneetsarna Apr 30, 2024

Choose a reason for hiding this comment

valyria257 Apr 30, 2024

Choose a reason for hiding this comment

puneetsarna May 23, 2024

Choose a reason for hiding this comment

stephybun left a comment

Choose a reason for hiding this comment

stephybun left a comment

Choose a reason for hiding this comment

valyria257 commented Jun 3, 2024

stephybun left a comment

Choose a reason for hiding this comment