Skip to content

Commit 825122c

Browse files
authored
adjust tcr e2e ins from guangzhou to shanghai (#1778)
* adjust tcr e2e ins from guangzhou to shanghai * add region * adjust retention_id * adjust vpc from gz to sh
1 parent ec7b68e commit 825122c

22 files changed

+87
-60
lines changed

tencentcloud/basic_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -549,10 +549,10 @@ variable "cam_user_basic" {
549549
`
550550

551551
// TCR Service
552-
const defaultTCRInstanceName = "keep-tcr-instance"
553-
const defaultTCRInstanceId = "tcr-e79o580i"
554-
const defaultTCRNamespace = "keep-tcr-namespace"
555-
const defaultTCRRepoName = "keep-tcr-repo"
552+
const defaultTCRInstanceName = "keep-tcr-instance-sh"
553+
const defaultTCRInstanceId = "tcr-800uf6j9"
554+
const defaultTCRNamespace = "keep-tcr-namespace-sh"
555+
const defaultTCRRepoName = "keep-tcr-repo-sh"
556556
const defaultTCRSSL = "0a5zD3cN"
557557

558558
const defaultTCRInstanceVar = `

tencentcloud/data_source_tc_tcr_image_manifests_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ func TestAccTencentCloudTcrImageManifestsDataSource_basic(t *testing.T) {
1818
Providers: testAccProviders,
1919
Steps: []resource.TestStep{
2020
{
21-
Config: fmt.Sprintf(testAccTcrImageManifestsDataSource, defaultTCRInstanceId, defaultTCRNamespace, defaultTCRRepoName),
21+
Config: fmt.Sprintf(testAccTcrImageManifestsDataSource, defaultTCRInstanceId, defaultTCRNamespace, defaultTCRRepoName),
22+
PreConfig: func() { testAccStepSetRegion(t, "ap-shanghai") },
2223
Check: resource.ComposeTestCheckFunc(
2324
testAccCheckTencentCloudDataSourceID(testTcrImageManifestsObjectName),
2425
resource.TestCheckResourceAttrSet(testTcrImageManifestsObjectName, "id"),

tencentcloud/data_source_tc_tcr_images_test.go

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ func TestAccTencentCloudTcrImagesDataSource_basic(t *testing.T) {
1818
Providers: testAccProviders,
1919
Steps: []resource.TestStep{
2020
{
21-
Config: fmt.Sprintf(testAccTcrImagesDataSource_id, defaultTCRInstanceId, defaultTCRNamespace, defaultTCRRepoName),
21+
Config: fmt.Sprintf(testAccTcrImagesDataSource_id, defaultTCRInstanceId, defaultTCRNamespace, defaultTCRRepoName),
22+
PreConfig: func() { testAccStepSetRegion(t, "ap-shanghai") },
2223
Check: resource.ComposeTestCheckFunc(
2324
resource.TestCheckResourceAttrSet(testObjectName, "id"),
2425
resource.TestCheckResourceAttr(testObjectName, "registry_id", defaultTCRInstanceId),
@@ -40,7 +41,8 @@ func TestAccTencentCloudTcrImagesDataSource_exact(t *testing.T) {
4041
Providers: testAccProviders,
4142
Steps: []resource.TestStep{
4243
{
43-
Config: fmt.Sprintf(testAccTcrImagesDataSource_exact, defaultTCRInstanceId, defaultTCRNamespace, defaultTCRRepoName),
44+
Config: fmt.Sprintf(testAccTcrImagesDataSource_exact, defaultTCRInstanceId, defaultTCRNamespace, defaultTCRRepoName),
45+
PreConfig: func() { testAccStepSetRegion(t, "ap-shanghai") },
4446
Check: resource.ComposeTestCheckFunc(
4547
resource.TestCheckResourceAttrSet(testObjectName, "id"),
4648
resource.TestCheckResourceAttr(testObjectName, "registry_id", defaultTCRInstanceId),
@@ -63,7 +65,8 @@ func TestAccTencentCloudTcrImagesDataSource_exact_version(t *testing.T) {
6365
Providers: testAccProviders,
6466
Steps: []resource.TestStep{
6567
{
66-
Config: fmt.Sprintf(testAccTcrImagesDataSource_exact_version, defaultTCRInstanceId, defaultTCRNamespace, defaultTCRRepoName),
68+
Config: fmt.Sprintf(testAccTcrImagesDataSource_exact_version, defaultTCRInstanceId, defaultTCRNamespace, defaultTCRRepoName),
69+
PreConfig: func() { testAccStepSetRegion(t, "ap-shanghai") },
6770
Check: resource.ComposeTestCheckFunc(
6871
resource.TestCheckResourceAttrSet(testObjectName, "id"),
6972
resource.TestCheckResourceAttr(testObjectName, "registry_id", defaultTCRInstanceId),

tencentcloud/data_source_tc_tcr_instances_test.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,16 @@ import (
88

99
var testDataTCRInstancesName = "data.tencentcloud_tcr_instances.tcr"
1010

11-
func TestAccTencentCloudTCRInstancesData(t *testing.T) {
11+
func TestAccTencentCloudTcrInstancesData(t *testing.T) {
1212
t.Parallel()
1313
resource.Test(t, resource.TestCase{
1414
PreCheck: func() { testAccPreCheck(t) },
1515
Providers: testAccProviders,
1616
CheckDestroy: testAccCheckTCRInstanceDestroy,
1717
Steps: []resource.TestStep{
1818
{
19-
Config: testAccTencentCloudDataTCRInstancesBasic,
19+
Config: testAccTencentCloudDataTCRInstancesBasic,
20+
PreConfig: func() { testAccStepSetRegion(t, "ap-shanghai") },
2021
Check: resource.ComposeAggregateTestCheckFunc(
2122
resource.TestCheckResourceAttrSet(testDataTCRInstancesName, "instance_list.0.id"),
2223
resource.TestCheckResourceAttrSet(testDataTCRInstancesName, "instance_list.0.instance_type"),

tencentcloud/data_source_tc_tcr_namespaces_test.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,16 @@ import (
88

99
var testDataTCRNamespacesNameAll = "data.tencentcloud_tcr_namespaces.id_test"
1010

11-
func TestAccTencentCloudTCRNamespacesData(t *testing.T) {
11+
func TestAccTencentCloudTcrNamespacesData(t *testing.T) {
1212
t.Parallel()
1313
resource.Test(t, resource.TestCase{
1414
PreCheck: func() { testAccPreCheck(t) },
1515
Providers: testAccProviders,
1616
CheckDestroy: testAccCheckTCRNamespaceDestroy,
1717
Steps: []resource.TestStep{
1818
{
19-
Config: testAccTencentCloudDataTCRNamespacesBasic,
19+
Config: testAccTencentCloudDataTCRNamespacesBasic,
20+
PreConfig: func() { testAccStepSetRegion(t, "ap-shanghai") },
2021
Check: resource.ComposeAggregateTestCheckFunc(
2122
resource.TestCheckResourceAttrSet(testDataTCRNamespacesNameAll, "namespace_list.0.name"),
2223
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

tencentcloud/data_source_tc_tcr_repositories_test.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,16 @@ import (
88

99
var testDataTCRRepositoriesNameAll = "data.tencentcloud_tcr_repositories.id_test"
1010

11-
func TestAccTencentCloudTCRRepositoriesData(t *testing.T) {
11+
func TestAccTencentCloudTcrRepositoriesData(t *testing.T) {
1212
t.Parallel()
1313
resource.Test(t, resource.TestCase{
1414
PreCheck: func() { testAccPreCheck(t) },
1515
Providers: testAccProviders,
1616
CheckDestroy: testAccCheckTCRRepositoryDestroy,
1717
Steps: []resource.TestStep{
1818
{
19-
Config: testAccTencentCloudDataTCRRepositoriesBasic,
19+
Config: testAccTencentCloudDataTCRRepositoriesBasic,
20+
PreConfig: func() { testAccStepSetRegion(t, "ap-shanghai") },
2021
Check: resource.ComposeAggregateTestCheckFunc(
2122
resource.TestCheckResourceAttrSet(testDataTCRRepositoriesNameAll, "repository_list.0.name"),
2223
resource.TestCheckResourceAttrSet(testDataTCRRepositoriesNameAll, "repository_list.0.create_time"),

tencentcloud/data_source_tc_tcr_tag_retention_execution_tasks_test.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,13 @@ func TestAccTencentCloudTcrTagRetentionExecutionTasksDataSource_basic(t *testing
1818
Providers: testAccProviders,
1919
Steps: []resource.TestStep{
2020
{
21-
Config: fmt.Sprintf(testAccTcrTagRetentionExecutionTasksDataSource, defaultTCRInstanceId),
21+
Config: fmt.Sprintf(testAccTcrTagRetentionExecutionTasksDataSource, defaultTCRInstanceId),
22+
PreConfig: func() { testAccStepSetRegion(t, "ap-shanghai") },
2223
Check: resource.ComposeTestCheckFunc(
2324
testAccCheckTencentCloudDataSourceID(testExecutionTasksObjectName),
2425
resource.TestCheckResourceAttrSet(testExecutionTasksObjectName, "id"),
2526
resource.TestCheckResourceAttr(testExecutionTasksObjectName, "registry_id", defaultTCRInstanceId),
26-
resource.TestCheckResourceAttr(testExecutionTasksObjectName, "retention_id", "17"),
27+
resource.TestCheckResourceAttr(testExecutionTasksObjectName, "retention_id", "1"),
2728
resource.TestCheckResourceAttr(testExecutionTasksObjectName, "execution_id", "1"),
2829
resource.TestCheckResourceAttrSet(testExecutionTasksObjectName, "retention_task_list.#"),
2930
resource.TestCheckResourceAttrSet(testExecutionTasksObjectName, "retention_task_list.0.task_id"),
@@ -38,7 +39,7 @@ const testAccTcrTagRetentionExecutionTasksDataSource = `
3839
3940
data "tencentcloud_tcr_tag_retention_execution_tasks" "tasks" {
4041
registry_id = "%s"
41-
retention_id = "17"
42+
retention_id = "1"
4243
execution_id = "1"
4344
}
4445

tencentcloud/data_source_tc_tcr_tokens_test.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,16 @@ import (
88

99
var testDataTCRTokensNameAll = "data.tencentcloud_tcr_tokens.id_test"
1010

11-
func TestAccTencentCloudTCRTokensData(t *testing.T) {
11+
func TestAccTencentCloudTcrTokensData(t *testing.T) {
1212
t.Parallel()
1313
resource.Test(t, resource.TestCase{
1414
PreCheck: func() { testAccPreCheck(t) },
1515
Providers: testAccProviders,
1616
CheckDestroy: testAccCheckTCRTokenDestroy,
1717
Steps: []resource.TestStep{
1818
{
19-
Config: testAccTencentCloudDataTCRTokensBasic,
19+
Config: testAccTencentCloudDataTCRTokensBasic,
20+
PreConfig: func() { testAccStepSetRegion(t, "ap-shanghai") },
2021
Check: resource.ComposeAggregateTestCheckFunc(
2122
resource.TestCheckResourceAttrSet(testDataTCRTokensNameAll, "token_list.0.token_id"),
2223
resource.TestCheckResourceAttrSet(testDataTCRTokensNameAll, "token_list.0.create_time"),

tencentcloud/data_source_tc_tcr_vpc_attachments_test.go

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,16 @@ import (
88

99
var testDataTCRVPCAttachmentsNameAll = "data.tencentcloud_tcr_vpc_attachments.id_test"
1010

11-
func TestAccTencentCloudTCRVPCAttachmentsData(t *testing.T) {
11+
func TestAccTencentCloudTcrVPCAttachmentsData(t *testing.T) {
1212
t.Parallel()
1313
resource.Test(t, resource.TestCase{
1414
PreCheck: func() { testAccPreCheck(t) },
1515
Providers: testAccProviders,
1616
CheckDestroy: testAccCheckTCRNamespaceDestroy,
1717
Steps: []resource.TestStep{
1818
{
19-
Config: testAccTencentCloudDataTCRVPCAttachmentsBasic,
19+
Config: testAccTencentCloudDataTCRVPCAttachmentsBasic,
20+
PreConfig: func() { testAccStepSetRegion(t, "ap-shanghai") },
2021
Check: resource.ComposeAggregateTestCheckFunc(
2122
testAccCheckTCRVPCAttachmentExists("tencentcloud_tcr_vpc_attachment.mytcr_vpc_attachment"),
2223
resource.TestCheckResourceAttr(testDataTCRVPCAttachmentsNameAll, "vpc_attachment_list.#", "1"),
@@ -27,7 +28,18 @@ func TestAccTencentCloudTCRVPCAttachmentsData(t *testing.T) {
2728
})
2829
}
2930

30-
const testAccTencentCloudDataTCRVPCAttachmentsBasic = defaultVpcSubnets + `
31+
const defaultTcrVpcSubnets = `
32+
33+
data "tencentcloud_vpc_subnets" "sh" {
34+
availability_zone = "ap-shanghai-1"
35+
}
36+
37+
locals {
38+
vpc_id = data.tencentcloud_vpc_subnets.sh.instance_list.0.vpc_id
39+
subnet_id = data.tencentcloud_vpc_subnets.sh.instance_list.0.subnet_id
40+
}`
41+
42+
const testAccTencentCloudDataTCRVPCAttachmentsBasic = defaultTcrVpcSubnets + `
3143
resource "tencentcloud_tcr_instance" "mytcr_instance" {
3244
name = "test-tcr-attach"
3345
instance_type = "basic"

tencentcloud/data_source_tc_tcr_webhook_trigger_logs_test.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ func TestAccTencentCloudTcrDescribeWebhookTriggerLogsDataSource_basic(t *testing
1515
Providers: testAccProviders,
1616
Steps: []resource.TestStep{
1717
{
18-
Config: testAccTcrDescribeWebhookTriggerLogsDataSource,
18+
Config: testAccTcrDescribeWebhookTriggerLogsDataSource,
19+
PreConfig: func() { testAccStepSetRegion(t, "ap-shanghai") },
1920
Check: resource.ComposeTestCheckFunc(
2021
testAccCheckTencentCloudDataSourceID("data.tencentcloud_tcr_webhook_trigger_logs.my_logs"),
2122
resource.TestCheckResourceAttrSet("data.tencentcloud_tcr_webhook_trigger_logs.my_logs", "logs.#"),
@@ -42,7 +43,7 @@ const testAccTcrDescribeWebhookTriggerLogsDataSource = defaultTCRInstanceData +
4243
data "tencentcloud_tcr_webhook_trigger_logs" "my_logs" {
4344
registry_id = local.tcr_id
4445
namespace = var.tcr_namespace
45-
trigger_id = 2
46+
trigger_id = 1
4647
tags = {
4748
"createdBy" = "terraform"
4849
}

0 commit comments

Comments
 (0)