public
/
terraform-provider-google
mirror of https://github.com/letic/terraform-provider-google.git
0
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixup non-Removed ISV tests (#3443) 

<!-- This change is generated by MagicModules. -->
Original Author: @rileykarson
This commit is contained in:
The Magician 2019-04-16 13:06:09 -07:00 committed by Riley Karson
parent 0965a6c8d8
commit dc95bd3468
2 changed files with 33 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
google/resource_container_node_pool_test.go
View File

@ -99,7 +99,7 @@ func TestAccContainerNodePool_withNodeConfig(t *testing.T) {
ImportStateVerify: true,
// autoscaling.# = 0 is equivalent to no autoscaling at all,
// but will still cause an import diff
ImportStateVerifyIgnore: []string{"autoscaling.#"},
ImportStateVerifyIgnore: []string{"autoscaling.#", "max_pods_per_node"},
},
{
Config: testAccContainerNodePool_withNodeConfigUpdate(cluster, nodePool),
@ -406,6 +406,30 @@ func TestAccContainerNodePool_version(t *testing.T) {
})
}
func TestAccContainerNodePool_regionalClusters(t *testing.T) {
t.Parallel()
cluster := fmt.Sprintf("tf-nodepool-test-%s", acctest.RandString(10))
np := fmt.Sprintf("tf-nodepool-test-%s", acctest.RandString(10))
resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckContainerNodePoolDestroy,
Steps: []resource.TestStep{
{
Config: testAccContainerNodePool_regionalClusters(cluster, np),
},
{
ResourceName: "google_container_node_pool.np",
ImportState: true,
ImportStateVerify: true,
ImportStateVerifyIgnore: []string{"max_pods_per_node"},
},
},
})
}
func testAccCheckContainerNodePoolDestroy(s *terraform.State) error {
config := testAccProvider.Meta().(*Config)
@ -440,29 +464,6 @@ func testAccCheckContainerNodePoolDestroy(s *terraform.State) error {
return nil
}
func TestAccContainerNodePool_regionalClusters(t *testing.T) {
t.Parallel()
cluster := fmt.Sprintf("tf-nodepool-test-%s", acctest.RandString(10))
np := fmt.Sprintf("tf-nodepool-test-%s", acctest.RandString(10))
resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckContainerNodePoolDestroy,
Steps: []resource.TestStep{
{
Config: testAccContainerNodePool_regionalClusters(cluster, np),
},
{
ResourceName: "google_container_node_pool.np",
ImportState: true,
ImportStateVerify: true,
},
},
})
}
func testAccContainerNodePool_basic(cluster, np string) string {
return fmt.Sprintf(`
resource "google_container_cluster" "cluster" {

14
google/resource_google_project_test.go
View File

@ -89,9 +89,10 @@ func TestAccProject_billing(t *testing.T) {
},
// Make sure import supports billing account
{
ResourceName: "google_project.acceptance",
ImportState: true,
ImportStateVerify: true,
ResourceName: "google_project.acceptance",
ImportState: true,
ImportStateVerify: true,
ImportStateVerifyIgnore: []string{"skip_delete"},
},
// Update to a different billing account
{
@ -129,9 +130,10 @@ func TestAccProject_labels(t *testing.T) {
},
// Make sure import supports labels
{
ResourceName: "google_project.acceptance",
ImportState: true,
ImportStateVerify: true,
ResourceName: "google_project.acceptance",
ImportState: true,
ImportStateVerify: true,
ImportStateVerifyIgnore: []string{"skip_delete"},
},
// update project with labels
{