azurerm_virtual_network_gateway - update the resource with existing Nat Rules
#25690
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
neil-yechenwei
force-pushed
the
fixvnetgwnatrule
branch
from
773611b to
2a6c53b
Compare
neil-yechenwei
force-pushed
the
fixvnetgwnatrule
branch
from
f01a77e to
a7284af
Compare
neil-yechenwei
force-pushed
the
fixvnetgwnatrule
branch
from
9343cd0 to
a7284af
Compare
jackofallops
requested changes
Apr 24, 2024
There was a problem hiding this comment.
Hi @neil-yechenwei - Thanks for this PR. It looks OK in principal, but since the resource uses a combined CreateUpdate the code will fail to check the err as it stands. Can you take a look at reworking this to ensure that error handling for the Get is performed for both call types?
Thanks!
| @@ -657,8 +657,8 @@ func resourceVirtualNetworkGatewayCreateUpdate(d *pluginsdk.ResourceData, meta i | |||
|
|
|||
| id := parse.NewVirtualNetworkGatewayID(subscriptionId, d.Get("resource_group_name").(string), d.Get("name").(string)) | |||
|
|
|||
| existing, err := client.Get(ctx, id.ResourceGroup, id.Name) | |||
There was a problem hiding this comment.
This will not handle the value for err in the update case, can you take a look at implementing differently to make sure error checking is done in both cases?
|
@jackofallops , thanks for the comments. I updated PR. Please take another look. The test cases in below latest test result that I just now re-triggered are also failed with same error in Teamcity Daily run. So they're not related with this PR.
|
jackofallops
approved these changes
Apr 25, 2024
There was a problem hiding this comment.
Hi @neil-yechenwei - Thanks for the changes, this LGTM now 👍
jackofallops
added a commit
that referenced
this pull request
Apr 25, 2024
dduportal
referenced
this pull request
in jenkins-infra/azure
Apr 26, 2024
<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.100.0" to "3.101.0" in file
".terraform.lock.hcl"</p>
<details>
<summary>3.101.0</summary>
<pre>Changelog retrieved
from:
	https://github.com/hashicorp/terraform-provider-azurerm/releases/tag/v3.101.0
ENHANCEMENTS:

*
dependencies: updating to `v0.20240424.1114424` of
`github.com/hashicorp/go-azure-sdk`
([#25749](hashicorp/terraform-provider-azurerm#25749
dependencies: updating to `v0.27.0` of
`github.com/tombuildsstuff/giovanni`
([#25702](hashicorp/terraform-provider-azurerm#25702
dependencies: updating `golang.org/x/net` to `0.23.0`
*
`azurerm_cognitive_account` - the `kind` property now supports
`ConversationalLanguageUnderstanding`
([#25735](hashicorp/terraform-provider-azurerm#25735
`azurerm_container_app_custom_domain` - support the ability to use Azure
Managed Certificates
([#25356](https://github.com/hashicorp/terraform-provider-azurerm/issues/25356))

BUG
FIXES:

* Data Source: `azurerm_application_insights` - set
correct AppID in data source
([#25687](hashicorp/terraform-provider-azurerm#25687
`azurerm_virtual_network` - suppress diff in ordering for
`address_space` due to inconsistent API response
([#23793](hashicorp/terraform-provider-azurerm#23793
`azurerm_storage_data_lake_gen2_filesystem` - add context deadline for
import
([#25712](hashicorp/terraform-provider-azurerm#25712
`azurerm_virtual_network_gateway` - preserve existing `nat_rules` on
updates
([#25690](https://github.com/hashicorp/terraform-provider-azurerm/issues/25690))


</pre>
</details>
</details>
<a
href="https://infra.ci.jenkins.io/job/updatecli/job/azure/job/main/135/">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>
Co-authored-by: Jenkins Infra Bot (updatecli) <[email protected]>
|
I'm going to lock this pull request because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active contributions. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Community Note
Description
Currently,
azurerm_virtual_network_gatewaywould always delete the nat rules of Virtual Network Gateway when updating any property of Virtual Network Gateway. Because the nat rules of Virtual Network Gateway is managed byazurerm_virtual_network_gateway_nat_ruleandazurerm_virtual_network_gatewaydoesn't handle the nat rule in the update operation so thatazurerm_virtual_network_gatewaywould always delete the nat rules.The test cases in below latest test result are also failed with same error in Teamcity Daily run. So they're not related with this PR.
PR Checklist
For example: “
resource_name_here- description of change e.g. adding propertynew_property_name_here”Changes to existing Resource / Data Source
Testing
Change Log
Below please provide what should go into the changelog (if anything) conforming to the Changelog Format documented here.
This is a (please select all that apply):
Related Issue(s)
Fixes #25683
Note
If this PR changes meaningfully during the course of review please update the title and description as required.