Skip to content

fix(cvm): [120399559]update test case #3227

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 3 commits into from
Mar 20, 2025
Merged

fix(cvm): [120399559]update test case #3227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
11ebdf9
update test case
Mar 20, 2025
4e45b02
add changelog
Mar 20, 2025
bd83b46
update
Mar 20, 2025
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
7 changes: 7 additions & 0 deletions .changelog/3227.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
```release-note:enhancement
resource/tencentcloud_instance: support `user_data` and `user_data_raw` update
```

```release-note:enhancement
resource/tencentcloud_reserved_instance: update cvm sdk
```
289 changes: 289 additions & 0 deletions tencentcloud/services/cvm/resource_tc_instance_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,69 @@ func TestAccTencentCloudInstanceResourceBasic(t *testing.T) {
},
})
}
func TestAccTencentCloudInstanceResource_UserDataRaw(t *testing.T) {
t.Parallel()
resource.Test(t, resource.TestCase{
PreCheck: func() {
acctest.AccPreCheck(t)
},
Providers: acctest.AccProviders,
CheckDestroy: testAccCheckCvmInstanceDestroy,
Steps: []resource.TestStep{
{
Config: testAccCvmInstanceResource_UserDataRaw,
Check: resource.ComposeTestCheckFunc(
testAccCheckCvmInstanceExists("tencentcloud_instance.cvm_user_data_raw"),
resource.TestCheckResourceAttr("tencentcloud_instance.cvm_user_data_raw", "user_data_raw", "test"),
),
},
{
Config: testAccCvmInstanceResource_UserDataRawUpdate,
Check: resource.ComposeTestCheckFunc(
testAccCheckCvmInstanceExists("tencentcloud_instance.cvm_user_data_raw"),
resource.TestCheckResourceAttr("tencentcloud_instance.cvm_user_data_raw", "user_data_raw", "test-update"),
),
},
{
ResourceName: "tencentcloud_instance.cvm_user_data_raw",
ImportState: true,
ImportStateVerifyIgnore: []string{"disable_monitor_service", "disable_security_service", "disable_automation_service", "hostname", "password", "force_delete"},
},
},
})
}

func TestAccTencentCloudInstanceResource_UserData(t *testing.T) {
t.Parallel()
resource.Test(t, resource.TestCase{
PreCheck: func() {
acctest.AccPreCheck(t)
},
Providers: acctest.AccProviders,
CheckDestroy: testAccCheckCvmInstanceDestroy,
Steps: []resource.TestStep{
{
Config: testAccCvmInstanceResource_UserData,
Check: resource.ComposeTestCheckFunc(
testAccCheckCvmInstanceExists("tencentcloud_instance.cvm_user_data"),
resource.TestCheckResourceAttr("tencentcloud_instance.cvm_user_data", "user_data", "dGVzdA=="),
),
},
{
Config: testAccCvmInstanceResource_UserDataUpdate,
Check: resource.ComposeTestCheckFunc(
testAccCheckCvmInstanceExists("tencentcloud_instance.cvm_user_data"),
resource.TestCheckResourceAttr("tencentcloud_instance.cvm_user_data", "user_data", "dGVzdC11cGRhdGU="),
),
},
{
ResourceName: "tencentcloud_instance.cvm_user_data",
ImportState: true,
ImportStateVerifyIgnore: []string{"disable_monitor_service", "disable_security_service", "disable_automation_service", "hostname", "password", "force_delete"},
},
},
})
}

func testAccCheckCvmInstanceExists(n string) resource.TestCheckFunc {
return func(s *terraform.State) error {
Expand Down Expand Up @@ -163,6 +226,232 @@ func testAccCheckCvmInstanceDestroy(s *terraform.State) error {
return nil
}

const testAccCvmInstanceResource_UserData = `

data "tencentcloud_availability_zones" "default" {
}
data "tencentcloud_images" "default" {
image_type = ["PUBLIC_IMAGE"]
image_name_regex = "Final"
}
data "tencentcloud_images" "testing" {
image_type = ["PUBLIC_IMAGE"]
}
data "tencentcloud_instance_types" "default" {
memory_size = 2
exclude_sold_out = true

filter {
name = "instance-family"
values = ["S1","S2","S3","S4","S5"]
}
filter {
name = "zone"
values = ["ap-guangzhou-7"]
}
cpu_core_count = 2
}
resource "tencentcloud_vpc" "vpc" {
name = "cvm-basic-vpc"
cidr_block = "10.0.0.0/16"
}
resource "tencentcloud_subnet" "subnet" {
availability_zone = "ap-guangzhou-7"
vpc_id = tencentcloud_vpc.vpc.id
name = "cvm-basic-subnet"
cidr_block = "10.0.0.0/16"
}
resource "tencentcloud_instance" "cvm_user_data" {
instance_name = "tf-test-user-data"
availability_zone = "ap-guangzhou-7"
image_id = data.tencentcloud_images.default.images.0.image_id
vpc_id = tencentcloud_vpc.vpc.id

tags = {
hostname = "tci"
}

lifecycle {
ignore_changes = [instance_type]
}
instance_type = data.tencentcloud_instance_types.default.instance_types.0.instance_type
subnet_id = tencentcloud_subnet.subnet.id
system_disk_type = "CLOUD_PREMIUM"
project_id = 0
user_data = "dGVzdA=="
}

`
const testAccCvmInstanceResource_UserDataUpdate = `

data "tencentcloud_availability_zones" "default" {
}
data "tencentcloud_images" "default" {
image_type = ["PUBLIC_IMAGE"]
image_name_regex = "Final"
}
data "tencentcloud_images" "testing" {
image_type = ["PUBLIC_IMAGE"]
}
data "tencentcloud_instance_types" "default" {
memory_size = 2
exclude_sold_out = true

filter {
name = "instance-family"
values = ["S1","S2","S3","S4","S5"]
}
filter {
name = "zone"
values = ["ap-guangzhou-7"]
}
cpu_core_count = 2
}
resource "tencentcloud_vpc" "vpc" {
name = "cvm-basic-vpc"
cidr_block = "10.0.0.0/16"
}
resource "tencentcloud_subnet" "subnet" {
availability_zone = "ap-guangzhou-7"
vpc_id = tencentcloud_vpc.vpc.id
name = "cvm-basic-subnet"
cidr_block = "10.0.0.0/16"
}
resource "tencentcloud_instance" "cvm_user_data" {
instance_name = "tf-test-user-data"
availability_zone = "ap-guangzhou-7"
image_id = data.tencentcloud_images.default.images.0.image_id
vpc_id = tencentcloud_vpc.vpc.id

tags = {
hostname = "tci"
}

lifecycle {
ignore_changes = [instance_type]
}
instance_type = data.tencentcloud_instance_types.default.instance_types.0.instance_type
subnet_id = tencentcloud_subnet.subnet.id
system_disk_type = "CLOUD_PREMIUM"
project_id = 0
user_data = "dGVzdC11cGRhdGU="
}

`

const testAccCvmInstanceResource_UserDataRaw = `

data "tencentcloud_availability_zones" "default" {
}
data "tencentcloud_images" "default" {
image_type = ["PUBLIC_IMAGE"]
image_name_regex = "Final"
}
data "tencentcloud_images" "testing" {
image_type = ["PUBLIC_IMAGE"]
}
data "tencentcloud_instance_types" "default" {
memory_size = 2
exclude_sold_out = true

filter {
name = "instance-family"
values = ["S1","S2","S3","S4","S5"]
}
filter {
name = "zone"
values = ["ap-guangzhou-7"]
}
cpu_core_count = 2
}
resource "tencentcloud_vpc" "vpc" {
name = "cvm-basic-vpc"
cidr_block = "10.0.0.0/16"
}
resource "tencentcloud_subnet" "subnet" {
availability_zone = "ap-guangzhou-7"
vpc_id = tencentcloud_vpc.vpc.id
name = "cvm-basic-subnet"
cidr_block = "10.0.0.0/16"
}
resource "tencentcloud_instance" "cvm_user_data_raw" {
instance_name = "tf-test-user-data-raw"
availability_zone = "ap-guangzhou-7"
image_id = data.tencentcloud_images.default.images.0.image_id
vpc_id = tencentcloud_vpc.vpc.id

tags = {
hostname = "tci"
}

lifecycle {
ignore_changes = [instance_type]
}
instance_type = data.tencentcloud_instance_types.default.instance_types.0.instance_type
subnet_id = tencentcloud_subnet.subnet.id
system_disk_type = "CLOUD_PREMIUM"
project_id = 0
user_data_raw = "test"
}

`
const testAccCvmInstanceResource_UserDataRawUpdate = `

data "tencentcloud_availability_zones" "default" {
}
data "tencentcloud_images" "default" {
image_type = ["PUBLIC_IMAGE"]
image_name_regex = "Final"
}
data "tencentcloud_images" "testing" {
image_type = ["PUBLIC_IMAGE"]
}
data "tencentcloud_instance_types" "default" {
memory_size = 2
exclude_sold_out = true

filter {
name = "instance-family"
values = ["S1","S2","S3","S4","S5"]
}
filter {
name = "zone"
values = ["ap-guangzhou-7"]
}
cpu_core_count = 2
}
resource "tencentcloud_vpc" "vpc" {
name = "cvm-basic-vpc"
cidr_block = "10.0.0.0/16"
}
resource "tencentcloud_subnet" "subnet" {
availability_zone = "ap-guangzhou-7"
vpc_id = tencentcloud_vpc.vpc.id
name = "cvm-basic-subnet"
cidr_block = "10.0.0.0/16"
}
resource "tencentcloud_instance" "cvm_user_data_raw" {
instance_name = "tf-test-user-data-raw"
availability_zone = "ap-guangzhou-7"
image_id = data.tencentcloud_images.default.images.0.image_id
vpc_id = tencentcloud_vpc.vpc.id

tags = {
hostname = "tci"
}

lifecycle {
ignore_changes = [instance_type]
}
instance_type = data.tencentcloud_instance_types.default.instance_types.0.instance_type
subnet_id = tencentcloud_subnet.subnet.id
system_disk_type = "CLOUD_PREMIUM"
project_id = 0
user_data_raw = "test-update"
}

`

const testAccCvmInstanceResource_BasicCreate = `

data "tencentcloud_availability_zones" "default" {
Expand Down
16 changes: 7 additions & 9 deletions tencentcloud/services/cvm/resource_tc_reserved_instance_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
)

func TestAccTencentCloudReservedInstance(t *testing.T) {
func TestAccTencentCloudReservedInstanceResource(t *testing.T) {
t.Parallel()
resource.Test(t, resource.TestCase{
PreCheck: func() { tcacctest.AccPreCheck(t) },
Expand All @@ -17,28 +17,26 @@ func TestAccTencentCloudReservedInstance(t *testing.T) {
{
Config: testAccReservedInstance,
Check: resource.ComposeTestCheckFunc(
testAccCheckPlacementGroupExists("tencentcloud_reserved_instance.reserved_instance"),
resource.TestCheckResourceAttr("tencentcloud_reserved_instance.reserved_instance", "config_id", "ca8d39c3-4605-4e8d-9a21-05188cc9d1d4"),
resource.TestCheckResourceAttr("tencentcloud_reserved_instance.reserved_instance", "instance_count", "2"),
resource.TestCheckResourceAttr("tencentcloud_reserved_instance.reserved_instance", "config_id", "3ae825a8-bf6f-4c43-aa2c-c507c08fba92"),
resource.TestCheckResourceAttr("tencentcloud_reserved_instance.reserved_instance", "instance_count", "1"),
resource.TestCheckResourceAttr("tencentcloud_reserved_instance.reserved_instance", "reserved_instance_name", "test"),
resource.TestCheckResourceAttrSet("tencentcloud_reserved_instance.reserved_instance", "start_time"),
resource.TestCheckResourceAttrSet("tencentcloud_reserved_instance.reserved_instance", "end_time"),
resource.TestCheckResourceAttrSet("tencentcloud_reserved_instance.reserved_instance", "status"),
),
},
{
ResourceName: "tencentcloud_reserved_instance.reserved_instance",
ImportState: true,
ImportStateVerify: true,
ResourceName: "tencentcloud_reserved_instance.reserved_instance",
ImportState: true,
},
},
})
}

const testAccReservedInstance = `
resource "tencentcloud_reserved_instance" "reserved_instance" {
config_id = "ca8d39c3-4605-4e8d-9a21-05188cc9d1d4"
instance_count = 2
config_id = "3ae825a8-bf6f-4c43-aa2c-c507c08fba92"
instance_count = 1
reserved_instance_name = "test"
}
`
Loading