From 24af5aba9959754662364236d8b1cfc282efb533 Mon Sep 17 00:00:00 2001 From: nickyinluo Date: Tue, 16 May 2023 14:28:17 +0800 Subject: [PATCH 1/4] adjust tcr e2e ins from guangzhou to shanghai --- tencentcloud/basic_test.go | 8 ++++---- .../resource_tc_tcr_manage_replication_operation_test.go | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tencentcloud/basic_test.go b/tencentcloud/basic_test.go index 72c2d98353..77cd5340e0 100644 --- a/tencentcloud/basic_test.go +++ b/tencentcloud/basic_test.go @@ -549,10 +549,10 @@ variable "cam_user_basic" { ` // TCR Service -const defaultTCRInstanceName = "keep-tcr-instance" -const defaultTCRInstanceId = "tcr-e79o580i" -const defaultTCRNamespace = "keep-tcr-namespace" -const defaultTCRRepoName = "keep-tcr-repo" +const defaultTCRInstanceName = "keep-tcr-instance-sh" +const defaultTCRInstanceId = "tcr-800uf6j9" +const defaultTCRNamespace = "keep-tcr-namespace-sh" +const defaultTCRRepoName = "keep-tcr-repo-sh" const defaultTCRSSL = "0a5zD3cN" const defaultTCRInstanceVar = ` diff --git a/tencentcloud/resource_tc_tcr_manage_replication_operation_test.go b/tencentcloud/resource_tc_tcr_manage_replication_operation_test.go index 2ffc67f88a..1301768612 100644 --- a/tencentcloud/resource_tc_tcr_manage_replication_operation_test.go +++ b/tencentcloud/resource_tc_tcr_manage_replication_operation_test.go @@ -30,7 +30,7 @@ func TestAccTencentCloudTcrManageReplicationOperationResource_basic(t *testing.T resource.TestCheckResourceAttr("tencentcloud_tcr_manage_replication_operation.my_replica", "rule.0.filters.1.type", "tag"), resource.TestCheckResourceAttr("tencentcloud_tcr_manage_replication_operation.my_replica", "rule.0.filters.2.type", "resource"), resource.TestCheckResourceAttr("tencentcloud_tcr_manage_replication_operation.my_replica", "description", "this is the tcr sync operation"), - resource.TestCheckResourceAttr("tencentcloud_tcr_manage_replication_operation.my_replica", "destination_region_id", "1"), + resource.TestCheckResourceAttr("tencentcloud_tcr_manage_replication_operation.my_replica", "destination_region_id", "4"), resource.TestCheckResourceAttrSet("tencentcloud_tcr_manage_replication_operation.my_replica", "peer_replication_option.#"), resource.TestCheckResourceAttr("tencentcloud_tcr_manage_replication_operation.my_replica", "peer_replication_option.0.enable_peer_replication", "false"), ), @@ -80,7 +80,7 @@ resource "tencentcloud_tcr_manage_replication_operation" "my_replica" { } } description = "this is the tcr sync operation" - destination_region_id = 1 // "ap-guangzhou" + destination_region_id = 4 // "ap-shanghai" peer_replication_option { peer_registry_uin = "" peer_registry_token = "" From 2b946605990bc59e2396daa5cdffe496dc236a0e Mon Sep 17 00:00:00 2001 From: nickyinluo Date: Tue, 16 May 2023 15:38:07 +0800 Subject: [PATCH 2/4] add region --- ...data_source_tc_tcr_image_manifests_test.go | 3 ++- .../data_source_tc_tcr_images_test.go | 9 ++++++--- .../data_source_tc_tcr_instances_test.go | 5 +++-- .../data_source_tc_tcr_namespaces_test.go | 5 +++-- .../data_source_tc_tcr_repositories_test.go | 5 +++-- ..._tcr_tag_retention_execution_tasks_test.go | 3 ++- .../data_source_tc_tcr_tokens_test.go | 5 +++-- ...data_source_tc_tcr_vpc_attachments_test.go | 5 +++-- ...source_tc_tcr_webhook_trigger_logs_test.go | 3 ++- ...r_create_image_signature_operation_test.go | 3 ++- .../resource_tc_tcr_customized_domain_test.go | 3 ++- ...urce_tc_tcr_delete_image_operation_test.go | 3 ++- ...resource_tc_tcr_immutable_tag_rule_test.go | 4 ++-- tencentcloud/resource_tc_tcr_instance_test.go | 19 ++++++++++--------- ...c_tcr_manage_replication_operation_test.go | 3 ++- .../resource_tc_tcr_namespace_test.go | 7 +++---- .../resource_tc_tcr_repository_test.go | 7 +++---- ...resource_tc_tcr_tag_retention_rule_test.go | 3 ++- tencentcloud/resource_tc_tcr_token_test.go | 7 +++---- .../resource_tc_tcr_vpc_attachment_test.go | 9 +++++---- .../resource_tc_tcr_webhook_trigger_test.go | 3 ++- 21 files changed, 65 insertions(+), 49 deletions(-) diff --git a/tencentcloud/data_source_tc_tcr_image_manifests_test.go b/tencentcloud/data_source_tc_tcr_image_manifests_test.go index 26ec711c1f..b8be22ef34 100644 --- a/tencentcloud/data_source_tc_tcr_image_manifests_test.go +++ b/tencentcloud/data_source_tc_tcr_image_manifests_test.go @@ -18,7 +18,8 @@ func TestAccTencentCloudTcrImageManifestsDataSource_basic(t *testing.T) { Providers: testAccProviders, Steps: []resource.TestStep{ { - Config: fmt.Sprintf(testAccTcrImageManifestsDataSource, defaultTCRInstanceId, defaultTCRNamespace, defaultTCRRepoName), + Config: fmt.Sprintf(testAccTcrImageManifestsDataSource, defaultTCRInstanceId, defaultTCRNamespace, defaultTCRRepoName), + PreConfig: func() { testAccStepSetRegion(t, "ap-shanghai") }, Check: resource.ComposeTestCheckFunc( testAccCheckTencentCloudDataSourceID(testTcrImageManifestsObjectName), resource.TestCheckResourceAttrSet(testTcrImageManifestsObjectName, "id"), diff --git a/tencentcloud/data_source_tc_tcr_images_test.go b/tencentcloud/data_source_tc_tcr_images_test.go index 2fafb06c6f..f7cffbd0e4 100644 --- a/tencentcloud/data_source_tc_tcr_images_test.go +++ b/tencentcloud/data_source_tc_tcr_images_test.go @@ -18,7 +18,8 @@ func TestAccTencentCloudTcrImagesDataSource_basic(t *testing.T) { Providers: testAccProviders, Steps: []resource.TestStep{ { - Config: fmt.Sprintf(testAccTcrImagesDataSource_id, defaultTCRInstanceId, defaultTCRNamespace, defaultTCRRepoName), + Config: fmt.Sprintf(testAccTcrImagesDataSource_id, defaultTCRInstanceId, defaultTCRNamespace, defaultTCRRepoName), + PreConfig: func() { testAccStepSetRegion(t, "ap-shanghai") }, Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttrSet(testObjectName, "id"), resource.TestCheckResourceAttr(testObjectName, "registry_id", defaultTCRInstanceId), @@ -40,7 +41,8 @@ func TestAccTencentCloudTcrImagesDataSource_exact(t *testing.T) { Providers: testAccProviders, Steps: []resource.TestStep{ { - Config: fmt.Sprintf(testAccTcrImagesDataSource_exact, defaultTCRInstanceId, defaultTCRNamespace, defaultTCRRepoName), + Config: fmt.Sprintf(testAccTcrImagesDataSource_exact, defaultTCRInstanceId, defaultTCRNamespace, defaultTCRRepoName), + PreConfig: func() { testAccStepSetRegion(t, "ap-shanghai") }, Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttrSet(testObjectName, "id"), resource.TestCheckResourceAttr(testObjectName, "registry_id", defaultTCRInstanceId), @@ -63,7 +65,8 @@ func TestAccTencentCloudTcrImagesDataSource_exact_version(t *testing.T) { Providers: testAccProviders, Steps: []resource.TestStep{ { - Config: fmt.Sprintf(testAccTcrImagesDataSource_exact_version, defaultTCRInstanceId, defaultTCRNamespace, defaultTCRRepoName), + Config: fmt.Sprintf(testAccTcrImagesDataSource_exact_version, defaultTCRInstanceId, defaultTCRNamespace, defaultTCRRepoName), + PreConfig: func() { testAccStepSetRegion(t, "ap-shanghai") }, Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttrSet(testObjectName, "id"), resource.TestCheckResourceAttr(testObjectName, "registry_id", defaultTCRInstanceId), diff --git a/tencentcloud/data_source_tc_tcr_instances_test.go b/tencentcloud/data_source_tc_tcr_instances_test.go index d338d21304..cb05720031 100644 --- a/tencentcloud/data_source_tc_tcr_instances_test.go +++ b/tencentcloud/data_source_tc_tcr_instances_test.go @@ -8,7 +8,7 @@ import ( var testDataTCRInstancesName = "data.tencentcloud_tcr_instances.tcr" -func TestAccTencentCloudTCRInstancesData(t *testing.T) { +func TestAccTencentCloudTcrInstancesData(t *testing.T) { t.Parallel() resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -16,7 +16,8 @@ func TestAccTencentCloudTCRInstancesData(t *testing.T) { CheckDestroy: testAccCheckTCRInstanceDestroy, Steps: []resource.TestStep{ { - Config: testAccTencentCloudDataTCRInstancesBasic, + Config: testAccTencentCloudDataTCRInstancesBasic, + PreConfig: func() { testAccStepSetRegion(t, "ap-shanghai") }, Check: resource.ComposeAggregateTestCheckFunc( resource.TestCheckResourceAttrSet(testDataTCRInstancesName, "instance_list.0.id"), resource.TestCheckResourceAttrSet(testDataTCRInstancesName, "instance_list.0.instance_type"), diff --git a/tencentcloud/data_source_tc_tcr_namespaces_test.go b/tencentcloud/data_source_tc_tcr_namespaces_test.go index 9671644da9..5a048160e3 100644 --- a/tencentcloud/data_source_tc_tcr_namespaces_test.go +++ b/tencentcloud/data_source_tc_tcr_namespaces_test.go @@ -8,7 +8,7 @@ import ( var testDataTCRNamespacesNameAll = "data.tencentcloud_tcr_namespaces.id_test" -func TestAccTencentCloudTCRNamespacesData(t *testing.T) { +func TestAccTencentCloudTcrNamespacesData(t *testing.T) { t.Parallel() resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -16,7 +16,8 @@ func TestAccTencentCloudTCRNamespacesData(t *testing.T) { CheckDestroy: testAccCheckTCRNamespaceDestroy, Steps: []resource.TestStep{ { - Config: testAccTencentCloudDataTCRNamespacesBasic, + Config: testAccTencentCloudDataTCRNamespacesBasic, + PreConfig: func() { testAccStepSetRegion(t, "ap-shanghai") }, Check: resource.ComposeAggregateTestCheckFunc( resource.TestCheckResourceAttrSet(testDataTCRNamespacesNameAll, "namespace_list.0.name"), resource.TestCheckResourceAttrSet(testDataTCRNamespacesNameAll, "namespace_list.0.is_public"), // we only need to care whether the value is set or not, rather than the exact value itself, and this value of public cannot be confirmed when the e2e case parallel running diff --git a/tencentcloud/data_source_tc_tcr_repositories_test.go b/tencentcloud/data_source_tc_tcr_repositories_test.go index e70f50d68c..864151f713 100644 --- a/tencentcloud/data_source_tc_tcr_repositories_test.go +++ b/tencentcloud/data_source_tc_tcr_repositories_test.go @@ -8,7 +8,7 @@ import ( var testDataTCRRepositoriesNameAll = "data.tencentcloud_tcr_repositories.id_test" -func TestAccTencentCloudTCRRepositoriesData(t *testing.T) { +func TestAccTencentCloudTcrRepositoriesData(t *testing.T) { t.Parallel() resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -16,7 +16,8 @@ func TestAccTencentCloudTCRRepositoriesData(t *testing.T) { CheckDestroy: testAccCheckTCRRepositoryDestroy, Steps: []resource.TestStep{ { - Config: testAccTencentCloudDataTCRRepositoriesBasic, + Config: testAccTencentCloudDataTCRRepositoriesBasic, + PreConfig: func() { testAccStepSetRegion(t, "ap-shanghai") }, Check: resource.ComposeAggregateTestCheckFunc( resource.TestCheckResourceAttrSet(testDataTCRRepositoriesNameAll, "repository_list.0.name"), resource.TestCheckResourceAttrSet(testDataTCRRepositoriesNameAll, "repository_list.0.create_time"), diff --git a/tencentcloud/data_source_tc_tcr_tag_retention_execution_tasks_test.go b/tencentcloud/data_source_tc_tcr_tag_retention_execution_tasks_test.go index bef6aad878..b95d634ff5 100644 --- a/tencentcloud/data_source_tc_tcr_tag_retention_execution_tasks_test.go +++ b/tencentcloud/data_source_tc_tcr_tag_retention_execution_tasks_test.go @@ -18,7 +18,8 @@ func TestAccTencentCloudTcrTagRetentionExecutionTasksDataSource_basic(t *testing Providers: testAccProviders, Steps: []resource.TestStep{ { - Config: fmt.Sprintf(testAccTcrTagRetentionExecutionTasksDataSource, defaultTCRInstanceId), + Config: fmt.Sprintf(testAccTcrTagRetentionExecutionTasksDataSource, defaultTCRInstanceId), + PreConfig: func() { testAccStepSetRegion(t, "ap-shanghai") }, Check: resource.ComposeTestCheckFunc( testAccCheckTencentCloudDataSourceID(testExecutionTasksObjectName), resource.TestCheckResourceAttrSet(testExecutionTasksObjectName, "id"), diff --git a/tencentcloud/data_source_tc_tcr_tokens_test.go b/tencentcloud/data_source_tc_tcr_tokens_test.go index bc632af1f6..9062d692d1 100644 --- a/tencentcloud/data_source_tc_tcr_tokens_test.go +++ b/tencentcloud/data_source_tc_tcr_tokens_test.go @@ -8,7 +8,7 @@ import ( var testDataTCRTokensNameAll = "data.tencentcloud_tcr_tokens.id_test" -func TestAccTencentCloudTCRTokensData(t *testing.T) { +func TestAccTencentCloudTcrTokensData(t *testing.T) { t.Parallel() resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -16,7 +16,8 @@ func TestAccTencentCloudTCRTokensData(t *testing.T) { CheckDestroy: testAccCheckTCRTokenDestroy, Steps: []resource.TestStep{ { - Config: testAccTencentCloudDataTCRTokensBasic, + Config: testAccTencentCloudDataTCRTokensBasic, + PreConfig: func() { testAccStepSetRegion(t, "ap-shanghai") }, Check: resource.ComposeAggregateTestCheckFunc( resource.TestCheckResourceAttrSet(testDataTCRTokensNameAll, "token_list.0.token_id"), resource.TestCheckResourceAttrSet(testDataTCRTokensNameAll, "token_list.0.create_time"), diff --git a/tencentcloud/data_source_tc_tcr_vpc_attachments_test.go b/tencentcloud/data_source_tc_tcr_vpc_attachments_test.go index 0e0643fee4..038ef49171 100644 --- a/tencentcloud/data_source_tc_tcr_vpc_attachments_test.go +++ b/tencentcloud/data_source_tc_tcr_vpc_attachments_test.go @@ -8,7 +8,7 @@ import ( var testDataTCRVPCAttachmentsNameAll = "data.tencentcloud_tcr_vpc_attachments.id_test" -func TestAccTencentCloudTCRVPCAttachmentsData(t *testing.T) { +func TestAccTencentCloudTcrVPCAttachmentsData(t *testing.T) { t.Parallel() resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -16,7 +16,8 @@ func TestAccTencentCloudTCRVPCAttachmentsData(t *testing.T) { CheckDestroy: testAccCheckTCRNamespaceDestroy, Steps: []resource.TestStep{ { - Config: testAccTencentCloudDataTCRVPCAttachmentsBasic, + Config: testAccTencentCloudDataTCRVPCAttachmentsBasic, + PreConfig: func() { testAccStepSetRegion(t, "ap-shanghai") }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckTCRVPCAttachmentExists("tencentcloud_tcr_vpc_attachment.mytcr_vpc_attachment"), resource.TestCheckResourceAttr(testDataTCRVPCAttachmentsNameAll, "vpc_attachment_list.#", "1"), diff --git a/tencentcloud/data_source_tc_tcr_webhook_trigger_logs_test.go b/tencentcloud/data_source_tc_tcr_webhook_trigger_logs_test.go index fa039602af..157fb7e085 100644 --- a/tencentcloud/data_source_tc_tcr_webhook_trigger_logs_test.go +++ b/tencentcloud/data_source_tc_tcr_webhook_trigger_logs_test.go @@ -15,7 +15,8 @@ func TestAccTencentCloudTcrDescribeWebhookTriggerLogsDataSource_basic(t *testing Providers: testAccProviders, Steps: []resource.TestStep{ { - Config: testAccTcrDescribeWebhookTriggerLogsDataSource, + Config: testAccTcrDescribeWebhookTriggerLogsDataSource, + PreConfig: func() { testAccStepSetRegion(t, "ap-shanghai") }, Check: resource.ComposeTestCheckFunc( testAccCheckTencentCloudDataSourceID("data.tencentcloud_tcr_webhook_trigger_logs.my_logs"), resource.TestCheckResourceAttrSet("data.tencentcloud_tcr_webhook_trigger_logs.my_logs", "logs.#"), diff --git a/tencentcloud/resource_tc_tcr_create_image_signature_operation_test.go b/tencentcloud/resource_tc_tcr_create_image_signature_operation_test.go index 4bd5203f68..c179393f8d 100644 --- a/tencentcloud/resource_tc_tcr_create_image_signature_operation_test.go +++ b/tencentcloud/resource_tc_tcr_create_image_signature_operation_test.go @@ -16,7 +16,8 @@ func TestAccTencentCloudTcrImageSignatureOperationResource_basic(t *testing.T) { Providers: testAccProviders, Steps: []resource.TestStep{ { - Config: fmt.Sprintf(testAccTcrImageSignatureOperation, defaultTCRInstanceId, defaultTCRNamespace, defaultTCRRepoName), + Config: fmt.Sprintf(testAccTcrImageSignatureOperation, defaultTCRInstanceId, defaultTCRNamespace, defaultTCRRepoName), + PreConfig: func() { testAccStepSetRegion(t, "ap-shanghai") }, Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttrSet("tencentcloud_tcr_create_image_signature_operation.sign_operation", "id"), resource.TestCheckResourceAttr("tencentcloud_tcr_create_image_signature_operation.sign_operation", "registry_id", defaultTCRInstanceId), diff --git a/tencentcloud/resource_tc_tcr_customized_domain_test.go b/tencentcloud/resource_tc_tcr_customized_domain_test.go index 1452200536..ff9397a87e 100644 --- a/tencentcloud/resource_tc_tcr_customized_domain_test.go +++ b/tencentcloud/resource_tc_tcr_customized_domain_test.go @@ -59,7 +59,8 @@ func TestAccTencentCloudTcrCustomizedDomainResource_basic(t *testing.T) { Providers: testAccProviders, Steps: []resource.TestStep{ { - Config: fmt.Sprintf(testAccTcrCustomizedDomain, defaultTCRSSL), + Config: fmt.Sprintf(testAccTcrCustomizedDomain, defaultTCRSSL), + PreConfig: func() { testAccStepSetRegion(t, "ap-shanghai") }, Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttrSet("tencentcloud_tcr_customized_domain.my_domain", "id"), resource.TestCheckResourceAttrSet("tencentcloud_tcr_customized_domain.my_domain", "registry_id"), diff --git a/tencentcloud/resource_tc_tcr_delete_image_operation_test.go b/tencentcloud/resource_tc_tcr_delete_image_operation_test.go index 0e8474257d..ce8d8704ee 100644 --- a/tencentcloud/resource_tc_tcr_delete_image_operation_test.go +++ b/tencentcloud/resource_tc_tcr_delete_image_operation_test.go @@ -16,7 +16,8 @@ func TestAccTencentCloudTcrDeleteImageOperationResource_basic(t *testing.T) { Providers: testAccProviders, Steps: []resource.TestStep{ { - Config: fmt.Sprintf(testAccTcrDeleteImageOperation, defaultTCRInstanceId, defaultTCRNamespace, defaultTCRRepoName), + Config: fmt.Sprintf(testAccTcrDeleteImageOperation, defaultTCRInstanceId, defaultTCRNamespace, defaultTCRRepoName), + PreConfig: func() { testAccStepSetRegion(t, "ap-shanghai") }, Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttrSet("tencentcloud_tcr_delete_image_operation.delete_image_operation", "id"), resource.TestCheckResourceAttr("tencentcloud_tcr_delete_image_operation.delete_image_operation", "registry_id", defaultTCRInstanceId), diff --git a/tencentcloud/resource_tc_tcr_immutable_tag_rule_test.go b/tencentcloud/resource_tc_tcr_immutable_tag_rule_test.go index f4205b0e41..62128d0aec 100644 --- a/tencentcloud/resource_tc_tcr_immutable_tag_rule_test.go +++ b/tencentcloud/resource_tc_tcr_immutable_tag_rule_test.go @@ -28,7 +28,6 @@ func testSweepTcrImmutableTagRule(r string) error { // the non-keep namespace will be removed directly when run sweeper tencentcloud_tcr_namespace // so... only need to care about the rules under the keep namespace rules, err := tcrService.DescribeTcrImmutableTagRuleById(ctx, defaultTCRInstanceId, helper.String(defaultTCRNamespace), nil) - if err != nil { return err } @@ -54,7 +53,8 @@ func TestAccTencentCloudTcrImmutableTagRuleResource_basic(t *testing.T) { CheckDestroy: testAccCheckTcrImmutableTagRuleDestroy, Steps: []resource.TestStep{ { - Config: fmt.Sprintf(testAccTcrImmutableTagRule_basic, defaultTCRInstanceId, defaultTCRNamespace), + Config: fmt.Sprintf(testAccTcrImmutableTagRule_basic, defaultTCRInstanceId, defaultTCRNamespace), + PreConfig: func() { testAccStepSetRegion(t, "ap-shanghai") }, Check: resource.ComposeTestCheckFunc( testAccCheckTcrImmutableTagRuleExists("tencentcloud_tcr_immutable_tag_rule.my_rule"), resource.TestCheckResourceAttrSet("tencentcloud_tcr_immutable_tag_rule.my_rule", "id"), diff --git a/tencentcloud/resource_tc_tcr_instance_test.go b/tencentcloud/resource_tc_tcr_instance_test.go index c3ec8dcbcc..84cce10547 100644 --- a/tencentcloud/resource_tc_tcr_instance_test.go +++ b/tencentcloud/resource_tc_tcr_instance_test.go @@ -27,7 +27,6 @@ func init() { service := TCRService{client} instances, err := service.DescribeTCRInstances(ctx, "", nil) - if err != nil { return err } @@ -91,7 +90,8 @@ func TestAccTencentCloudTcrInstanceResource_basic_and_update(t *testing.T) { CheckDestroy: testAccCheckTCRInstanceDestroy, Steps: []resource.TestStep{ { - Config: testAccTCRInstance_basic, + Config: testAccTCRInstance_basic, + PreConfig: func() { testAccStepSetRegion(t, "ap-shanghai") }, Check: resource.ComposeAggregateTestCheckFunc( resource.TestCheckResourceAttr("tencentcloud_tcr_instance.mytcr_instance", "name", "testacctcrinstance1"), resource.TestCheckResourceAttr("tencentcloud_tcr_instance.mytcr_instance", "instance_type", "basic"), @@ -116,8 +116,8 @@ func TestAccTencentCloudTcrInstanceResource_basic_and_update(t *testing.T) { resource.TestCheckResourceAttr("tencentcloud_tcr_instance.mytcr_instance", "delete_bucket", "true"), resource.TestCheckResourceAttr("tencentcloud_tcr_instance.mytcr_instance", "open_public_operation", "true"), resource.TestCheckResourceAttr("tencentcloud_tcr_instance.mytcr_instance", "security_policy.#", "2"), - //resource.TestCheckResourceAttr("tencentcloud_tcr_instance.mytcr_instance", "security_policy.0.cidr_block", "192.168.1.1/24"), - //resource.TestCheckResourceAttr("tencentcloud_tcr_instance.mytcr_instance", "security_policy.1.cidr_block", "10.0.0.1/16"), + // resource.TestCheckResourceAttr("tencentcloud_tcr_instance.mytcr_instance", "security_policy.0.cidr_block", "192.168.1.1/24"), + // resource.TestCheckResourceAttr("tencentcloud_tcr_instance.mytcr_instance", "security_policy.1.cidr_block", "10.0.0.1/16"), ), }, { @@ -126,7 +126,7 @@ func TestAccTencentCloudTcrInstanceResource_basic_and_update(t *testing.T) { testAccCheckTCRInstanceExists("tencentcloud_tcr_instance.mytcr_instance"), resource.TestCheckResourceAttr("tencentcloud_tcr_instance.mytcr_instance", "open_public_operation", "true"), resource.TestCheckResourceAttr("tencentcloud_tcr_instance.mytcr_instance", "security_policy.#", "1"), - //resource.TestCheckResourceAttr("tencentcloud_tcr_instance.mytcr_instance", "security_policy.0.cidr_block", "192.168.1.1/24"), + // resource.TestCheckResourceAttr("tencentcloud_tcr_instance.mytcr_instance", "security_policy.0.cidr_block", "192.168.1.1/24"), ), }, { @@ -148,7 +148,8 @@ func TestAccTencentCloudTcrInstanceResource_paypaid(t *testing.T) { CheckDestroy: testAccCheckTCRInstanceDestroy, Steps: []resource.TestStep{ { - Config: testAccTCRInstance_paypaid, + Config: testAccTCRInstance_paypaid, + PreConfig: func() { testAccStepSetRegion(t, "ap-shanghai") }, Check: resource.ComposeAggregateTestCheckFunc( resource.TestCheckResourceAttr("tencentcloud_tcr_instance.mytcr_instance_paypaid", "name", "paypaidtcrinstance"), resource.TestCheckResourceAttr("tencentcloud_tcr_instance.mytcr_instance_paypaid", "instance_type", "basic"), @@ -176,7 +177,8 @@ func TestAccTencentCloudTcrInstanceResource_replication(t *testing.T) { CheckDestroy: testAccCheckTCRInstanceDestroy, Steps: []resource.TestStep{ { - Config: testAccTCRInstance_replica, + Config: testAccTCRInstance_replica, + PreConfig: func() { testAccStepSetRegion(t, "ap-shanghai") }, Check: resource.ComposeAggregateTestCheckFunc( resource.TestCheckResourceAttr("tencentcloud_tcr_instance.mytcr_instance", "name", "tfreplicas"), resource.TestCheckResourceAttr("tencentcloud_tcr_instance.mytcr_instance", "replications.#", "2"), @@ -200,7 +202,6 @@ func TestAccTencentCloudTcrInstanceResource_replication(t *testing.T) { } func TestAccTencentCloudTcrInstanceResource_replica_set(t *testing.T) { - inputs := []interface{}{ map[string]interface{}{ "region_id": 1, @@ -253,7 +254,7 @@ func TestAccTencentCloudTcrInstanceResource_replica_set(t *testing.T) { assert.Equalf(t, expected1, result1, "%s case 1 not equal, expected:\n%v\ngot: \n%v", t.Name(), expected1, result1) var registries2 []*tcr.ReplicationRegistry - var registries2Incr = []*tcr.ReplicationRegistry{ + registries2Incr := []*tcr.ReplicationRegistry{ { ReplicationRegistryId: helper.String("d"), RegistryId: helper.String("x"), diff --git a/tencentcloud/resource_tc_tcr_manage_replication_operation_test.go b/tencentcloud/resource_tc_tcr_manage_replication_operation_test.go index 1301768612..e5e7fd3a07 100644 --- a/tencentcloud/resource_tc_tcr_manage_replication_operation_test.go +++ b/tencentcloud/resource_tc_tcr_manage_replication_operation_test.go @@ -17,7 +17,8 @@ func TestAccTencentCloudTcrManageReplicationOperationResource_basic(t *testing.T Providers: testAccProviders, Steps: []resource.TestStep{ { - Config: fmt.Sprintf(testAccTcrManageReplicationOperation, "sync", time.Now().Nanosecond()), + Config: fmt.Sprintf(testAccTcrManageReplicationOperation, "sync", time.Now().Nanosecond()), + PreConfig: func() { testAccStepSetRegion(t, "ap-shanghai") }, Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttrSet("tencentcloud_tcr_manage_replication_operation.my_replica", "id"), resource.TestCheckResourceAttrSet("tencentcloud_tcr_manage_replication_operation.my_replica", "source_registry_id"), diff --git a/tencentcloud/resource_tc_tcr_namespace_test.go b/tencentcloud/resource_tc_tcr_namespace_test.go index 0df36d450f..673a004463 100644 --- a/tencentcloud/resource_tc_tcr_namespace_test.go +++ b/tencentcloud/resource_tc_tcr_namespace_test.go @@ -32,7 +32,6 @@ func init() { }) instances, err := service.DescribeTCRInstances(ctx, "", filters) - if err != nil { return err } @@ -44,7 +43,6 @@ func init() { instanceId := *instances[0].RegistryId namespaces, err := service.DescribeTCRNameSpaces(ctx, instanceId, "test") - if err != nil { return err } @@ -65,7 +63,7 @@ func init() { }) } -func TestAccTencentCloudTCRNamespace_basic_and_update(t *testing.T) { +func TestAccTencentCloudTcrNamespace_basic_and_update(t *testing.T) { t.Parallel() resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -73,7 +71,8 @@ func TestAccTencentCloudTCRNamespace_basic_and_update(t *testing.T) { CheckDestroy: testAccCheckTCRNamespaceDestroy, Steps: []resource.TestStep{ { - Config: testAccTCRNamespace_basic, + Config: testAccTCRNamespace_basic, + PreConfig: func() { testAccStepSetRegion(t, "ap-shanghai") }, Check: resource.ComposeAggregateTestCheckFunc( resource.TestCheckResourceAttr("tencentcloud_tcr_namespace.mytcr_namespace", "name", "test"), resource.TestCheckResourceAttr("tencentcloud_tcr_namespace.mytcr_namespace", "is_public", "true"), diff --git a/tencentcloud/resource_tc_tcr_repository_test.go b/tencentcloud/resource_tc_tcr_repository_test.go index 52e812d1c3..353b9ca7f7 100644 --- a/tencentcloud/resource_tc_tcr_repository_test.go +++ b/tencentcloud/resource_tc_tcr_repository_test.go @@ -33,7 +33,6 @@ func testSweepTCRRepository(r string) error { }) instances, err := tcrService.DescribeTCRInstances(ctx, "", filters) - if err != nil { return err } @@ -46,7 +45,6 @@ func testSweepTCRRepository(r string) error { // the non-keep namespace will be removed directly when run sweeper tencentcloud_tcr_namespace // so... only need to care about the repos under the keep namespace repos, err := tcrService.DescribeTCRRepositories(ctx, instanceId, "", "") - if err != nil { return err } @@ -69,7 +67,7 @@ func testSweepTCRRepository(r string) error { return nil } -func TestAccTencentCloudTCRRepository_basic_and_update(t *testing.T) { +func TestAccTencentCloudTcrRepository_basic_and_update(t *testing.T) { t.Parallel() resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -77,7 +75,8 @@ func TestAccTencentCloudTCRRepository_basic_and_update(t *testing.T) { CheckDestroy: testAccCheckTCRRepositoryDestroy, Steps: []resource.TestStep{ { - Config: testAccTCRRepository_basic, + Config: testAccTCRRepository_basic, + PreConfig: func() { testAccStepSetRegion(t, "ap-shanghai") }, Check: resource.ComposeAggregateTestCheckFunc( resource.TestCheckResourceAttr("tencentcloud_tcr_repository.mytcr_repository", "name", "test"), resource.TestCheckResourceAttr("tencentcloud_tcr_repository.mytcr_repository", "brief_desc", "111"), diff --git a/tencentcloud/resource_tc_tcr_tag_retention_rule_test.go b/tencentcloud/resource_tc_tcr_tag_retention_rule_test.go index cff764ba8b..c06a5c61c3 100644 --- a/tencentcloud/resource_tc_tcr_tag_retention_rule_test.go +++ b/tencentcloud/resource_tc_tcr_tag_retention_rule_test.go @@ -21,7 +21,8 @@ func TestAccTencentCloudTcrTagRetentionRuleResource_basic(t *testing.T) { CheckDestroy: testAccCheckTCRTagRetentionRuleDestroy, Steps: []resource.TestStep{ { - Config: testAccTcrTagRetentionRule, + Config: testAccTcrTagRetentionRule, + PreConfig: func() { testAccStepSetRegion(t, "ap-shanghai") }, Check: resource.ComposeTestCheckFunc( testAccCheckTCRTagRetentionRuleExists("tencentcloud_tcr_tag_retention_rule.my_rule"), resource.TestCheckResourceAttrSet("tencentcloud_tcr_tag_retention_rule.my_rule", "id"), diff --git a/tencentcloud/resource_tc_tcr_token_test.go b/tencentcloud/resource_tc_tcr_token_test.go index 7641329fdb..176a8b8871 100644 --- a/tencentcloud/resource_tc_tcr_token_test.go +++ b/tencentcloud/resource_tc_tcr_token_test.go @@ -34,7 +34,6 @@ func init() { }) instances, err := service.DescribeTCRInstances(ctx, "", filters) - if err != nil { return err } @@ -46,7 +45,6 @@ func init() { instanceId := *instances[0].RegistryId tokens, err := service.DescribeTCRTokens(ctx, instanceId, "") - if err != nil { return err } @@ -73,7 +71,7 @@ func init() { }) } -func TestAccTencentCloudTCRToken_basic_and_update(t *testing.T) { +func TestAccTencentCloudTcrToken_basic_and_update(t *testing.T) { t.Parallel() resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -81,7 +79,8 @@ func TestAccTencentCloudTCRToken_basic_and_update(t *testing.T) { CheckDestroy: testAccCheckTCRTokenDestroy, Steps: []resource.TestStep{ { - Config: testAccTCRToken_basic, + Config: testAccTCRToken_basic, + PreConfig: func() { testAccStepSetRegion(t, "ap-shanghai") }, Check: resource.ComposeAggregateTestCheckFunc( resource.TestCheckResourceAttr("tencentcloud_tcr_token.mytcr_token", "description", "test token"), resource.TestCheckResourceAttr("tencentcloud_tcr_token.mytcr_token", "enable", "true"), diff --git a/tencentcloud/resource_tc_tcr_vpc_attachment_test.go b/tencentcloud/resource_tc_tcr_vpc_attachment_test.go index 3eb5754e6a..3231a91d61 100644 --- a/tencentcloud/resource_tc_tcr_vpc_attachment_test.go +++ b/tencentcloud/resource_tc_tcr_vpc_attachment_test.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" ) -func TestAccTencentCloudTCRVPCAttachment_basic(t *testing.T) { +func TestAccTencentCloudTcrVPCAttachment_basic(t *testing.T) { t.Parallel() resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -18,12 +18,13 @@ func TestAccTencentCloudTCRVPCAttachment_basic(t *testing.T) { CheckDestroy: testAccCheckTCRVPCAttachmentDestroy, Steps: []resource.TestStep{ { - Config: testAccTCRVPCAttachment_basic, + Config: testAccTCRVPCAttachment_basic, + PreConfig: func() { testAccStepSetRegion(t, "ap-shanghai") }, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckTCRVPCAttachmentExists("tencentcloud_tcr_vpc_attachment.mytcr_vpc_attachment_resource"), resource.TestCheckResourceAttrSet("tencentcloud_tcr_vpc_attachment.mytcr_vpc_attachment_resource", "status"), - //this access ip will solve out with very long time - //resource.TestCheckResourceAttrSet("tencentcloud_tcr_vpc_attachment.mytcr_vpc_attachment_resource", "access_ip"), + // this access ip will solve out with very long time + // resource.TestCheckResourceAttrSet("tencentcloud_tcr_vpc_attachment.mytcr_vpc_attachment_resource", "access_ip"), ), // Destroy: false, }, diff --git a/tencentcloud/resource_tc_tcr_webhook_trigger_test.go b/tencentcloud/resource_tc_tcr_webhook_trigger_test.go index e9c1196301..97171de35e 100644 --- a/tencentcloud/resource_tc_tcr_webhook_trigger_test.go +++ b/tencentcloud/resource_tc_tcr_webhook_trigger_test.go @@ -22,7 +22,8 @@ func TestAccTencentCloudTcrWebhookTriggerResource_basic(t *testing.T) { CheckDestroy: testAccCheckTCRWebhookTriggerDestroy, Steps: []resource.TestStep{ { - Config: fmt.Sprintf(testAccTCRWebhookTrigger, "webhooktrigger", "webhooktrigger", "webhooktrigger"), + Config: fmt.Sprintf(testAccTCRWebhookTrigger, "webhooktrigger", "webhooktrigger", "webhooktrigger"), + PreConfig: func() { testAccStepSetRegion(t, "ap-shanghai") }, Check: resource.ComposeTestCheckFunc( testAccCheckTCRWebhookTriggerExists("tencentcloud_tcr_webhook_trigger.my_trigger"), resource.TestCheckResourceAttrSet("tencentcloud_tcr_webhook_trigger.my_trigger", "id"), From 663b234ec7156269d29fa7def6720f62563f5f73 Mon Sep 17 00:00:00 2001 From: nickyinluo Date: Tue, 16 May 2023 17:13:39 +0800 Subject: [PATCH 3/4] adjust retention_id --- .../data_source_tc_tcr_tag_retention_execution_tasks_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tencentcloud/data_source_tc_tcr_tag_retention_execution_tasks_test.go b/tencentcloud/data_source_tc_tcr_tag_retention_execution_tasks_test.go index b95d634ff5..082c71f01d 100644 --- a/tencentcloud/data_source_tc_tcr_tag_retention_execution_tasks_test.go +++ b/tencentcloud/data_source_tc_tcr_tag_retention_execution_tasks_test.go @@ -24,7 +24,7 @@ func TestAccTencentCloudTcrTagRetentionExecutionTasksDataSource_basic(t *testing testAccCheckTencentCloudDataSourceID(testExecutionTasksObjectName), resource.TestCheckResourceAttrSet(testExecutionTasksObjectName, "id"), resource.TestCheckResourceAttr(testExecutionTasksObjectName, "registry_id", defaultTCRInstanceId), - resource.TestCheckResourceAttr(testExecutionTasksObjectName, "retention_id", "17"), + resource.TestCheckResourceAttr(testExecutionTasksObjectName, "retention_id", "1"), resource.TestCheckResourceAttr(testExecutionTasksObjectName, "execution_id", "1"), resource.TestCheckResourceAttrSet(testExecutionTasksObjectName, "retention_task_list.#"), resource.TestCheckResourceAttrSet(testExecutionTasksObjectName, "retention_task_list.0.task_id"), @@ -39,7 +39,7 @@ const testAccTcrTagRetentionExecutionTasksDataSource = ` data "tencentcloud_tcr_tag_retention_execution_tasks" "tasks" { registry_id = "%s" - retention_id = "17" + retention_id = "1" execution_id = "1" } From 186ad00a888aa4ee4a4f241be1640979b1781841 Mon Sep 17 00:00:00 2001 From: nickyinluo Date: Tue, 16 May 2023 19:31:30 +0800 Subject: [PATCH 4/4] adjust vpc from gz to sh --- .../data_source_tc_tcr_vpc_attachments_test.go | 13 ++++++++++++- .../data_source_tc_tcr_webhook_trigger_logs_test.go | 2 +- tencentcloud/resource_tc_tcr_vpc_attachment_test.go | 2 +- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/tencentcloud/data_source_tc_tcr_vpc_attachments_test.go b/tencentcloud/data_source_tc_tcr_vpc_attachments_test.go index 038ef49171..948b4b3087 100644 --- a/tencentcloud/data_source_tc_tcr_vpc_attachments_test.go +++ b/tencentcloud/data_source_tc_tcr_vpc_attachments_test.go @@ -28,7 +28,18 @@ func TestAccTencentCloudTcrVPCAttachmentsData(t *testing.T) { }) } -const testAccTencentCloudDataTCRVPCAttachmentsBasic = defaultVpcSubnets + ` +const defaultTcrVpcSubnets = ` + +data "tencentcloud_vpc_subnets" "sh" { + availability_zone = "ap-shanghai-1" +} + +locals { + vpc_id = data.tencentcloud_vpc_subnets.sh.instance_list.0.vpc_id + subnet_id = data.tencentcloud_vpc_subnets.sh.instance_list.0.subnet_id +}` + +const testAccTencentCloudDataTCRVPCAttachmentsBasic = defaultTcrVpcSubnets + ` resource "tencentcloud_tcr_instance" "mytcr_instance" { name = "test-tcr-attach" instance_type = "basic" diff --git a/tencentcloud/data_source_tc_tcr_webhook_trigger_logs_test.go b/tencentcloud/data_source_tc_tcr_webhook_trigger_logs_test.go index 157fb7e085..da96c1e68b 100644 --- a/tencentcloud/data_source_tc_tcr_webhook_trigger_logs_test.go +++ b/tencentcloud/data_source_tc_tcr_webhook_trigger_logs_test.go @@ -43,7 +43,7 @@ const testAccTcrDescribeWebhookTriggerLogsDataSource = defaultTCRInstanceData + data "tencentcloud_tcr_webhook_trigger_logs" "my_logs" { registry_id = local.tcr_id namespace = var.tcr_namespace - trigger_id = 2 + trigger_id = 1 tags = { "createdBy" = "terraform" } diff --git a/tencentcloud/resource_tc_tcr_vpc_attachment_test.go b/tencentcloud/resource_tc_tcr_vpc_attachment_test.go index 3231a91d61..53385eca28 100644 --- a/tencentcloud/resource_tc_tcr_vpc_attachment_test.go +++ b/tencentcloud/resource_tc_tcr_vpc_attachment_test.go @@ -99,7 +99,7 @@ func testAccCheckTCRVPCAttachmentExists(n string) resource.TestCheckFunc { } } -const testAccTCRVPCAttachment_basic = defaultVpcSubnets + ` +const testAccTCRVPCAttachment_basic = defaultTcrVpcSubnets + ` resource "tencentcloud_tcr_instance" "mytcr_instance" { name = "test-resource-attach" instance_type = "basic"