From 97374250b4d9a33f6901e0c2d0bf14efabcb3441 Mon Sep 17 00:00:00 2001 From: George Nikolopoulos Date: Fri, 10 Sep 2021 17:31:25 +0300 Subject: [PATCH 1/3] Fix lbmonitor_metric_binding failing test --- ...citrixadc_lbmonitor_metric_binding_test.go | 19 +++++++++++++++---- .../lbmonitor_metric_binding/resources.tf | 15 +++++++++++++-- 2 files changed, 28 insertions(+), 6 deletions(-) diff --git a/citrixadc/resource_citrixadc_lbmonitor_metric_binding_test.go b/citrixadc/resource_citrixadc_lbmonitor_metric_binding_test.go index fc9e5a0f4..7dfdf79ab 100644 --- a/citrixadc/resource_citrixadc_lbmonitor_metric_binding_test.go +++ b/citrixadc/resource_citrixadc_lbmonitor_metric_binding_test.go @@ -26,10 +26,21 @@ import ( "github.com/hashicorp/terraform/terraform" ) +// Need the following cli commands since no resource yet exists +// add lb metricTable tab1 +// bind metrictable tab1 metric1 1.3.6.1.4.1.5951.4.1.1.8.0 + const testAccLbmonitor_metric_binding_basic = ` + +resource "citrixadc_lbmonitor" "tfmonitor1" { + monitorname = "tf-monitor1" + type = "LOAD" + metrictable = "tab1" +} + resource citrixadc_lbmonitor_metric_binding tf_acclbmonitor_metric_binding { - monitorname = "mload2" - metric = "metric2" + monitorname = citrixadc_lbmonitor.tfmonitor1.monitorname + metric = "metric1" metricthreshold = 100 } ` @@ -47,8 +58,8 @@ func TestAccLbmonitor_metric_binding_basic(t *testing.T) { Config: testAccLbmonitor_metric_binding_basic, Check: resource.ComposeTestCheckFunc( testAccCheckLbmonitor_metric_bindingExist("citrixadc_lbmonitor_metric_binding.tf_acclbmonitor_metric_binding", nil), - resource.TestCheckResourceAttr("citrixadc_lbmonitor_metric_binding.tf_acclbmonitor_metric_binding", "monitorname", "mload2"), - resource.TestCheckResourceAttr("citrixadc_lbmonitor_metric_binding.tf_acclbmonitor_metric_binding", "metric", "metric2"), + resource.TestCheckResourceAttr("citrixadc_lbmonitor_metric_binding.tf_acclbmonitor_metric_binding", "monitorname", "tf-monitor1"), + resource.TestCheckResourceAttr("citrixadc_lbmonitor_metric_binding.tf_acclbmonitor_metric_binding", "metric", "metric1"), resource.TestCheckResourceAttr("citrixadc_lbmonitor_metric_binding.tf_acclbmonitor_metric_binding", "metricthreshold", "100"), ), }, diff --git a/examples/lbmonitor_metric_binding/resources.tf b/examples/lbmonitor_metric_binding/resources.tf index 03c58c0a2..5c7b6f42a 100644 --- a/examples/lbmonitor_metric_binding/resources.tf +++ b/examples/lbmonitor_metric_binding/resources.tf @@ -1,6 +1,17 @@ +# Need the following cli commands since no resource yet exists +# add lb metricTable tab1 +# bind metrictable tab1 metric1 1.3.6.1.4.1.5951.4.1.1.8.0 +# add lb monitor mload1 LOAD + +resource "citrixadc_lbmonitor" "tfmonitor1" { + monitorname = "tf-monitor1" + type = "LOAD" + metrictable = "tab1" +} + resource citrixadc_lbmonitor_metric_binding demo_binding1 { - monitorname = "mload2" - metric = "demometric" + monitorname = citrixadc_lbmonitor.tfmonitor1.monitorname + metric = "metric1" metricthreshold = 100 } From 0f202e392367db51ec632d8eab54d7efa0f3b997 Mon Sep 17 00:00:00 2001 From: George Nikolopoulos Date: Tue, 14 Sep 2021 09:58:28 +0300 Subject: [PATCH 2/3] Update .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 07477cd72..0757d1e0a 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ dist/ .vscode/ tf.log *.plan +.terraform.lock.hcl From 9b08e8b789e68bf979690ef57f5ed56677dadec6 Mon Sep 17 00:00:00 2001 From: George Nikolopoulos Date: Tue, 14 Sep 2021 09:59:25 +0300 Subject: [PATCH 3/3] Update CHANGELOG --- CHANGELOG.md | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3bccdf2b6..4e7150a8d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,36 @@ +## 1.6.0 (September 14, 2021) + +FEATURES + +* **New Resource** `botpolicy` +* **New Resource** `botpolicylabel` +* **New Resource** `botprofile` +* **New Resource** `botsettings` +* **New Resource** `lbgroup` +* **New Resource** `lbgroup_lbvserver_binding` +* **New Resource** `lbmetrictable` +* **New Resource** `lbmonitor_metric_binding` +* **New Resource** `lbmonitor_sslcertkey_binding` +* **New Resource** `lbprofile` +* **New Resource** `lbroute` +* **New Resource** `lbroute6` +* **New Resource** `lbsipparameters` +* **New Resource** `lbvserver_analyticsprofile_binding` +* **New Resource** `lbvserver_appflowpolicy_binding` +* **New Resource** `lbvserver_appqoepolicy_binding` +* **New Resource** `lbvserver_auditsyslogpolicy_binding` +* **New Resource** `lbvserver_authorizationpolicy_binding` +* **New Resource** `lbvserver_botpolicy_binding` +* **New Resource** `lbvserver_cachepolicy_binding` +* **New Resource** `lbvserver_contentinspectionpolicy_binding` +* **New Resource** `lbvserver_dnspolicy64_binding` +* **New Resource** `lbvserver_feopolicy_binding` +* **New Resource** `lbvserver_spilloverpolicy_binding` +* **New Resource** `lbvserver_tmtrafficpolicy_binding` +* **New Resource** `lbvserver_videooptimizationdetectionpolicy_binding` +* **New Resource** `lbvserver_videooptimizationpacingpolicy_binding` +* **New Resource** `sslcacertgroup` + ## 1.5.0 (July 16, 2021) ENHANCEMENTS