Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions tencentcloud/basic_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 = `
Expand Down
3 changes: 2 additions & 1 deletion tencentcloud/data_source_tc_tcr_image_manifests_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"),
Expand Down
9 changes: 6 additions & 3 deletions tencentcloud/data_source_tc_tcr_images_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand All @@ -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),
Expand All @@ -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),
Expand Down
5 changes: 3 additions & 2 deletions tencentcloud/data_source_tc_tcr_instances_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,16 @@ 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) },
Providers: testAccProviders,
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"),
Expand Down
5 changes: 3 additions & 2 deletions tencentcloud/data_source_tc_tcr_namespaces_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,16 @@ 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) },
Providers: testAccProviders,
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
Expand Down
5 changes: 3 additions & 2 deletions tencentcloud/data_source_tc_tcr_repositories_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,16 @@ 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) },
Providers: testAccProviders,
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"),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,13 @@ 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"),
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"),
Expand All @@ -38,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"
}

Expand Down
5 changes: 3 additions & 2 deletions tencentcloud/data_source_tc_tcr_tokens_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,16 @@ 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) },
Providers: testAccProviders,
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"),
Expand Down
18 changes: 15 additions & 3 deletions tencentcloud/data_source_tc_tcr_vpc_attachments_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,16 @@ 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) },
Providers: testAccProviders,
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"),
Expand All @@ -27,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"
Expand Down
5 changes: 3 additions & 2 deletions tencentcloud/data_source_tc_tcr_webhook_trigger_logs_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.#"),
Expand All @@ -42,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"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
3 changes: 2 additions & 1 deletion tencentcloud/resource_tc_tcr_customized_domain_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"),
Expand Down
3 changes: 2 additions & 1 deletion tencentcloud/resource_tc_tcr_delete_image_operation_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
4 changes: 2 additions & 2 deletions tencentcloud/resource_tc_tcr_immutable_tag_rule_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand All @@ -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"),
Expand Down
19 changes: 10 additions & 9 deletions tencentcloud/resource_tc_tcr_instance_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ func init() {
service := TCRService{client}

instances, err := service.DescribeTCRInstances(ctx, "", nil)

if err != nil {
return err
}
Expand Down Expand Up @@ -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"),
Expand All @@ -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"),
),
},
{
Expand All @@ -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"),
),
},
{
Expand All @@ -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"),
Expand Down Expand Up @@ -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"),
Expand All @@ -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,
Expand Down Expand Up @@ -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"),
Expand Down
Loading