Skip to content

fix: update exporter integration test #1234

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

Merged
merged 5 commits into from
Aug 26, 2022
Merged

fix: update exporter integration test #1234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
084ef84
fix: update exporter integration test
gitmkn Aug 25, 2022
3eab515
fix: add exporter integration test weeper
gitmkn Aug 25, 2022
97fc2be
fix: update exporter integration test
gitmkn Aug 25, 2022
179b2f7
fix: update exporter integration test
gitmkn Aug 25, 2022
fefd84b
fix: update default job name
gitmkn Aug 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 46 additions & 7 deletions tencentcloud/resource_tc_monitor_tmp_exporter_integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,54 @@ package tencentcloud
import (
"context"
"fmt"
"strconv"
"strings"
"testing"

"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
"github.com/hashicorp/terraform-plugin-sdk/terraform"
)

const defaultKind = ""

func init() {
// go test -v ./tencentcloud -sweep=ap-guangzhou -sweep-run=tencentcloud_monitor_tmp_exporter_integration
resource.AddTestSweepers("tencentcloud_monitor_tmp_exporter_integration", &resource.Sweeper{
Name: "tencentcloud_monitor_tmp_exporter_integration",
F: testSweepExporterIntegration,
})
}
func testSweepExporterIntegration(region string) error {
logId := getLogId(contextNil)
ctx := context.WithValue(context.TODO(), logIdKey, logId)
cli, _ := sharedClientForRegion(region)
client := cli.(*TencentCloudClient).apiV3Conn
service := MonitorService{client}

instanceId := defaultPrometheusId
clusterId := tkeClusterIdAgent
ids := strings.Join([]string{"", instanceId, strconv.Itoa(1), clusterId, defaultKind}, FILED_SP)

for {
instances, err := service.DescribeMonitorTmpExporterIntegration(ctx, ids)
if err != nil {
return err
}

if instances == nil {
return nil
}

id := strings.Join([]string{*instances.Name, instanceId, strconv.Itoa(1), clusterId, defaultKind}, FILED_SP)
err = service.DeleteMonitorTmpExporterIntegrationById(ctx, id)
if err != nil {
return err
}
}

return nil
}

func TestAccTencentCloudMonitorExporterIntegration_basic(t *testing.T) {
t.Parallel()
resource.Test(t, resource.TestCase{
Expand All @@ -22,7 +64,7 @@ func TestAccTencentCloudMonitorExporterIntegration_basic(t *testing.T) {
testAccCheckExporterIntegrationExists("tencentcloud_monitor_tmp_exporter_integration.basic"),
resource.TestCheckResourceAttr("tencentcloud_monitor_tmp_exporter_integration.basic", "kind", "cvm-http-sd-exporter"),
resource.TestCheckResourceAttr("tencentcloud_monitor_tmp_exporter_integration.basic", "kube_type", "1"),
resource.TestCheckResourceAttr("tencentcloud_monitor_tmp_exporter_integration.basic", "cluster_id", "cls-ely08ic4"),
resource.TestCheckResourceAttr("tencentcloud_monitor_tmp_exporter_integration.basic", "cluster_id", "cls-87o4klby"),
),
},
{
Expand Down Expand Up @@ -94,9 +136,6 @@ const testExporterIntegrationVar = `
variable "prometheus_id" {
default = "` + defaultPrometheusId + `"
}
variable "default_cluster" {
default = "` + defaultTkeClusterId + `"
}
variable "cluster_id" {
default = "` + tkeClusterIdAgent + `"
}
Expand All @@ -105,16 +144,16 @@ const testExporterIntegration_basic = testExporterIntegrationVar + `
resource "tencentcloud_monitor_tmp_exporter_integration" "basic" {
instance_id = var.prometheus_id
kind = "cvm-http-sd-exporter"
content = "{\"kind\":\"cvm-http-sd-exporter\",\"spec\":{\"job\":\"job_name: example-job-name\\nmetrics_path: /metrics\\ncvm_sd_configs:\\n- region: ap-guangzhou\\n ports:\\n - 9100\\n filters: \\n - name: tag:示例标签键\\n values: \\n - 示例标签值\\nrelabel_configs: \\n- source_labels: [__meta_cvm_instance_state]\\n regex: RUNNING\\n action: keep\\n- regex: __meta_cvm_tag_(.*)\\n replacement: $1\\n action: labelmap\\n- source_labels: [__meta_cvm_region]\\n target_label: region\\n action: replace\"}}"
content = "{\"kind\":\"cvm-http-sd-exporter\",\"spec\":{\"job\":\"job_name: example-job-name-test\\nmetrics_path: /metrics\\ncvm_sd_configs:\\n- region: ap-guangzhou\\n ports:\\n - 9100\\n filters: \\n - name: tag:示例标签键\\n values: \\n - 示例标签值\\nrelabel_configs: \\n- source_labels: [__meta_cvm_instance_state]\\n regex: RUNNING\\n action: keep\\n- regex: __meta_cvm_tag_(.*)\\n replacement: $1\\n action: labelmap\\n- source_labels: [__meta_cvm_region]\\n target_label: region\\n action: replace\"}}"
kube_type = 1
cluster_id = var.default_cluster
cluster_id = var.cluster_id
}`

const testExporterIntegration_update = testExporterIntegrationVar + `
resource "tencentcloud_monitor_tmp_exporter_integration" "basic" {
instance_id = var.prometheus_id
kind = "cvm-http-sd-exporter"
content = "{\"kind\":\"cvm-http-sd-exporter\",\"spec\":{\"job\":\"job_name: example-job-name\\nmetrics_path: /metrics\\ncvm_sd_configs:\\n- region: ap-guangzhou\\n ports:\\n - 9100\\n filters: \\n - name: tag:示例标签键\\n values: \\n - 示例标签值\\nrelabel_configs: \\n- source_labels: [__meta_cvm_instance_state]\\n regex: RUNNING\\n action: keep\\n- regex: __meta_cvm_tag_(.*)\\n replacement: $1\\n action: labelmap\\n- source_labels: [__meta_cvm_region]\\n target_label: region\\n action: replace\"}}"
content = "{\"kind\":\"cvm-http-sd-exporter\",\"spec\":{\"job\":\"job_name: example-job-name-test\\nmetrics_path: /metrics\\ncvm_sd_configs:\\n- region: ap-guangzhou\\n ports:\\n - 9100\\n filters: \\n - name: tag:示例标签键\\n values: \\n - 示例标签值\\nrelabel_configs: \\n- source_labels: [__meta_cvm_instance_state]\\n regex: RUNNING\\n action: keep\\n- regex: __meta_cvm_tag_(.*)\\n replacement: $1\\n action: labelmap\\n- source_labels: [__meta_cvm_region]\\n target_label: region\\n action: replace\"}}"
kube_type = 1
cluster_id = var.cluster_id
}`
5 changes: 4 additions & 1 deletion tencentcloud/service_tencentcloud_monitor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -518,7 +518,9 @@ func (me *MonitorService) DescribeMonitorTmpExporterIntegration(ctx context.Cont
}()

ids := strings.Split(tmpExporterIntegrationId, FILED_SP)
request.Name = &ids[0]
if ids[0] != "" {
request.Name = &ids[0]
}
request.InstanceId = &ids[1]
kubeType, _ := strconv.Atoi(ids[2])
request.KubeType = helper.IntInt64(kubeType)
Expand Down Expand Up @@ -547,6 +549,7 @@ func (me *MonitorService) DeleteMonitorTmpExporterIntegrationById(ctx context.Co

request := monitor.NewDeleteExporterIntegrationRequest()
ids := strings.Split(tmpExporterIntegrationId, FILED_SP)

request.Name = &ids[0]
request.InstanceId = &ids[1]
kubeType, _ := strconv.Atoi(ids[2])
Expand Down