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
6 changes: 5 additions & 1 deletion tencentcloud/connectivity/transport.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ import (
)

const REQUEST_CLIENT = "TENCENTCLOUD_API_REQUEST_CLIENT"
const ENV_TESTING_ROUTE_USER_ID = "TENCENTCLOUD_ENV_TESTING_USER_ID"
const ENV_TESTING_ROUTE_HEADER_KEY = "x-qcloud-user-id"

var ReqClient = "Terraform-latest"

Expand Down Expand Up @@ -42,7 +44,9 @@ func (me *LogRoundTripper) RoundTrip(request *http.Request) (response *http.Resp
if envReqClient := os.Getenv(REQUEST_CLIENT); envReqClient != "" {
ReqClient = envReqClient
}

if routeUserID := os.Getenv(ENV_TESTING_ROUTE_USER_ID); routeUserID != "" {
request.Header.Set(ENV_TESTING_ROUTE_HEADER_KEY, routeUserID)
}
request.Header.Set("X-TC-RequestClient", ReqClient)
inBytes = []byte(fmt.Sprintf("%s, request: ", request.Header[headName]))
requestBody, errRet := ioutil.ReadAll(bodyReader)
Expand Down
22 changes: 20 additions & 2 deletions tencentcloud/resource_tc_cbs_storage_testing_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,17 @@ func TestAccTencentCloudTestingCbsStorageResource_basic(t *testing.T) {
resource.TestCheckResourceAttr("tencentcloud_cbs_storage.storage_basic", "storage_name", "tf-storage-basic"),
resource.TestCheckResourceAttr("tencentcloud_cbs_storage.storage_basic", "storage_type", "CLOUD_PREMIUM"),
resource.TestCheckResourceAttr("tencentcloud_cbs_storage.storage_basic", "storage_size", "50"),
resource.TestCheckResourceAttr("tencentcloud_cbs_storage.storage_basic", "availability_zone", "ap-guangzhou-3"),
resource.TestCheckResourceAttr("tencentcloud_cbs_storage.storage_basic", "availability_zone", "ap-guangzhou-2"),
),
},
{
Config: testAccTestingCbsStorageUp_basic,
Check: resource.ComposeTestCheckFunc(
testAccCheckStorageExists("tencentcloud_cbs_storage.storage_basic"),
resource.TestCheckResourceAttr("tencentcloud_cbs_storage.storage_basic", "storage_name", "tf-storage-basic"),
resource.TestCheckResourceAttr("tencentcloud_cbs_storage.storage_basic", "storage_type", "CLOUD_PREMIUM"),
resource.TestCheckResourceAttr("tencentcloud_cbs_storage.storage_basic", "storage_size", "100"),
resource.TestCheckResourceAttr("tencentcloud_cbs_storage.storage_basic", "availability_zone", "ap-guangzhou-2"),
),
},
{
Expand All @@ -38,6 +48,14 @@ resource "tencentcloud_cbs_storage" "storage_basic" {
storage_type = "CLOUD_PREMIUM"
storage_name = "tf-storage-basic"
storage_size = 50
availability_zone = "ap-guangzhou-3"
availability_zone = "ap-guangzhou-2"
}
`
const testAccTestingCbsStorageUp_basic = `
resource "tencentcloud_cbs_storage" "storage_basic" {
storage_type = "CLOUD_PREMIUM"
storage_name = "tf-storage-basic"
storage_size = 100
availability_zone = "ap-guangzhou-2"
}
`