azurerm_virtual_network_peering - update to use go-azure-sdk package
#26065
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
stephybun
requested changes
May 27, 2024
There was a problem hiding this comment.
Thanks @neil-yechenwei. I left some comments around consistency and making sure to use Create/Update/Delete ThenPoll methods. Could you please fix those up?
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| locks.ByID(virtualNetworkPeeringResourceType) | ||
| defer locks.UnlockByID(virtualNetworkPeeringResourceType) | ||
|
|
||
| existing, err := client.Get(ctx, id.ResourceGroup, id.VirtualNetworkName, id.Name) | ||
| existing, err := client.Get(ctx, pointer.From(id)) |
There was a problem hiding this comment.
Suggested change
| existing, err := client.Get(ctx, pointer.From(id)) | |
| existing, err := client.Get(ctx, *id) |
| if err != nil { | ||
| return fmt.Errorf("retrieving %s: %+v", *id, err) | ||
| } | ||
|
|
||
| if existing.Model == nil || existing.Model.Properties == nil { | ||
| return fmt.Errorf("retrieving %s: `properties` was nil", pointer.From(id)) |
There was a problem hiding this comment.
Suggested change
| return fmt.Errorf("retrieving %s: `properties` was nil", pointer.From(id)) | |
| return fmt.Errorf("retrieving %s: `properties` was nil", *id) |
| } | ||
| } | ||
|
|
||
| future, err := client.CreateOrUpdate(ctx, id.ResourceGroup, id.VirtualNetworkName, id.Name, existing, network.SyncRemoteAddressSpaceTrue) | ||
| future, err := client.CreateOrUpdate(ctx, pointer.From(id), pointer.From(existing.Model), virtualnetworkpeerings.CreateOrUpdateOperationOptions{SyncRemoteAddressSpace: pointer.To(virtualnetworkpeerings.SyncRemoteAddressSpaceTrue)}) |
There was a problem hiding this comment.
Suggested change
| future, err := client.CreateOrUpdate(ctx, pointer.From(id), pointer.From(existing.Model), virtualnetworkpeerings.CreateOrUpdateOperationOptions{SyncRemoteAddressSpace: pointer.To(virtualnetworkpeerings.SyncRemoteAddressSpaceTrue)}) | |
| if err := client.CreateOrUpdate(ctx, *id, *existing.Model, virtualnetworkpeerings.CreateOrUpdateOperationOptions{SyncRemoteAddressSpace: pointer.To(virtualnetworkpeerings.SyncRemoteAddressSpaceTrue)}); err != nil { |
| if err != nil { | ||
| return fmt.Errorf("updating %s: %+v", *id, err) | ||
| } | ||
| if err := future.WaitForCompletionRef(ctx, client.Client); err != nil { | ||
| if err := future.Poller.PollUntilDone(ctx); err != nil { |
There was a problem hiding this comment.
Should be able to replace this by the CreateOrUpdateThenPoll method
Suggested change
| if err := future.Poller.PollUntilDone(ctx); err != nil { |
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| resp, err := client.Get(ctx, id.ResourceGroup, id.VirtualNetworkName, id.Name) | ||
| resp, err := client.Get(ctx, pointer.From(id)) |
There was a problem hiding this comment.
Suggested change
| resp, err := client.Get(ctx, pointer.From(id)) | |
| resp, err := client.Get(ctx, *id) |
| if err != nil { | ||
| return fmt.Errorf("deleting %s: %+v", *id, err) | ||
| } | ||
|
|
||
| if err = future.WaitForCompletionRef(ctx, client.Client); err != nil { | ||
| if err = future.Poller.PollUntilDone(ctx); err != nil { |
There was a problem hiding this comment.
Suggested change
| if err = future.Poller.PollUntilDone(ctx); err != nil { |
| if err != nil { | ||
| return nil, err | ||
| } | ||
| resp, err := clients.Network.VnetPeeringsClient.Get(ctx, id.ResourceGroup, id.VirtualNetworkName, id.Name) | ||
| resp, err := clients.Network.VirtualNetworkPeerings.Get(ctx, pointer.From(id)) |
There was a problem hiding this comment.
Suggested change
| resp, err := clients.Network.VirtualNetworkPeerings.Get(ctx, pointer.From(id)) | |
| resp, err := clients.Network.VirtualNetworkPeerings.Get(ctx, *id) |
| if err != nil { | ||
| return nil, fmt.Errorf("reading %s: %+v", *id, err) | ||
| } | ||
|
|
||
| return utils.Bool(resp.ID != nil), nil | ||
| return utils.Bool(resp.Model != nil), nil |
There was a problem hiding this comment.
Suggested change
| return utils.Bool(resp.Model != nil), nil | |
| return pointer.To(resp.Model != nil), nil |
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| future, err := client.Network.VnetPeeringsClient.Delete(ctx, id.ResourceGroup, id.VirtualNetworkName, id.Name) | ||
| future, err := client.Network.VirtualNetworkPeerings.Delete(ctx, pointer.From(id)) |
There was a problem hiding this comment.
Suggested change
| future, err := client.Network.VirtualNetworkPeerings.Delete(ctx, pointer.From(id)) | |
| if err := client.Network.VirtualNetworkPeerings.DeleteThenPoll(ctx, *id); err != nil { |
| if err != nil { | ||
| return nil, fmt.Errorf("deleting on virtual network peering: %+v", err) | ||
| } | ||
|
|
||
| if err = future.WaitForCompletionRef(ctx, client.Network.VnetPeeringsClient.Client); err != nil { | ||
| if err = future.Poller.PollUntilDone(ctx); err != nil { |
There was a problem hiding this comment.
Suggested change
| if err = future.Poller.PollUntilDone(ctx); err != nil { |
|
@stephybun , thanks for the comments. I updated PR. Please take another look. Below is the latest test result I just now triggered.
|
stephybun
approved these changes
May 27, 2024
|
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
Service team is requesting new feature Subnet Peering and this feature only exists in API version 2023-11-01. So we have to update resource to use go-azure-sdk package first and then upgrade API version to 2023-11-01.
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.
azurerm_virtual_network_peering- update to usego-azure-sdkpackageThis is a (please select all that apply):
Note
If this PR changes meaningfully during the course of review please update the title and description as required.