New Resource: azurerm_network_watcher_flow_log (#5059)

continuation of #2262 fixes #1776
hashicorp · Dec 18, 2019 · 8f991ff · 8f991ff
1 parent 597e155
commit 8f991ff
Show file tree

Hide file tree

Showing 9 changed files with 1,069 additions and 6 deletions.
diff --git a/azurerm/provider.go b/azurerm/provider.go
@@ -385,6 +385,7 @@ func Provider() terraform.ResourceProvider {
 		"azurerm_network_profile":                                                        resourceArmNetworkProfile(),
 		"azurerm_network_security_group":                                                 resourceArmNetworkSecurityGroup(),
 		"azurerm_network_security_rule":                                                  resourceArmNetworkSecurityRule(),
+		"azurerm_network_watcher_flow_log":                                               resourceArmNetworkWatcherFlowLog(),
 		"azurerm_network_watcher":                                                        resourceArmNetworkWatcher(),
 		"azurerm_netapp_account":                                                         resourceArmNetAppAccount(),
 		"azurerm_netapp_pool":                                                            resourceArmNetAppPool(),

diff --git a/azurerm/resource_arm_network_connection_monitor_test.go b/azurerm/resource_arm_network_connection_monitor_test.go
@@ -374,7 +374,7 @@ func testCheckAzureRMNetworkConnectionMonitorDestroy(s *terraform.State) error {
 func testAccAzureRMNetworkConnectionMonitor_baseConfig(rInt int, location string) string {
 	return fmt.Sprintf(`
 resource "azurerm_resource_group" "test" {
-  name     = "acctestRG-%d"
+  name     = "acctestRG-watcher-%d"
   location = "%s"
 }
 

diff --git a/azurerm/resource_arm_network_packet_capture_test.go b/azurerm/resource_arm_network_packet_capture_test.go
@@ -204,7 +204,7 @@ func testCheckAzureRMNetworkPacketCaptureDestroy(s *terraform.State) error {
 func testAzureRMNetworkPacketCapture_base(rInt int, location string) string {
 	return fmt.Sprintf(`
 resource "azurerm_resource_group" "test" {
-  name     = "acctestRG-%d"
+  name     = "acctestRG-watcher-%d"
   location = "%s"
 }
 

diff --git a/azurerm/resource_arm_network_watcher.go b/azurerm/resource_arm_network_watcher.go
@@ -21,6 +21,7 @@ func resourceArmNetworkWatcher() *schema.Resource {
 		Read:   resourceArmNetworkWatcherRead,
 		Update: resourceArmNetworkWatcherCreateUpdate,
 		Delete: resourceArmNetworkWatcherDelete,
+
 		Importer: &schema.ResourceImporter{
 			State: schema.ImportStatePassthrough,
 		},