From 0fe12511ac2d31093b28cab273cf248cbf4064ec Mon Sep 17 00:00:00 2001 From: yupwei68 Date: Thu, 28 May 2020 15:20:14 +0800 Subject: [PATCH 1/3] update --- .../network_watcher_flow_log_resource.go | 28 +++++++++++++------ .../network_watcher_flow_log_resource_test.go | 14 +++++----- .../tests/network_watcher_resource_test.go | 14 +++++----- 3 files changed, 34 insertions(+), 22 deletions(-) diff --git a/azurerm/internal/services/network/network_watcher_flow_log_resource.go b/azurerm/internal/services/network/network_watcher_flow_log_resource.go index 798b62d11bb8..5e63972cef34 100644 --- a/azurerm/internal/services/network/network_watcher_flow_log_resource.go +++ b/azurerm/internal/services/network/network_watcher_flow_log_resource.go @@ -304,36 +304,48 @@ func resourceArmNetworkWatcherFlowLogDelete(d *schema.ResourceData, meta interfa return err } - // Get current flow log status + //Get current flow log status statusParameters := network.FlowLogStatusParameters{ TargetResourceID: &id.NetworkSecurityGroupID, } future, err := client.GetFlowLogStatus(ctx, id.ResourceGroup, id.NetworkWatcherName, statusParameters) if err != nil { - return fmt.Errorf("Error getting Flow Log Configuration for target %q (Network Watcher %q / Resource Group %q): %+v", id.NetworkSecurityGroupID, id.NetworkWatcherName, id.ResourceGroup, err) + return fmt.Errorf("getting Flow Log Configuration for target %q (Network Watcher %q / Resource Group %q): %+v", id.NetworkSecurityGroupID, id.NetworkWatcherName, id.ResourceGroup, err) } if err = future.WaitForCompletionRef(ctx, client.Client); err != nil { - return fmt.Errorf("Error waiting for retrieval of Flow Log Configuration for target %q (Network Watcher %q / Resource Group %q): %+v", id.NetworkSecurityGroupID, id.NetworkWatcherName, id.ResourceGroup, err) + return fmt.Errorf("waiting for retrieval of Flow Log Configuration for target %q (Network Watcher %q / Resource Group %q): %+v", id.NetworkSecurityGroupID, id.NetworkWatcherName, id.ResourceGroup, err) } fli, err := future.Result(*client) if err != nil { - return fmt.Errorf("Error retrieving Flow Log Configuration for target %q (Network Watcher %q / Resource Group %q): %+v", id.NetworkSecurityGroupID, id.NetworkWatcherName, id.ResourceGroup, err) + return fmt.Errorf("retrieving Flow Log Configuration for target %q (Network Watcher %q / Resource Group %q): %+v", id.NetworkSecurityGroupID, id.NetworkWatcherName, id.ResourceGroup, err) } - // There is no delete in Azure API. Disabling flow log is effectively a delete in Terraform. + //There is no delete in Azure API. Disabling flow log is effectively a delete in Terraform. if props := fli.FlowLogProperties; props != nil { if props.Enabled != nil && *props.Enabled { props.Enabled = utils.Bool(false) - setFuture, err := client.SetFlowLogConfiguration(ctx, id.ResourceGroup, id.NetworkWatcherName, fli) + param := network.FlowLogInformation{ + TargetResourceID: &id.NetworkSecurityGroupID, + FlowLogProperties: &network.FlowLogProperties{ + StorageID: utils.String(*fli.StorageID), + Enabled: utils.Bool(false), + }, + FlowAnalyticsConfiguration: &network.TrafficAnalyticsProperties{ + NetworkWatcherFlowAnalyticsConfiguration: &network.TrafficAnalyticsConfigurationProperties{ + Enabled: utils.Bool(false), + }, + }, + } + setFuture, err := client.SetFlowLogConfiguration(ctx, id.ResourceGroup, id.NetworkWatcherName, param) if err != nil { - return fmt.Errorf("Error disabling Flow Log Configuration for target %q (Network Watcher %q / Resource Group %q): %+v", id.NetworkSecurityGroupID, id.NetworkWatcherName, id.ResourceGroup, err) + return fmt.Errorf("disabling Flow Log Configuration for target %q (Network Watcher %q / Resource Group %q): %+v", id.NetworkSecurityGroupID, id.NetworkWatcherName, id.ResourceGroup, err) } if err = setFuture.WaitForCompletionRef(ctx, client.Client); err != nil { - return fmt.Errorf("Error waiting for completion of disabling Flow Log Configuration for target %q (Network Watcher %q / Resource Group %q): %+v", id.NetworkSecurityGroupID, id.NetworkWatcherName, id.ResourceGroup, err) + return fmt.Errorf("waiting for completion of disabling Flow Log Configuration for target %q (Network Watcher %q / Resource Group %q): %+v", id.NetworkSecurityGroupID, id.NetworkWatcherName, id.ResourceGroup, err) } } } diff --git a/azurerm/internal/services/network/tests/network_watcher_flow_log_resource_test.go b/azurerm/internal/services/network/tests/network_watcher_flow_log_resource_test.go index 610d6f56750a..ae20941a9312 100644 --- a/azurerm/internal/services/network/tests/network_watcher_flow_log_resource_test.go +++ b/azurerm/internal/services/network/tests/network_watcher_flow_log_resource_test.go @@ -12,7 +12,7 @@ import ( nw "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/network" ) -func testAccAzureRMNetworkWatcherFlowLog_basic(t *testing.T) { +func TestAccAzureRMNetworkWatcherFlowLog_basic(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_network_watcher_flow_log", "test") resource.Test(t, resource.TestCase{ @@ -39,7 +39,7 @@ func testAccAzureRMNetworkWatcherFlowLog_basic(t *testing.T) { }) } -func testAccAzureRMNetworkWatcherFlowLog_disabled(t *testing.T) { +func TestAccAzureRMNetworkWatcherFlowLog_disabled(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_network_watcher_flow_log", "test") resource.Test(t, resource.TestCase{ @@ -66,7 +66,7 @@ func testAccAzureRMNetworkWatcherFlowLog_disabled(t *testing.T) { }) } -func testAccAzureRMNetworkWatcherFlowLog_reenabled(t *testing.T) { +func TestAccAzureRMNetworkWatcherFlowLog_reenabled(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_network_watcher_flow_log", "test") resource.Test(t, resource.TestCase{ @@ -107,7 +107,7 @@ func testAccAzureRMNetworkWatcherFlowLog_reenabled(t *testing.T) { }) } -func testAccAzureRMNetworkWatcherFlowLog_retentionPolicy(t *testing.T) { +func TestAccAzureRMNetworkWatcherFlowLog_retentionPolicy(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_network_watcher_flow_log", "test") resource.Test(t, resource.TestCase{ @@ -149,7 +149,7 @@ func testAccAzureRMNetworkWatcherFlowLog_retentionPolicy(t *testing.T) { }) } -func testAccAzureRMNetworkWatcherFlowLog_updateStorageAccount(t *testing.T) { +func TestAccAzureRMNetworkWatcherFlowLog_updateStorageAccount(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_network_watcher_flow_log", "test") resource.Test(t, resource.TestCase{ @@ -191,7 +191,7 @@ func testAccAzureRMNetworkWatcherFlowLog_updateStorageAccount(t *testing.T) { }) } -func testAccAzureRMNetworkWatcherFlowLog_trafficAnalytics(t *testing.T) { +func TestAccAzureRMNetworkWatcherFlowLog_trafficAnalytics(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_network_watcher_flow_log", "test") resource.Test(t, resource.TestCase{ @@ -290,7 +290,7 @@ func testAccAzureRMNetworkWatcherFlowLog_trafficAnalytics(t *testing.T) { }) } -func testAccAzureRMNetworkWatcherFlowLog_version(t *testing.T) { +func TestAccAzureRMNetworkWatcherFlowLog_version(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_network_watcher_flow_log", "test") resource.Test(t, resource.TestCase{ diff --git a/azurerm/internal/services/network/tests/network_watcher_resource_test.go b/azurerm/internal/services/network/tests/network_watcher_resource_test.go index d54bc015c381..887ba079e829 100644 --- a/azurerm/internal/services/network/tests/network_watcher_resource_test.go +++ b/azurerm/internal/services/network/tests/network_watcher_resource_test.go @@ -54,13 +54,13 @@ func TestAccAzureRMNetworkWatcher(t *testing.T) { "requiresImport": testAccAzureRMNetworkPacketCapture_requiresImport, }, "FlowLog": { - "basic": testAccAzureRMNetworkWatcherFlowLog_basic, - "disabled": testAccAzureRMNetworkWatcherFlowLog_disabled, - "reenabled": testAccAzureRMNetworkWatcherFlowLog_reenabled, - "retentionPolicy": testAccAzureRMNetworkWatcherFlowLog_retentionPolicy, - "updateStorageAccount": testAccAzureRMNetworkWatcherFlowLog_updateStorageAccount, - "trafficAnalytics": testAccAzureRMNetworkWatcherFlowLog_trafficAnalytics, - "version": testAccAzureRMNetworkWatcherFlowLog_version, + "basic": TestAccAzureRMNetworkWatcherFlowLog_basic, + "disabled": TestAccAzureRMNetworkWatcherFlowLog_disabled, + "reenabled": TestAccAzureRMNetworkWatcherFlowLog_reenabled, + "retentionPolicy": TestAccAzureRMNetworkWatcherFlowLog_retentionPolicy, + "updateStorageAccount": TestAccAzureRMNetworkWatcherFlowLog_updateStorageAccount, + "trafficAnalytics": TestAccAzureRMNetworkWatcherFlowLog_trafficAnalytics, + "version": TestAccAzureRMNetworkWatcherFlowLog_version, }, } From d1e4f0de8339975128dd97c0204f873e83788d85 Mon Sep 17 00:00:00 2001 From: yupwei68 Date: Fri, 29 May 2020 09:35:58 +0800 Subject: [PATCH 2/3] remove useless --- .../services/network/network_watcher_flow_log_resource.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azurerm/internal/services/network/network_watcher_flow_log_resource.go b/azurerm/internal/services/network/network_watcher_flow_log_resource.go index 5e63972cef34..605e0239eb91 100644 --- a/azurerm/internal/services/network/network_watcher_flow_log_resource.go +++ b/azurerm/internal/services/network/network_watcher_flow_log_resource.go @@ -304,7 +304,7 @@ func resourceArmNetworkWatcherFlowLogDelete(d *schema.ResourceData, meta interfa return err } - //Get current flow log status + // Get current flow log status statusParameters := network.FlowLogStatusParameters{ TargetResourceID: &id.NetworkSecurityGroupID, } @@ -322,7 +322,7 @@ func resourceArmNetworkWatcherFlowLogDelete(d *schema.ResourceData, meta interfa return fmt.Errorf("retrieving Flow Log Configuration for target %q (Network Watcher %q / Resource Group %q): %+v", id.NetworkSecurityGroupID, id.NetworkWatcherName, id.ResourceGroup, err) } - //There is no delete in Azure API. Disabling flow log is effectively a delete in Terraform. + // There is no delete in Azure API. Disabling flow log is effectively a delete in Terraform. if props := fli.FlowLogProperties; props != nil { if props.Enabled != nil && *props.Enabled { props.Enabled = utils.Bool(false) From fa3bb0e32d8e4e5ba5e70cf3ba8727f1b4db36a9 Mon Sep 17 00:00:00 2001 From: yupwei68 Date: Tue, 9 Jun 2020 10:57:44 +0800 Subject: [PATCH 3/3] revert test --- .../network_watcher_flow_log_resource_test.go | 14 +++++++------- .../network/tests/network_watcher_resource_test.go | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/azurerm/internal/services/network/tests/network_watcher_flow_log_resource_test.go b/azurerm/internal/services/network/tests/network_watcher_flow_log_resource_test.go index ae20941a9312..610d6f56750a 100644 --- a/azurerm/internal/services/network/tests/network_watcher_flow_log_resource_test.go +++ b/azurerm/internal/services/network/tests/network_watcher_flow_log_resource_test.go @@ -12,7 +12,7 @@ import ( nw "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/network" ) -func TestAccAzureRMNetworkWatcherFlowLog_basic(t *testing.T) { +func testAccAzureRMNetworkWatcherFlowLog_basic(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_network_watcher_flow_log", "test") resource.Test(t, resource.TestCase{ @@ -39,7 +39,7 @@ func TestAccAzureRMNetworkWatcherFlowLog_basic(t *testing.T) { }) } -func TestAccAzureRMNetworkWatcherFlowLog_disabled(t *testing.T) { +func testAccAzureRMNetworkWatcherFlowLog_disabled(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_network_watcher_flow_log", "test") resource.Test(t, resource.TestCase{ @@ -66,7 +66,7 @@ func TestAccAzureRMNetworkWatcherFlowLog_disabled(t *testing.T) { }) } -func TestAccAzureRMNetworkWatcherFlowLog_reenabled(t *testing.T) { +func testAccAzureRMNetworkWatcherFlowLog_reenabled(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_network_watcher_flow_log", "test") resource.Test(t, resource.TestCase{ @@ -107,7 +107,7 @@ func TestAccAzureRMNetworkWatcherFlowLog_reenabled(t *testing.T) { }) } -func TestAccAzureRMNetworkWatcherFlowLog_retentionPolicy(t *testing.T) { +func testAccAzureRMNetworkWatcherFlowLog_retentionPolicy(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_network_watcher_flow_log", "test") resource.Test(t, resource.TestCase{ @@ -149,7 +149,7 @@ func TestAccAzureRMNetworkWatcherFlowLog_retentionPolicy(t *testing.T) { }) } -func TestAccAzureRMNetworkWatcherFlowLog_updateStorageAccount(t *testing.T) { +func testAccAzureRMNetworkWatcherFlowLog_updateStorageAccount(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_network_watcher_flow_log", "test") resource.Test(t, resource.TestCase{ @@ -191,7 +191,7 @@ func TestAccAzureRMNetworkWatcherFlowLog_updateStorageAccount(t *testing.T) { }) } -func TestAccAzureRMNetworkWatcherFlowLog_trafficAnalytics(t *testing.T) { +func testAccAzureRMNetworkWatcherFlowLog_trafficAnalytics(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_network_watcher_flow_log", "test") resource.Test(t, resource.TestCase{ @@ -290,7 +290,7 @@ func TestAccAzureRMNetworkWatcherFlowLog_trafficAnalytics(t *testing.T) { }) } -func TestAccAzureRMNetworkWatcherFlowLog_version(t *testing.T) { +func testAccAzureRMNetworkWatcherFlowLog_version(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_network_watcher_flow_log", "test") resource.Test(t, resource.TestCase{ diff --git a/azurerm/internal/services/network/tests/network_watcher_resource_test.go b/azurerm/internal/services/network/tests/network_watcher_resource_test.go index 887ba079e829..d54bc015c381 100644 --- a/azurerm/internal/services/network/tests/network_watcher_resource_test.go +++ b/azurerm/internal/services/network/tests/network_watcher_resource_test.go @@ -54,13 +54,13 @@ func TestAccAzureRMNetworkWatcher(t *testing.T) { "requiresImport": testAccAzureRMNetworkPacketCapture_requiresImport, }, "FlowLog": { - "basic": TestAccAzureRMNetworkWatcherFlowLog_basic, - "disabled": TestAccAzureRMNetworkWatcherFlowLog_disabled, - "reenabled": TestAccAzureRMNetworkWatcherFlowLog_reenabled, - "retentionPolicy": TestAccAzureRMNetworkWatcherFlowLog_retentionPolicy, - "updateStorageAccount": TestAccAzureRMNetworkWatcherFlowLog_updateStorageAccount, - "trafficAnalytics": TestAccAzureRMNetworkWatcherFlowLog_trafficAnalytics, - "version": TestAccAzureRMNetworkWatcherFlowLog_version, + "basic": testAccAzureRMNetworkWatcherFlowLog_basic, + "disabled": testAccAzureRMNetworkWatcherFlowLog_disabled, + "reenabled": testAccAzureRMNetworkWatcherFlowLog_reenabled, + "retentionPolicy": testAccAzureRMNetworkWatcherFlowLog_retentionPolicy, + "updateStorageAccount": testAccAzureRMNetworkWatcherFlowLog_updateStorageAccount, + "trafficAnalytics": testAccAzureRMNetworkWatcherFlowLog_trafficAnalytics, + "version": testAccAzureRMNetworkWatcherFlowLog_version, }, }