Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

azurerm_network_connection_monitor - support coverage_level, excluded_ip_addresses, included_ip_addresses, target_resource_id, resource_type #11540

Merged
merged 17 commits into from
May 7, 2021
Merged

azurerm_network_connection_monitor - support coverage_level, excluded_ip_addresses, included_ip_addresses, target_resource_id, resource_type #11540

merged 17 commits into from
May 7, 2021

Conversation

neil-yechenwei
Copy link
Contributor

fixes #10423

neil-yechenwei added 2 commits April 30, 2021 17:23
@ghost ghost added size/L and removed size/M labels Apr 30, 2021
@manicminer manicminer added this to the v2.58.0 milestone Apr 30, 2021
manicminer
manicminer suggested changes Apr 30, 2021
View reviewed changes
Copy link
Contributor

@manicminer manicminer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @neil-yechenwei, thanks for this PR, this is off to a good start. I have some comments inline with some schema changes, a question around the default value for the type property, and a test naming tweak. If we can get these fixed up and the tests pass, then this should be good to merge. Thanks!

azurerm/internal/services/network/network_connection_monitor_resource.go Show resolved Hide resolved
azurerm/internal/services/network/network_connection_monitor_resource.go Show resolved Hide resolved
azurerm/internal/services/network/network_connection_monitor_resource.go Outdated Show resolved Hide resolved
azurerm/internal/services/network/network_connection_monitor_resource.go Show resolved Hide resolved
azurerm/internal/services/network/network_connection_monitor_resource.go Show resolved Hide resolved
website/docs/r/network_connection_monitor.html.markdown Outdated Show resolved Hide resolved
azurerm/internal/services/network/network_connection_monitor_resource_test.go Outdated Show resolved Hide resolved
azurerm/internal/services/network/network_connection_monitor_resource_test.go Outdated Show resolved Hide resolved
azurerm/internal/services/network/network_connection_monitor_resource_test.go Outdated Show resolved Hide resolved
azurerm/internal/services/network/network_connection_monitor_resource_test.go Outdated Show resolved Hide resolved
manicminer
manicminer reviewed Apr 30, 2021
View reviewed changes
azurerm/internal/services/network/network_connection_monitor_resource.go Outdated
"virtual_machine_id": resourceId,
"name": name,
"address": address,
"resource_id": resourceId,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should set virtual_machine_id too whilst it's still in the schema

Copy link
Contributor Author

@neil-yechenwei neil-yechenwei Apr 30, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

After tested, there is diff when the virtual_machine_id property isn't specified in tf config file but it is set in state file. Seems Computed: true doesn't work in TypeSet. So I have to not set it in state file. Otherwise, test case would fail.

@ghost ghost added size/XL and removed size/L labels Apr 30, 2021
neil-yechenwei added 2 commits May 1, 2021 01:03
katbyte
katbyte requested changes May 4, 2021
View reviewed changes
Copy link
Collaborator

@katbyte katbyte left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @neil-yechenwei - overall this looks good and i've left some comments inline to address

azurerm/internal/services/network/network_connection_monitor_resource.go Outdated Show resolved Hide resolved
azurerm/internal/services/network/network_connection_monitor_resource.go Outdated Show resolved Hide resolved
azurerm/internal/services/network/network_connection_monitor_resource.go Outdated Show resolved Hide resolved
azurerm/internal/services/network/network_connection_monitor_resource.go Outdated Show resolved Hide resolved
@ghost ghost added size/L and removed size/XL labels May 4, 2021
@neil-yechenwei
Copy link
Contributor Author

neil-yechenwei commented May 6, 2021 •
edited
Loading

All test cases related with network connection monitor are passed.

--- PASS: TestAccNetworkWatcher/ConnectionMonitor (0.00s)
 --- PASS: TestAccNetworkWatcher/ConnectionMonitor/addressComplete (565.49s)
 --- PASS: TestAccNetworkWatcher/ConnectionMonitor/endpointType (846.89s)
 --- PASS: TestAccNetworkWatcher/ConnectionMonitor/addressUpdate (791.42s)
 --- PASS: TestAccNetworkWatcher/ConnectionMonitor/addressBasic (637.21s)
 --- PASS: TestAccNetworkWatcher/ConnectionMonitor/vmBasic (576.77s)
 --- PASS: TestAccNetworkWatcher/ConnectionMonitor/vmComplete (571.58s)
 --- PASS: TestAccNetworkWatcher/ConnectionMonitor/vmUpdate (669.77s)
 --- PASS: TestAccNetworkWatcher/ConnectionMonitor/updateEndpoint (738.12s)
 --- PASS: TestAccNetworkWatcher/ConnectionMonitor/destinationUpdate (943.69s)
 --- PASS: TestAccNetworkWatcher/ConnectionMonitor/missingDestinationInvalid (489.24s)
 --- PASS: TestAccNetworkWatcher/ConnectionMonitor/bothDestinationsInvalid (664.20s)
 --- PASS: TestAccNetworkWatcher/ConnectionMonitor/requiresImport (577.80s)
 --- PASS: TestAccNetworkWatcher/ConnectionMonitor/icmpConfiguration (550.92s)
 --- PASS: TestAccNetworkWatcher/ConnectionMonitor/bothAddressAndVirtualMachineId (619.22s)
 --- PASS: TestAccNetworkWatcher/ConnectionMonitor/httpConfiguration (575.81s)

@ghost ghost removed the waiting-response label May 6, 2021
neil-yechenwei added 2 commits May 6, 2021 09:11
@ghost ghost added size/XL and removed size/L labels May 6, 2021
@neil-yechenwei
Copy link
Contributor Author

@katbyte & @manicminer , thanks for your comments. I've updated code. Please have an another look. Thanks.

@katbyte katbyte changed the title Support MMAWorkspaceMachine as endpoint type for azurerm_network_connection_monitor azurerm_network_connection_monitor - support coverage_level, excluded_ip_addresses, included_ip_addresses, target_resource_id, resource_type May 6, 2021
katbyte
katbyte approved these changes May 6, 2021
View reviewed changes
Copy link
Collaborator

@katbyte katbyte left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @neil-yechenwei - aside from one comment this is looking good!

azurerm/internal/services/network/network_connection_monitor_resource.go Outdated Show resolved Hide resolved
@neil-yechenwei
Copy link
Contributor Author

@katbyte , thanks for your comment. I've updated the code. Please have an another look. Thanks.

@ghost ghost removed the waiting-response label May 7, 2021
@neil-yechenwei neil-yechenwei requested a review from katbyte May 7, 2021 01:26
katbyte
katbyte approved these changes May 7, 2021
View reviewed changes
Copy link
Collaborator

@katbyte katbyte left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @neil-yechenwei - LGTM 👍

@katbyte katbyte merged commit d5412c4 into hashicorp:master May 7, 2021
katbyte added a commit that referenced this pull request May 7, 2021
@katbyte
CHANGELOG.md for #11540
fc15ec1
@ghost
Copy link

ghost commented May 7, 2021

This has been released in version 2.58.0 of the provider. Please see the Terraform documentation on provider versioning or reach out if you need any assistance upgrading. As an example:

provider "azurerm" {
    version = "~> 2.58.0"
}
# ... other configuration ...

favoretti pushed a commit to gro1m/terraform-provider-azurerm that referenced this pull request May 26, 2021
@favoretti
azurerm_network_connection_monitor - support coverage_level, `exclu…
358a0cf 
…ded_ip_addresses`, `included_ip_addresses`, `target_resource_id`, `resource_type` (hashicorp#11540)

fixes hashicorp#10423
favoretti pushed a commit to gro1m/terraform-provider-azurerm that referenced this pull request May 26, 2021
@katbyte @favoretti
CHANGELOG.md for hashicorp#11540
d2412e7
@github-actions
Copy link

github-actions bot commented Jun 7, 2021

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.
If you have found a problem that seems related to this change, please open a new issue and complete the issue template so we can capture all the details necessary to investigate further.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jun 7, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@katbyte katbyte katbyte approved these changes

@manicminer manicminer Awaiting requested review from manicminer

Assignees
No one assigned
Labels
documentation enhancement service/network-watcher size/XL
Projects
None yet
Milestone
v2.58.0
Development

Successfully merging this pull request may close these issues.

Support for MMAWorkspaceMachine as endpoint type for azurerm_network_connection_monitor
3 participants
@neil-yechenwei @manicminer @katbyte