public/terraform-provider-google
0
0
Fork 0
mirror of https://github.com/letic/terraform-provider-google.git synced 2024-07-06 02:02:43 +00:00
Code Issues Projects Releases Wiki Activity

Allow specifying resource name for project metadata item config in tests (#305)

Browse Source
This commit is contained in:
Joe Selman 2017-08-08 13:05:13 -07:00 committed by GitHub
parent 8d215aaac3
commit 73ef33191d
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
google/import_compute_project_metadata_item_test.go
View File

@ -16,7 +16,7 @@ func TestAccComputeProjectMetadataItem_importBasic(t *testing.T) {
CheckDestroy: testAccCheckProjectMetadataItemDestroy, CheckDestroy: testAccCheckProjectMetadataItemDestroy,
Steps: []resource.TestStep{ Steps: []resource.TestStep{
{ {
Config: testAccProjectMetadataItem_basic(key, "myValue"), Config: testAccProjectMetadataItem_basicWithResourceName("foobar", key, "myValue"),
}, },
{ {
ResourceName: "google_compute_project_metadata_item.foobar", ResourceName: "google_compute_project_metadata_item.foobar",

12
google/resource_compute_project_metadata_item_test.go
View File

@ -77,13 +77,13 @@ func TestAccComputeProjectMetadataItem_basicUpdate(t *testing.T) {
CheckDestroy: testAccCheckProjectMetadataItemDestroy, CheckDestroy: testAccCheckProjectMetadataItemDestroy,
Steps: []resource.TestStep{ Steps: []resource.TestStep{
{ {
Config: testAccProjectMetadataItem_basic(key, "myValue"), Config: testAccProjectMetadataItem_basicWithResourceName("foobar", key, "myValue"),
Check: resource.ComposeTestCheckFunc( Check: resource.ComposeTestCheckFunc(
testAccCheckProjectMetadataItem_hasMetadata(key, "myValue"), testAccCheckProjectMetadataItem_hasMetadata(key, "myValue"),
), ),
}, },
{ {
Config: testAccProjectMetadataItem_basic(key, "myUpdatedValue"), Config: testAccProjectMetadataItem_basicWithResourceName("foobar", key, "myUpdatedValue"),
Check: resource.ComposeTestCheckFunc( Check: resource.ComposeTestCheckFunc(
testAccCheckProjectMetadataItem_hasMetadata(key, "myUpdatedValue"), testAccCheckProjectMetadataItem_hasMetadata(key, "myUpdatedValue"),
), ),
@ -139,10 +139,14 @@ func testAccCheckProjectMetadataItemDestroy(s *terraform.State) error {
} }
func testAccProjectMetadataItem_basic(key, val string) string { func testAccProjectMetadataItem_basic(key, val string) string {
return testAccProjectMetadataItem_basicWithResourceName(acctest.RandString(10), key, val)
}
func testAccProjectMetadataItem_basicWithResourceName(resourceName, key, val string) string {
return fmt.Sprintf(` return fmt.Sprintf(`
resource "google_compute_project_metadata_item" "foobar-%s" { resource "google_compute_project_metadata_item" "%s" {
key = "%s" key = "%s"
value = "%s" value = "%s"
} }
`, acctest.RandString(10), key, val) `, resourceName, key, val)
} }