From 333db4b4ca79cec85314688dcc559e780d9fc7ff Mon Sep 17 00:00:00 2001 From: arunma Date: Tue, 25 Oct 2022 17:21:26 +0800 Subject: [PATCH 1/2] fix: update tmp_config unit --- tencentcloud/resource_tc_monitor_tmp_tke_config_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tencentcloud/resource_tc_monitor_tmp_tke_config_test.go b/tencentcloud/resource_tc_monitor_tmp_tke_config_test.go index b5d87a1bcb..4ac501e978 100644 --- a/tencentcloud/resource_tc_monitor_tmp_tke_config_test.go +++ b/tencentcloud/resource_tc_monitor_tmp_tke_config_test.go @@ -227,7 +227,7 @@ resource "tencentcloud_monitor_tmp_tke_config" "basic" { }` const testAccTmpTkeConfig_update = testAccTmpTkeConfigVar + ` -resource "tencentcloud_monitor_tmp_tke_config" "update" { +resource "tencentcloud_monitor_tmp_tke_config" "basic" { instance_id = var.prometheus_id cluster_type = var.tke_cluster_type cluster_id = var.tke_cluster_id From 9a4013ba69ae90b53e112d72f2d6248ea1966ec2 Mon Sep 17 00:00:00 2001 From: arunma Date: Tue, 25 Oct 2022 17:44:48 +0800 Subject: [PATCH 2/2] fix: update tmp_config unit --- .../resource_tc_monitor_tmp_tke_config_test.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tencentcloud/resource_tc_monitor_tmp_tke_config_test.go b/tencentcloud/resource_tc_monitor_tmp_tke_config_test.go index 5eacdc9384..c02ce83b52 100644 --- a/tencentcloud/resource_tc_monitor_tmp_tke_config_test.go +++ b/tencentcloud/resource_tc_monitor_tmp_tke_config_test.go @@ -70,13 +70,13 @@ func TestAccTencentCloudMonitorTmpTkeConfig_basic(t *testing.T) { { Config: testAccTmpTkeConfig_update, Check: resource.ComposeTestCheckFunc( - testAccCheckTmpTkeConfigExists("tencentcloud_monitor_tmp_tke_config.update"), - resource.TestCheckResourceAttr("tencentcloud_monitor_tmp_tke_config.update", "instance_id", defaultPrometheusId), - resource.TestCheckResourceAttr("tencentcloud_monitor_tmp_tke_config.update", "cluster_type", defaultTkeClusterType), - resource.TestCheckResourceAttr("tencentcloud_monitor_tmp_tke_config.update", "cluster_id", defaultTkeClusterId), - resource.TestCheckResourceAttr("tencentcloud_monitor_tmp_tke_config.update", "raw_jobs.0.config", "scrape_configs:\n- job_name: "+raw_job_name+"\n scrape_interval: 20s\n honor_labels: true\n"), - resource.TestCheckResourceAttr("tencentcloud_monitor_tmp_tke_config.update", "service_monitors.0.config", "apiVersion: monitoring.coreos.com/v1\nkind: ServiceMonitor\nmetadata:\n name: "+service_monitors_name+"\n namespace: kube-system\nspec:\n endpoints:\n - interval: 20s\n port: 8080-8080-tcp\n path: /metrics\n relabelings:\n - action: replace\n sourceLabels:\n - __meta_kubernetes_pod_label_app\n targetLabel: application\n namespaceSelector:\n matchNames:\n - test\n selector:\n matchLabels:\n app: test"), - resource.TestCheckResourceAttr("tencentcloud_monitor_tmp_tke_config.update", "pod_monitors.0.config", "apiVersion: monitoring.coreos.com/v1\nkind: PodMonitor\nmetadata:\n name: "+pod_monitors_name+"\n namespace: kube-system\nspec:\n podMetricsEndpoints:\n - interval: 20s\n port: metric-port\n path: /metrics\n relabelings:\n - action: replace\n sourceLabels:\n - instance\n regex: (.*)\n targetLabel: instance\n replacement: xxxxxx\n namespaceSelector:\n matchNames:\n - test\n selector:\n matchLabels:\n k8s-app: test"), + testAccCheckTmpTkeConfigExists("tencentcloud_monitor_tmp_tke_config.basic"), + resource.TestCheckResourceAttr("tencentcloud_monitor_tmp_tke_config.basic", "instance_id", defaultPrometheusId), + resource.TestCheckResourceAttr("tencentcloud_monitor_tmp_tke_config.basic", "cluster_type", defaultTkeClusterType), + resource.TestCheckResourceAttr("tencentcloud_monitor_tmp_tke_config.basic", "cluster_id", defaultTkeClusterId), + resource.TestCheckResourceAttr("tencentcloud_monitor_tmp_tke_config.basic", "raw_jobs.0.config", "scrape_configs:\n- job_name: "+raw_job_name+"\n scrape_interval: 20s\n honor_labels: true\n"), + resource.TestCheckResourceAttr("tencentcloud_monitor_tmp_tke_config.basic", "service_monitors.0.config", "apiVersion: monitoring.coreos.com/v1\nkind: ServiceMonitor\nmetadata:\n name: "+service_monitors_name+"\n namespace: kube-system\nspec:\n endpoints:\n - interval: 20s\n port: 8080-8080-tcp\n path: /metrics\n relabelings:\n - action: replace\n sourceLabels:\n - __meta_kubernetes_pod_label_app\n targetLabel: application\n namespaceSelector:\n matchNames:\n - test\n selector:\n matchLabels:\n app: test"), + resource.TestCheckResourceAttr("tencentcloud_monitor_tmp_tke_config.basic", "pod_monitors.0.config", "apiVersion: monitoring.coreos.com/v1\nkind: PodMonitor\nmetadata:\n name: "+pod_monitors_name+"\n namespace: kube-system\nspec:\n podMetricsEndpoints:\n - interval: 20s\n port: metric-port\n path: /metrics\n relabelings:\n - action: replace\n sourceLabels:\n - instance\n regex: (.*)\n targetLabel: instance\n replacement: xxxxxx\n namespaceSelector:\n matchNames:\n - test\n selector:\n matchLabels:\n k8s-app: test"), ), }, },