diff --git a/tencentcloud/resource_tc_tem_app_config_test.go b/tencentcloud/resource_tc_tem_app_config_test.go index beb0b0baf9..c3d83b1b5d 100644 --- a/tencentcloud/resource_tc_tem_app_config_test.go +++ b/tencentcloud/resource_tc_tem_app_config_test.go @@ -11,8 +11,8 @@ import ( "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/errors" ) -// go test -i; go test -test.run TestAccTencentCloudNeedFixTemAppConfigResource_basic -v -func TestAccTencentCloudNeedFixTemAppConfigResource_basic(t *testing.T) { +// go test -i; go test -test.run TestAccTencentCloudTemAppConfigResource_basic -v +func TestAccTencentCloudTemAppConfigResource_basic(t *testing.T) { t.Parallel() resource.Test(t, resource.TestCase{ PreCheck: func() { diff --git a/tencentcloud/resource_tc_tem_application_test.go b/tencentcloud/resource_tc_tem_application_test.go index 09dd67b793..f1a06bc9a4 100644 --- a/tencentcloud/resource_tc_tem_application_test.go +++ b/tencentcloud/resource_tc_tem_application_test.go @@ -9,8 +9,8 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" ) -// go test -i; go test -test.run TestAccTencentCloudNeedFixTemApplicationResource_basic -v -func TestAccTencentCloudNeedFixTemApplicationResource_basic(t *testing.T) { +// go test -i; go test -test.run TestAccTencentCloudTemApplicationResource_basic -v +func TestAccTencentCloudTemApplicationResource_basic(t *testing.T) { t.Parallel() resource.Test(t, resource.TestCase{ diff --git a/tencentcloud/resource_tc_tem_environment_test.go b/tencentcloud/resource_tc_tem_environment_test.go index 533e963645..ab5723b888 100644 --- a/tencentcloud/resource_tc_tem_environment_test.go +++ b/tencentcloud/resource_tc_tem_environment_test.go @@ -10,8 +10,8 @@ import ( "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/errors" ) -// go test -i; go test -test.run TestAccTencentCloudNeedFixTemEnvironmentResource_basic -v -func TestAccTencentCloudNeedFixTemEnvironmentResource_basic(t *testing.T) { +// go test -i; go test -test.run TestAccTencentCloudTemEnvironmentResource_basic -v +func TestAccTencentCloudTemEnvironmentResource_basic(t *testing.T) { t.Parallel() resource.Test(t, resource.TestCase{ diff --git a/tencentcloud/resource_tc_tem_gateway_test.go b/tencentcloud/resource_tc_tem_gateway_test.go index a3c36f7855..be913be801 100644 --- a/tencentcloud/resource_tc_tem_gateway_test.go +++ b/tencentcloud/resource_tc_tem_gateway_test.go @@ -10,8 +10,8 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" ) -// go test -i; go test -test.run TestAccTencentCloudNeedFixTemGatewayResource_basic -v -func TestAccTencentCloudNeedFixTemGatewayResource_basic(t *testing.T) { +// go test -i; go test -test.run TestAccTencentCloudTemGatewayResource_basic -v +func TestAccTencentCloudTemGatewayResource_basic(t *testing.T) { t.Parallel() resource.Test(t, resource.TestCase{ diff --git a/tencentcloud/resource_tc_tem_log_config_test.go b/tencentcloud/resource_tc_tem_log_config_test.go index cd001c9397..da488f931a 100644 --- a/tencentcloud/resource_tc_tem_log_config_test.go +++ b/tencentcloud/resource_tc_tem_log_config_test.go @@ -11,8 +11,8 @@ import ( sdkErrors "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/errors" ) -// go test -i; go test -test.run TestAccTencentCloudNeedFixTemLogConfigResource_basic -v -func TestAccTencentCloudNeedFixTemLogConfigResource_basic(t *testing.T) { +// go test -i; go test -test.run TestAccTencentCloudTemLogConfigResource_basic -v +func TestAccTencentCloudTemLogConfigResource_basic(t *testing.T) { t.Parallel() resource.Test(t, resource.TestCase{ diff --git a/tencentcloud/resource_tc_tem_scale_rule_test.go b/tencentcloud/resource_tc_tem_scale_rule_test.go index 10c7bbae1e..79a7813752 100644 --- a/tencentcloud/resource_tc_tem_scale_rule_test.go +++ b/tencentcloud/resource_tc_tem_scale_rule_test.go @@ -10,8 +10,8 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" ) -// go test -i; go test -test.run TestAccTencentCloudNeedFixTemScaleRuleResource_basic -v -func TestAccTencentCloudNeedFixTemScaleRuleResource_basic(t *testing.T) { +// go test -i; go test -test.run TestAccTencentCloudTemScaleRuleResource_basic -v +func TestAccTencentCloudTemScaleRuleResource_basic(t *testing.T) { t.Parallel() resource.Test(t, resource.TestCase{ diff --git a/tencentcloud/resource_tc_tem_workload_test.go b/tencentcloud/resource_tc_tem_workload_test.go index 3f1d5c6541..80ecbd5573 100644 --- a/tencentcloud/resource_tc_tem_workload_test.go +++ b/tencentcloud/resource_tc_tem_workload_test.go @@ -11,9 +11,9 @@ import ( sdkErrors "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/errors" ) -// go test -i; go test -test.run TestAccTencentCloudNeedFixTemWorkloadResource_basic -v -func TestAccTencentCloudNeedFixTemWorkloadResource_basic(t *testing.T) { - t.Parallel() +// go test -i; go test -test.run TestAccTencentCloudTemWorkloadResource_basic -v +func TestAccTencentCloudTemWorkloadResource_basic(t *testing.T) { + // t.Parallel() resource.Test(t, resource.TestCase{ PreCheck: func() { @@ -28,7 +28,7 @@ func TestAccTencentCloudNeedFixTemWorkloadResource_basic(t *testing.T) { testAccCheckTemWorkloadExists("tencentcloud_tem_workload.workload"), resource.TestCheckResourceAttrSet("tencentcloud_tem_workload.workload", "id"), resource.TestCheckResourceAttr("tencentcloud_tem_workload.workload", "environment_id", defaultEnvironmentId), - resource.TestCheckResourceAttr("tencentcloud_tem_workload.workload", "application_id", defaultApplicationId), + resource.TestCheckResourceAttrSet("tencentcloud_tem_workload.workload", "application_id"), resource.TestCheckResourceAttr("tencentcloud_tem_workload.workload", "deploy_version", "hello-world"), resource.TestCheckResourceAttr("tencentcloud_tem_workload.workload", "deploy_mode", "IMAGE"), resource.TestCheckResourceAttr("tencentcloud_tem_workload.workload", "img_repo", "tem_demo/tem_demo"), @@ -69,7 +69,7 @@ func testAccCheckTemWorkloadDestroy(s *terraform.State) error { if !ok { return err } - if ee.Code == "ResourceNotFound.ServiceRunningVersionNotFound" { + if ee.Code == "ResourceNotFound.ServiceRunningVersionNotFound" || ee.Code == "ResourceNotFound.ServiceNotFound" { return nil } return err @@ -116,16 +116,12 @@ const testAccTemWorkloadVar = ` variable "environment_id" { default = "` + defaultEnvironmentId + `" } - -variable "application_id" { - default = "` + defaultApplicationId + `" -} ` -const testAccTemWorkload = testAccTemWorkloadVar + ` +const testAccTemWorkload = testAccTemApplication + testAccTemWorkloadVar + ` resource "tencentcloud_tem_workload" "workload" { - application_id = var.application_id + application_id = tencentcloud_tem_application.application.id environment_id = var.environment_id deploy_version = "hello-world" deploy_mode = "IMAGE"